#20: Correct more issues in non-regression tests

5 files changed, 37 insertions, 15 deletions

diff --git a/Dragon/src/BREF.f b/Dragon/src/BREF.f
index 9e7de4a..88ec646 100644
--- a/Dragon/src/BREF.f
+++ b/Dragon/src/BREF.f
@@ -238,7 +238,7 @@
       DEALLOCATE(IMIX1,IGAP,ADFREF,ITRIAL,IPEDI2)
       IF(IPRINT.GT.0) THEN
         CALL LCMGET(IPMAC1,'STATE-VECTOR',ISTATE)
-        WRITE(6,110) IPRINT,(ISTATE(I),I=1,9),ISTATE(12),ISTATE(14)
+        WRITE(6,110) IPRINT,(ISTATE(I),I=1,10),ISTATE(12),ISTATE(14)
       ENDIF
       RETURN
 *
@@ -255,6 +255,7 @@
      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 IDF   ,I6,44H   (=0/2/3/4 ADF INFORMATION ABSENT/PRESENT)/
-     5 7H ISPH  ,I6,36H   (=0/1 SPH FACTORS ABSENT/PRESENT))
+     4 7H NW    ,I6,43H   (=0/1: NTOT1 INFORMATION ABSENT/PRESENT)/
+     5 7H IDF   ,I6,44H   (=0/2/3/4 ADF INFORMATION ABSENT/PRESENT)/
+     6 7H ISPH  ,I6,36H   (=0/1 SPH FACTORS ABSENT/PRESENT))
       END
diff --git a/Dragon/src/BRERT.f b/Dragon/src/BRERT.f
index 10d4155..19afde9 100644
--- a/Dragon/src/BRERT.f
+++ b/Dragon/src/BRERT.f
@@ -334,6 +334,7 @@
       IF(J_FUEL.GT.0) ISTATE(4)=1
       IF(ICODE(2).NE.0) ISTATE(8)=1  ! physical albedo information
       ISTATE(9)=1  ! diffusion coefficient information
+      IF(IDIFF.EQ.1) ISTATE(10)=NL-1 ! NTOT1 is present
       IF(ISPH.EQ.0) ISTATE(12)=3 ! discontinuity factor information
       IF(ISPH.EQ.1) ISTATE(14)=1 ! SPH factor information
       CALL LCMPUT(IPMAC1,'STATE-VECTOR',NSTATE,1,ISTATE)
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
diff --git a/Dragon/src/MACDRV.f b/Dragon/src/MACDRV.f
index cbdf780..64a673f 100644
--- a/Dragon/src/MACDRV.f
+++ b/Dragon/src/MACDRV.f
@@ -1,6 +1,6 @@
 *DECK MACDRV
       SUBROUTINE MACDRV(IPLIST,INDREC,IPRINT,IDF,NBMIX,NGROUP,NANISO,
-     >                  NIFISS,NEDMAC,ITRANC,NDELG,NSTEP,NALBP)
+     >                  NIFISS,NEDMAC,ITRANC,NDELG,NSTEP,NALBP,ILEAK,NW)
 *
 *-----------------------------------------------------------------------
 *
@@ -37,6 +37,8 @@
 * NSTEP   number of delta cross-section sets used for generalized
 *         perturbation theory (GPT) or kinetics calculations.
 * NALBP   number of physical albedos.
+* ILEAK   type of diffusion coefficient information.
+* NW      weighting flag (=0/1: P1-weighted information absent/present).
 *
 *-----------------------------------------------------------------------
 *
@@ -46,7 +48,7 @@
 *----
       TYPE(C_PTR) IPLIST
       INTEGER     INDREC,IPRINT,IDF,NBMIX,NGROUP,NANISO,NIFISS,NEDMAC,
-     >            ITRANC,NDELG,NSTEP,NALBP
+     >            ITRANC,NDELG,NSTEP,NALBP,ILEAK,NW
 *----
 *  LOCAL VARIABLES
 *----
@@ -352,5 +354,13 @@
         CALL MACWXS(IPLIST,IPRINT,NGROUP,NBMIX,NIFISS,NANISO,
      >              ITRANC,NEDMAC)
       ENDIF
+*----
+*  SET STATE-VECTOR FLAGS
+*----
+      NW=0
+      IF(LNEWXS(9)) NW=1
+      ILEAK=0
+      IF(LNEWXS(7)) ILEAK=1
+      IF(LNEWXS(10).OR.LNEWXS(11).OR.LNEWXS(12)) ILEAK=2
       RETURN
       END
diff --git a/Dragon/src/MACUPD.f b/Dragon/src/MACUPD.f
index 8efd97c..9246aae 100644
--- a/Dragon/src/MACUPD.f
+++ b/Dragon/src/MACUPD.f
@@ -1,6 +1,6 @@
 *DECK MACUPD
       SUBROUTINE MACUPD(NENTRY,KENTRY,IPRINT,NTOTMX,NBMIX ,NGROUP,
-     >                  NANISO,NIFISS,NEDMAC,ITRANC)
+     >                  NANISO,NIFISS,NEDMAC,ITRANC,ILEAK,NW)
 *
 *-----------------------------------------------------------------------
 *
@@ -27,6 +27,8 @@
 * NIFISS  number fissile isotopes per mixture.
 * NEDMAC  number of aditional edition x-s.
 * ITRANC  type of transport correction.
+* ILEAK   type of diffusion coefficient information.
+* NW      weighting flag (=0/1: P1-weighted information absent/present).
 *
 *-----------------------------------------------------------------------
 *
@@ -37,7 +39,7 @@
 *----
       TYPE(C_PTR)  KENTRY(NENTRY)
       INTEGER      NENTRY,IPRINT,NTOTMX,NBMIX,NGROUP,NANISO,NIFISS,
-     >             NEDMAC,ITRANC
+     >             NEDMAC,ITRANC,ILEAK,NW
 *----
 *  LOCAL VARIABLES
 *----
@@ -200,6 +202,8 @@
             NIFISO=ISTATE(4)
             NEDO=ISTATE(5)
             NDELO=ISTATE(7)
+            ILEAK=MIN(ILEAK,ISTATE(9))
+            NW=MIN(NW,ISTATE(10))
             CALL MACNFI(IPMACR,IPRINT,IEN   ,NTOTMX,NGROUP,NIFISS,
      >                  NEDMAC,NBMIXF,NGROF ,NIFISF,NEDF  ,NDELF ,
      >                  NBMIXO,NIFISO,NEDO  ,NDELO ,IMLOC ,ENERN ,