summaryrefslogtreecommitdiff
path: root/Donjon/data
diff options
context:
space:
mode:
authorAlain Hebert <alainhebert@Alains-MacBook-Pro.local>2025-12-24 21:55:16 -0500
committerAlain Hebert <alainhebert@Alains-MacBook-Pro.local>2025-12-24 21:55:16 -0500
commit45dec1d4dd8c3b339e9ac3e267088e1d97ef3f1f (patch)
tree53eacf81efe860f5a42fd9dae8768daab48ae851 /Donjon/data
parentc4db2987ef7214cb11537e6805bc319807e11866 (diff)
#19: Adapt non-regression tests to NJOY2016 new draglibs
Diffstat (limited to 'Donjon/data')
-rwxr-xr-xDonjon/data/Reflector_beavrs_APEX_DF-RT_proc/REFL_APEX.c2m2
-rwxr-xr-xDonjon/data/Reflector_beavrs_DF-RT_Jeff3p1SHEM295.access10
-rwxr-xr-xDonjon/data/Reflector_beavrs_DF-RT_Jeff3p1SHEM295_apx.access10
-rwxr-xr-xDonjon/data/Reflector_beavrs_DF-RT_Jeff3p1SHEM295_mco_proc/REFL_MCO.c2m2
-rwxr-xr-xDonjon/data/Reflector_beavrs_DF-RT_Jeff3p1SHEM295_mco_proc/VAL_CB1_plot_RT.py3
5 files changed, 14 insertions, 13 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):