Merge branch '19-depreciate-use-of-version-4-and-5-0-draglibs' into 'main'

#19: Adapt non-regression tests to NJOY2016 new draglibs

See merge request dragon/5.1!39

9 files changed, 33 insertions, 21 deletions

diff --git a/Donjon/data/Reflector_beavrs_APEX_DF-RT_proc/REFL_APEX.c2m b/Donjon/data/Reflector_beavrs_APEX_DF-RT_proc/REFL_APEX.c2m
index c206ee0..d860422 100755
--- a/Donjon/data/Reflector_beavrs_APEX_DF-RT_proc/REFL_APEX.c2m
+++ b/Donjon/data/Reflector_beavrs_APEX_DF-RT_proc/REFL_APEX.c2m
@@ -177,7 +177,7 @@ REAL Keff ;
 REAL CB ; ! ppm
 INTEGER iPalier ;
 LINKED_LIST OUT_1 MACR_TRAC MACR_FLUX ;
-MODULE NSST: NSSF: TRIVAT: TRIVAA: FLUD: VAL: ;
+MODULE NSST: NSSF: TRIVAT: TRIVAA: FLUD: ;
 
 *--------------------------------------------------------------------
 * Boron tabulation
diff --git a/Donjon/data/Reflector_beavrs_DF-RT_Jeff3p1SHEM295.access b/Donjon/data/Reflector_beavrs_DF-RT_Jeff3p1SHEM295.access
index 0e850c7..6ae2a76 100755
--- a/Donjon/data/Reflector_beavrs_DF-RT_Jeff3p1SHEM295.access
+++ b/Donjon/data/Reflector_beavrs_DF-RT_Jeff3p1SHEM295.access
@@ -23,15 +23,15 @@ else
   echo 'use big endian libraries'
   pos=$1/../../libraries/b_endian
 fi
-if [ -f "$pos"/draglibJeff3p1p1SHEM295.gz ]
+if [ -f "$pos"/draglibJeff3p1p1SHEM295_v5p1.gz ]
    then
-    echo 'gunzipping draglibJeff3p1p1SHEM295'
+    echo 'gunzipping draglibJeff3p1p1SHEM295_v5p1'
     chmod 755 "$pos"
-    gunzip "$pos"/draglibJeff3p1p1SHEM295.gz
+    gunzip "$pos"/draglibJeff3p1p1SHEM295_v5p1.gz
 fi
-if [ -f "$pos"/draglibJeff3p1p1SHEM295 ]
+if [ -f "$pos"/draglibJeff3p1p1SHEM295_v5p1 ]
    then
-    ln -s "$pos"/draglibJeff3p1p1SHEM295 DLIB_295
+    ln -s "$pos"/draglibJeff3p1p1SHEM295_v5p1 DLIB_295
 fi
 ln -s $1/data/Reflector_beavrs_DF-RT_Jeff3p1SHEM295_proc/assbly_caseA_mpo_draglib_shem_feed.hdf .
 ls -l
diff --git a/Donjon/data/Reflector_beavrs_DF-RT_Jeff3p1SHEM295_apx.access b/Donjon/data/Reflector_beavrs_DF-RT_Jeff3p1SHEM295_apx.access
index b624581..87ae8df 100755
--- a/Donjon/data/Reflector_beavrs_DF-RT_Jeff3p1SHEM295_apx.access
+++ b/Donjon/data/Reflector_beavrs_DF-RT_Jeff3p1SHEM295_apx.access
@@ -23,15 +23,15 @@ else
   echo 'use big endian libraries'
   pos=$1/../../libraries/b_endian
 fi
-if [ -f "$pos"/draglibJeff3p1p1SHEM295.gz ]
+if [ -f "$pos"/draglibJeff3p1p1SHEM295_v5p1.gz ]
    then
-    echo 'gunzipping draglibJeff3p1p1SHEM295'
+    echo 'gunzipping draglibJeff3p1p1SHEM295_v5p1'
     chmod 755 "$pos"
-    gunzip "$pos"/draglibJeff3p1p1SHEM295.gz
+    gunzip "$pos"/draglibJeff3p1p1SHEM295_v5p1.gz
 fi
-if [ -f "$pos"/draglibJeff3p1p1SHEM295 ]
+if [ -f "$pos"/draglibJeff3p1p1SHEM295_v5p1 ]
    then
-    ln -s "$pos"/draglibJeff3p1p1SHEM295 DLIB_295
+    ln -s "$pos"/draglibJeff3p1p1SHEM295_v5p1 DLIB_295
 fi
 ln -s $1/data/Reflector_beavrs_DF-RT_Jeff3p1SHEM295_apx_proc/assbly_caseA_apx_draglib_shem_feed.hdf .
 ls -l
diff --git a/Donjon/data/Reflector_beavrs_DF-RT_Jeff3p1SHEM295_mco_proc/REFL_MCO.c2m b/Donjon/data/Reflector_beavrs_DF-RT_Jeff3p1SHEM295_mco_proc/REFL_MCO.c2m
index 06cc603..3673176 100755
--- a/Donjon/data/Reflector_beavrs_DF-RT_Jeff3p1SHEM295_mco_proc/REFL_MCO.c2m
+++ b/Donjon/data/Reflector_beavrs_DF-RT_Jeff3p1SHEM295_mco_proc/REFL_MCO.c2m
@@ -348,7 +348,7 @@ WHILE IndexCB iBoreMax < DO
   IF IndexCB 1 = THEN
     OVAL := VAL: MACR_TRAC MACR_FLUX MACRO ::
       EDIT 2
-      POWR 1.0 DIM 1 0.1
+      POWR 1.0 DIM 1 0.1 ! normalize to 1 MW
     ;
     _VAL_CB1 := OVAL ;
     OVAL := DELETE: OVAL ;
diff --git a/Donjon/data/Reflector_beavrs_DF-RT_Jeff3p1SHEM295_mco_proc/VAL_CB1_plot_RT.py b/Donjon/data/Reflector_beavrs_DF-RT_Jeff3p1SHEM295_mco_proc/VAL_CB1_plot_RT.py
index 63cbf0a..680400d 100755
--- a/Donjon/data/Reflector_beavrs_DF-RT_Jeff3p1SHEM295_mco_proc/VAL_CB1_plot_RT.py
+++ b/Donjon/data/Reflector_beavrs_DF-RT_Jeff3p1SHEM295_mco_proc/VAL_CB1_plot_RT.py
@@ -23,7 +23,8 @@ for ig in range(ngr):
     o2 = my_lcm['GROUP'][ig].keys()
     flux_case1[ig] = my_lcm['GROUP'][ig]['FLUX-INTG']
     if 'H-FACTOR' in o2:
-        hfac_case1[ig] = my_lcm['GROUP'][ig]['H-FACTOR']
+        fact = 1.60217650E-25 # transform eV/s into MW
+        hfac_case1[ig] = my_lcm['GROUP'][ig]['H-FACTOR']*fact
     else:
         hfac_case1[ig] = my_lcm['GROUP'][ig]['NUSIGF']
     for iel in range(nel):
diff --git a/Dragon/data/ASSBLY_CASEA_1level_mpo.save b/Dragon/data/ASSBLY_CASEA_1level_mpo.save
index 6f3adc3..4dfbea9 100755
--- a/Dragon/data/ASSBLY_CASEA_1level_mpo.save
+++ b/Dragon/data/ASSBLY_CASEA_1level_mpo.save
@@ -16,5 +16,5 @@ else
    MACH=`uname -sm | sed 's/[ ]/_/'`
 fi
 ls -l
-mv MyMpo.hdf $1/"$MACH"/assbly_caseA_mpo.hdf
+mv MyMpo.hdf $1/"$MACH"/assbly_caseA_mpo_feed.hdf
 echo "ASSBLY_CASEA_1level_mpo.save completed"
diff --git a/Dragon/data/ErmBeavrsPwrRefl.x2m b/Dragon/data/ErmBeavrsPwrRefl.x2m
index 3c54439..9ff9b43 100644
--- a/Dragon/data/ErmBeavrsPwrRefl.x2m
+++ b/Dragon/data/ErmBeavrsPwrRefl.x2m
@@ -28,7 +28,7 @@ MODULE
   LIB: GEO: SYBILT: ASM: FLU: EDI: COMPO: DELETE:
   USS: UTL: END: ABORT: MAC: SNT: GREP: MSTR: BREF: ;
 LINKED_LIST ListeIsot ListeAutop ;
-PROCEDURE assertS ;
+REAL REFVALUE DELTA ;
 
 *---- geometric buckling      --------------------------
 REAL Core_height := 365.0  ; (*core height in cm*)
@@ -465,18 +465,29 @@ WHILE IndexCB 2 <= DO
       ;
       ECHO "...CASE=" CASE "IndexCB=" IndexCB ;
       IF CASE 1 = IndexCB 1 = * THEN
-         assertS FLUX_REF :: K-EFFECTIVE 1 1.178190 ;
+         EVALUATE REFVALUE := 1.178192 ;
          _VAL_CA1_CB1 := OVAL ;
       ELSEIF CASE 2 = IndexCB 1 = * THEN
-         assertS FLUX_REF :: K-EFFECTIVE 1 1.288893 ;
+         EVALUATE REFVALUE := 1.288894 ;
          _VAL_CA2_CB1 := OVAL ;
       ELSEIF CASE 1 = IndexCB 2 = * THEN
-         assertS FLUX_REF :: K-EFFECTIVE 1 1.176635 ;
+         EVALUATE REFVALUE := 1.176477 ;
          _VAL_CA1_CB2 := OVAL ;
       ELSEIF CASE 2 = IndexCB 2 = * THEN
-         assertS FLUX_REF :: K-EFFECTIVE 1 1.287811 ;
+         EVALUATE REFVALUE := 1.287686 ;
          _VAL_CA2_CB2 := OVAL ;
       ENDIF ;
+      GREP: FLUX_REF :: GETVAL 'K-EFFECTIVE' 1 >>Keff<< ;
+      EVALUATE DELTA := Keff REFVALUE - REFVALUE / ABS ;
+      IF DELTA 1.0E-3 < THEN
+        PRINT "TEST SUCCESSFUL; DELTA=" DELTA ;
+      ELSE
+        PRINT "------------" ;
+        PRINT "TEST FAILURE" ;
+        PRINT "------------" ;
+        PRINT "REFERENCE=" REFVALUE " CALCULATED=" Keff ;
+        ABORT: ;
+      ENDIF ;
       FLUX_REF MACRO OVAL := DELETE: FLUX_REF MACRO OVAL ;
 
       EVALUATE CASE := CASE 1 + ;
diff --git a/Dragon/data/pincell_mco.save b/Dragon/data/pincell_mco.save
index 386663b..6fa1c02 100755
--- a/Dragon/data/pincell_mco.save
+++ b/Dragon/data/pincell_mco.save
@@ -16,5 +16,5 @@ else
    MACH=`uname -sm | sed 's/[ ]/_/'`
 fi
 ls -l
-mv ACOMPO $1/"$MACH"/_ACompo
+mv ACOMPO $1/"$MACH"/_ACompo_pincell
 echo "pincell_mco.save completed"
diff --git a/Dragon/data/rep900_mco.save b/Dragon/data/rep900_mco.save
index 3bd96be..2aed0b1 100755
--- a/Dragon/data/rep900_mco.save
+++ b/Dragon/data/rep900_mco.save
@@ -16,5 +16,5 @@ else
    MACH=`uname -sm | sed 's/[ ]/_/'`
 fi
 ls -l
-mv ACOMPO $1/"$MACH"/_ACompo
+mv ACOMPO $1/"$MACH"/_ACompo_rep900
 echo "rep900_mco.save completed"