diff options
| author | HEBERT Alain <alain.hebert@polymtl.ca> | 2025-12-24 22:13:35 -0500 |
|---|---|---|
| committer | HEBERT Alain <alain.hebert@polymtl.ca> | 2025-12-24 22:13:35 -0500 |
| commit | ec64ba52445d2d06deba1216471ccf3d289c78a3 (patch) | |
| tree | 53eacf81efe860f5a42fd9dae8768daab48ae851 /Dragon/data | |
| parent | c4db2987ef7214cb11537e6805bc319807e11866 (diff) | |
| parent | 45dec1d4dd8c3b339e9ac3e267088e1d97ef3f1f (diff) | |
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
Diffstat (limited to 'Dragon/data')
| -rwxr-xr-x | Dragon/data/ASSBLY_CASEA_1level_mpo.save | 2 | ||||
| -rw-r--r-- | Dragon/data/ErmBeavrsPwrRefl.x2m | 21 | ||||
| -rwxr-xr-x | Dragon/data/pincell_mco.save | 2 | ||||
| -rwxr-xr-x | Dragon/data/rep900_mco.save | 2 |
4 files changed, 19 insertions, 8 deletions
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" |