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

7 files changed, 9 insertions, 3 deletions

diff --git a/Donjon/data/rep1300_reflector_sp1.x2m b/Donjon/data/rep1300_reflector_sp1.x2m
index 140d3fa..8003131 100644
--- a/Donjon/data/rep1300_reflector_sp1.x2m
+++ b/Donjon/data/rep1300_reflector_sp1.x2m
@@ -55,8 +55,6 @@ MACRO := SCR: SAPOBJ :: EDIT 2 NMIX 55 SAPHYB SAPOBJ
   MIX 51 USE SET 'BURN' 0.0 ENDMIX    MIX 52 USE SET 'BURN' 0.0 ENDMIX
   MIX 53 USE SET 'BURN' 0.0 ENDMIX    MIX 54 USE SET 'BURN' 0.0 ENDMIX
   MIX 55 USE SET 'BURN' 0.0 ENDMIX ;
-  
-  UTL: MACRO :: STEP UP GROUP STEP AT 1 DUMP ;
 *----
 * Define the macro geometry (MACROGEOM)
 *----
diff --git a/Donjon/src/ACRMAC.f b/Donjon/src/ACRMAC.f
index 37f5444..7705ca3 100644
--- a/Donjon/src/ACRMAC.f
+++ b/Donjon/src/ACRMAC.f
@@ -491,6 +491,7 @@
       ISTATE(4)=NF
       ISTATE(5)=NED
       ISTATE(6)=ITRANC
+      IF(LMAKE1(6)) ISTATE(10)=1
       CALL LCMPUT(IPMAC,'STATE-VECTOR',NSTATE,1,ISTATE)
 *----
 *  INCLUDE LEAKAGE IN THE MACROLIB (USED ONLY FOR NON-REGRESSION TESTS)
diff --git a/Donjon/src/DLEAK.f b/Donjon/src/DLEAK.f
index f3e629b..01ce26d 100644
--- a/Donjon/src/DLEAK.f
+++ b/Donjon/src/DLEAK.f
@@ -252,6 +252,7 @@
       ISTATE(2)=NMIX

       ISTATE(3)=1

       ISTATE(9)=ILEAK

+      IF(ITYPE.EQ.2) ISTATE(10)=1 ! set NTOT1 flag

       ISTATE(11)=NPERT

       CALL LCMPUT(IPNEW,'STATE-VECTOR',NSTATE,1,ISTATE)

       IF(IMPX.GT.1) CALL LCMLIB(IPNEW)

diff --git a/Donjon/src/DSPH.f b/Donjon/src/DSPH.f
index f52b811..f78fa14 100644
--- a/Donjon/src/DSPH.f
+++ b/Donjon/src/DSPH.f
@@ -98,6 +98,7 @@
       NDEL=ISTATE(7)

       NALBP=ISTATE(8)

       ILEAKS=ISTATE(9)

+      NW=ISTATE(10)

 *----

 *  READ THE INPUT DATA

 *----

@@ -453,7 +454,7 @@
       CALL LCMPUT(MPNEW,'IJJS00',NMIX,1,IJJ)

       CALL LCMPUT(MPNEW,'IPOS00',NMIX,1,NJJ)

       CALL LCMPUT(MPNEW,'NTOT0',NMIX,2,GAR)

-      CALL LCMPUT(MPNEW,'NTOT1',NMIX,2,GAR)

+      IF(IMC.EQ.1) CALL LCMPUT(MPNEW,'NTOT1',NMIX,2,GAR)

       IF(NIFISS.GT.0) THEN

         PER2(:NMIX,:NIFISS)=0.0

         CALL LCMPUT(MPNEW,'NUSIGF',NMIX*NIFISS,2,PER2)

@@ -487,12 +488,14 @@
 *----

 *  SET THE PERTURBED MACROLIB STATE-VECTOR

 *----

+      IF(IMC.EQ.1) NW=1 ! activate NTOT1 flag

       ISTATE(:NSTATE)=0

       ISTATE(1)=NGRP

       ISTATE(2)=NMIX

       ISTATE(3)=1

       ISTATE(7)=NALBP

       ISTATE(9)=ILEAKS

+      ISTATE(10)=NW

       ISTATE(11)=NPERT

       CALL LCMPUT(IPNEW,'STATE-VECTOR',NSTATE,1,ISTATE)

       IF(IMPX.GT.1) CALL LCMLIB(IPNEW)

diff --git a/Donjon/src/MCRMAC.f b/Donjon/src/MCRMAC.f
index 5c819da..6a15a76 100644
--- a/Donjon/src/MCRMAC.f
+++ b/Donjon/src/MCRMAC.f
@@ -476,6 +476,7 @@
       ISTATE(4)=NF
       ISTATE(5)=NED
       ISTATE(6)=ITRANC
+      IF(LMAKE1(6)) ISTATE(10)=1
       CALL LCMPUT(IPMAC,'STATE-VECTOR',NSTATE,1,ISTATE)
 *----
 *  INCLUDE LEAKAGE IN THE MACROLIB (USED ONLY FOR NON-REGRESSION TESTS)
diff --git a/Donjon/src/PCRMAC.f b/Donjon/src/PCRMAC.f
index 06cf5af..d4337f9 100644
--- a/Donjon/src/PCRMAC.f
+++ b/Donjon/src/PCRMAC.f
@@ -422,6 +422,7 @@
       ISTATE(4)=MAX(ISTATE(4),NF)
       IF(LMAKE1(4)) ISTATE(9)=1
       IF(LMAKE1(5)) ISTATE(9)=2
+      IF(LMAKE1(9)) ISTATE(10)=1
       CALL LCMPUT(IPMAC,'STATE-VECTOR',NSTATE,1,ISTATE)
 *----
 *  INCLUDE LEAKAGE IN THE MACROLIB (USED ONLY FOR NON-REGRESSION TESTS)
diff --git a/Donjon/src/SCRSAP.f b/Donjon/src/SCRSAP.f
index b51a4ab..37f7d49 100644
--- a/Donjon/src/SCRSAP.f
+++ b/Donjon/src/SCRSAP.f
@@ -504,6 +504,7 @@
       ISTATE(4)=NF
       ISTATE(5)=NED
       ISTATE(6)=ITRANC
+      IF(LMAKE1(6)) ISTATE(10)=1
       CALL LCMPUT(IPMAC,'STATE-VECTOR',NSTATE,1,ISTATE)
 *----
 *  INCLUDE LEAKAGE IN THE MACROLIB (USED ONLY FOR NON-REGRESSION TESTS)