diff options
| author | Alain Hebert <alainhebert@Alains-MacBook-Pro.local> | 2025-12-21 19:25:34 -0500 |
|---|---|---|
| committer | Alain Hebert <alainhebert@Alains-MacBook-Pro.local> | 2025-12-21 19:25:34 -0500 |
| commit | 33730217cfd6de8a38c93c2400265e4025ab404a (patch) | |
| tree | ed40c4131e0c1b4493183936f34d2233a7ec4cfe /Dragon/src/MAC.f | |
| parent | 5c0d4cce527b0d42dc794a475550783ea846b30a (diff) | |
#20: Correct more issues in non-regression tests
Diffstat (limited to 'Dragon/src/MAC.f')
| -rw-r--r-- | Dragon/src/MAC.f | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/Dragon/src/MAC.f b/Dragon/src/MAC.f index c4f0cde..e87c7b9 100644 --- a/Dragon/src/MAC.f +++ b/Dragon/src/MAC.f @@ -135,6 +135,7 @@ ITRANC=0 NDELG=0 NALBP=0 + NW=0 NSTEP=0 IDF=0 NPART0=0 @@ -158,6 +159,7 @@ ITRANC=ISTATE(6) NDELG=ISTATE(7) NALBP =ISTATE(8) + NW =ISTATE(10) NSTEP=ISTATE(11) IDF=ISTATE(12) NPART0=ISTATE(17) @@ -167,7 +169,7 @@ *---- IF(NMACSR.EQ.1) THEN CALL MACDRV(IPMACR,INDREC,IPRINT,IDF,NBMIX,NGROUP,NANISO, - 1 NIFISS,NEDMAC,ITRANC,NDELG,NSTEP,NALBP) + 1 NIFISS,NEDMAC,ITRANC,NDELG,NSTEP,NALBP,ILEAK,NW) ELSE NNEWMX=0 NANISO=MAX(NLO,NANISO) @@ -226,7 +228,7 @@ 1 //'S.') ENDIF CALL MACUPD(NENTRY,KENTRY,IPRINT,NTOTMX,NBMIX,NGROUP, - 1 NANISO,NIFISS,NEDMAC,ITRANC) + 1 NANISO,NIFISS,NEDMAC,ITRANC,ILEAK,NW) IF(NMACSR.EQ.-2) CALL LCMSIX(KENTRY(IPMAC2),' ',2) ENDIF * @@ -244,6 +246,8 @@ ISTATE(6)=ITRANC ISTATE(7)=NDELG ISTATE(8)=NALBP + ISTATE(9)=ILEAK + ISTATE(10)=NW ISTATE(11)=NSTEP ISTATE(12)=IDF ISTATE(17)=NPART0 @@ -257,12 +261,12 @@ CALL LCMPUT(IPMACR,'STATE-VECTOR',NSTATE,1,ISTATE) ENDIF IF(IPRINT.GT.1) CALL LCMLIB(IPMACR) - IF(IPRINT.GT.0) WRITE(IOUT,100) IPRINT,(ISTATE(I),I=1,9), - 1 ISTATE(11),ISTATE(12),ISTATE(17) + IF(IPRINT.GT.0) WRITE(IOUT,100) IPRINT,(ISTATE(I),I=1,12), + 1 ISTATE(17) CALL LCMSIX(IPMACR,' ',0) RETURN * - 100 FORMAT(/8H OPTIONS/8H -------/ + 100 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)/ @@ -275,7 +279,9 @@ 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 NSTEP ,I6,39H (NUMBER OF PERTURBATION DIRECTORIES)/ - 5 7H IDF ,I6,48H (=0/2 BOUNDARY FLUXES FOR ADF ABSENT/PRESENT)/ - 6 7H NPART0,I6,34H (NUMBER OF COMPANION PARTICLES)) + 4 7H NW ,I6,45H (=0/1: P1-WEIGHTED INFORMATION ABSENT/PRES, + 5 4HENT)/ + 6 7H NSTEP ,I6,39H (NUMBER OF PERTURBATION DIRECTORIES)/ + 7 7H IDF ,I6,48H (=0/2 BOUNDARY FLUXES FOR ADF ABSENT/PRESENT)/ + 8 7H NPART0,I6,34H (NUMBER OF COMPANION PARTICLES)) END |