From 33730217cfd6de8a38c93c2400265e4025ab404a Mon Sep 17 00:00:00 2001 From: Alain Hebert Date: Sun, 21 Dec 2025 19:25:34 -0500 Subject: #20: Correct more issues in non-regression tests --- Trivac/src/MACD.f | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) (limited to 'Trivac/src/MACD.f') diff --git a/Trivac/src/MACD.f b/Trivac/src/MACD.f index b9ce53b..d820b62 100755 --- a/Trivac/src/MACD.f +++ b/Trivac/src/MACD.f @@ -70,6 +70,8 @@ NIFISS=1 NDG=0 NALBP=0 + ILEAK=0 + NW=0 NSTEP=0 IF(NENTRY.EQ.2) THEN IF((IENTRY(2).NE.1).AND.(IENTRY(2).NE.2)) CALL XABORT('MACD' @@ -97,6 +99,8 @@ NIFISS=IPAR(4) NDG=IPAR(7) NALBP=IPAR(8) + ILEAK=IPAR(9) + NW=IPAR(10) NSTEP=IPAR(11) ENDIF *---- @@ -178,7 +182,8 @@ CALL REDGET(INDIC,NITMA,FLOTT,TEXT4,DFLOTT) IF((INDIC.NE.3).OR.(TEXT4.NE.'INPU')) CALL XABORT('MACD: INPU' 1 //'T KEYWORD EXPECTED.') - CALL MACXSI(IPLIST,IND,NMIXT,NGRP,NDG,NL,IMPX,NBMIX,JND) + CALL MACXSI(IPLIST,IND,NMIXT,NGRP,NDG,NL,IMPX,NBMIX,ILEAK,NW, + 1 JND) IF(ISTEP.GT.0) THEN IF(IMPX.GT.1) CALL LCMLIB(IPLIST) CALL LCMSIX(IPLIST,' ',2) @@ -208,9 +213,28 @@ IPAR(6)=0 IPAR(7)=NDG IPAR(8)=NALBP + IPAR(9)=ILEAK + IPAR(10)=NW IPAR(11)=NSTEP CALL LCMPUT(IPLIST,'STATE-VECTOR',NSTATE,1,IPAR) + IF(IMPX.GT.0) WRITE(6,100) IMPX,(IPAR(I),I=1,10) ENDIF IF(IMPX.GT.1) CALL LCMLIB(IPLIST) RETURN +* + 100 FORMAT(/8H OPTIONS/8H -------/ + 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 -- cgit v1.2.3