diff options
| author | HEBERT Alain <alain.hebert@polymtl.ca> | 2025-12-22 07:53:47 -0500 |
|---|---|---|
| committer | HEBERT Alain <alain.hebert@polymtl.ca> | 2025-12-22 07:53:47 -0500 |
| commit | 0fbdc50700be08e00ecad828d9c99b5c045b382b (patch) | |
| tree | 387c66409dc587768edd0f9257a5eaa4d942c07f | |
| parent | 64491754efcb832b71915f66cd7301fedcc72df7 (diff) | |
| parent | c8c3cb9cfb212b9d35a7ef263a84ed3eb61c7a8c (diff) | |
Merge branch '20-correct-a-ntot1-issue-in-spn-bivac-trivac-solutions' into 'main'
#20: Correct a regression
See merge request dragon/5.1!37
| -rwxr-xr-x | Trivac/src/BIVSPS.f | 6 | ||||
| -rwxr-xr-x | Trivac/src/TRIRCA.f | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/Trivac/src/BIVSPS.f b/Trivac/src/BIVSPS.f index ece519c..dd2603d 100755 --- a/Trivac/src/BIVSPS.f +++ b/Trivac/src/BIVSPS.f @@ -106,8 +106,10 @@ WRITE(TEXT12,'(4HNTOT,I1)') MIN(IL-1,9) CALL LCMLEN(KPMACR,TEXT12,LENGT,ITYLCM) CALL LCMLEN(KPMACR,'NTOT1',LENGT1,ITYLCM) - IF((LENGT1.GT.0).AND.(NW.EQ.0)) CALL XABORT('BIVSPS: YOU MUST HA' - 1 //'VE NW>0.') + IF((LENGT1.GT.0).AND.(NW.EQ.0)) THEN + WRITE(6,'(49H BIVSPS: **WARNING** YOU HAVE NW=0 AND NTOT1 INFO, + 1 27HRMATION IS PRESENT IN GROUP,I4,1H.)') IGR + ENDIF IF((IL.EQ.1).AND.(LENGT.NE.NBMIX)) CALL XABORT('BIVSPS: NO NTOT0' 1 //' CROSS SECTIONS.') IF(MOD(IL-1,2).EQ.0) THEN diff --git a/Trivac/src/TRIRCA.f b/Trivac/src/TRIRCA.f index 6c1b496..b2fe1b1 100755 --- a/Trivac/src/TRIRCA.f +++ b/Trivac/src/TRIRCA.f @@ -79,8 +79,10 @@ WRITE(TEXT12,'(4HNTOT,I1)') MIN(IL-1,9) CALL LCMLEN(KPMACP,TEXT12,LENGT,ITYLCM) CALL LCMLEN(KPMACP,'NTOT1',LENGT1,ITYLCM) - IF((LENGT1.GT.0).AND.(NW.EQ.0)) CALL XABORT('TRIRCA: YOU MUST HA' - 1 //'VE NW>0.') + IF((LENGT1.GT.0).AND.(NW.EQ.0)) THEN + WRITE(6,'(49H TRIRCA: **WARNING** YOU HAVE NW=0 AND NTOT1 INFO, + 1 27HRMATION IS PRESENT IN GROUP,I4,1H.)') IGR + ENDIF IF((IL.EQ.1).AND.(LENGT.NE.NBMIX)) CALL XABORT('TRIRCA: NO NTOT0' 1 //' CROSS SECTIONS.') IF(MOD(IL-1,2).EQ.0) THEN @@ -132,7 +134,9 @@ ENDIF GO TO 100 ELSE - IF(LENGT.EQ.NBMIX) THEN + IF(NW.EQ.0) THEN + CALL LCMGET(KPMACP,'NTOT0',SGD(1,2)) + ELSE IF(LENGT.EQ.NBMIX) THEN CALL LCMGET(KPMACP,TEXT12,SGD(1,2)) ELSE IF(LENGT1.EQ.NBMIX) THEN CALL LCMGET(KPMACP,'NTOT1',SGD(1,2)) |