diff options
| author | HEBERT Alain <alain.hebert@polymtl.ca> | 2025-12-21 19:50:03 -0500 |
|---|---|---|
| committer | HEBERT Alain <alain.hebert@polymtl.ca> | 2025-12-21 19:50:03 -0500 |
| commit | 64491754efcb832b71915f66cd7301fedcc72df7 (patch) | |
| tree | ed40c4131e0c1b4493183936f34d2233a7ec4cfe /Trivac/src/OUTAUX.f | |
| parent | 5c0d4cce527b0d42dc794a475550783ea846b30a (diff) | |
| parent | 33730217cfd6de8a38c93c2400265e4025ab404a (diff) | |
Merge branch '20-correct-a-ntot1-issue-in-spn-bivac-trivac-solutions' into 'main'
#20: Correct more issues in non-regression tests
See merge request dragon/5.1!36
Diffstat (limited to 'Trivac/src/OUTAUX.f')
| -rwxr-xr-x | Trivac/src/OUTAUX.f | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/Trivac/src/OUTAUX.f b/Trivac/src/OUTAUX.f index 64a2567..d3e1ed7 100755 --- a/Trivac/src/OUTAUX.f +++ b/Trivac/src/OUTAUX.f @@ -47,7 +47,7 @@ * SUBROUTINE ARGUMENTS *---- TYPE(C_PTR) IPMAC1,IPMAC2 - PARAMETER(NREAC=11) + PARAMETER(NREAC=12) INTEGER NBMIX,NL,NBFIS,NGRP,NEL,NUN,NALBP,NZS,NGCOND,MAT(NEL), 1 IDL(NEL),IHOM(NEL),IGCOND(NGCOND),IMPX REAL VOL(NEL),EVECT(NUN,NGRP) @@ -73,7 +73,7 @@ * DATA STATEMENT *---- DATA HREAC/'NTOT0','SIGW00','NUSIGF','NFTOT','H-FACTOR', - 1 'OVERV','DIFF','DIFFX','DIFFY','DIFFZ','C-FACTOR'/ + 1 'OVERV','DIFF','DIFFX','DIFFY','DIFFZ','NTOT1','C-FACTOR'/ *---- * SCRATCH STORAGE ALLOCATION * OUTR(IBM,NREAC+1): volume @@ -511,8 +511,9 @@ ELSE IF(LREAC(8)) THEN IDATA(9)=2 ENDIF - IDATA(15)=0 + IF(LREAC(11)) IDATA(10)=1 CALL LCMPUT(IPMAC2,'STATE-VECTOR',NSTATE,1,IDATA) + IF(IMPX.GT.0) WRITE(6,550) IMPX,(IDATA(I),I=1,10) *---- * SCRATCH STORAGE DEALLOCATION *---- @@ -524,4 +525,19 @@ 520 FORMAT(/' G R O U P : ',I3/1X,'IHOM',9A14) 530 FORMAT(1X,I4,1P,9E14.5) 540 FORMAT(/5H SUM,1P,8E14.5) + 550 FORMAT(/17H MACROLIB OPTIONS/17H ----------------/ + 1 7H IPRINT,I6,30H (0=NO PRINT/1=SHORT/2=MORE)/ + 2 7H NGROUP,I6,28H (NUMBER OF ENERGY GROUPS)/ + 3 7H NBMIX ,I6,39H (NUMBER OF MIXTURES IN THE MACROLIB)/ + 4 7H NANISO,I6,34H (MAXIMUM SCATTERING ANISOTROPY)/ + 5 7H NIFISS,I6,45H (MAXIMUM NUMBER OF FISSILE ISOTOPES IN A M, + 6 7HIXTURE)/ + 7 7H NEDMAC,I6,34H (NUMBER OF CROSS SECTION EDITS)/ + 8 7H ITRANC,I6,45H (0=NO TRANSPORT CORRECTION/1=APOLLO TYPE/2, + 9 43H=RECOVER FROM LIBRARY/4=LEAKAGE CORRECTION)/ + 1 7H NLG ,I6,39H (NUMBER OF DELAYED PRECURSOR GROUPS)/ + 2 7H NALB ,I6,31H (NUMBER OF PHYSICAL ALBEDOS)/ + 3 7H ILEAK ,I6,40H (1=DIFF AVAILABLE; 2=DIFFX AVAILABLE)/ + 4 7H NW ,I6,45H (=0/1: P1-WEIGHTED INFORMATION ABSENT/PRES, + 5 4HENT)) END |