diff options
| author | HEBERT Alain <alain.hebert@polymtl.ca> | 2025-12-23 11:34:01 -0500 |
|---|---|---|
| committer | HEBERT Alain <alain.hebert@polymtl.ca> | 2025-12-23 11:34:01 -0500 |
| commit | bd7171d346ad4f079aa89b2d9fdd6a56aa0a3b1c (patch) | |
| tree | ff7bea851c1ce9685d26fc5080f65fcf9110086b /Dragon | |
| parent | 0fbdc50700be08e00ecad828d9c99b5c045b382b (diff) | |
Resolve "Depreciate use of Version 4 and 5.0 Draglibs"
Diffstat (limited to 'Dragon')
106 files changed, 1070 insertions, 336 deletions
diff --git a/Dragon/data/ASSBLY_CASEA_1level_multicompo.x2m b/Dragon/data/ASSBLY_CASEA_1level_multicompo.x2m index 15f28e2..9fd9676 100644 --- a/Dragon/data/ASSBLY_CASEA_1level_multicompo.x2m +++ b/Dragon/data/ASSBLY_CASEA_1level_multicompo.x2m @@ -239,7 +239,7 @@ ENDWHILE ; ************************************************************************ _MyCompo := MyCompo ; -assertS FLUX2 :: K-INFINITY 1 1.014858 ; +assertS FLUX2 :: K-INFINITY 1 1.014208 ; ECHO "test ASSBLY_CASEA_1level_multicompo completed" ; END: ; diff --git a/Dragon/data/DF_RTBeavrsPwrRefl.access b/Dragon/data/DF_RTBeavrsPwrRefl.access index 748cee3..37189b1 100755 --- a/Dragon/data/DF_RTBeavrsPwrRefl.access +++ b/Dragon/data/DF_RTBeavrsPwrRefl.access @@ -24,15 +24,15 @@ else echo 'use big endian libraries' pos=$1/../../libraries/b_endian fi -if [ -f "$pos"/draglibJef2p2.gz ] +if [ -f "$pos"/draglibJef2p2_v5p1.gz ] then -echo 'gunzipping draglibJef2p2' +echo 'gunzipping draglibJef2p2_v5p1' chmod 755 "$pos" -gunzip "$pos"/draglibJef2p2.gz +gunzip "$pos"/draglibJef2p2_v5p1.gz fi -if [ -f "$pos"/draglibJef2p2 ] +if [ -f "$pos"/draglibJef2p2_v5p1 ] then -ln -s "$pos"/draglibJef2p2 D172JEF22 +ln -s "$pos"/draglibJef2p2_v5p1 D172JEF22 fi ln -s "$1"/data/ErmBeavrsPwrRefl_proc/*.c2m . ls -l diff --git a/Dragon/data/DF_RTBeavrsPwrRefl.x2m b/Dragon/data/DF_RTBeavrsPwrRefl.x2m index ab267c8..158e926 100644 --- a/Dragon/data/DF_RTBeavrsPwrRefl.x2m +++ b/Dragon/data/DF_RTBeavrsPwrRefl.x2m @@ -404,10 +404,10 @@ WHILE IndexCB 2 <= DO ; ECHO "...IndexCB=" IndexCB ; IF IndexCB 1 = THEN - assertS FLUX_REF :: K-EFFECTIVE 1 1.191874 ; + assertS FLUX_REF :: K-EFFECTIVE 1 1.191647 ; _VAL_CB1 := OVAL ; ELSEIF IndexCB 2 = THEN - assertS FLUX_REF :: K-EFFECTIVE 1 1.190132 ; + assertS FLUX_REF :: K-EFFECTIVE 1 1.189905 ; _VAL_CB2 := OVAL ; ENDIF ; FLUX_REF SYSTEM MACRO OVAL := DELETE: FLUX_REF SYSTEM MACRO OVAL ; diff --git a/Dragon/data/ErmBeavrsPwrRefl.access b/Dragon/data/ErmBeavrsPwrRefl.access index 1ebeba1..6be4270 100755 --- a/Dragon/data/ErmBeavrsPwrRefl.access +++ b/Dragon/data/ErmBeavrsPwrRefl.access @@ -24,15 +24,15 @@ else echo 'use big endian libraries' pos=$1/../../libraries/b_endian fi -if [ -f "$pos"/draglibJef2p2.gz ] +if [ -f "$pos"/draglibJef2p2_v5p1.gz ] then -echo 'gunzipping draglibJef2p2' +echo 'gunzipping draglibJef2p2_v5p1' chmod 755 "$pos" -gunzip "$pos"/draglibJef2p2.gz +gunzip "$pos"/draglibJef2p2_v5p1.gz fi -if [ -f "$pos"/draglibJef2p2 ] +if [ -f "$pos"/draglibJef2p2_v5p1 ] then -ln -s "$pos"/draglibJef2p2 D172JEF22 +ln -s "$pos"/draglibJef2p2_v5p1 D172JEF22 fi ls -l echo $accessname".access script terminated" diff --git a/Dragon/data/ErmBeavrsPwrRefl.x2m b/Dragon/data/ErmBeavrsPwrRefl.x2m index a8f088f..3c54439 100644 --- a/Dragon/data/ErmBeavrsPwrRefl.x2m +++ b/Dragon/data/ErmBeavrsPwrRefl.x2m @@ -465,16 +465,16 @@ WHILE IndexCB 2 <= DO ; ECHO "...CASE=" CASE "IndexCB=" IndexCB ; IF CASE 1 = IndexCB 1 = * THEN - assertS FLUX_REF :: K-EFFECTIVE 1 1.178396 ; + assertS FLUX_REF :: K-EFFECTIVE 1 1.178190 ; _VAL_CA1_CB1 := OVAL ; ELSEIF CASE 2 = IndexCB 1 = * THEN - assertS FLUX_REF :: K-EFFECTIVE 1 1.289101 ; + assertS FLUX_REF :: K-EFFECTIVE 1 1.288893 ; _VAL_CA2_CB1 := OVAL ; ELSEIF CASE 1 = IndexCB 2 = * THEN - assertS FLUX_REF :: K-EFFECTIVE 1 1.176606 ; + assertS FLUX_REF :: K-EFFECTIVE 1 1.176635 ; _VAL_CA1_CB2 := OVAL ; ELSEIF CASE 2 = IndexCB 2 = * THEN - assertS FLUX_REF :: K-EFFECTIVE 1 1.287891 ; + assertS FLUX_REF :: K-EFFECTIVE 1 1.287811 ; _VAL_CA2_CB2 := OVAL ; ENDIF ; FLUX_REF MACRO OVAL := DELETE: FLUX_REF MACRO OVAL ; diff --git a/Dragon/data/OSC_CASEA_1level_rse.x2m b/Dragon/data/OSC_CASEA_1level_rse.x2m index a16c6b3..b365898 100644 --- a/Dragon/data/OSC_CASEA_1level_rse.x2m +++ b/Dragon/data/OSC_CASEA_1level_rse.x2m @@ -257,7 +257,7 @@ ECHO "+++ Burnup=" BUend " Kinf=" Kinf " at step" istep ; ************************************************************************ ENDWHILE ; -assertS FLUX2 :: K-INFINITY 1 0.9157988 ; +assertS FLUX2 :: K-INFINITY 1 1.039912 ; LIBRARY LIBRARY2 := DELETE: LIBRARY LIBRARY2 ; ************************************************************************ @@ -402,7 +402,7 @@ WHILE iBoreStep iBoreMax < DO ENDIF ; ! test no to repeat reference case ENDWHILE ; ! boron loop -assertS FLUX2 :: K-INFINITY 1 0.9157987 ; +assertS FLUX2 :: K-INFINITY 1 1.039912 ; ************************************************************************ * END OF BORON LOOP * ************************************************************************ diff --git a/Dragon/data/OSC_CASEA_2level_rse.x2m b/Dragon/data/OSC_CASEA_2level_rse.x2m index 4fe45c9..fd0a4a4 100644 --- a/Dragon/data/OSC_CASEA_2level_rse.x2m +++ b/Dragon/data/OSC_CASEA_2level_rse.x2m @@ -306,7 +306,7 @@ WHILE istep maxstep < DO ************************************************************************ ENDWHILE ; -assertS FLUX2 :: K-EFFECTIVE 1 0.8989664 ; +assertS FLUX2 :: K-EFFECTIVE 1 1.041865 ; ************************************************************************ * END SECOND LEVEL FLUX CALCULATION * ************************************************************************ diff --git a/Dragon/data/RegtestCNG_mccg.access b/Dragon/data/RegtestCNG_mccg.access index 13d462d..a892798 100755 --- a/Dragon/data/RegtestCNG_mccg.access +++ b/Dragon/data/RegtestCNG_mccg.access @@ -23,15 +23,15 @@ else echo 'use big endian libraries' pos=$1/../../libraries/b_endian fi -if [ -f "$pos"/draglibJef2p2.gz ] +if [ -f "$pos"/draglibJef2p2_v5p1.gz ] then echo 'gunzipping DLIB_J2' chmod 755 "$pos" - gunzip "$pos"/draglibJef2p2.gz + gunzip "$pos"/draglibJef2p2_v5p1.gz fi -if [ -f "$pos"/draglibJef2p2 ] +if [ -f "$pos"/draglibJef2p2_v5p1 ] then - ln -s "$pos"/draglibJef2p2 DLIB_J2 + ln -s "$pos"/draglibJef2p2_v5p1 DLIB_J2 fi ln -s "$1"/data/proc_CNG/*.c2m . ls diff --git a/Dragon/data/RegtestCNG_mccg.x2m b/Dragon/data/RegtestCNG_mccg.x2m index 87fa7f0..8092843 100644 --- a/Dragon/data/RegtestCNG_mccg.x2m +++ b/Dragon/data/RegtestCNG_mccg.x2m @@ -188,7 +188,7 @@ PIJ := ASM: LIBC GEOFLXC TRKFLXC :: FLUXC := FLU: PIJ LIBC GEOFLXC TRKFLXC :: EDIT 1 TYPE K THER 5 5E-5 ; -assertS FLUXC :: 'K-EFFECTIVE' 1 1.323817 ; +assertS FLUXC :: 'K-EFFECTIVE' 1 1.324040 ; * * edition * diff --git a/Dragon/data/TEST_GEO_hex_sect_tspc.x2m b/Dragon/data/TEST_GEO_hex_sect_tspc.x2m index 60c56ad..dc393f2 100644 --- a/Dragon/data/TEST_GEO_hex_sect_tspc.x2m +++ b/Dragon/data/TEST_GEO_hex_sect_tspc.x2m @@ -189,7 +189,7 @@ OUT := EDI: MICRO2 TRACK FLUX TDT_LAT_SECT CP :: MERG COMP COND ; -assertS FLUX :: 'K-EFFECTIVE' 1 1.341990 ; +assertS FLUX :: 'K-EFFECTIVE' 1 1.342777 ; ECHO "test TEST_GEO_hex_sect_tspc completed" ; END: ; diff --git a/Dragon/data/TEST_GEO_latt_tspc_S30.x2m b/Dragon/data/TEST_GEO_latt_tspc_S30.x2m index 868ef26..8e03c5d 100644 --- a/Dragon/data/TEST_GEO_latt_tspc_S30.x2m +++ b/Dragon/data/TEST_GEO_latt_tspc_S30.x2m @@ -175,7 +175,7 @@ OUT := EDI: MICRO2 TRACK FLUX ALFR_LATT_b CP :: COND ; -assertS FLUX :: 'K-EFFECTIVE' 1 0.1612311 ; +assertS FLUX :: 'K-EFFECTIVE' 1 0.1612761 ; ECHO "test TEST_GEO_latt_tspc_S30 completed" ; END: ; QUIT "LIST" . diff --git a/Dragon/data/fbr_tone.x2m b/Dragon/data/fbr_tone.x2m index e15fc14..bc3fc18 100644 --- a/Dragon/data/fbr_tone.x2m +++ b/Dragon/data/fbr_tone.x2m @@ -40,7 +40,7 @@ LIBRARY := LIB: :: LIBRARY := TONE: LIBRARY TRACK :: EDIT 3 TRAN PIJ ; ASB := ASM: LIBRARY TRACK :: PIJ ; FLUX := FLU: LIBRARY TRACK ASB :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.466248 ; +assertS FLUX :: K-EFFECTIVE 1 1.463941 ; LIBRARY ASB FLUX := DELETE: LIBRARY ASB FLUX ; ECHO "test fbr_tone completed" ; END: ; diff --git a/Dragon/data/lumpSS.x2m b/Dragon/data/lumpSS.x2m index b070c3a..7dd9c4e 100644 --- a/Dragon/data/lumpSS.x2m +++ b/Dragon/data/lumpSS.x2m @@ -200,11 +200,11 @@ WHILE istep maxstep < DO * NON-REGRESSION * ************************************************************ IF istep 1 = THEN - assertS FLUX :: K-EFFECTIVE 1 1.329496 ; + assertS FLUX :: K-EFFECTIVE 1 1.329378 ; ELSEIF istep 2 = THEN - assertS FLUX :: K-EFFECTIVE 1 1.314796 ; + assertS FLUX :: K-EFFECTIVE 1 1.314567 ; ELSEIF istep 3 = THEN - assertS FLUX :: K-EFFECTIVE 1 1.292124 ; + assertS FLUX :: K-EFFECTIVE 1 1.291854 ; ENDIF ; ************************************************************ diff --git a/Dragon/data/pincell_apx.access b/Dragon/data/pincell_apx.access index 3473626..c9325ec 100755 --- a/Dragon/data/pincell_apx.access +++ b/Dragon/data/pincell_apx.access @@ -23,15 +23,15 @@ else echo 'use big endian libraries' pos=$1/../../libraries/b_endian fi -if [ -f "$pos"/draglibJef2p2.gz ] +if [ -f "$pos"/draglibJef2p2_v5p1.gz ] then echo 'gunzipping DLIB_J2' chmod 755 "$pos" - gunzip "$pos"/draglibJef2p2.gz + gunzip "$pos"/draglibJef2p2_v5p1.gz fi -if [ -f "$pos"/draglibJef2p2 ] +if [ -f "$pos"/draglibJef2p2_v5p1 ] then - ln -s "$pos"/draglibJef2p2 DLIB_J2 + ln -s "$pos"/draglibJef2p2_v5p1 DLIB_J2 fi ln -s $1/data/pincell_mco_proc/*.c2m . ls -l diff --git a/Dragon/data/pincell_apx.x2m b/Dragon/data/pincell_apx.x2m index 83ba686..65da8ed 100644 --- a/Dragon/data/pincell_apx.x2m +++ b/Dragon/data/pincell_apx.x2m @@ -232,7 +232,7 @@ WHILE istep maxstep < DO EDIOBJ := DELETE: EDIOBJ ; ENDWHILE ; ! reference burnup loop -assertS FLUX :: K-INFINITY 1 1.224515 ; +assertS FLUX :: K-INFINITY 1 1.224364 ; LIBRARY LIBRARY2 := DELETE: LIBRARY LIBRARY2 ; FLUX := DELETE: FLUX ; diff --git a/Dragon/data/pincell_mco.access b/Dragon/data/pincell_mco.access index ded4cd6..3e0fd03 100755 --- a/Dragon/data/pincell_mco.access +++ b/Dragon/data/pincell_mco.access @@ -23,15 +23,15 @@ else echo 'use big endian libraries' pos=$1/../../libraries/b_endian fi -if [ -f "$pos"/draglibJef2p2.gz ] +if [ -f "$pos"/draglibJef2p2_v5p1.gz ] then echo 'gunzipping DLIB_J2' chmod 755 "$pos" - gunzip "$pos"/draglibJef2p2.gz + gunzip "$pos"/draglibJef2p2_v5p1.gz fi -if [ -f "$pos"/draglibJef2p2 ] +if [ -f "$pos"/draglibJef2p2_v5p1 ] then - ln -s "$pos"/draglibJef2p2 DLIB_J2 + ln -s "$pos"/draglibJef2p2_v5p1 DLIB_J2 fi ls -l echo "pincell_mco access script terminated" diff --git a/Dragon/data/pincell_mco.x2m b/Dragon/data/pincell_mco.x2m index d4407a4..8731887 100644 --- a/Dragon/data/pincell_mco.x2m +++ b/Dragon/data/pincell_mco.x2m @@ -257,11 +257,11 @@ WHILE istep maxstep < DO ENDWHILE ; ! reference burnup loop IF iDcaStep_0 1 = THEN - assertS FLUX :: K-INFINITY 1 1.049062 ; + assertS FLUX :: K-INFINITY 1 1.048820 ; ELSEIF iDcaStep_0 2 = THEN - assertS FLUX :: K-INFINITY 1 1.153705 ; + assertS FLUX :: K-INFINITY 1 1.153505 ; ELSEIF iDcaStep_0 3 = THEN - assertS FLUX :: K-INFINITY 1 1.224496 ; + assertS FLUX :: K-INFINITY 1 1.224352 ; ENDIF ; LIBRARY LIBRARY2 := DELETE: LIBRARY LIBRARY2 ; diff --git a/Dragon/data/pincell_mpo.access b/Dragon/data/pincell_mpo.access index 58031e3..9394942 100755 --- a/Dragon/data/pincell_mpo.access +++ b/Dragon/data/pincell_mpo.access @@ -23,15 +23,15 @@ else echo 'use big endian libraries' pos=$1/../../libraries/b_endian fi -if [ -f "$pos"/draglibJef2p2.gz ] +if [ -f "$pos"/draglibJef2p2_v5p1.gz ] then echo 'gunzipping DLIB_J2' chmod 755 "$pos" - gunzip "$pos"/draglibJef2p2.gz + gunzip "$pos"/draglibJef2p2_v5p1.gz fi -if [ -f "$pos"/draglibJef2p2 ] +if [ -f "$pos"/draglibJef2p2_v5p1 ] then - ln -s "$pos"/draglibJef2p2 DLIB_J2 + ln -s "$pos"/draglibJef2p2_v5p1 DLIB_J2 fi ln -s $1/data/pincell_mco_proc/*.c2m . ls -l diff --git a/Dragon/data/pincell_mpo.x2m b/Dragon/data/pincell_mpo.x2m index 8b177fd..7e0b367 100644 --- a/Dragon/data/pincell_mpo.x2m +++ b/Dragon/data/pincell_mpo.x2m @@ -224,7 +224,7 @@ WHILE istep maxstep < DO EDIOBJ := DELETE: EDIOBJ ; ENDWHILE ; ! reference burnup loop -assertS FLUX :: K-INFINITY 1 1.224515 ; +assertS FLUX :: K-INFINITY 1 1.224364 ; LIBRARY LIBRARY2 := DELETE: LIBRARY LIBRARY2 ; FLUX := DELETE: FLUX ; diff --git a/Dragon/data/pincell_sap.access b/Dragon/data/pincell_sap.access index c20082e..3e8900b 100755 --- a/Dragon/data/pincell_sap.access +++ b/Dragon/data/pincell_sap.access @@ -23,15 +23,15 @@ else echo 'use big endian libraries' pos=$1/../../libraries/b_endian fi -if [ -f "$pos"/draglibJef2p2.gz ] +if [ -f "$pos"/draglibJef2p2_v5p1.gz ] then echo 'gunzipping DLIB_J2' chmod 755 "$pos" - gunzip "$pos"/draglibJef2p2.gz + gunzip "$pos"/draglibJef2p2_v5p1.gz fi -if [ -f "$pos"/draglibJef2p2 ] +if [ -f "$pos"/draglibJef2p2_v5p1 ] then - ln -s "$pos"/draglibJef2p2 DLIB_J2 + ln -s "$pos"/draglibJef2p2_v5p1 DLIB_J2 fi ln -s $1/data/pincell_mco_proc/*.c2m . ls -l diff --git a/Dragon/data/pincell_sap.x2m b/Dragon/data/pincell_sap.x2m index ce5599e..5d5dde3 100644 --- a/Dragon/data/pincell_sap.x2m +++ b/Dragon/data/pincell_sap.x2m @@ -232,7 +232,7 @@ WHILE istep maxstep < DO EDIOBJ := DELETE: EDIOBJ ; ENDWHILE ; ! reference burnup loop -assertS FLUX :: K-INFINITY 1 1.224515 ; +assertS FLUX :: K-INFINITY 1 1.224364 ; LIBRARY LIBRARY2 := DELETE: LIBRARY LIBRARY2 ; FLUX := DELETE: FLUX ; diff --git a/Dragon/data/rep900_het_gff_jef2p2.access b/Dragon/data/rep900_het_gff_jef2p2.access index f799133..fc3a9aa 100755 --- a/Dragon/data/rep900_het_gff_jef2p2.access +++ b/Dragon/data/rep900_het_gff_jef2p2.access @@ -23,15 +23,15 @@ else echo 'use big endian libraries' pos=$1/../../libraries/b_endian fi -if [ -f "$pos"/draglibJef2p2.gz ] +if [ -f "$pos"/draglibJef2p2_v5p1.gz ] then echo 'gunzipping DLIB_J2' chmod 755 "$pos" - gunzip "$pos"/draglibJef2p2.gz + gunzip "$pos"/draglibJef2p2_v5p1.gz fi -if [ -f "$pos"/draglibJef2p2 ] +if [ -f "$pos"/draglibJef2p2_v5p1 ] then - ln -s "$pos"/draglibJef2p2 DLIB_J2 + ln -s "$pos"/draglibJef2p2_v5p1 DLIB_J2 fi ls echo "rep900_het_gff_jef2p2 access script terminated" diff --git a/Dragon/data/rep900_het_gff_jef2p2.x2m b/Dragon/data/rep900_het_gff_jef2p2.x2m index 9b60d0c..5419f80 100644 --- a/Dragon/data/rep900_het_gff_jef2p2.x2m +++ b/Dragon/data/rep900_het_gff_jef2p2.x2m @@ -291,7 +291,7 @@ WHILE istep maxstep < DO ENDWHILE ; ! reference burnup loop -assertS FLUX2 :: 'K-INFINITY' 1 1.297091 ; +assertS FLUX2 :: 'K-INFINITY' 1 1.297254 ; LIBRARY LIBRARY2 LIBEQ := DELETE: LIBRARY LIBRARY2 LIBEQ ; FLUX1 FLUX2 := DELETE: FLUX1 FLUX2 ; * diff --git a/Dragon/data/sens.access b/Dragon/data/sens.access index 11403ff..1666da7 100755 --- a/Dragon/data/sens.access +++ b/Dragon/data/sens.access @@ -23,15 +23,15 @@ else echo 'use big endian libraries' pos=$1/../../libraries/b_endian fi -if [ -f "$pos"/draglibJef2p2.gz ] +if [ -f "$pos"/draglibJef2p2_v5p1.gz ] then echo 'gunzipping DLIB_J2' chmod 755 "$pos" - gunzip "$pos"/draglibJef2p2.gz + gunzip "$pos"/draglibJef2p2_v5p1.gz fi -if [ -f "$pos"/draglibJef2p2 ] +if [ -f "$pos"/draglibJef2p2_v5p1 ] then - ln -s "$pos"/draglibJef2p2 DLIB_J2 + ln -s "$pos"/draglibJef2p2_v5p1 DLIB_J2 fi ls echo "sens access script terminated" diff --git a/Dragon/data/tdraglib.access b/Dragon/data/tdraglib.access index 35c6314..43adfc3 100755 --- a/Dragon/data/tdraglib.access +++ b/Dragon/data/tdraglib.access @@ -23,15 +23,15 @@ else echo 'use big endian libraries' pos=$1/../../libraries/b_endian fi -if [ -f "$pos"/draglibJef2p2.gz ] +if [ -f "$pos"/draglibJef2p2_v5p1.gz ] then echo 'gunzipping DLIB_J2' chmod 755 "$pos" - gunzip "$pos"/draglibJef2p2.gz + gunzip "$pos"/draglibJef2p2_v5p1.gz fi -if [ -f "$pos"/draglibJef2p2 ] +if [ -f "$pos"/draglibJef2p2_v5p1 ] then - ln -s "$pos"/draglibJef2p2 DLIB_J2 + ln -s "$pos"/draglibJef2p2_v5p1 DLIB_J2 fi ls -l echo "tdraglib access script terminated" diff --git a/Dragon/data/tdraglib_proc/SPH_FixedPt.c2m b/Dragon/data/tdraglib_proc/SPH_FixedPt.c2m new file mode 100644 index 0000000..83d9996 --- /dev/null +++ b/Dragon/data/tdraglib_proc/SPH_FixedPt.c2m @@ -0,0 +1,105 @@ +**************************************************************** +* * +* Procedure : SPH_FixedPt.c2m * +* Purpose : Compute SPH factors using a fixed point approach * +* Author : A. Hebert * +* * +* CALL : * +* Macro2 Optim := SPH_FixedPt Macro1 Macrogeom Track * +* :: (data) ; * +* * +* Output object: * +* Macro2 : Corrected macrolib * +* Optim : L_OPTIMIZE object * +* * +* Input objects: * +* Macro1 : Reference macrolib for the macro-geometry * +* Macrogeom : Macro-geometry * +* Track : Tracking of the macro-geometry * +* * +* Input data: * +* fmin : minimum acceptable correction factor * +* fmax : maximum acceptable correction factor * +* epsout : convergence criterion for outer iterations * +* IterEmax : maximum number of iterations * +* * +**************************************************************** +PARAMETER MACRO2 OPTIM MACRO1 MACROGEOM TRACK :: + ::: LINKED_LIST MACRO2 OPTIM MACRO1 MACROGEOM TRACK ; ; +MODULE BIVACA: FLUD: GREP: OUT: FPSPH: MAC: ERROR: DELETE: END: ; +LINKED_LIST SYSTEM CALC EDIT ; +LOGICAL Conv ; +REAL Keff fmin fmax epsout ; +DOUBLE rmsval ; +INTEGER IterE IterEmax ; + :: >>fmin<< >>fmax<< >>epsout<< >>IterEmax<< ; + +!**************************************** +!**************************************** +!********** SPH ITERATIONS ********** +!**************************************** +!**************************************** + +MACRO2 := MACRO1 ; + +EVALUATE IterE := 0 ; +REPEAT + + EVALUATE IterE := IterE 1 + ; + ECHO "#------------------------------" ; + IF IterE 10 < THEN + ECHO "#-------------" IterE "--------------" ; + ELSE + ECHO "#------------" IterE "--------------" ; + ENDIF ; + ECHO "#------------------------------" ; + + SYSTEM := BIVACA: MACRO2 TRACK :: EDIT 0 ; + IF IterE 1 = THEN + CALC := FLUD: SYSTEM TRACK :: + EDIT 0 ADI 5 EXTE 50 1.0E-6 ACCE 5 3 ; + ELSE + CALC := FLUD: CALC SYSTEM TRACK :: + EDIT 0 ADI 5 EXTE 50 1.0E-6 ACCE 5 3 ; + ENDIF ; + SYSTEM := DELETE: SYSTEM ; + + GREP: CALC :: GETVAL 'K-EFFECTIVE ' 1 >>Keff<< ; + + EDIT := OUT: CALC MACROGEOM MACRO2 TRACK :: + EDIT 0 INTG MIX ; + IF IterE 1 = THEN + ECHO "Error statistics before correction" ; + ERROR: MACRO1 EDIT :: HREA 'NFTOT' ; + ENDIF ; + IF IterE 1 = THEN + OPTIM := FPSPH: EDIT MACRO1 :: EDIT 2 SPH PN + VAR-VAL-MIN <<fmin>> + VAR-VAL-MAX <<fmax>> + OUT-STEP-EPS <<epsout>> OUT-CONV-TST >>Conv<< >>rmsval<< ; + ELSE + OPTIM := FPSPH: OPTIM EDIT MACRO1 :: EDIT 1 + VAR-VAL-MIN <<fmin>> + VAR-VAL-MAX <<fmax>> + OUT-CONV-TST >>Conv<< >>rmsval<< ; + ENDIF ; + ECHO "outer iteration=" IterE "rmsval=" rmsval D_TO_R "Keff=" Keff "Conv=" Conv ; + EDIT := DELETE: EDIT ; + MACRO2 := MACRO2 MACRO1 ; + MACRO2 := MAC: MACRO2 OPTIM ; + +UNTIL Conv IterE IterEmax > + ; +CALC := DELETE: CALC ; +*---- +* VERIFICATION CALCULATION +*---- +SYSTEM := BIVACA: MACRO2 TRACK :: EDIT 0 ; +CALC := FLUD: SYSTEM TRACK :: + EDIT 0 ADI 5 EXTE 50 1.0E-6 ACCE 5 3 ; + +EDIT := OUT: CALC MACROGEOM MACRO2 TRACK :: + EDIT 0 INTG MIX ; + +ECHO "Error statistics after correction" ; +ERROR: MACRO1 EDIT :: HREA 'NFTOT' ; +END: ; diff --git a/Dragon/data/tdraglib_proc/TCDR01.c2m b/Dragon/data/tdraglib_proc/TCDR01.c2m index bf4081f..267e344 100644 --- a/Dragon/data/tdraglib_proc/TCDR01.c2m +++ b/Dragon/data/tdraglib_proc/TCDR01.c2m @@ -55,7 +55,7 @@ LIBRARY := SHI: LIBRARY DISCR :: EDIT 0 NOLJ ; CP := ASM: LIBRARY DISCR ; CALC := FLU: CP LIBRARY DISCR :: TYPE K ; -assertS CALC :: 'K-EFFECTIVE' 1 0.8237322 ; +assertS CALC :: 'K-EFFECTIVE' 1 0.8238095 ; OUT := EDI: LIBRARY DISCR CALC :: EDIT 4 MERG MIX 1 2 3 COND 4.0 SAVE ; DISCR CP := DELETE: DISCR CP ; @@ -72,7 +72,7 @@ LIBRARY := SHI: LIBRARY DISCR :: EDIT 0 NOLJ ; CP := ASM: LIBRARY DISCR ; CALC := FLU: CALC CP LIBRARY DISCR :: TYPE K ; -assertS CALC :: 'K-EFFECTIVE' 1 0.8239249 ; +assertS CALC :: 'K-EFFECTIVE' 1 0.8240606 ; OUT := EDI: OUT LIBRARY DISCR CALC :: EDIT 1 MERG MIX 1 2 3 COND 4.0 STAT ALL REFE 1 ; CALC DISCR CP := DELETE: CALC DISCR CP ; @@ -89,7 +89,7 @@ LIBRARY := SHI: LIBRARY DISCR TRKSPC :: EDIT 0 NOLJ ; CP := ASM: LIBRARY DISCR TRKSPC ; CALC := FLU: CP LIBRARY DISCR :: TYPE K ; -assertS CALC :: 'K-EFFECTIVE' 1 0.8247744 ; +assertS CALC :: 'K-EFFECTIVE' 1 0.8249122 ; OUT := EDI: OUT LIBRARY DISCR CALC :: EDIT 1 MERG MIX 1 2 3 COND 4.0 STAT ALL REFE 1 ; DISCR TRKSPC CP := DELETE: DISCR TRKSPC CP ; @@ -106,7 +106,7 @@ LIBRARY := SHI: LIBRARY DISCR TRKSPC :: EDIT 0 NOLJ ; CP := ASM: LIBRARY DISCR TRKSPC ; CALC := FLU: CALC CP LIBRARY DISCR :: TYPE K ; -assertS CALC :: 'K-EFFECTIVE' 1 0.8256814 ; +assertS CALC :: 'K-EFFECTIVE' 1 0.8258194 ; OUT := EDI: OUT LIBRARY DISCR CALC :: EDIT 1 MERG MIX 1 2 3 COND 4.0 STAT ALL REFE 1 ; DISCR TRKSPC CP := DELETE: DISCR TRKSPC CP ; diff --git a/Dragon/data/tdraglib_proc/TCDR02.c2m b/Dragon/data/tdraglib_proc/TCDR02.c2m index 1c6bf0a..8bf5a03 100644 --- a/Dragon/data/tdraglib_proc/TCDR02.c2m +++ b/Dragon/data/tdraglib_proc/TCDR02.c2m @@ -126,7 +126,7 @@ LIBRARY := SHI: LIBRARY DISCR :: LJ ; CP := ASM: LIBRARY DISCR :: ARM ; CALC := FLU: CP LIBRARY DISCR :: TYPE B B1 PNL ; -assertS CALC :: 'K-INFINITY' 1 1.256444 ; +assertS CALC :: 'K-INFINITY' 1 1.256550 ; *---- * Editing using SPH model for transport-diffusion with Selengut @@ -154,8 +154,8 @@ ISOT := DATABASE :: STEP UP default STEP UP MIXTURES STEP AT 5 STEP UP CALCULATIONS STEP AT 1 STEP UP ISOTOPESLIST STEP AT 1 ; -assertS ISOT :: 'NWT0' 1 0.5218698 ; -assertS ISOT :: 'NWT0' 2 0.1277670 ; +assertS ISOT :: 'NWT0' 1 0.5221841 ; +assertS ISOT :: 'NWT0' 2 0.1277635 ; ECHO "test TCDR02 completed" ; END: ; diff --git a/Dragon/data/tdraglib_proc/TCDR02_void.c2m b/Dragon/data/tdraglib_proc/TCDR02_void.c2m index b8a5e79..af8aecd 100644 --- a/Dragon/data/tdraglib_proc/TCDR02_void.c2m +++ b/Dragon/data/tdraglib_proc/TCDR02_void.c2m @@ -133,7 +133,7 @@ DISCR := SYBILT: ASSMB :: CP := ASM: LIBRARY DISCR :: ARM ; CALC := FLU: CP LIBRARY DISCR :: EDIT 1 TYPE K P1 HETE BUCK -0.017069 ; -assertS CALC :: 'K-EFFECTIVE' 1 1.000043 ; +assertS CALC :: 'K-EFFECTIVE' 1 1.000201 ; ECHO "test TCDR02_void completed" ; END: ; diff --git a/Dragon/data/tdraglib_proc/TCDR03.c2m b/Dragon/data/tdraglib_proc/TCDR03.c2m index 380eb42..84e1a99 100644 --- a/Dragon/data/tdraglib_proc/TCDR03.c2m +++ b/Dragon/data/tdraglib_proc/TCDR03.c2m @@ -121,7 +121,7 @@ LIBRARY := SHI: LIBRARY DISCR :: EDIT 0 NOLJ ; CP := ASM: LIBRARY DISCR ; CALC := FLU: CP LIBRARY DISCR :: TYPE B B1 PNL ; -assertS CALC :: 'K-INFINITY' 1 0.6800977 ; +assertS CALC :: 'K-INFINITY' 1 0.6801561 ; OUT := EDI: LIBRARY DISCR CALC ASSMBH :: EDIT 3 UPS SAVE MICR RES MERGE CELL COND 4.0 ; @@ -145,8 +145,8 @@ ISOT := DATABASE :: STEP UP default STEP UP MIXTURES STEP AT 5 STEP UP CALCULATIONS STEP AT 1 STEP UP ISOTOPESLIST STEP AT 1 ; -assertS ISOT :: 'NWT0' 1 1.504198E+00 ; -assertS ISOT :: 'NWT0' 2 1.369299E-01 ; +assertS ISOT :: 'NWT0' 1 1.501717E+00 ; +assertS ISOT :: 'NWT0' 2 1.369932E-01 ; ECHO "test TCDR03 completed" ; END: ; diff --git a/Dragon/data/tdraglib_proc/TCDR04.c2m b/Dragon/data/tdraglib_proc/TCDR04.c2m index c98134b..a324d45 100644 --- a/Dragon/data/tdraglib_proc/TCDR04.c2m +++ b/Dragon/data/tdraglib_proc/TCDR04.c2m @@ -81,7 +81,7 @@ TRACK := SYBILT: MOSTELA :: SYS := ASM: LIBRARY TRACK ; FLUX := FLU: SYS LIBRARY TRACK :: TYPE K B1 SIGS BUCK 0.2948E-2 ; -assertS FLUX :: 'K-INFINITY' 1 0.8247780 ; +assertS FLUX :: 'K-INFINITY' 1 0.8248808 ; EDITION := EDI: LIBRARY TRACK FLUX :: EDIT 3 MICR 25 Th232 U233 U234 U235 U236 U238 Np237 Np238 Pu238 Pu239 Pu240 Pu241 Pu242 Am241 Am242 Am243 Cm242 Cm243 Cm244 @@ -139,7 +139,7 @@ WHILE evoend step2 < DO step3 step4 step5 step2 ; EVALUATE istep := istep 1 + ; ENDWHILE ; -assertS FLUX :: 'K-EFFECTIVE' 1 0.7645292 ; +assertS FLUX :: 'K-EFFECTIVE' 1 0.7644340 ; res := DATABASE ; @@ -150,8 +150,8 @@ ISOT := DATABASE :: STEP UP default STEP UP MIXTURES STEP AT 1 STEP UP CALCULATIONS STEP AT 2 STEP UP ISOTOPESLIST STEP AT 26 ; -assertS ISOT :: 'NWT0' 1 37.66850 ; -assertS ISOT :: 'NWT0' 2 16.65745 ; +assertS ISOT :: 'NWT0' 1 3.786228E+01 ; +assertS ISOT :: 'NWT0' 2 1.672558E+01 ; ECHO "test TCDR04 completed" ; END: ; diff --git a/Dragon/data/tdraglib_proc/TCDR05.c2m b/Dragon/data/tdraglib_proc/TCDR05.c2m index 7f8d6cb..c047360 100644 --- a/Dragon/data/tdraglib_proc/TCDR05.c2m +++ b/Dragon/data/tdraglib_proc/TCDR05.c2m @@ -103,7 +103,7 @@ VOLMATF INTLINF := EXCELT: CANDU6F :: PIJ := ASM: LIBRARY VOLMATF INTLINF ; FLUX := FLU: PIJ LIBRARY VOLMATF :: TYPE K ; -assertS FLUX :: 'K-INFINITY' 1 1.117541 ; +assertS FLUX :: 'K-INFINITY' 1 1.117787 ; EDITION := EDI: LIBRARY VOLMATF FLUX :: COND 4.0 MERGE MIX 0 0 0 0 1 0 0 0 0 0 MICR RES SAVE ON 'moderator' ; DATABASE := COMPO: DATABASE EDITION :: @@ -170,16 +170,16 @@ ISOT := DATABASE :: STEP UP fuel STEP UP MIXTURES STEP AT 1 STEP UP CALCULATIONS STEP AT 5 STEP UP ISOTOPESLIST STEP AT 1 ; -assertS ISOT :: 'NWT0' 1 9.761326E0 ; -assertS ISOT :: 'NWT0' 2 2.651622E1 ; +assertS ISOT :: 'NWT0' 1 9.787898E+00 ; +assertS ISOT :: 'NWT0' 2 2.658490E+01 ; ISOT := DELETE: ISOT ; ISOT := DATABASE :: STEP UP moderator STEP UP MIXTURES STEP AT 1 STEP UP CALCULATIONS STEP AT 1 STEP UP ISOTOPESLIST STEP AT 1 ; -assertS ISOT :: 'NWT0' 1 9.095968E-2 ; -assertS ISOT :: 'NWT0' 2 3.246063E-1 ; +assertS ISOT :: 'NWT0' 1 9.099452E-02 ; +assertS ISOT :: 'NWT0' 2 3.246804E-01 ; INTLINF INTLINS := DELETE: INTLINF INTLINS ; ECHO "test TCDR05 completed" ; diff --git a/Dragon/data/tdraglib_proc/TCDR06.c2m b/Dragon/data/tdraglib_proc/TCDR06.c2m index bae3d04..9e57257 100644 --- a/Dragon/data/tdraglib_proc/TCDR06.c2m +++ b/Dragon/data/tdraglib_proc/TCDR06.c2m @@ -66,7 +66,7 @@ SYS := ASM: LIBRARY TRACK INTLIN :: EDIT 0 ; FLUX := FLU: SYS LIBRARY TRACK :: TYPE K ; -assertS FLUX :: 'K-EFFECTIVE' 1 1.117081 ; +assertS FLUX :: 'K-EFFECTIVE' 1 1.117330 ; *---- * Microscopic cross sections from WIMSLIB for stainless steel * MIX 1,2,3 from EDI: : fuel, structure material and moderator @@ -127,7 +127,7 @@ SYS := ASM: LIBRARY2 TRACK INTLIN :: EDIT 0 ; FLUX := FLU: SYS LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: 'K-EFFECTIVE' 1 1.127179 ; +assertS FLUX :: 'K-EFFECTIVE' 1 1.127370 ; EDITION := EDI: LIBRARY2 TRACK FLUX :: EDIT 2 MERG COMP COND 4.0 SAVE ON 'NOBC' ; SYS TRACK INTLIN := DELETE: SYS TRACK INTLIN ; @@ -142,7 +142,7 @@ SYS := ASM: LIBRARY2 TRACK INTLIN :: EDIT 0 ; FLUX := FLU: FLUX SYS LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: 'K-EFFECTIVE' 1 1.041988 ; +assertS FLUX :: 'K-EFFECTIVE' 1 1.042161 ; EDITION := EDI: EDITION LIBRARY2 TRACK FLUX :: EDIT 2 MERG COMP COND 4.0 STAT DELS REFE 'NOBC' ; TRACK INTLIN SYS := DELETE: TRACK INTLIN SYS ; diff --git a/Dragon/data/tdraglib_proc/TCDR07.c2m b/Dragon/data/tdraglib_proc/TCDR07.c2m index be6360a..5594062 100644 --- a/Dragon/data/tdraglib_proc/TCDR07.c2m +++ b/Dragon/data/tdraglib_proc/TCDR07.c2m @@ -71,17 +71,17 @@ SYS := ASM: LIBRARY TRACK INTLIN :: EDIT 0 PIJK ; FLUX := FLU: SYS LIBRARY TRACK :: TYPE K ; -assertS FLUX :: 'K-EFFECTIVE' 1 1.117062 ; +assertS FLUX :: 'K-EFFECTIVE' 1 1.117309 ; EDITION := EDI: FLUX LIBRARY TRACK :: EDIT 3 SAVE COND 4.0 TAKE REGI 1 4 7 10 16 24 ; FLUX := FLU: FLUX SYS LIBRARY TRACK :: TYPE B B1 PNL ; -assertS FLUX :: 'K-INFINITY' 1 1.108985 ; +assertS FLUX :: 'K-INFINITY' 1 1.109237 ; EDITION := EDI: EDITION FLUX LIBRARY TRACK :: EDIT 3 SAVE COND 4.0 TAKE REGI 1 4 7 10 16 24 ; FLUX := FLU: FLUX SYS LIBRARY TRACK :: TYPE B B1 TIBERE ; -assertS FLUX :: 'K-INFINITY' 1 1.108995 ; +assertS FLUX :: 'K-INFINITY' 1 1.109251 ; EDITION := EDI: EDITION FLUX LIBRARY TRACK :: EDIT 3 SAVE COND 4.0 TAKE REGI 1 4 7 10 16 24 ; FLUX SYS := DELETE: FLUX SYS ; @@ -89,7 +89,7 @@ SYS := ASM: LIBRARY TRACK INTLIN :: EDIT 0 PIJ ECCO ; FLUX := FLU: SYS LIBRARY TRACK :: TYPE B B1 ECCO ; -assertS FLUX :: 'K-INFINITY' 1 1.108996 ; +assertS FLUX :: 'K-INFINITY' 1 1.109249 ; EDITION := EDI: EDITION FLUX LIBRARY TRACK :: EDIT 3 SAVE COND 4.0 TAKE REGI 1 4 7 10 16 24 ; FLUX SYS TRACK INTLIN := DELETE: FLUX SYS TRACK INTLIN ; @@ -111,17 +111,17 @@ SYS := ASM: LIBRARY TRACK INTLIN :: EDIT 0 PIJK ; FLUX := FLU: SYS LIBRARY TRACK :: TYPE K ; -assertS FLUX :: 'K-EFFECTIVE' 1 1.140569 ; +assertS FLUX :: 'K-EFFECTIVE' 1 1.140787 ; EDITION := EDI: EDITION FLUX LIBRARY TRACK :: EDIT 3 SAVE COND 4.0 TAKE REGI 1 4 7 10 16 24 ; FLUX := FLU: FLUX SYS LIBRARY TRACK :: TYPE B B1 PNL ; -assertS FLUX :: 'K-INFINITY' 1 1.132941 ; +assertS FLUX :: 'K-INFINITY' 1 1.133169 ; EDITION := EDI: EDITION FLUX LIBRARY TRACK :: EDIT 3 SAVE COND 4.0 TAKE REGI 1 4 7 10 16 24 ; FLUX := FLU: FLUX SYS LIBRARY TRACK :: TYPE B B1 TIBERE ; -assertS FLUX :: 'K-INFINITY' 1 1.133257 ; +assertS FLUX :: 'K-INFINITY' 1 1.133490 ; EDITION := EDI: EDITION FLUX LIBRARY TRACK :: EDIT 3 SAVE COND 4.0 TAKE REGI 1 4 7 10 16 24 ; FLUX SYS := DELETE: FLUX SYS ; @@ -129,7 +129,7 @@ SYS := ASM: LIBRARY TRACK INTLIN :: EDIT 0 PIJ ECCO ; FLUX := FLU: SYS LIBRARY TRACK :: TYPE B B1 ECCO ; -assertS FLUX :: 'K-INFINITY' 1 1.133257 ; +assertS FLUX :: 'K-INFINITY' 1 1.133488 ; EDITION := EDI: EDITION FLUX LIBRARY TRACK :: EDIT 3 SAVE COND 4.0 TAKE REGI 1 4 7 10 16 24 ; FLUX SYS TRACK INTLIN := DELETE: FLUX SYS TRACK INTLIN ; diff --git a/Dragon/data/tdraglib_proc/TCDR08.c2m b/Dragon/data/tdraglib_proc/TCDR08.c2m index 311ac4c..06247c5 100644 --- a/Dragon/data/tdraglib_proc/TCDR08.c2m +++ b/Dragon/data/tdraglib_proc/TCDR08.c2m @@ -67,7 +67,7 @@ LIBRARY := SHI: LIBRARY TRACK :: EDIT 0 NOLJ ; PIJ := ASM: LIBRARY TRACK ; FLUX := FLU: PIJ LIBRARY TRACK :: TYPE K ; -assertS FLUX :: 'K-EFFECTIVE' 1 1.873188 ; +assertS FLUX :: 'K-EFFECTIVE' 1 1.873172 ; EDITION := EDI: FLUX LIBRARY TRACK :: COND 4.0 MERGE COMP SAVE ; *---- @@ -118,7 +118,7 @@ WHILE Timei TotalTime < DO ENDIF ; EVALUATE Timei := Timef ; ENDWHILE ; -assertS FLUX :: 'K-EFFECTIVE' 1 1.217538 ; +assertS FLUX :: 'K-EFFECTIVE' 1 1.216965 ; ECHO "test TCDR08 completed" ; END: ; QUIT "LIST" . diff --git a/Dragon/data/tdraglib_proc/TCDR09.c2m b/Dragon/data/tdraglib_proc/TCDR09.c2m index 9af763b..a183648 100644 --- a/Dragon/data/tdraglib_proc/TCDR09.c2m +++ b/Dragon/data/tdraglib_proc/TCDR09.c2m @@ -52,7 +52,7 @@ LIBRARY := SHI: LIBRARY VOLMAT :: EDIT 0 NOLJ ; PIJ := ASM: LIBRARY VOLMAT ; FLUX := FLU: PIJ LIBRARY VOLMAT :: TYPE K ; -assertS FLUX :: 'K-EFFECTIVE' 1 0.7670202 ; +assertS FLUX :: 'K-EFFECTIVE' 1 0.7671104 ; OUT := EDI: FLUX LIBRARY VOLMAT :: EDIT 4 MERG MIX 1 2 3 COND 4.0 SAVE ; PIJ VOLMAT := DELETE: PIJ VOLMAT ; @@ -62,7 +62,7 @@ VOLMAT := SYBILT: MOSTELV :: PIJ := ASM: LIBRARY VOLMAT ; FLUX := FLU: FLUX PIJ LIBRARY VOLMAT :: TYPE K ; -assertS FLUX :: 'K-EFFECTIVE' 1 1.048279E-02 ; +assertS FLUX :: 'K-EFFECTIVE' 1 1.050192E-02 ; OUT := EDI: OUT FLUX LIBRARY VOLMAT :: EDIT 4 MERG MIX 1 2 3 COND 4.0 SAVE ; OUT FLUX PIJ LIBRARY VOLMAT := DELETE: diff --git a/Dragon/data/tdraglib_proc/TCDR10.c2m b/Dragon/data/tdraglib_proc/TCDR10.c2m index d34a4cf..139f1e5 100644 --- a/Dragon/data/tdraglib_proc/TCDR10.c2m +++ b/Dragon/data/tdraglib_proc/TCDR10.c2m @@ -73,13 +73,13 @@ LIBRARY := SHI: LIBRARY VOLMAT :: EDIT 0 NOLJ ; PIJ := ASM: LIBRARY VOLMAT ; FLUX := FLU: PIJ LIBRARY VOLMAT :: TYPE K ; -assertS FLUX :: 'K-EFFECTIVE' 1 0.7670202 ; +assertS FLUX :: 'K-EFFECTIVE' 1 0.7671104 ; OUT := EDI: FLUX LIBRARY VOLMAT :: EDIT 4 MERG MIX 1 2 3 COND 4.0 ; FLUX := DELETE: FLUX ; FLUX := FLU: PIJ LIBRARY VOLMAT :: TYPE S EXTE 30 UNKT 1.0E-3 ; -assertV FLUX :: 'FLUX' (*GROUP*) 10 (*REGION*) 4 2.656012E+05 ; +assertV FLUX :: 'FLUX' (*GROUP*) 10 (*REGION*) 4 2.659060E+05 ; OUT := EDI: OUT FLUX LIBRARY VOLMAT :: EDIT 4 MERG MIX 1 2 3 COND 4.0 ; OUT FLUX PIJ LIBRARY VOLMAT := DELETE: diff --git a/Dragon/data/tdraglib_proc/TCDR11.c2m b/Dragon/data/tdraglib_proc/TCDR11.c2m index 86c654e..dc9b541 100644 --- a/Dragon/data/tdraglib_proc/TCDR11.c2m +++ b/Dragon/data/tdraglib_proc/TCDR11.c2m @@ -92,7 +92,7 @@ VOLMATF INTLINF := EXCELT: CANDU6F :: PIJ := ASM: LIBRARY VOLMATF INTLINF ; FLUX := FLU: PIJ LIBRARY VOLMATF :: TYPE K ; -assertS FLUX :: 'K-EFFECTIVE' 1 1.117541 ; +assertS FLUX :: 'K-EFFECTIVE' 1 1.117787 ; EDITION := EDI: FLUX LIBRARY VOLMATF CANDU6F :: MERG REGI 6 6 10 7 7 10 1 1 8 8 10 1 1 9 9 10 1 1 2 3 4 5 5 5 @@ -111,7 +111,7 @@ PIJ := DELETE: PIJ ; PIJ := ASM: LIBRARY VOLMATF INTLINF ; FLUX := FLU: FLUX PIJ LIBRARY VOLMATF :: TYPE K ; -assertS FLUX :: 'K-EFFECTIVE' 1 0.9515619 ; +assertS FLUX :: 'K-EFFECTIVE' 1 0.9513567 ; EDITION := EDI: EDITION FLUX LIBRARY VOLMATF CANDU6F :: MGEO CANDU6F ; @@ -126,7 +126,7 @@ EDITION := DELETE: EDITION ; PIJ := ASM: LIBRARY VOLMATF INTLINF ; FLUX := FLU: PIJ LIBRARY VOLMATF :: TYPE K ; -assertS FLUX :: 'K-EFFECTIVE' 1 1.117564 ; +assertS FLUX :: 'K-EFFECTIVE' 1 1.117779 ; EDITION := EDI: FLUX LIBRARY VOLMATF :: EDIT 1 MERGE COMP MICR ALL SAVE ; EVALUATE Timec := 1.0 ; @@ -158,7 +158,7 @@ WHILE Timei Timec < DO ENDIF ; EVALUATE Timei := Timef ; ENDWHILE ; -assertS FLUX :: 'K-EFFECTIVE' 1 1.075418 ; +assertS FLUX :: 'K-EFFECTIVE' 1 1.075556 ; res := EDITION ; EDITION BURNUP FLUX PIJ LIBRARY INTLINF VOLMATF CANDU6F := DELETE: EDITION BURNUP FLUX PIJ LIBRARY INTLINF VOLMATF CANDU6F ; diff --git a/Dragon/data/tdraglib_proc/TCDR12.c2m b/Dragon/data/tdraglib_proc/TCDR12.c2m index 5a1162e..215f72b 100644 --- a/Dragon/data/tdraglib_proc/TCDR12.c2m +++ b/Dragon/data/tdraglib_proc/TCDR12.c2m @@ -100,7 +100,7 @@ LIBRARY := LIB: :: ; ISOT := LIBRARY :: STEP UP ISOTOPESLIST STEP AT 14 ; (*U238 0004*) -assertS ISOT :: NG 35 2.219075E-01 ; +assertS ISOT :: NG 35 2.219074E-01 ; ECHO "test TCDR12 completed" ; END: ; QUIT "LIST" . diff --git a/Dragon/data/tdraglib_proc/TCDR13.c2m b/Dragon/data/tdraglib_proc/TCDR13.c2m index d524cd5..0849b76 100644 --- a/Dragon/data/tdraglib_proc/TCDR13.c2m +++ b/Dragon/data/tdraglib_proc/TCDR13.c2m @@ -90,7 +90,7 @@ LIBRARY := SHI: LIBRARY VOLMATS INTLINS :: EDIT 0 NOLJ ; PIJ := ASM: LIBRARY VOLMATF INTLINF ; FLUX := FLU: PIJ LIBRARY VOLMATF :: TYPE K ; -assertS FLUX :: 'K-INFINITY' 1 1.117541 ; +assertS FLUX :: 'K-INFINITY' 1 1.117787 ; EDITION := EDI: FLUX LIBRARY VOLMATF :: COND 4.0 MERGE MIX 0 0 0 0 1 0 0 0 0 0 MICR RES SAVE ON 'moderator' ; DATABASE := COMPO: DATABASE EDITION :: @@ -115,16 +115,16 @@ ISOT := DATABASE :: STEP UP fuel STEP UP MIXTURES STEP AT 1 STEP UP CALCULATIONS STEP AT 5 STEP UP ISOTOPESLIST STEP AT 1 ; -assertS ISOT :: 'NWT0' 1 1.149079E1 ; -assertS ISOT :: 'NWT0' 2 2.586806E1 ; +assertS ISOT :: 'NWT0' 1 1.152544E+01 ; +assertS ISOT :: 'NWT0' 2 2.593972E+01 ; ISOT := DELETE: ISOT ; ISOT := DATABASE :: STEP UP moderator STEP UP MIXTURES STEP AT 1 STEP UP CALCULATIONS STEP AT 1 STEP UP ISOTOPESLIST STEP AT 1 ; -assertS ISOT :: 'NWT0' 1 9.095950E-2 ; -assertS ISOT :: 'NWT0' 2 3.246065E-1 ; +assertS ISOT :: 'NWT0' 1 9.099452E-02 ; +assertS ISOT :: 'NWT0' 2 3.246804E-01 ; INTLINF INTLINS := DELETE: INTLINF INTLINS ; ECHO "test TCDR13 completed" ; diff --git a/Dragon/data/tdraglib_proc/TCDR14.c2m b/Dragon/data/tdraglib_proc/TCDR14.c2m index 768e2f7..cf04c4f 100644 --- a/Dragon/data/tdraglib_proc/TCDR14.c2m +++ b/Dragon/data/tdraglib_proc/TCDR14.c2m @@ -160,7 +160,7 @@ LIBRARY := SHI: LIBRARY DISCR :: LJ ; CP := ASM: LIBRARY DISCR ; CALC := FLU: CP LIBRARY DISCR :: TYPE B B1 PNL ; -assertS CALC :: 'K-INFINITY' 1 1.256372 ; +assertS CALC :: 'K-INFINITY' 1 1.256499 ; OUT := EDI: CALC LIBRARY DISCR ASSMB_HOM :: EDIT 3 UPS SAVE MICR ALL MERGE MIX 1 1 1 2 2 2 2 2 @@ -219,13 +219,13 @@ WHILE Timei Timec < DO ENDIF ; EVALUATE Timei := Timef ; ENDWHILE ; -assertS CALC :: 'K-INFINITY' 1 1.211175 ; +assertS CALC :: 'K-INFINITY' 1 1.211245 ; COMPO := CPO: OUT BURNUP :: BURNUP REF-CASE NAME COMPO ; RECORD := COMPO :: STEP UP 'COMPO 2' ; -assertS RECORD :: 'BURNUP' 4 3.197132E+02 ; +assertS RECORD :: 'BURNUP' 4 3.197130E+02 ; *---- * 2 group Burnup initialization *---- @@ -240,7 +240,7 @@ DISCR := BIVACT: ASSMB_HOM :: CP := ASM: LIBRARY DISCR :: ARM ; CALC := FLU: CP LIBRARY DISCR :: TYPE K LKRD IDEM ; -assertS CALC :: 'K-INFINITY' 1 1.256390 ; +assertS CALC :: 'K-INFINITY' 1 1.256512 ; *---- * 2 group Burnup *---- @@ -286,7 +286,7 @@ WHILE Timei Timec < DO EVALUATE Timei := Timef ; ENDWHILE ; saCOMPO := MCOMPO ; -assertS CALC :: 'K-INFINITY' 1 1.212845 ; +assertS CALC :: 'K-INFINITY' 1 1.212984 ; ECHO "test TCDR14 completed" ; END: ; diff --git a/Dragon/data/tdraglib_proc/TCDR15.c2m b/Dragon/data/tdraglib_proc/TCDR15.c2m index 7b70a14..747d4d2 100644 --- a/Dragon/data/tdraglib_proc/TCDR15.c2m +++ b/Dragon/data/tdraglib_proc/TCDR15.c2m @@ -194,7 +194,7 @@ LIBRARY2 := USS: LIBRARY TRACK TRACK_FIL :: 1.0000E-02 MICR ISOTXS ASCII ALL SAVE ; -assertS FLUX :: K-INFINITY 1 1.145036 ; +assertS FLUX :: K-INFINITY 1 1.144844 ; ECHO "test TCDR15 completed" ; EDIT.out := OUT1G ; END: ; diff --git a/Dragon/data/tdraglib_proc/TCDR16.c2m b/Dragon/data/tdraglib_proc/TCDR16.c2m index e228900..93e7a84 100644 --- a/Dragon/data/tdraglib_proc/TCDR16.c2m +++ b/Dragon/data/tdraglib_proc/TCDR16.c2m @@ -146,7 +146,7 @@ LIBRARY2 := USS: LIBRARY TRACK TRACK_FIL :: EDIT 1 TYPE K P1 EXTE 300 1E-5 THER 10 1E-5 ; -assertS FLUX :: 'K-EFFECTIVE' 1 1.144677 ; +assertS FLUX :: 'K-EFFECTIVE' 1 1.144789 ; ECHO "test TCDR16 completed" ; END: ; QUIT "LIST" . diff --git a/Dragon/data/tdraglib_proc/TCDR17.c2m b/Dragon/data/tdraglib_proc/TCDR17.c2m index ce2751c..25f9f66 100644 --- a/Dragon/data/tdraglib_proc/TCDR17.c2m +++ b/Dragon/data/tdraglib_proc/TCDR17.c2m @@ -139,7 +139,7 @@ DATABASE := COMPO: :: *--- BURNUP LIBRARY := EVO: LIBRARY CALC DISCR :: SAVE 0.0 DAY POWR <<Power>> ; -assertS CALC :: 'K-EFFECTIVE' 1 9.225872E-01 ; +assertS CALC :: 'K-EFFECTIVE' 1 0.9227237 ; DATABASE := COMPO: DATABASE OUT BURNUP LIBRARY :: EDIT 0 ALLX @@ -200,7 +200,7 @@ ENDWHILE ; saCOMPO2 := DATABASE ; -assertS CALC :: 'K-EFFECTIVE' 1 9.392296E-01 ; +assertS CALC :: 'K-EFFECTIVE' 1 0.9391420 ; ECHO "test TCDR17 completed" ; END: ; QUIT . diff --git a/Dragon/data/tdraglib_proc/TCDR18.c2m b/Dragon/data/tdraglib_proc/TCDR18.c2m index e3dba38..8bcb2e9 100644 --- a/Dragon/data/tdraglib_proc/TCDR18.c2m +++ b/Dragon/data/tdraglib_proc/TCDR18.c2m @@ -77,7 +77,7 @@ EDITION := EDI: LIBRARY2 FLUX TRACK :: *-- GROUP := EDITION :: STEP UP EDITMOD STEP UP MACROLIB STEP UP GROUP STEP AT 1 ; -assertS GROUP :: 'NTOT0' 1 0.1447909 ; +assertS GROUP :: 'NTOT0' 1 1.447905E-01 ; ECHO "test TCDR18 completed" ; END: ; QUIT "LIST" . diff --git a/Dragon/data/tdraglib_proc/TCDR19.c2m b/Dragon/data/tdraglib_proc/TCDR19.c2m index 26266db..7089ae5 100644 --- a/Dragon/data/tdraglib_proc/TCDR19.c2m +++ b/Dragon/data/tdraglib_proc/TCDR19.c2m @@ -152,7 +152,7 @@ LIBRARY2 := USS: LIBRARY TRACK TRACK_FIL :: TYPE K EXTE 500 1E-5 THER 10 1E-5 ; -assertS FLUX :: 'K-INFINITY' 1 1.208958 ; +assertS FLUX :: 'K-INFINITY' 1 1.208795 ; ECHO "test TCDR19 completed" ; END: ; QUIT "LIST" . diff --git a/Dragon/data/tdraglib_proc/TCDR20.c2m b/Dragon/data/tdraglib_proc/TCDR20.c2m index 772c061..f445c95 100644 --- a/Dragon/data/tdraglib_proc/TCDR20.c2m +++ b/Dragon/data/tdraglib_proc/TCDR20.c2m @@ -169,7 +169,7 @@ EDIT := SPH: EDIT SPHTRACK :: MACRO := EDIT :: STEP UP 'REF-CASE0001' STEP UP MACROLIB ; SYS := ASM: MACRO SPHTRACK :: ARM ; FLUX := FLU: MACRO SPHTRACK SYS :: TYPE K EXTE 100 5.0E-8 ; -assertS FLUX :: 'K-EFFECTIVE' 1 1.503346 ; +assertS FLUX :: 'K-EFFECTIVE' 1 1.503431 ; ECHO "test TCDR20 completed" ; END: ; QUIT "LIST" . diff --git a/Dragon/data/tdraglib_proc/TCDR21.c2m b/Dragon/data/tdraglib_proc/TCDR21.c2m index ab526c2..dcd43ad 100644 --- a/Dragon/data/tdraglib_proc/TCDR21.c2m +++ b/Dragon/data/tdraglib_proc/TCDR21.c2m @@ -128,16 +128,16 @@ EDITION := SPH: EDITION :: EDIT 2 ALBS SELE_ALB ; * MACDIR := EDITION :: STEP UP 'REF-CASE0001' STEP UP MACROLIB STEP UP GROUP STEP AT 1 ; -assertS MACDIR :: 'NTOT0' 1 5.363227E-01 ; -assertS MACDIR :: 'NUSIGF' 1 6.825784E-03 ; -assertS MACDIR :: 'DIFF' 1 1.532271E+00 ; -assertS MACDIR :: 'SIGW00' 1 5.097417E-01 ; +assertS MACDIR :: 'NTOT0' 1 5.361698E-01 ; +assertS MACDIR :: 'NUSIGF' 1 6.822402E-03 ; +assertS MACDIR :: 'DIFF' 1 1.532455E+00 ; +assertS MACDIR :: 'SIGW00' 1 5.096055E-01 ; MACDIR := DELETE: MACDIR ; MACDIR := EDITION :: STEP UP 'REF-CASE0001' STEP UP MACROLIB STEP UP GROUP STEP AT 2 ; -assertS MACDIR :: 'NTOT0' 1 1.338058E+00 ; -assertS MACDIR :: 'NUSIGF' 1 1.413793E-01 ; -assertS MACDIR :: 'DIFF' 1 3.821711E-01 ; +assertS MACDIR :: 'NTOT0' 1 1.338060E+00 ; +assertS MACDIR :: 'NUSIGF' 1 1.413817E-01 ; +assertS MACDIR :: 'DIFF' 1 3.821671E-01 ; assertS MACDIR :: 'SIGW00' 1 1.247216E+00 ; MACDIR := DELETE: MACDIR ; ECHO "test TCDR21 completed" ; diff --git a/Dragon/data/tdraglib_proc/TCDR22.c2m b/Dragon/data/tdraglib_proc/TCDR22.c2m index 8983c9f..a8eac72 100644 --- a/Dragon/data/tdraglib_proc/TCDR22.c2m +++ b/Dragon/data/tdraglib_proc/TCDR22.c2m @@ -10,17 +10,20 @@ * Define STRUCTURES and MODULES used *---- LINKED_LIST - ASSMB DISCR LIBRARY CP CALC OUT SPHGEOM MTRACK MACRO MACRO2 SYS FLUX - EDIT ; + ASSMB DISCR LIBRARY LIBRARY2 CP CALC OUT SPHGEOM MTRACK MACRO MACRO2 SYS + FLUX EDIT OPTIM ; MODULE - LIB: GEO: SYBILT: SHI: ASM: FLU: EDI: FLUD: MAC: DELETE: UTL: BIVACT: - BIVACA: SPH: OUT: ERROR: END: ; + LIB: GEO: SYBILT: USS: ASM: FLU: EDI: FLUD: MAC: DELETE: UTL: BIVACT: + BIVACA: OUT: ERROR: END: ; +PROCEDURE SPH_FixedPt ; PROCEDURE assertS ; +INTEGER IterEmax := 50 ; *---- * Microscopic cross sections from Jef 2.2 Draglib *---- LIBRARY := LIB: :: NMIX 8 CTRA WIMS ANIS 2 + SUBG MIXS LIB: DRAGON FIL: DLIB_J2 MIX 1 579.9 H1H2O = H1_H2O 4.76690E-2 O16H2O = O16 2.38345E-2 @@ -122,7 +125,7 @@ ASSMB := GEO: :: CAR2D 9 9 DISCR := SYBILT: ASSMB :: TITLE 'TCDR02: 17 X 17 MULTICELL PWR BENCHMARK WITHOUT POISON' MAXR 400 QUA2 6 3 ; -LIBRARY := SHI: LIBRARY DISCR :: LJ ; +LIBRARY2 := USS: LIBRARY DISCR :: PASS 2 ; ASSMB DISCR := DELETE: ASSMB DISCR ; *---- * New lattice geometry with VOID boundary condition @@ -148,16 +151,16 @@ ASSMB := GEO: :: CAR2D 9 9 DISCR := SYBILT: ASSMB :: TITLE 'TCDR02: 17 X 17 MULTICELL PWR BENCHMARK WITHOUT POISON' MAXR 400 QUA2 6 3 ; -CP := ASM: LIBRARY DISCR :: ARM ; -CALC := FLU: CP LIBRARY DISCR :: +CP := ASM: LIBRARY2 DISCR :: ARM ; +CALC := FLU: CP LIBRARY2 DISCR :: TYPE K P1 HETE ; -assertS CALC :: 'K-EFFECTIVE' 1 0.4551677 ; +assertS CALC :: 'K-EFFECTIVE' 1 0.4565791 ; *---- * Editing using SPH model for transport-diffusion with flux-volume * normalization *---- -OUT := EDI: LIBRARY DISCR CALC ASSMB :: +OUT := EDI: LIBRARY2 DISCR CALC ASSMB :: EDIT 4 UPS SAVE MICR RES MERGE CELL COND 4.0 ; @@ -187,21 +190,19 @@ MACRO := OUT :: STEP UP 'REF-CASE0001' STEP UP 'MACROLIB' ; *---- MACRO := MAC: MACRO :: ALBP 1 0.0 0.0 ; *---- -* Perform SPH equivalence +* Perform fixed-point SPH equivalence *---- -MACRO2 := SPH: MACRO MTRACK :: EDIT 2 ITER 1.0E-7 ; +MACRO2 OPTIM := SPH_FixedPt MACRO SPHGEOM MTRACK + :: 0.0 10.0 1.0E-7 <<IterEmax>> ; +ECHO "control variables at convergence" ; +UTL: OPTIM :: IMPR 'VAR-VALUE' * ; *---- * Verification calculation *---- +CALC := DELETE: CALC ; SYS := BIVACA: MACRO2 MTRACK ; -FLUX := FLUD: SYS MTRACK :: EDIT 2 ADI 20 ACCE 5 3 ; -EDIT := OUT: FLUX SPHGEOM MACRO2 MTRACK :: - EDIT 0 INTG MIX ; - -ECHO "Error statistics after correction" ; -ERROR: MACRO EDIT :: HREA 'NFTOT' ; - -assertS FLUX :: K-EFFECTIVE 1 0.4551687 ; +CALC := FLUD: SYS MTRACK :: EDIT 2 ADI 5 ACCE 5 3 ; +assertS CALC :: K-EFFECTIVE 1 0.4565792 ; ECHO "test TCDR22 completed" ; END: ; diff --git a/Dragon/data/tdraglib_proc/TCDR31.c2m b/Dragon/data/tdraglib_proc/TCDR31.c2m index 23530bd..4613628 100644 --- a/Dragon/data/tdraglib_proc/TCDR31.c2m +++ b/Dragon/data/tdraglib_proc/TCDR31.c2m @@ -93,7 +93,7 @@ VOLMATF INTLINF := EXCELT: CANDU6F :: PIJ := ASM: LIBRARY VOLMATF INTLINF ; FLUX := FLU: PIJ LIBRARY VOLMATF :: TYPE K ; -assertS FLUX :: 'K-EFFECTIVE' 1 1.117541 ; +assertS FLUX :: 'K-EFFECTIVE' 1 1.117787 ; EDITION := EDI: FLUX LIBRARY VOLMATF CANDU6F :: MERG REGI 6 6 10 7 7 10 1 1 8 8 10 1 1 9 9 10 1 1 2 3 4 5 5 5 @@ -131,7 +131,7 @@ VOLMATF INTLINF := EXCELT: CANDU6F :: PIJ := ASM: LIBRARY VOLMATF INTLINF ; FLUX := FLU: PIJ LIBRARY VOLMATF :: TYPE K ; -assertS FLUX :: 'K-EFFECTIVE' 1 1.117542 ; +assertS FLUX :: 'K-EFFECTIVE' 1 1.117703 ; EDITION := EDI: FLUX LIBRARY VOLMATF :: EDIT 1 MERGE COMP MICR ALL SAVE ; EVALUATE Timec := 1.0 ; @@ -163,7 +163,7 @@ WHILE Timei Timec < DO ENDIF ; EVALUATE Timei := Timef ; ENDWHILE ; -assertS FLUX :: 'K-EFFECTIVE' 1 1.075418 ; +assertS FLUX :: 'K-EFFECTIVE' 1 1.075547 ; res := EDITION ; EDITION BURNUP FLUX PIJ LIBRARY INTLINF VOLMATF CANDU6F := DELETE: EDITION BURNUP FLUX PIJ LIBRARY INTLINF VOLMATF CANDU6F ; diff --git a/Dragon/data/tdraglib_proc/TCDR32.c2m b/Dragon/data/tdraglib_proc/TCDR32.c2m index c0653b0..9c1fe02 100644 --- a/Dragon/data/tdraglib_proc/TCDR32.c2m +++ b/Dragon/data/tdraglib_proc/TCDR32.c2m @@ -68,7 +68,7 @@ LIBRARY := LIB: :: LIBRARY2 := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 LEVEL 1 MXIT 3 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.212449 ; +assertS FLUX :: K-EFFECTIVE 1 1.212435 ; LIBRARY2 CP FLUX := DELETE: LIBRARY2 CP FLUX ; *---- * SHI LEVEL 2 @@ -76,7 +76,7 @@ LIBRARY2 CP FLUX := DELETE: LIBRARY2 CP FLUX ; LIBRARY2 := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 LEVEL 2 MXIT 3 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.217413 ; +assertS FLUX :: K-EFFECTIVE 1 1.217428 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * USS @@ -117,7 +117,7 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 3 GRMIN 45 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.216461 ; +assertS FLUX :: K-EFFECTIVE 1 1.216626 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * Ribon extended @@ -158,7 +158,7 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 3 GRMIN 45 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.216642 ; +assertS FLUX :: K-EFFECTIVE 1 1.216878 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * Ribon extended with correlation @@ -201,7 +201,7 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 4 GRMIN 45 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.218970 ; +assertS FLUX :: K-EFFECTIVE 1 1.219296 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; ECHO "test TCDR32 completed" ; END: ; diff --git a/Dragon/data/tdraglib_proc/TCDR33.c2m b/Dragon/data/tdraglib_proc/TCDR33.c2m index e7f8ed4..59aec17 100644 --- a/Dragon/data/tdraglib_proc/TCDR33.c2m +++ b/Dragon/data/tdraglib_proc/TCDR33.c2m @@ -92,7 +92,7 @@ LIBRARY := SHI: LIBRARY TRACK :: EDIT 0 NOLJ ; PIJ := ASM: LIBRARY TRACK ; FLUX := FLU: PIJ LIBRARY TRACK :: TYPE K ; -assertS FLUX :: 'K-EFFECTIVE' 1 1.873188 ; +assertS FLUX :: 'K-EFFECTIVE' 1 1.873172 ; EDITION := EDI: FLUX LIBRARY TRACK :: COND 4.0 MERGE COMP SAVE ; *---- @@ -140,7 +140,7 @@ WHILE Timei TotalTime < DO ENDIF ; EVALUATE Timei := Timef ; ENDWHILE ; -assertS FLUX :: 'K-EFFECTIVE' 1 1.760241 ; +assertS FLUX :: 'K-EFFECTIVE' 1 1.834845 ; ECHO "test TCDR33 completed" ; END: ; QUIT "LIST" . diff --git a/Dragon/data/tdraglib_proc/TCDR34.c2m b/Dragon/data/tdraglib_proc/TCDR34.c2m index 062008f..a9755a5 100644 --- a/Dragon/data/tdraglib_proc/TCDR34.c2m +++ b/Dragon/data/tdraglib_proc/TCDR34.c2m @@ -54,12 +54,12 @@ TRACK := SYBILT: C3 :: LIBRARY2 := USS: LIBRARY TRACK :: EDIT 0 TRAN PASS 2 GRMIN 45 ; SYS := ASM: LIBRARY2 TRACK :: PIJ ECCO ; FLUX := FLU: SYS LIBRARY2 TRACK :: TYPE B P1 ECCO ; -assertS FLUX :: 'K-INFINITY' 1 1.378569 ; +assertS FLUX :: 'K-INFINITY' 1 1.378641 ; EDIT := EDI: FLUX LIBRARY2 TRACK :: EDIT 3 COND 75 99 MERGE COMP SAVE ON 'EDITCDAT 1' ; MACDIR := EDIT :: STEP UP 'EDITCDAT 1' STEP UP MACROLIB STEP UP GROUP STEP AT 2 ; -assertS MACDIR :: 'DIFF' 1 0.64423 ; +assertS MACDIR :: 'DIFF' 1 0.6442041 ; ECHO "test TCDR34 completed" ; END: ; diff --git a/Dragon/data/tdraglib_proc/TCDR35.c2m b/Dragon/data/tdraglib_proc/TCDR35.c2m index 7156fc0..c380f06 100644 --- a/Dragon/data/tdraglib_proc/TCDR35.c2m +++ b/Dragon/data/tdraglib_proc/TCDR35.c2m @@ -74,6 +74,6 @@ TRACK := SNT: GEOM2 :: SN 16 SCAT 1 QUAD 10 ; SYS := ASM: LIBRARY2 TRACK :: ARM ; FLUX := FLU: SYS LIBRARY2 TRACK :: EDIT 1 TYPE K ; -assertS FLUX :: 'K-EFFECTIVE' 1 1.387591 ; +assertS FLUX :: 'K-EFFECTIVE' 1 1.388029 ; ECHO "test TCDR35 completed" ; END: ; diff --git a/Dragon/data/tdraglib_proc/TCDR36.c2m b/Dragon/data/tdraglib_proc/TCDR36.c2m index 8a67373..6c68390 100644 --- a/Dragon/data/tdraglib_proc/TCDR36.c2m +++ b/Dragon/data/tdraglib_proc/TCDR36.c2m @@ -196,7 +196,7 @@ TRACK_F1 := SYBILT: GEOM_F1 :: SYS := ASM: AUTO_LIB TRACK_F1 :: ; FLUX1 := FLU: AUTO_LIB TRACK_F1 SYS :: TYPE B B1 SIGS ; SYS := DELETE: SYS ; -assertS FLUX1 :: 'K-INFINITY' 1 1.217577 ; +assertS FLUX1 :: 'K-INFINITY' 1 1.217641 ; * ************************************************************************ * burnup loop -- burnup loop -- burnup loop -- burnup loop -- burnup loo @@ -276,7 +276,7 @@ WHILE Burni Burnc < DO EVALUATE Timei := Timef ; * ENDWHILE ; -assertS FLUX1 :: 'K-INFINITY' 1 1.161285 ; +assertS FLUX1 :: 'K-INFINITY' 1 1.161281 ; * LIBRARY GEOM_SS TRACK_SS AUTO_LIB BURN := DELETE: LIBRARY GEOM_SS TRACK_SS AUTO_LIB BURN ; diff --git a/Dragon/data/tdraglib_proc/TCDR37.c2m b/Dragon/data/tdraglib_proc/TCDR37.c2m index 8f0422a..476ab2a 100644 --- a/Dragon/data/tdraglib_proc/TCDR37.c2m +++ b/Dragon/data/tdraglib_proc/TCDR37.c2m @@ -141,10 +141,10 @@ LIBRARY := SHI: LIBRARY TRACK TRACK_FIL :: FLUX := FLU: SYS LIBRARY TRACK TRACK_FIL :: EDIT 1 TYPE K P1 EXTE 300 1E-5 THER 10 1E-5 ; - assertS FLUX :: K-EFFECTIVE 1 1.083298 ; + assertS FLUX :: K-EFFECTIVE 1 1.083412 ; *-------------------------------------------------------- -* Graphik +* Graphic *-------------------------------------------------------- * Fig_reg.ps := PSP: TRACK :: diff --git a/Dragon/data/tdraglib_proc/TCDR38.c2m b/Dragon/data/tdraglib_proc/TCDR38.c2m index bf4eeed..b8ddecb 100644 --- a/Dragon/data/tdraglib_proc/TCDR38.c2m +++ b/Dragon/data/tdraglib_proc/TCDR38.c2m @@ -119,7 +119,7 @@ FLUX := FLU: SYS LIBRARY2 TRACKF :: GREP: FLUX :: GETVAL 'K-INFINITY' 1 >>Kinf<< ; ECHO "Kinf=" Kinf ; -EVALUATE REFVALUE := 1.110458 ; +EVALUATE REFVALUE := 1.110557 ; EVALUATE DELTA := Kinf REFVALUE - REFVALUE / ABS ; IF DELTA 1.0E-3 < THEN PRINT "TEST SUCCESSFUL; DELTA=" DELTA ; diff --git a/Dragon/data/tdraglib_proc/TCDR41.c2m b/Dragon/data/tdraglib_proc/TCDR41.c2m index 7c4e5a1..0aa2776 100644 --- a/Dragon/data/tdraglib_proc/TCDR41.c2m +++ b/Dragon/data/tdraglib_proc/TCDR41.c2m @@ -98,7 +98,7 @@ SYS := ASM: LIBRARY2 TRACK TRACK_FIL :: EDIT 2 ARM ; FLUX := FLU: LIBRARY2 TRACK SYS TRACK_FIL :: EDIT 1 TYPE K B0 SIGS BUCK <<Buckl>> ; -assertS FLUX :: 'K-EFFECTIVE' 1 1.392635 ; +assertS FLUX :: 'K-EFFECTIVE' 1 1.393150 ; EDIT := EDI: FLUX LIBRARY2 TRACK CELL :: EDIT 2 COND 27 59 95 ; @@ -155,7 +155,7 @@ SYS := ASM: LIBRARY2 TRACK TRACK_FIL :: EDIT 2 ARM ; FLUX := FLU: LIBRARY2 TRACK SYS TRACK_FIL :: EDIT 1 TYPE K B0 SIGS BUCK <<Buckl>> ; -assertS FLUX :: 'K-EFFECTIVE' 1 1.393138 ; +assertS FLUX :: 'K-EFFECTIVE' 1 1.393633 ; EDIT := EDI: FLUX LIBRARY2 TRACK CELL :: EDIT 2 COND 27 59 95 ; diff --git a/Dragon/data/tdraglib_proc/TCDR42.c2m b/Dragon/data/tdraglib_proc/TCDR42.c2m index 2023f36..de0e334 100644 --- a/Dragon/data/tdraglib_proc/TCDR42.c2m +++ b/Dragon/data/tdraglib_proc/TCDR42.c2m @@ -96,7 +96,7 @@ LIBRARY2 := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 LEVEL 0 MXIT 3 PIJ ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.342790 ; +assertS FLUX :: K-EFFECTIVE 1 1.342668 ; LIBRARY2 CP FLUX := DELETE: LIBRARY2 CP FLUX ; *---- * SHI LEVEL 0 WITH ARM (FLUX-CURRENT EURYDICE ITERATIONS) @@ -105,7 +105,7 @@ LIBRARY2 := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 LEVEL 0 MXIT 3 ARM ; CP := ASM: LIBRARY2 TRACK :: ARM ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.342790 ; +assertS FLUX :: K-EFFECTIVE 1 1.342668 ; LIBRARY2 CP FLUX := DELETE: LIBRARY2 CP FLUX ; *---- * SHI LEVEL 1 WITH PIJ @@ -114,7 +114,7 @@ LIBRARY2 := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 LEVEL 1 MXIT 3 PIJ ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.345739 ; +assertS FLUX :: K-EFFECTIVE 1 1.345441 ; LIBRARY2 CP FLUX := DELETE: LIBRARY2 CP FLUX ; *---- * SHI LEVEL 1 WITH ARM (FLUX-CURRENT EURYDICE ITERATIONS) @@ -123,7 +123,7 @@ LIBRARY2 := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 LEVEL 1 MXIT 3 ARM ; CP := ASM: LIBRARY2 TRACK :: ARM ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.345739 ; +assertS FLUX :: K-EFFECTIVE 1 1.345441 ; * ECHO "test TCDR42 completed" ; END: ; diff --git a/Dragon/data/tdraglib_proc/TCDR43.c2m b/Dragon/data/tdraglib_proc/TCDR43.c2m index 01c97fd..fbbb5cc 100644 --- a/Dragon/data/tdraglib_proc/TCDR43.c2m +++ b/Dragon/data/tdraglib_proc/TCDR43.c2m @@ -272,6 +272,6 @@ TRACK1_F := SYBILT: SPHGEOM :: MAXJ 500 QUA2 20 3 DP01 ; CP1 := ASM: MACRO TRACK1_F :: PIJ ; FLUX1 := FLU: MACRO TRACK1_F CP1 :: TYPE K ; -assertS FLUX1 :: K-EFFECTIVE 1 1.264118 ; +assertS FLUX1 :: K-EFFECTIVE 1 1.264182 ; ECHO "test TCDR43 completed" ; END: ; diff --git a/Dragon/data/tdraglib_proc/TCDR44.c2m b/Dragon/data/tdraglib_proc/TCDR44.c2m index 2da37e5..f74790e 100644 --- a/Dragon/data/tdraglib_proc/TCDR44.c2m +++ b/Dragon/data/tdraglib_proc/TCDR44.c2m @@ -81,7 +81,7 @@ FLUX := MC: TRACK LIBRARY2 :: * * Non regression assert * -EVALUATE REFVALUE := 1.395400 ; +EVALUATE REFVALUE := 1.402651 ; * GREP: FLUX :: GETVAL K-EFFECTIVE 1 >>VALUE<< ; EVALUATE DELTA := VALUE REFVALUE - REFVALUE / ABS ; diff --git a/Dragon/data/tdraglib_proc/TCDR46.c2m b/Dragon/data/tdraglib_proc/TCDR46.c2m index 9d36bdc..2ff1a0e 100644 --- a/Dragon/data/tdraglib_proc/TCDR46.c2m +++ b/Dragon/data/tdraglib_proc/TCDR46.c2m @@ -87,24 +87,24 @@ DISCR_SS := SYBILT: ASSMB_SS :: MAXZ 1000000 MAXR 1000000 LIBRARY_SS := USS: LIBRARY DISCR_SS ; CP := ASM: LIBRARY_SS DISCR :: ARM ; FLUX := FLU: CP LIBRARY_SS DISCR :: EDIT 2 TYPE B B1 SIGS ; -assertS FLUX :: 'K-INFINITY' 1 1.279648 ; +assertS FLUX :: 'K-INFINITY' 1 1.279805 ; EDITION := EDI: LIBRARY_SS DISCR FLUX ASSMB :: EDIT 4 SAVE MICR RES MERGE COMP COND 0.625 JOUT ; EDITION := SPH: EDITION :: EDIT 9 ALBS SELE_ALB ; * MACDIR := EDITION :: STEP UP 'REF-CASE0001' STEP UP MACROLIB STEP UP GROUP STEP AT 1 ; -assertS MACDIR :: 'NTOT0' 1 5.305629E-01 ; -assertS MACDIR :: 'NUSIGF' 1 6.686473E-03 ; -assertS MACDIR :: 'DIFF' 1 1.400524E+00 ; -assertS MACDIR :: 'SIGW00' 1 5.050910E-01 ; +assertS MACDIR :: 'NTOT0' 1 5.303974E-01 ; +assertS MACDIR :: 'NUSIGF' 1 6.683205E-03 ; +assertS MACDIR :: 'DIFF' 1 1.400765E+00 ; +assertS MACDIR :: 'SIGW00' 1 5.049425E-01 ; MACDIR := DELETE: MACDIR ; MACDIR := EDITION :: STEP UP 'REF-CASE0001' STEP UP MACROLIB STEP UP GROUP STEP AT 2 ; -assertS MACDIR :: 'NTOT0' 1 1.359428E+00 ; -assertS MACDIR :: 'NUSIGF' 1 1.365678E-01 ; -assertS MACDIR :: 'DIFF' 1 4.055927E-01 ; -assertS MACDIR :: 'SIGW00' 1 1.271332E+00 ; +assertS MACDIR :: 'NTOT0' 1 1.359430E+00 ; +assertS MACDIR :: 'NUSIGF' 1 1.365735E-01 ; +assertS MACDIR :: 'DIFF' 1 4.055988E-01 ; +assertS MACDIR :: 'SIGW00' 1 1.271331E+00 ; MACDIR := DELETE: MACDIR ; ECHO "test TCDR46 completed" ; END: ; diff --git a/Dragon/data/tdraglib_proc/TCDR47.c2m b/Dragon/data/tdraglib_proc/TCDR47.c2m index 1c9f41d..a0290a4 100644 --- a/Dragon/data/tdraglib_proc/TCDR47.c2m +++ b/Dragon/data/tdraglib_proc/TCDR47.c2m @@ -124,23 +124,24 @@ DISCR := SYBILT: EIGHTH :: MAXZ 1000000 MAXR 1000000 QUA2 3 3 GAUSS DP01 ; CP := ASM: LIBRARY2 DISCR :: ARM ; FLUX := FLU: CP LIBRARY2 DISCR :: EDIT 1 TYPE B B1 SIGS ; +assertS FLUX :: 'K-INFINITY' 1 1.279805 ; EDITION := EDI: LIBRARY2 DISCR FLUX EIGHTH :: EDIT 1 SAVE MICR RES MERGE COMP COND 0.625 JOUT ; EDITION := SPH: EDITION :: EDIT 2 ALBS SELE_ALB ; * MACDIR := EDITION :: STEP UP 'REF-CASE0001' STEP UP MACROLIB STEP UP GROUP STEP AT 1 ; -assertS MACDIR :: 'NTOT0' 1 5.305629E-01 ; -assertS MACDIR :: 'NUSIGF' 1 6.686473E-03 ; -assertS MACDIR :: 'DIFF' 1 1.400524E+00 ; -assertS MACDIR :: 'SIGW00' 1 5.050910E-01 ; +assertS MACDIR :: 'NTOT0' 1 5.303974E-01 ; +assertS MACDIR :: 'NUSIGF' 1 6.683205E-03 ; +assertS MACDIR :: 'DIFF' 1 1.400765E+00 ; +assertS MACDIR :: 'SIGW00' 1 5.049425E-01 ; MACDIR := DELETE: MACDIR ; MACDIR := EDITION :: STEP UP 'REF-CASE0001' STEP UP MACROLIB STEP UP GROUP STEP AT 2 ; -assertS MACDIR :: 'NTOT0' 1 1.359428E+00 ; -assertS MACDIR :: 'NUSIGF' 1 1.365678E-01 ; -assertS MACDIR :: 'DIFF' 1 4.055927E-01 ; -assertS MACDIR :: 'SIGW00' 1 1.271332E+00 ; +assertS MACDIR :: 'NTOT0' 1 1.359430E+00 ; +assertS MACDIR :: 'NUSIGF' 1 1.365735E-01 ; +assertS MACDIR :: 'DIFF' 1 4.055988E-01 ; +assertS MACDIR :: 'SIGW00' 1 1.271331E+00 ; MACDIR := DELETE: MACDIR ; ECHO "test TCDR47 completed" ; END: ; diff --git a/Dragon/data/tdraglib_proc/TCDR48.c2m b/Dragon/data/tdraglib_proc/TCDR48.c2m index 10dda98..73a0753 100644 --- a/Dragon/data/tdraglib_proc/TCDR48.c2m +++ b/Dragon/data/tdraglib_proc/TCDR48.c2m @@ -36,8 +36,8 @@ LIBRARY := LIB: :: *---- ASB := ASM: LIBRARY TRACK :: PIJ ; FLUX := FLU: LIBRARY TRACK ASB :: EDIT 2 TYPE L P1 SIGS BUCK -1.0E-2 ; -assertS FLUX :: 'B2 B1HOM' 1 -6.071696E-3 ; +assertS FLUX :: 'B2 B1HOM' 1 -6.071697E-03 ; FLUX := FLU: FLUX LIBRARY TRACK ASB :: TYPE L RHS SIGS ; -assertS FLUX :: 'B2 B1HOM' 1 -6.071696E-3 ; +assertS FLUX :: 'B2 B1HOM' 1 -6.071662E-03 ; ECHO "test TCDR48 completed" ; END: ; diff --git a/Dragon/data/tdraglib_proc/TCDR49.c2m b/Dragon/data/tdraglib_proc/TCDR49.c2m index 9086450..086bc22 100644 --- a/Dragon/data/tdraglib_proc/TCDR49.c2m +++ b/Dragon/data/tdraglib_proc/TCDR49.c2m @@ -100,7 +100,7 @@ DISCR := SYBILT: ASSMB :: LIBRARY2 := USS: LIBRARY DISCR :: EDIT 2 PASS 2 ARM ; CP := ASM: LIBRARY2 DISCR :: ARM ; CALC := FLU: CP LIBRARY2 DISCR :: TYPE K B1 SIGS ; -assertS CALC :: 'K-INFINITY' 1 1.233258 ; +assertS CALC :: 'K-INFINITY' 1 1.233395 ; DISCR LIBRARY2 CP CALC := DELETE: DISCR LIBRARY2 CP CALC ; *---- * Self-Shielding calculation SALT WITH MULTICELL SURFACIC @@ -118,7 +118,7 @@ DISCR DISCR_FIL := SALT: Fic_SAL :: LIBRARY2 := USS: LIBRARY DISCR DISCR_FIL :: EDIT 2 PASS 2 ARM ; CP := ASM: LIBRARY2 DISCR DISCR_FIL :: EDIT 1 ARM ; CALC := FLU: CP LIBRARY2 DISCR :: TYPE K B1 SIGS ; -assertS CALC :: 'K-INFINITY' 1 1.232764 ; +assertS CALC :: 'K-INFINITY' 1 1.232901 ; ECHO "test TCDR49 completed" ; END: ; QUIT "LIST" . diff --git a/Dragon/data/testDuo.access b/Dragon/data/testDuo.access index 997acf9..4828c85 100755 --- a/Dragon/data/testDuo.access +++ b/Dragon/data/testDuo.access @@ -23,15 +23,15 @@ else echo 'use big endian libraries' pos=$1/../../libraries/b_endian fi -if [ -f "$pos"/draglibJef2p2.gz ] +if [ -f "$pos"/draglibJef2p2_v5p1.gz ] then echo 'gunzipping DLIB_J2' chmod 755 "$pos" - gunzip "$pos"/draglibJef2p2.gz + gunzip "$pos"/draglibJef2p2_v5p1.gz fi -if [ -f "$pos"/draglibJef2p2 ] +if [ -f "$pos"/draglibJef2p2_v5p1 ] then - ln -s "$pos"/draglibJef2p2 DLIB_J2 + ln -s "$pos"/draglibJef2p2_v5p1 DLIB_J2 fi ls echo "testDuo access script terminated" diff --git a/Dragon/data/testDuo.x2m b/Dragon/data/testDuo.x2m index c0880e0..7822b20 100644 --- a/Dragon/data/testDuo.x2m +++ b/Dragon/data/testDuo.x2m @@ -59,7 +59,7 @@ CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; CP := DELETE: CP ; -assertS FLUX :: K-EFFECTIVE 1 1.386444 ; +assertS FLUX :: K-EFFECTIVE 1 1.386455 ; *---- * ADJOINT TRANSPORT CALCULATION OF THE FIRST CALCULATION @@ -70,7 +70,7 @@ CP := ASM: MACROT TRACK :: PIJ ; FLUX := FLU: FLUX CP MACROT TRACK :: TYPE K ; CP MACRO MACROT := DELETE: CP MACRO MACROT ; -assertS FLUX :: K-EFFECTIVE 1 1.386444 ; +assertS FLUX :: K-EFFECTIVE 1 1.386455 ; *---- * CONSTRUCT AN EDITION MACROLIB FOR THE FIRST CALCULATION @@ -114,7 +114,7 @@ CP := ASM: LIBRARY TRACK :: PIJ ; FLUX := FLU: CP LIBRARY TRACK :: TYPE K ; CP := DELETE: CP ; -assertS FLUX :: K-EFFECTIVE 1 1.383546 ; +assertS FLUX :: K-EFFECTIVE 1 1.383528 ; *---- * ADJOINT TRANSPORT CALCULATION OF THE SECOND CALCULATION @@ -125,7 +125,7 @@ CP := ASM: MACROT TRACK :: PIJ ; FLUX := FLU: FLUX CP MACROT TRACK :: TYPE K ; CP := DELETE: CP ; -assertS FLUX :: K-EFFECTIVE 1 1.383546 ; +assertS FLUX :: K-EFFECTIVE 1 1.383528 ; *---- * CONSTRUCT AN EDITION MACROLIB FOR THE SECOND CALCULATION @@ -157,7 +157,7 @@ ECHO "rhoScat=" rhoScat ; ECHO "rhoNuSigf=" rhoNuSigf ; ECHO "rhoLeak=" rhoLeak ; -EVALUATE REFVALUE := -1.074349E+3 ; +EVALUATE REFVALUE := -1.093944E+03 ; EVALUATE DELTA := rhoNtot0 REFVALUE - REFVALUE / ABS ; IF DELTA 0.01 < THEN PRINT "TEST SUCCESSFUL; DELTA=" DELTA ; @@ -169,7 +169,7 @@ ELSE ABORT: ; ENDIF ; -EVALUATE REFVALUE := -1.048365E3 ; +EVALUATE REFVALUE := -1.068490E+03 ; EVALUATE DELTA := rhoScat REFVALUE - REFVALUE / ABS ; IF DELTA 0.01 < THEN PRINT "TEST SUCCESSFUL; DELTA=" DELTA ; @@ -181,7 +181,7 @@ ELSE ABORT: ; ENDIF ; -EVALUATE REFVALUE := -5.738088E1 ; +EVALUATE REFVALUE := -5.744516E+01 ; EVALUATE DELTA := rhoNuSigf REFVALUE - REFVALUE / ABS ; IF DELTA 0.01 < THEN PRINT "TEST SUCCESSFUL; DELTA=" DELTA ; @@ -193,7 +193,7 @@ ELSE ABORT: ; ENDIF ; -EVALUATE REFVALUE := 1.330732E2 ; +EVALUATE REFVALUE := 1.366547E+02 ; EVALUATE DELTA := rhoLeak REFVALUE - REFVALUE / ABS ; IF DELTA 0.01 < THEN PRINT "TEST SUCCESSFUL; DELTA=" DELTA ; diff --git a/Dragon/data/testDuo_B1.access b/Dragon/data/testDuo_B1.access index 4ce8977..d3a1ed6 100755 --- a/Dragon/data/testDuo_B1.access +++ b/Dragon/data/testDuo_B1.access @@ -23,15 +23,15 @@ else echo 'use big endian libraries' pos=$1/../../libraries/b_endian fi -if [ -f "$pos"/draglibJef2p2.gz ] +if [ -f "$pos"/draglibJef2p2_v5p1.gz ] then echo 'gunzipping DLIB_J2' chmod 755 "$pos" - gunzip "$pos"/draglibJef2p2.gz + gunzip "$pos"/draglibJef2p2_v5p1.gz fi -if [ -f "$pos"/draglibJef2p2 ] +if [ -f "$pos"/draglibJef2p2_v5p1 ] then - ln -s "$pos"/draglibJef2p2 DLIB_J2 + ln -s "$pos"/draglibJef2p2_v5p1 DLIB_J2 fi ls echo "testDuo_B1 access script terminated" diff --git a/Dragon/data/testDuo_B1.x2m b/Dragon/data/testDuo_B1.x2m index 45002c7..d76f4ee 100644 --- a/Dragon/data/testDuo_B1.x2m +++ b/Dragon/data/testDuo_B1.x2m @@ -60,7 +60,7 @@ FLUX := FLU: CP LIBRARY2 TRACK :: TYPE B B1 SIGS EXTE 1.0E-7 ; GREP: FLUX :: GETVAL 'B2 B1HOM' 1 >>B2<< ; CP := DELETE: CP ; -assertS FLUX :: K-INFINITY 1 1.377848 ; +assertS FLUX :: K-INFINITY 1 1.377865 ; *---- * ADJOINT TRANSPORT CALCULATION OF THE FIRST CALCULATION @@ -116,7 +116,7 @@ FLUX := FLU: CP LIBRARY TRACK :: TYPE B B1 SIGS EXTE 1.0E-7 ; GREP: FLUX :: GETVAL 'B2 B1HOM' 1 >>B2<< ; CP := DELETE: CP ; -assertS FLUX :: K-INFINITY 1 1.374971 ; +assertS FLUX :: K-INFINITY 1 1.374964 ; *---- * ADJOINT TRANSPORT CALCULATION OF THE SECOND CALCULATION @@ -159,7 +159,7 @@ ECHO "rhoScat=" rhoScat ; ECHO "rhoNuSigf=" rhoNuSigf ; ECHO "rhoLeak=" rhoLeak ; -EVALUATE REFVALUE := -5.581822E2 ; +EVALUATE REFVALUE := -5.606881E+02 ; EVALUATE DELTA := rhoNtot0 REFVALUE - ABS ; IF DELTA 1.0 < THEN PRINT "TEST SUCCESSFUL; DELTA=" DELTA ; @@ -171,7 +171,7 @@ ELSE ABORT: ; ENDIF ; -EVALUATE REFVALUE := -7.100798E2 ; +EVALUATE REFVALUE := -7.184767E+02 ; EVALUATE DELTA := rhoScat REFVALUE - ABS ; IF DELTA 1.0 < THEN PRINT "TEST SUCCESSFUL; DELTA=" DELTA ; @@ -183,7 +183,7 @@ ELSE ABORT: ; ENDIF ; -EVALUATE REFVALUE := 3.774100E1 ; +EVALUATE REFVALUE := 4.004554E+01 ; EVALUATE DELTA := rhoNuSigf REFVALUE - ABS ; IF DELTA 1.0 < THEN PRINT "TEST SUCCESSFUL; DELTA=" DELTA ; @@ -195,7 +195,7 @@ ELSE ABORT: ; ENDIF ; -EVALUATE REFVALUE := -1.141487E2 ; +EVALUATE REFVALUE := -1.177568E+02 ; EVALUATE DELTA := rhoLeak REFVALUE - ABS ; IF DELTA 1.0 < THEN PRINT "TEST SUCCESSFUL; DELTA=" DELTA ; diff --git a/Dragon/data/testVVER7.x2m b/Dragon/data/testVVER7.x2m index 7fe3f30..f5b73bf 100644 --- a/Dragon/data/testVVER7.x2m +++ b/Dragon/data/testVVER7.x2m @@ -54,7 +54,7 @@ UTL: COMPO :: STEP UP EDIBU DIR STEP UP MIXTURES STEP AT 1 STEP UP CALCULATIONS STEP AT 2 ; OUT := COMPO :: STEP UP EDIBU STEP UP MIXTURES STEP AT 1 STEP UP CALCULATIONS STEP AT 2 ; -assertS OUT :: 'K-EFFECTIVE' 1 1.008797 ; +assertS OUT :: 'K-EFFECTIVE' 1 1.009776 ; ECHO "test testVVER7 completed" ; END: ; diff --git a/Dragon/data/tmatxs2.access b/Dragon/data/tmatxs2.access index ff6f14f..21e51de 100755 --- a/Dragon/data/tmatxs2.access +++ b/Dragon/data/tmatxs2.access @@ -23,15 +23,15 @@ else echo 'use big endian libraries' pos=$1/../../libraries/b_endian fi -if [ -f "$pos"/draglibJef2p2.gz ] +if [ -f "$pos"/draglibJef2p2_v5p1.gz ] then echo 'gunzipping DLIB_J2' chmod 755 "$pos" - gunzip "$pos"/draglibJef2p2.gz + gunzip "$pos"/draglibJef2p2_v5p1.gz fi -if [ -f "$pos"/draglibJef2p2 ] +if [ -f "$pos"/draglibJef2p2_v5p1 ] then - ln -s "$pos"/draglibJef2p2 DLIB_J2 + ln -s "$pos"/draglibJef2p2_v5p1 DLIB_J2 fi if [ -f "$pos"/draglibJeff3p1p1SHEM295_v5p1.gz ] diff --git a/Dragon/data/trowland.access b/Dragon/data/trowland.access index ea5fe2c..0c678c1 100755 --- a/Dragon/data/trowland.access +++ b/Dragon/data/trowland.access @@ -23,15 +23,15 @@ else echo 'use big endian libraries' pos=$1/../../libraries/b_endian fi -if [ -f "$pos"/draglibJef2p2.gz ] +if [ -f "$pos"/draglibJef2p2_v5p1.gz ] then echo 'gunzipping DLIB_J2' chmod 755 "$pos" - gunzip "$pos"/draglibJef2p2.gz + gunzip "$pos"/draglibJef2p2_v5p1.gz fi -if [ -f "$pos"/draglibJef2p2 ] +if [ -f "$pos"/draglibJef2p2_v5p1 ] then - ln -s "$pos"/draglibJef2p2 DLIB_J2 + ln -s "$pos"/draglibJef2p2_v5p1 DLIB_J2 fi ls echo "trowland access script terminated" diff --git a/Dragon/data/trowland_proc/mox_1c_case1.c2m b/Dragon/data/trowland_proc/mox_1c_case1.c2m index 964004c..7a375e8 100644 --- a/Dragon/data/trowland_proc/mox_1c_case1.c2m +++ b/Dragon/data/trowland_proc/mox_1c_case1.c2m @@ -54,7 +54,7 @@ LIBRARY := LIB: :: LIBRARY := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 ; CP := ASM: LIBRARY TRACK :: PIJ ; FLUX := FLU: CP LIBRARY TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.211783 ; +assertS FLUX :: K-EFFECTIVE 1 1.211813 ; LIBRARY CP FLUX := DELETE: LIBRARY CP FLUX ; *---- * USS @@ -89,7 +89,7 @@ LIBRARY2 := USS: LIBRARY TRACK :: CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.214894 ; +assertS FLUX :: K-EFFECTIVE 1 1.215058 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * Ribon extended @@ -124,7 +124,7 @@ LIBRARY2 := USS: LIBRARY TRACK :: CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.214438 ; +assertS FLUX :: K-EFFECTIVE 1 1.214667 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * Ribon extended with correlation @@ -159,7 +159,7 @@ LIBRARY2 := USS: LIBRARY TRACK :: CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.216819 ; +assertS FLUX :: K-EFFECTIVE 1 1.217064 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; ECHO "test mox_1c_case1 completed" ; END: ; diff --git a/Dragon/data/trowland_proc/mox_1c_case2.c2m b/Dragon/data/trowland_proc/mox_1c_case2.c2m index 5dbe2da..c3af459 100644 --- a/Dragon/data/trowland_proc/mox_1c_case2.c2m +++ b/Dragon/data/trowland_proc/mox_1c_case2.c2m @@ -54,7 +54,7 @@ LIBRARY := LIB: :: LIBRARY := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 ; CP := ASM: LIBRARY TRACK :: PIJ ; FLUX := FLU: CP LIBRARY TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.196600 ; +assertS FLUX :: K-EFFECTIVE 1 1.196639 ; LIBRARY CP FLUX := DELETE: LIBRARY CP FLUX ; *---- * USS @@ -89,7 +89,7 @@ LIBRARY2 := USS: LIBRARY TRACK :: CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.200151 ; +assertS FLUX :: K-EFFECTIVE 1 1.200324 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * Ribon extended @@ -124,7 +124,7 @@ LIBRARY2 := USS: LIBRARY TRACK :: CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.199719 ; +assertS FLUX :: K-EFFECTIVE 1 1.200026 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * Ribon extended with correlation @@ -160,7 +160,7 @@ LIBRARY2 := USS: LIBRARY TRACK :: CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.202332 ; +assertS FLUX :: K-EFFECTIVE 1 1.202691 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; ECHO "test mox_1c_case2 completed" ; END: ; diff --git a/Dragon/data/trowland_proc/mox_1c_case3.c2m b/Dragon/data/trowland_proc/mox_1c_case3.c2m index 5000db5..e765b67 100644 --- a/Dragon/data/trowland_proc/mox_1c_case3.c2m +++ b/Dragon/data/trowland_proc/mox_1c_case3.c2m @@ -54,7 +54,7 @@ LIBRARY := LIB: :: LIBRARY := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 ; CP := ASM: LIBRARY TRACK :: PIJ ; FLUX := FLU: CP LIBRARY TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.254774 ; +assertS FLUX :: K-EFFECTIVE 1 1.254805 ; LIBRARY CP FLUX := DELETE: LIBRARY CP FLUX ; *---- * USS @@ -89,7 +89,7 @@ LIBRARY2 := USS: LIBRARY TRACK :: CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.257776 ; +assertS FLUX :: K-EFFECTIVE 1 1.257941 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * Ribon extended @@ -124,7 +124,7 @@ LIBRARY2 := USS: LIBRARY TRACK :: CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.257338 ; +assertS FLUX :: K-EFFECTIVE 1 1.257563 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * Ribon extended with correlation @@ -161,7 +161,7 @@ LIBRARY2 := USS: LIBRARY TRACK :: CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.259420 ; +assertS FLUX :: K-EFFECTIVE 1 1.259668 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; ECHO "test mox_1c_case3 completed" ; END: ; diff --git a/Dragon/data/trowland_proc/mox_1c_case4.c2m b/Dragon/data/trowland_proc/mox_1c_case4.c2m index 4ed936e..e25088a 100644 --- a/Dragon/data/trowland_proc/mox_1c_case4.c2m +++ b/Dragon/data/trowland_proc/mox_1c_case4.c2m @@ -55,7 +55,7 @@ LIBRARY := LIB: :: LIBRARY := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 ; CP := ASM: LIBRARY TRACK :: PIJ ; FLUX := FLU: CP LIBRARY TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.240108 ; +assertS FLUX :: K-EFFECTIVE 1 1.240151 ; LIBRARY CP FLUX := DELETE: LIBRARY CP FLUX ; *---- * USS @@ -91,7 +91,7 @@ LIBRARY2 := USS: LIBRARY TRACK :: CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.243575 ; +assertS FLUX :: K-EFFECTIVE 1 1.243747 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * Ribon extended @@ -127,7 +127,7 @@ LIBRARY2 := USS: LIBRARY TRACK :: CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.243140 ; +assertS FLUX :: K-EFFECTIVE 1 1.243456 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * Ribon extended with correlation @@ -163,7 +163,7 @@ LIBRARY2 := USS: LIBRARY TRACK :: CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.245390 ; +assertS FLUX :: K-EFFECTIVE 1 1.245764 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; ECHO "test mox_1c_case4 completed" ; END: ; diff --git a/Dragon/data/trowland_proc/mox_6c_case1.c2m b/Dragon/data/trowland_proc/mox_6c_case1.c2m index b0cff3f..6c7c029 100644 --- a/Dragon/data/trowland_proc/mox_6c_case1.c2m +++ b/Dragon/data/trowland_proc/mox_6c_case1.c2m @@ -68,7 +68,7 @@ LIBRARY := LIB: :: LIBRARY2 := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 LEVEL 1 MXIT 3 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.212406 ; +assertS FLUX :: K-EFFECTIVE 1 1.212435 ; LIBRARY2 CP FLUX := DELETE: LIBRARY2 CP FLUX ; *---- * SHI LEVEL 2 @@ -76,7 +76,7 @@ LIBRARY2 CP FLUX := DELETE: LIBRARY2 CP FLUX ; LIBRARY2 := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 LEVEL 2 MXIT 3 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.217351 ; +assertS FLUX :: K-EFFECTIVE 1 1.217428 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * USS @@ -117,7 +117,7 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 3 GRMIN 45 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.216483 ; +assertS FLUX :: K-EFFECTIVE 1 1.216626 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * Ribon extended @@ -158,7 +158,7 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 3 GRMIN 45 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.216640 ; +assertS FLUX :: K-EFFECTIVE 1 1.216878 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * Ribon extended with correlation @@ -199,7 +199,7 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 4 GRMIN 45 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.219029 ; +assertS FLUX :: K-EFFECTIVE 1 1.219295 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; ECHO "test mox_6c_case1 completed" ; END: ; diff --git a/Dragon/data/trowland_proc/mox_6c_case2.c2m b/Dragon/data/trowland_proc/mox_6c_case2.c2m index 29dffc0..91811db 100644 --- a/Dragon/data/trowland_proc/mox_6c_case2.c2m +++ b/Dragon/data/trowland_proc/mox_6c_case2.c2m @@ -68,7 +68,7 @@ LIBRARY := LIB: :: LIBRARY2 := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 LEVEL 1 MXIT 3 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.196737 ; +assertS FLUX :: K-EFFECTIVE 1 1.196778 ; LIBRARY2 CP FLUX := DELETE: LIBRARY2 CP FLUX ; *---- * SHI LEVEL 2 @@ -76,7 +76,7 @@ LIBRARY2 CP FLUX := DELETE: LIBRARY2 CP FLUX ; LIBRARY2 := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 LEVEL 2 MXIT 3 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.202921 ; +assertS FLUX :: K-EFFECTIVE 1 1.202990 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * USS @@ -117,7 +117,7 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 3 GRMIN 45 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.201930 ; +assertS FLUX :: K-EFFECTIVE 1 1.202079 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * Ribon extended @@ -158,7 +158,7 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 3 GRMIN 45 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.202230 ; +assertS FLUX :: K-EFFECTIVE 1 1.202529 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * Ribon extended with correlation @@ -199,7 +199,7 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 4 GRMIN 45 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.204836 ; +assertS FLUX :: K-EFFECTIVE 1 1.205209 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; ECHO "test mox_6c_case2 completed" ; END: ; diff --git a/Dragon/data/trowland_proc/mox_6c_case3.c2m b/Dragon/data/trowland_proc/mox_6c_case3.c2m index a339190..9ea4b11 100644 --- a/Dragon/data/trowland_proc/mox_6c_case3.c2m +++ b/Dragon/data/trowland_proc/mox_6c_case3.c2m @@ -68,7 +68,7 @@ LIBRARY := LIB: :: LIBRARY2 := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 LEVEL 1 MXIT 3 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.255316 ; +assertS FLUX :: K-EFFECTIVE 1 1.255384 ; LIBRARY2 CP FLUX := DELETE: LIBRARY2 CP FLUX ; *---- * SHI LEVEL 2 @@ -76,7 +76,7 @@ LIBRARY2 CP FLUX := DELETE: LIBRARY2 CP FLUX ; LIBRARY2 := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 LEVEL 2 MXIT 3 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.260489 ; +assertS FLUX :: K-EFFECTIVE 1 1.260530 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * USS @@ -117,7 +117,7 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 3 GRMIN 45 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.259171 ; +assertS FLUX :: K-EFFECTIVE 1 1.259336 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * Ribon extended @@ -158,7 +158,7 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 3 GRMIN 45 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.259364 ; +assertS FLUX :: K-EFFECTIVE 1 1.259616 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * Ribon extended with correlation @@ -199,7 +199,7 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 4 GRMIN 45 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.261451 ; +assertS FLUX :: K-EFFECTIVE 1 1.261735 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; ECHO "test mox_6c_case3 completed" ; END: ; diff --git a/Dragon/data/trowland_proc/mox_6c_case4.c2m b/Dragon/data/trowland_proc/mox_6c_case4.c2m index 92edf56..20fbf8b 100644 --- a/Dragon/data/trowland_proc/mox_6c_case4.c2m +++ b/Dragon/data/trowland_proc/mox_6c_case4.c2m @@ -68,7 +68,7 @@ LIBRARY := LIB: :: LIBRARY2 := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 LEVEL 1 MXIT 3 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.240057 ; +assertS FLUX :: K-EFFECTIVE 1 1.240102 ; LIBRARY2 CP FLUX := DELETE: LIBRARY2 CP FLUX ; *---- * SHI LEVEL 2 @@ -76,7 +76,7 @@ LIBRARY2 CP FLUX := DELETE: LIBRARY2 CP FLUX ; LIBRARY2 := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 LEVEL 2 MXIT 3 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.246576 ; +assertS FLUX :: K-EFFECTIVE 1 1.246666 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * USS @@ -117,7 +117,7 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 3 GRMIN 45 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.245146 ; +assertS FLUX :: K-EFFECTIVE 1 1.245318 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * Ribon extended @@ -158,7 +158,7 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 3 GRMIN 45 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.245467 ; +assertS FLUX :: K-EFFECTIVE 1 1.245798 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * Ribon extended with correlation @@ -199,7 +199,7 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 4 GRMIN 45 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.247720 ; +assertS FLUX :: K-EFFECTIVE 1 1.248117 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; ECHO "test mox_6c_case4 completed" ; END: ; diff --git a/Dragon/data/trowland_proc/mox_6c_case5.c2m b/Dragon/data/trowland_proc/mox_6c_case5.c2m index b3b9ef1..8d7b136 100644 --- a/Dragon/data/trowland_proc/mox_6c_case5.c2m +++ b/Dragon/data/trowland_proc/mox_6c_case5.c2m @@ -114,6 +114,6 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 5 GRMIN 45 ; CP := ASM: LIBRARY2 TRACK :: EDIT 1 PIJ ; CALC := FLU: CP LIBRARY2 TRACK :: EDIT 1 TYPE K ; -assertS CALC :: K-EFFECTIVE 1 1.209962 ; +assertS CALC :: K-EFFECTIVE 1 1.202269 ; ECHO "test mox_6c_case5 completed" ; QUIT "LIST" . diff --git a/Dragon/data/trowland_proc/uo2_1c_case1.c2m b/Dragon/data/trowland_proc/uo2_1c_case1.c2m index b6d78c6..a0d4186 100644 --- a/Dragon/data/trowland_proc/uo2_1c_case1.c2m +++ b/Dragon/data/trowland_proc/uo2_1c_case1.c2m @@ -46,7 +46,7 @@ LIBRARY := LIB: :: LIBRARY := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 ; CP := ASM: LIBRARY TRACK :: PIJ ; FLUX := FLU: CP LIBRARY TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.383546 ; +assertS FLUX :: K-EFFECTIVE 1 1.383528 ; LIBRARY CP FLUX := DELETE: LIBRARY CP FLUX ; *---- * USS @@ -75,7 +75,7 @@ LIBRARY2 := USS: LIBRARY TRACK :: CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.386392 ; +assertS FLUX :: K-EFFECTIVE 1 1.386455 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * Ribon extended @@ -104,7 +104,7 @@ LIBRARY2 := USS: LIBRARY TRACK :: CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.385827 ; +assertS FLUX :: K-EFFECTIVE 1 1.386297 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * Ribon extended with correlation @@ -133,7 +133,7 @@ LIBRARY2 := USS: LIBRARY TRACK :: CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.385731 ; +assertS FLUX :: K-EFFECTIVE 1 1.385866 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; ECHO "test uo2_1c_case1 completed" ; END: ; diff --git a/Dragon/data/trowland_proc/uo2_1c_case2.c2m b/Dragon/data/trowland_proc/uo2_1c_case2.c2m index 45ad2eb..462a407 100644 --- a/Dragon/data/trowland_proc/uo2_1c_case2.c2m +++ b/Dragon/data/trowland_proc/uo2_1c_case2.c2m @@ -46,7 +46,7 @@ LIBRARY := LIB: :: LIBRARY := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 ; CP := ASM: LIBRARY TRACK :: PIJ ; FLUX := FLU: CP LIBRARY TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.330381 ; +assertS FLUX :: K-EFFECTIVE 1 1.330351 ; LIBRARY CP FLUX := DELETE: LIBRARY CP FLUX ; *---- * USS @@ -75,7 +75,7 @@ LIBRARY2 := USS: LIBRARY TRACK :: CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.333523 ; +assertS FLUX :: K-EFFECTIVE 1 1.333658 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * Ribon extended @@ -104,7 +104,7 @@ LIBRARY2 := USS: LIBRARY TRACK :: CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.332833 ; +assertS FLUX :: K-EFFECTIVE 1 1.333404 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * Ribon extended with correlation @@ -133,7 +133,7 @@ LIBRARY2 := USS: LIBRARY TRACK :: CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.332671 ; +assertS FLUX :: K-EFFECTIVE 1 1.332622 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; ECHO "test uo2_1c_case2 completed" ; END: ; diff --git a/Dragon/data/trowland_proc/uo2_1c_case3.c2m b/Dragon/data/trowland_proc/uo2_1c_case3.c2m index 63a5bd3..0bc0a49 100644 --- a/Dragon/data/trowland_proc/uo2_1c_case3.c2m +++ b/Dragon/data/trowland_proc/uo2_1c_case3.c2m @@ -47,7 +47,7 @@ LIBRARY := LIB: :: LIBRARY := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 ; CP := ASM: LIBRARY TRACK :: PIJ ; FLUX := FLU: CP LIBRARY TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.296387 ; +assertS FLUX :: K-EFFECTIVE 1 1.296384 ; LIBRARY CP FLUX := DELETE: LIBRARY CP FLUX ; *---- * USS @@ -77,7 +77,7 @@ LIBRARY2 := USS: LIBRARY TRACK :: CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.301136 ; +assertS FLUX :: K-EFFECTIVE 1 1.301383 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * Ribon extended @@ -107,7 +107,7 @@ LIBRARY2 := USS: LIBRARY TRACK :: CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.300764 ; +assertS FLUX :: K-EFFECTIVE 1 1.307834 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * Ribon extended with correlation @@ -137,7 +137,7 @@ LIBRARY2 := USS: LIBRARY TRACK :: CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.300509 ; +assertS FLUX :: K-EFFECTIVE 1 1.308285 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; ECHO "test uo2_1c_case3 completed" ; END: ; diff --git a/Dragon/data/trowland_proc/uo2_1c_case4.c2m b/Dragon/data/trowland_proc/uo2_1c_case4.c2m index a491d90..90c3b6d 100644 --- a/Dragon/data/trowland_proc/uo2_1c_case4.c2m +++ b/Dragon/data/trowland_proc/uo2_1c_case4.c2m @@ -46,7 +46,7 @@ LIBRARY := LIB: :: LIBRARY := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 ; CP := ASM: LIBRARY TRACK :: PIJ ; FLUX := FLU: CP LIBRARY TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.310755 ; +assertS FLUX :: K-EFFECTIVE 1 1.310745 ; LIBRARY CP FLUX := DELETE: LIBRARY CP FLUX ; *---- * USS @@ -75,7 +75,7 @@ LIBRARY2 := USS: LIBRARY TRACK :: CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.314775 ; +assertS FLUX :: K-EFFECTIVE 1 1.314615 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * Ribon extended @@ -104,7 +104,7 @@ LIBRARY2 := USS: LIBRARY TRACK :: CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.313890 ; +assertS FLUX :: K-EFFECTIVE 1 1.314164 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * Ribon extended with correlation @@ -133,7 +133,7 @@ LIBRARY2 := USS: LIBRARY TRACK :: CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.313668 ; +assertS FLUX :: K-EFFECTIVE 1 1.313385 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; ECHO "test uo2_1c_case4 completed" ; END: ; diff --git a/Dragon/data/trowland_proc/uo2_6c_case1.c2m b/Dragon/data/trowland_proc/uo2_6c_case1.c2m index b6829e3..75eaf1e 100644 --- a/Dragon/data/trowland_proc/uo2_6c_case1.c2m +++ b/Dragon/data/trowland_proc/uo2_6c_case1.c2m @@ -63,7 +63,7 @@ LIBRARY := LIB: :: LIBRARY2 := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 LEVEL 1 MXIT 3 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.386497 ; +assertS FLUX :: K-EFFECTIVE 1 1.386467 ; LIBRARY2 CP FLUX := DELETE: LIBRARY2 CP FLUX ; *---- * SHI LEVEL 2 @@ -71,7 +71,7 @@ LIBRARY2 CP FLUX := DELETE: LIBRARY2 CP FLUX ; LIBRARY2 := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 LEVEL 2 MXIT 3 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.389577 ; +assertS FLUX :: K-EFFECTIVE 1 1.389604 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * USS @@ -106,7 +106,7 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 2 GRMIN 45 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.387408 ; +assertS FLUX :: K-EFFECTIVE 1 1.387462 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * Ribon extended @@ -141,7 +141,7 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 2 GRMIN 45 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.387702 ; +assertS FLUX :: K-EFFECTIVE 1 1.388190 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * Ribon extended with correlation @@ -176,7 +176,7 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 4 GRMIN 45 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.387639 ; +assertS FLUX :: K-EFFECTIVE 1 1.387964 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; ECHO "test uo2_6c_case1 completed" ; END: ; diff --git a/Dragon/data/trowland_proc/uo2_6c_case2.c2m b/Dragon/data/trowland_proc/uo2_6c_case2.c2m index dd80751..3ad6899 100644 --- a/Dragon/data/trowland_proc/uo2_6c_case2.c2m +++ b/Dragon/data/trowland_proc/uo2_6c_case2.c2m @@ -63,7 +63,7 @@ LIBRARY := LIB: :: LIBRARY2 := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 LEVEL 1 MXIT 3 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.334656 ; +assertS FLUX :: K-EFFECTIVE 1 1.334615 ; LIBRARY2 CP FLUX := DELETE: LIBRARY2 CP FLUX ; *---- * SHI LEVEL 2 @@ -71,7 +71,7 @@ LIBRARY2 CP FLUX := DELETE: LIBRARY2 CP FLUX ; LIBRARY2 := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 LEVEL 2 MXIT 3 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.337793 ; +assertS FLUX :: K-EFFECTIVE 1 1.337805 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * USS @@ -106,7 +106,7 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 2 GRMIN 45 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.334885 ; +assertS FLUX :: K-EFFECTIVE 1 1.335009 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * Ribon extended @@ -141,7 +141,7 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 2 GRMIN 45 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.335035 ; +assertS FLUX :: K-EFFECTIVE 1 1.335629 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * Ribon extended with correlation @@ -176,7 +176,7 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 4 GRMIN 45 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.334913 ; +assertS FLUX :: K-EFFECTIVE 1 1.335166 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; ECHO "test uo2_6c_case2 completed" ; END: ; diff --git a/Dragon/data/trowland_proc/uo2_6c_case3.c2m b/Dragon/data/trowland_proc/uo2_6c_case3.c2m index 3cda0f1..72a9be6 100644 --- a/Dragon/data/trowland_proc/uo2_6c_case3.c2m +++ b/Dragon/data/trowland_proc/uo2_6c_case3.c2m @@ -63,7 +63,7 @@ LIBRARY := LIB: :: LIBRARY2 := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 LEVEL 1 MXIT 3 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.299005 ; +assertS FLUX :: K-EFFECTIVE 1 1.299020 ; LIBRARY2 CP FLUX := DELETE: LIBRARY2 CP FLUX ; *---- * SHI LEVEL 2 @@ -71,7 +71,7 @@ LIBRARY2 CP FLUX := DELETE: LIBRARY2 CP FLUX ; LIBRARY2 := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 LEVEL 2 MXIT 3 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.306005 ; +assertS FLUX :: K-EFFECTIVE 1 1.305848 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * USS @@ -106,7 +106,7 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 2 GRMIN 45 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.303040 ; +assertS FLUX :: K-EFFECTIVE 1 1.303275 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * Ribon extended @@ -141,7 +141,7 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 2 GRMIN 45 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.303980 ; +assertS FLUX :: K-EFFECTIVE 1 1.316244 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * Ribon extended with correlation @@ -176,7 +176,7 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 4 GRMIN 45 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.303796 ; +assertS FLUX :: K-EFFECTIVE 1 1.316225 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; ECHO "test uo2_6c_case3 completed" ; END: ; diff --git a/Dragon/data/trowland_proc/uo2_6c_case4.c2m b/Dragon/data/trowland_proc/uo2_6c_case4.c2m index d57637e..8a41b46 100644 --- a/Dragon/data/trowland_proc/uo2_6c_case4.c2m +++ b/Dragon/data/trowland_proc/uo2_6c_case4.c2m @@ -63,7 +63,7 @@ LIBRARY := LIB: :: LIBRARY2 := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 LEVEL 1 MXIT 3 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.314095 ; +assertS FLUX :: K-EFFECTIVE 1 1.314097 ; LIBRARY2 CP FLUX := DELETE: LIBRARY2 CP FLUX ; *---- * SHI LEVEL 2 @@ -71,7 +71,7 @@ LIBRARY2 CP FLUX := DELETE: LIBRARY2 CP FLUX ; LIBRARY2 := SHI: LIBRARY TRACK :: EDIT 1 LJ GRMIN 45 LEVEL 2 MXIT 3 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.319513 ; +assertS FLUX :: K-EFFECTIVE 1 1.319498 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * USS @@ -106,7 +106,7 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 2 GRMIN 45 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.316421 ; +assertS FLUX :: K-EFFECTIVE 1 1.316250 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * Ribon extended @@ -141,7 +141,7 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 2 GRMIN 45 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.316549 ; +assertS FLUX :: K-EFFECTIVE 1 1.316831 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; *---- * Ribon extended with correlation @@ -176,7 +176,7 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 4 GRMIN 45 ; CP := ASM: LIBRARY2 TRACK :: PIJ ; FLUX := FLU: CP LIBRARY2 TRACK :: TYPE K ; -assertS FLUX :: K-EFFECTIVE 1 1.316382 ; +assertS FLUX :: K-EFFECTIVE 1 1.316412 ; LIBRARY LIBRARY2 CP FLUX := DELETE: LIBRARY LIBRARY2 CP FLUX ; ECHO "test uo2_6c_case4 completed" ; END: ; diff --git a/Dragon/data/trowland_proc/uo2_6c_case5.c2m b/Dragon/data/trowland_proc/uo2_6c_case5.c2m index 91ad0de..2ed562f 100644 --- a/Dragon/data/trowland_proc/uo2_6c_case5.c2m +++ b/Dragon/data/trowland_proc/uo2_6c_case5.c2m @@ -78,6 +78,6 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK :: EDIT 1 TRAN PASS 5 GRMIN 45 ; CP := ASM: LIBRARY2 TRACK :: EDIT 1 PIJ ; CALC := FLU: CP LIBRARY2 TRACK :: EDIT 1 TYPE K ; -assertS CALC :: K-EFFECTIVE 1 1.320614 ; +assertS CALC :: K-EFFECTIVE 1 1.306048 ; ECHO "test uo2_6c_case5 completed" ; QUIT "LIST" . diff --git a/Dragon/data/trowland_shem295_jeff3.1_proc/gd_295_kec1.c2m b/Dragon/data/trowland_shem295_jeff3.1_proc/gd_295_kec1.c2m index ef84375..4ac9a35 100644 --- a/Dragon/data/trowland_shem295_jeff3.1_proc/gd_295_kec1.c2m +++ b/Dragon/data/trowland_shem295_jeff3.1_proc/gd_295_kec1.c2m @@ -87,5 +87,5 @@ MIX <<COMB0102>> COMB <<COMB0101>> 1.0 (*COMB0102*) LIBRARY2 := USS: LIBRARY TRACK_SS :: EDIT 1 TRAN PASS 3 GRMIN 52 ; CP := ASM: LIBRARY2 TRACK TF_EXC :: EDIT 1 PIJ ; CALC := FLU: CP LIBRARY2 TRACK :: EDIT 1 TYPE K ; -assertS CALC :: K-EFFECTIVE 1 0.3288226 ; +assertS CALC :: K-EFFECTIVE 1 0.3291729 ; QUIT "LIST" . diff --git a/Dragon/data/trowland_shem295_jeff3.1_proc/mox_295_kec1.c2m b/Dragon/data/trowland_shem295_jeff3.1_proc/mox_295_kec1.c2m index 06c9f2b..5ec04b8 100644 --- a/Dragon/data/trowland_shem295_jeff3.1_proc/mox_295_kec1.c2m +++ b/Dragon/data/trowland_shem295_jeff3.1_proc/mox_295_kec1.c2m @@ -90,7 +90,7 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK_SS :: EDIT 1 TRAN PASS 3 GRMIN 52 ; CP := ASM: LIBRARY2 TRACK TF_EXC :: EDIT 1 PIJ ; CALC := FLU: CP LIBRARY2 TRACK :: EDIT 1 TYPE K ; -assertS CALC :: K-EFFECTIVE 1 1.228971 ; +assertS CALC :: K-EFFECTIVE 1 1.228236 ; * * Tone's method LIBRARY CP CALC := DELETE: LIBRARY CP CALC ; @@ -130,7 +130,7 @@ LIBRARY := LIB: :: LIBRARY := TONE: LIBRARY TRACK_SS :: EDIT 1 TRAN MXIT 3 SPH GRMIN 52 ; CP := ASM: LIBRARY TRACK TF_EXC :: EDIT 1 PIJ ; CALC := FLU: CP LIBRARY TRACK :: EDIT 1 TYPE K ; -assertS CALC :: K-EFFECTIVE 1 1.227709 ; +assertS CALC :: K-EFFECTIVE 1 1.226969 ; * * Resonance spectrum expansion method LIBRARY LIBRARY2 CP CALC := DELETE: LIBRARY LIBRARY2 CP CALC ; @@ -171,6 +171,6 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK_SS :: EDIT 1 TRAN PASS 3 GRMIN 52 ; CP := ASM: LIBRARY2 TRACK TF_EXC :: EDIT 1 PIJ ; CALC := FLU: CP LIBRARY2 TRACK :: EDIT 1 TYPE K ; -assertS CALC :: K-EFFECTIVE 1 1.229507 ; +assertS CALC :: K-EFFECTIVE 1 1.228751 ; ECHO "test mox_295_kec1 completed" ; QUIT "LIST" . diff --git a/Dragon/data/trowland_shem295_jeff3.1_proc/mox_295_kec2.c2m b/Dragon/data/trowland_shem295_jeff3.1_proc/mox_295_kec2.c2m index ae2cd66..e71a314 100644 --- a/Dragon/data/trowland_shem295_jeff3.1_proc/mox_295_kec2.c2m +++ b/Dragon/data/trowland_shem295_jeff3.1_proc/mox_295_kec2.c2m @@ -90,7 +90,7 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK_SS :: EDIT 1 TRAN PASS 3 GRMIN 52 ; CP := ASM: LIBRARY2 TRACK TF_EXC :: EDIT 1 PIJ ; CALC := FLU: CP LIBRARY2 TRACK :: EDIT 1 TYPE K ; -assertS CALC :: K-EFFECTIVE 1 1.212714 ; +assertS CALC :: K-EFFECTIVE 1 1.211944 ; * * Tone's method LIBRARY CP CALC := DELETE: LIBRARY CP CALC ; @@ -130,7 +130,7 @@ LIBRARY := LIB: :: LIBRARY := TONE: LIBRARY TRACK_SS :: EDIT 1 TRAN MXIT 3 SPH GRMIN 52 ; CP := ASM: LIBRARY TRACK TF_EXC :: EDIT 1 PIJ ; CALC := FLU: CP LIBRARY TRACK :: EDIT 1 TYPE K ; -assertS CALC :: K-EFFECTIVE 1 1.211497 ; +assertS CALC :: K-EFFECTIVE 1 1.210719 ; * ** Resonance spectrum expansion method LIBRARY LIBRARY2 CP CALC := DELETE: LIBRARY LIBRARY2 CP CALC ; @@ -171,6 +171,6 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK_SS :: EDIT 1 TRAN PASS 3 GRMIN 52 ; CP := ASM: LIBRARY2 TRACK TF_EXC :: EDIT 1 PIJ ; CALC := FLU: CP LIBRARY2 TRACK :: EDIT 1 TYPE K ; -assertS CALC :: K-EFFECTIVE 1 1.212991 ; +assertS CALC :: K-EFFECTIVE 1 1.212279 ; ECHO "test mox_295_kec2 completed" ; QUIT "LIST" . diff --git a/Dragon/data/trowland_shem295_jeff3.1_proc/mox_295_kec3.c2m b/Dragon/data/trowland_shem295_jeff3.1_proc/mox_295_kec3.c2m index fd4ea3f..6551b23 100644 --- a/Dragon/data/trowland_shem295_jeff3.1_proc/mox_295_kec3.c2m +++ b/Dragon/data/trowland_shem295_jeff3.1_proc/mox_295_kec3.c2m @@ -90,7 +90,7 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK_SS :: EDIT 1 TRAN PASS 3 GRMIN 52 ; CP := ASM: LIBRARY2 TRACK TF_EXC :: EDIT 1 PIJ ; CALC := FLU: CP LIBRARY2 TRACK :: EDIT 1 TYPE K ; -assertS CALC :: K-EFFECTIVE 1 1.274984 ; +assertS CALC :: K-EFFECTIVE 1 1.274385 ; * * Tone's method LIBRARY CP CALC := DELETE: LIBRARY CP CALC ; @@ -130,7 +130,7 @@ LIBRARY := LIB: :: LIBRARY := TONE: LIBRARY TRACK_SS :: EDIT 1 TRAN MXIT 3 SPH GRMIN 52 ; CP := ASM: LIBRARY TRACK TF_EXC :: EDIT 1 PIJ ; CALC := FLU: CP LIBRARY TRACK :: EDIT 1 TYPE K ; -assertS CALC :: K-EFFECTIVE 1 1.273706 ; +assertS CALC :: K-EFFECTIVE 1 1.273102 ; * * Resonance spectrum expansion method LIBRARY LIBRARY2 CP CALC := DELETE: LIBRARY LIBRARY2 CP CALC ; @@ -171,6 +171,6 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK_SS :: EDIT 1 TRAN PASS 3 GRMIN 52 ; CP := ASM: LIBRARY2 TRACK TF_EXC :: EDIT 1 PIJ ; CALC := FLU: CP LIBRARY2 TRACK :: EDIT 1 TYPE K ; -assertS CALC :: K-EFFECTIVE 1 1.275405 ; +assertS CALC :: K-EFFECTIVE 1 1.274731 ; ECHO "test mox_295_kec3 completed" ; QUIT "LIST" . diff --git a/Dragon/data/trowland_shem295_jeff3.1_proc/mox_295_kec4.c2m b/Dragon/data/trowland_shem295_jeff3.1_proc/mox_295_kec4.c2m index e51c7d0..4883938 100644 --- a/Dragon/data/trowland_shem295_jeff3.1_proc/mox_295_kec4.c2m +++ b/Dragon/data/trowland_shem295_jeff3.1_proc/mox_295_kec4.c2m @@ -90,7 +90,7 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK_SS :: EDIT 1 TRAN PASS 3 GRMIN 52 ; CP := ASM: LIBRARY2 TRACK TF_EXC :: EDIT 1 PIJ ; CALC := FLU: CP LIBRARY2 TRACK :: EDIT 1 TYPE K ; -assertS CALC :: K-EFFECTIVE 1 1.259702 ; +assertS CALC :: K-EFFECTIVE 1 1.259078 ; * * Tone's method LIBRARY CP CALC := DELETE: LIBRARY CP CALC ; @@ -130,7 +130,7 @@ LIBRARY := LIB: :: LIBRARY := TONE: LIBRARY TRACK_SS :: EDIT 1 TRAN MXIT 3 SPH GRMIN 52 ; CP := ASM: LIBRARY TRACK TF_EXC :: EDIT 1 PIJ ; CALC := FLU: CP LIBRARY TRACK :: EDIT 1 TYPE K ; -assertS CALC :: K-EFFECTIVE 1 1.258466 ; +assertS CALC :: K-EFFECTIVE 1 1.257836 ; * * Resonance spectrum expansion method LIBRARY LIBRARY2 CP CALC := DELETE: LIBRARY LIBRARY2 CP CALC ; @@ -171,6 +171,6 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK_SS :: EDIT 1 TRAN PASS 3 GRMIN 52 ; CP := ASM: LIBRARY2 TRACK TF_EXC :: EDIT 1 PIJ ; CALC := FLU: CP LIBRARY2 TRACK :: EDIT 1 TYPE K ; -assertS CALC :: K-EFFECTIVE 1 1.259876 ; +assertS CALC :: K-EFFECTIVE 1 1.259302 ; ECHO "test mox_295_kec4 completed" ; QUIT "LIST" . diff --git a/Dragon/data/trowland_shem295_jeff3.1_proc/mox_295_kec5.c2m b/Dragon/data/trowland_shem295_jeff3.1_proc/mox_295_kec5.c2m index af6d2a1..5b4c322 100644 --- a/Dragon/data/trowland_shem295_jeff3.1_proc/mox_295_kec5.c2m +++ b/Dragon/data/trowland_shem295_jeff3.1_proc/mox_295_kec5.c2m @@ -135,7 +135,7 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK_SS :: EDIT 1 TRAN PASS 3 NOCO GRMIN 52 ; CP := ASM: LIBRARY2 TRACK TF_EXC :: EDIT 1 PIJ ; CALC := FLU: CP LIBRARY2 TRACK :: EDIT 1 TYPE K ; -assertS CALC :: K-EFFECTIVE 1 1.210817 ; +assertS CALC :: K-EFFECTIVE 1 1.210038 ; * * Tone's method LIBRARY CP CALC := DELETE: LIBRARY CP CALC ; @@ -220,7 +220,7 @@ LIBRARY := LIB: :: LIBRARY := TONE: LIBRARY TRACK_SS :: EDIT 1 TRAN MXIT 3 SPH GRMIN 52 ; CP := ASM: LIBRARY TRACK TF_EXC :: EDIT 1 PIJ ; CALC := FLU: CP LIBRARY TRACK :: EDIT 1 TYPE K ; -assertS CALC :: K-EFFECTIVE 1 1.208753 ; +assertS CALC :: K-EFFECTIVE 1 1.207975 ; * * Resonance spectrum expansion method (ECCO full correlation) LIBRARY LIBRARY2 CP CALC := DELETE: LIBRARY LIBRARY2 CP CALC ; @@ -306,6 +306,6 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK_SS :: EDIT 1 TRAN PASS 3 NOCO GRMIN 56 ; CP := ASM: LIBRARY2 TRACK TF_EXC :: EDIT 1 PIJ ; CALC := FLU: CP LIBRARY2 TRACK :: EDIT 1 TYPE K ; -assertS CALC :: K-EFFECTIVE 1 1.209550 ; +assertS CALC :: K-EFFECTIVE 1 1.208763 ; ECHO "test mox_295_kec5 completed" ; QUIT "LIST" . diff --git a/Dragon/data/trowland_shem295_jeff3.1_proc/uo2_295_kec1.c2m b/Dragon/data/trowland_shem295_jeff3.1_proc/uo2_295_kec1.c2m index 60fe9d6..b06e2f9 100644 --- a/Dragon/data/trowland_shem295_jeff3.1_proc/uo2_295_kec1.c2m +++ b/Dragon/data/trowland_shem295_jeff3.1_proc/uo2_295_kec1.c2m @@ -84,7 +84,7 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK_SS :: EDIT 1 TRAN PASS 3 GRMIN 52 ; CP := ASM: LIBRARY2 TRACK TF_EXC :: EDIT 1 PIJ ; CALC := FLU: CP LIBRARY2 TRACK :: EDIT 1 TYPE K ; -assertS CALC :: K-EFFECTIVE 1 1.388247 ; +assertS CALC :: K-EFFECTIVE 1 1.388194 ; * * Tone's method LIBRARY CP CALC := DELETE: LIBRARY CP CALC ; @@ -118,7 +118,7 @@ LIBRARY := LIB: :: LIBRARY := TONE: LIBRARY TRACK_SS :: EDIT 1 TRAN MXIT 3 SPH GRMIN 52 ; CP := ASM: LIBRARY TRACK TF_EXC :: EDIT 1 PIJ ; CALC := FLU: CP LIBRARY TRACK :: EDIT 1 TYPE K ; -assertS CALC :: K-EFFECTIVE 1 1.387176 ; +assertS CALC :: K-EFFECTIVE 1 1.387116 ; * * Resonance spectrum expansion method LIBRARY LIBRARY2 CP CALC := DELETE: LIBRARY LIBRARY2 CP CALC ; @@ -153,7 +153,7 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK_SS :: EDIT 1 TRAN PASS 3 GRMIN 52 ; CP := ASM: LIBRARY2 TRACK TF_EXC :: EDIT 1 PIJ ; CALC := FLU: CP LIBRARY2 TRACK :: EDIT 1 TYPE K ; -assertS CALC :: K-EFFECTIVE 1 1.388969 ; +assertS CALC :: K-EFFECTIVE 1 1.388909 ; * * Autosecol UFG method LIBRARY LIBRARY2 CP CALC := DELETE: LIBRARY LIBRARY2 CP CALC ; @@ -188,6 +188,6 @@ LIBRARY := LIB: :: LIBRARY2 := AUTO: LIBRARY TRACK_SS :: EDIT 3 GRMIN 52 MAXT 60000 SEED 123456 ; CP := ASM: LIBRARY2 TRACK TF_EXC :: EDIT 1 PIJ ; CALC := FLU: CP LIBRARY2 TRACK :: EDIT 1 TYPE K ; -assertS CALC :: K-EFFECTIVE 1 1.387987 ; +assertS CALC :: K-EFFECTIVE 1 1.387933 ; ECHO "test uo2_295_kec1 completed" ; QUIT "LIST" . diff --git a/Dragon/data/trowland_shem295_jeff3.1_proc/uo2_295_kec2.c2m b/Dragon/data/trowland_shem295_jeff3.1_proc/uo2_295_kec2.c2m index d5b91d6..7964a64 100644 --- a/Dragon/data/trowland_shem295_jeff3.1_proc/uo2_295_kec2.c2m +++ b/Dragon/data/trowland_shem295_jeff3.1_proc/uo2_295_kec2.c2m @@ -84,7 +84,7 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK_SS :: EDIT 1 TRAN PASS 3 GRMIN 52 ; CP := ASM: LIBRARY2 TRACK TF_EXC :: EDIT 1 PIJ ; CALC := FLU: CP LIBRARY2 TRACK :: EDIT 1 TYPE K ; -assertS CALC :: K-EFFECTIVE 1 1.335245 ; +assertS CALC :: K-EFFECTIVE 1 1.335179 ; * * Tone's method LIBRARY CP CALC := DELETE: LIBRARY CP CALC ; @@ -118,7 +118,7 @@ LIBRARY := LIB: :: LIBRARY := TONE: LIBRARY TRACK_SS :: EDIT 1 TRAN MXIT 3 SPH GRMIN 52 ; CP := ASM: LIBRARY TRACK TF_EXC :: EDIT 1 PIJ ; CALC := FLU: CP LIBRARY TRACK :: EDIT 1 TYPE K ; -assertS CALC :: K-EFFECTIVE 1 1.334218 ; +assertS CALC :: K-EFFECTIVE 1 1.334141 ; * * Resonance spectrum expansion method LIBRARY LIBRARY2 CP CALC := DELETE: LIBRARY LIBRARY2 CP CALC ; @@ -153,6 +153,6 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK_SS :: EDIT 1 TRAN PASS 3 GRMIN 52 ; CP := ASM: LIBRARY2 TRACK TF_EXC :: EDIT 1 PIJ ; CALC := FLU: CP LIBRARY2 TRACK :: EDIT 1 TYPE K ; -assertS CALC :: K-EFFECTIVE 1 1.335770 ; +assertS CALC :: K-EFFECTIVE 1 1.335705 ; ECHO "test uo2_295_kec2 completed" ; QUIT "LIST" . diff --git a/Dragon/data/trowland_shem295_jeff3.1_proc/uo2_295_kec3.c2m b/Dragon/data/trowland_shem295_jeff3.1_proc/uo2_295_kec3.c2m index 363c0fa..9b3736f 100644 --- a/Dragon/data/trowland_shem295_jeff3.1_proc/uo2_295_kec3.c2m +++ b/Dragon/data/trowland_shem295_jeff3.1_proc/uo2_295_kec3.c2m @@ -84,7 +84,7 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK_SS :: EDIT 1 TRAN PASS 3 GRMIN 52 ; CP := ASM: LIBRARY2 TRACK TF_EXC :: EDIT 1 PIJ ; CALC := FLU: CP LIBRARY2 TRACK :: EDIT 1 TYPE K ; -assertS CALC :: K-EFFECTIVE 1 1.302678 ; +assertS CALC :: K-EFFECTIVE 1 1.302594 ; * * Tone's method LIBRARY CP CALC := DELETE: LIBRARY CP CALC ; @@ -118,7 +118,7 @@ LIBRARY := LIB: :: LIBRARY := TONE: LIBRARY TRACK_SS :: EDIT 1 TRAN MXIT 3 SPH GRMIN 52 ; CP := ASM: LIBRARY TRACK TF_EXC :: EDIT 1 PIJ ; CALC := FLU: CP LIBRARY TRACK :: EDIT 1 TYPE K ; -assertS CALC :: K-EFFECTIVE 1 1.300903 ; +assertS CALC :: K-EFFECTIVE 1 1.300822 ; * * Resonance spectrum expansion method LIBRARY LIBRARY2 CP CALC := DELETE: LIBRARY LIBRARY2 CP CALC ; @@ -153,6 +153,6 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK_SS :: EDIT 1 TRAN PASS 3 GRMIN 52 ; CP := ASM: LIBRARY2 TRACK TF_EXC :: EDIT 1 PIJ ; CALC := FLU: CP LIBRARY2 TRACK :: EDIT 1 TYPE K ; -assertS CALC :: K-EFFECTIVE 1 1.303022 ; +assertS CALC :: K-EFFECTIVE 1 1.302951 ; ECHO "test uo2_295_kec3 completed" ; QUIT "LIST" . diff --git a/Dragon/data/trowland_shem295_jeff3.1_proc/uo2_295_kec4.c2m b/Dragon/data/trowland_shem295_jeff3.1_proc/uo2_295_kec4.c2m index 45a349d..7e34f66 100644 --- a/Dragon/data/trowland_shem295_jeff3.1_proc/uo2_295_kec4.c2m +++ b/Dragon/data/trowland_shem295_jeff3.1_proc/uo2_295_kec4.c2m @@ -84,7 +84,7 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK_SS :: EDIT 1 TRAN PASS 3 GRMIN 52 ; CP := ASM: LIBRARY2 TRACK TF_EXC :: EDIT 1 PIJ ; CALC := FLU: CP LIBRARY2 TRACK :: EDIT 1 TYPE K ; -assertS CALC :: K-EFFECTIVE 1 1.314612 ; +assertS CALC :: K-EFFECTIVE 1 1.314546 ; * * Tone's method LIBRARY CP CALC := DELETE: LIBRARY CP CALC ; @@ -118,7 +118,7 @@ LIBRARY := LIB: :: LIBRARY := TONE: LIBRARY TRACK_SS :: EDIT 1 TRAN MXIT 3 SPH GRMIN 52 ; CP := ASM: LIBRARY TRACK TF_EXC :: EDIT 1 PIJ ; CALC := FLU: CP LIBRARY TRACK :: EDIT 1 TYPE K ; -assertS CALC :: K-EFFECTIVE 1 1.313378 ; +assertS CALC :: K-EFFECTIVE 1 1.313296 ; * * Resonance spectrum expansion method LIBRARY LIBRARY2 CP CALC := DELETE: LIBRARY LIBRARY2 CP CALC ; @@ -153,6 +153,6 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK_SS :: EDIT 1 TRAN PASS 3 GRMIN 52 ; CP := ASM: LIBRARY2 TRACK TF_EXC :: EDIT 1 PIJ ; CALC := FLU: CP LIBRARY2 TRACK :: EDIT 1 TYPE K ; -assertS CALC :: K-EFFECTIVE 1 1.314974 ; +assertS CALC :: K-EFFECTIVE 1 1.314903 ; ECHO "test uo2_295_kec4 completed" ; QUIT "LIST" . diff --git a/Dragon/data/trowland_shem295_jeff3.1_proc/uo2_295_kec5.c2m b/Dragon/data/trowland_shem295_jeff3.1_proc/uo2_295_kec5.c2m index 31e3401..c058645 100644 --- a/Dragon/data/trowland_shem295_jeff3.1_proc/uo2_295_kec5.c2m +++ b/Dragon/data/trowland_shem295_jeff3.1_proc/uo2_295_kec5.c2m @@ -99,7 +99,7 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK_SS :: EDIT 1 TRAN PASS 4 NOCO GRMIN 52 ; CP := ASM: LIBRARY2 TRACK TF_EXC :: EDIT 1 PIJ ; CALC := FLU: CP LIBRARY2 TRACK :: EDIT 1 TYPE K ; -assertS CALC :: K-EFFECTIVE 1 1.301416 ; +assertS CALC :: K-EFFECTIVE 1 1.301334 ; * * Tone's method LIBRARY CP CALC := DELETE: LIBRARY CP CALC ; @@ -148,7 +148,7 @@ LIBRARY := LIB: :: LIBRARY := TONE: LIBRARY TRACK_SS :: EDIT 1 TRAN MXIT 3 SPH GRMIN 52 ; CP := ASM: LIBRARY TRACK TF_EXC :: EDIT 1 PIJ ; CALC := FLU: CP LIBRARY TRACK :: EDIT 1 TYPE K ; -assertS CALC :: K-EFFECTIVE 1 1.298397 ; +assertS CALC :: K-EFFECTIVE 1 1.298314 ; * * Resonance spectrum expansion method (ECCO full correlation) LIBRARY LIBRARY2 CP CALC := DELETE: LIBRARY LIBRARY2 CP CALC ; @@ -198,6 +198,6 @@ LIBRARY := LIB: :: LIBRARY2 := USS: LIBRARY TRACK_SS :: EDIT 1 TRAN PASS 4 NOCO GRMIN 56 ; CP := ASM: LIBRARY2 TRACK TF_EXC :: EDIT 1 PIJ ; CALC := FLU: CP LIBRARY2 TRACK :: EDIT 1 TYPE K ; -assertS CALC :: K-EFFECTIVE 1 1.299549 ; +assertS CALC :: K-EFFECTIVE 1 1.299558 ; ECHO "test uo2_295_kec5 completed" ; QUIT "LIST" . diff --git a/Dragon/src/FPSOUT.f b/Dragon/src/FPSOUT.f new file mode 100644 index 0000000..5d78203 --- /dev/null +++ b/Dragon/src/FPSOUT.f @@ -0,0 +1,150 @@ +*DECK FPSOUT + SUBROUTINE FPSOUT(IPMAC,IPRINT,NG,NMIL,NFIS,ILEAKS,TEXT9,OUTG) +* +*----------------------------------------------------------------------- +* +*Purpose: +* Compute the leakage rate in each energy group +* +*Copyright: +* Copyright (C) 2019 Ecole Polytechnique de Montreal +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version +* +*Author(s): +* A. Hebert +* +*Parameters: input +* IPMAC pointer to the macrolib structure. +* IPRINT print parameter +* NG number of energy groups. +* NMIL number of material mixtures. +* NFIS number of fissile isotopes. +* ILEAKS type of leakage calculation =0: no leakage; =1: homogeneous +* leakage (Diffon). +* TEXT9 type of calculation ('REFERENCE' or 'MACRO'). +* +*Parameters: output +* OUTG leakage rates. +* +*----------------------------------------------------------------------- +* + USE GANLIB +*---- +* SUBROUTINE ARGUMENTS +*---- + TYPE(C_PTR) IPMAC + INTEGER IPRINT,NG,NMIL,NFIS,ILEAKS + CHARACTER TEXT9*9 + REAL OUTG(NG) +*---- +* LOCAL VARIABLES +*---- + TYPE(C_PTR) JPMAC,KPMAC + CHARACTER HSMG*131 +*---- +* ALLOCATABLE ARRAYS +*---- + INTEGER, ALLOCATABLE, DIMENSION(:) :: IJJ,NJJ,IPOS + REAL, ALLOCATABLE, DIMENSION(:) :: GAR,WORK,DIFHOM,DIFF + REAL, ALLOCATABLE, DIMENSION(:,:) :: PHI,NUF + REAL, ALLOCATABLE, DIMENSION(:,:,:) :: CHI,RHS,LHS +*---- +* SCRATCH STORAGE ALLOCATION +*---- + ALLOCATE(PHI(NMIL,NG),RHS(NMIL,NG,NG),LHS(NMIL,NG,NG)) + ALLOCATE(IJJ(NMIL),NJJ(NMIL),IPOS(NMIL),GAR(NMIL),WORK(NMIL*NG), + > CHI(NMIL,NFIS,NG),NUF(NMIL,NFIS),DIFHOM(NG),DIFF(NMIL)) +*---- +* COMPUTE THE ACTUAL AND REFERENCE REACTION RATE MATRICES +*---- + CALL LCMGET(IPMAC,'K-EFFECTIVE',ZKEFF) + IF(IPRINT.GT.1) WRITE(6,120) TEXT9,ZKEFF + CALL LCMLEN(IPMAC,'B2 B1HOM',ILCMLN,ITYLCM) + IF(ILCMLN.EQ.1) THEN + CALL LCMGET(IPMAC,'B2 B1HOM',B2) + ELSE + B2=0.0 + ENDIF + IF((ILEAKS.EQ.1).AND.(IPRINT.GT.1)) THEN + WRITE(6,'(/9H FPSOUT: ,A,4H B2=,1P,E12.4)') TEXT9,B2 + ENDIF + RHS(:NMIL,:NG,:NG)=0.0 + LHS(:NMIL,:NG,:NG)=0.0 + JPMAC=LCMGID(IPMAC,'GROUP') + DO IG=1,NG + KPMAC=LCMGIL(JPMAC,IG) + CALL LCMGET(KPMAC,'CHI',CHI(1,1,IG)) + CALL LCMLEN(KPMAC,'FLUX-INTG',ILG,ITYLCM) + IF(ILG.NE.NMIL) CALL XABORT('FPSOUT: MISSING REFERENCE FLUX.') + CALL LCMGET(KPMAC,'FLUX-INTG',PHI(1,IG)) + ENDDO + DO IG=1,NG + KPMAC=LCMGIL(JPMAC,IG) + IF(ILEAKS.EQ.1) THEN + CALL LCMLEN(KPMAC,'DIFF',ILCMLN,ITYLCM) + IF(ILCMLN.GT.0) THEN + CALL LCMGET(KPMAC,'DIFF',DIFF) + ELSE + CALL LCMGET(IPMAC,'DIFHOMB1HOM',DIFHOM) + DO IBM=1,NMIL + DIFF(IBM)=DIFHOM(IG) + ENDDO + ENDIF + ELSE + DIFF(:NMIL)=0.0 + ENDIF + CALL LCMGET(KPMAC,'NTOT0',GAR) + CALL LCMGET(KPMAC,'SCAT00',WORK) + CALL LCMGET(KPMAC,'NJJS00',NJJ) + CALL LCMGET(KPMAC,'IJJS00',IJJ) + CALL LCMGET(KPMAC,'IPOS00',IPOS) + DO IBM=1,NMIL + IPOSDE=IPOS(IBM) + DO JG=IJJ(IBM),IJJ(IBM)-NJJ(IBM)+1,-1 +* IG <-- JG + RHS(IBM,IG,JG)=RHS(IBM,IG,JG)-WORK(IPOSDE)*PHI(IBM,JG) + IPOSDE=IPOSDE+1 + ENDDO + RHS(IBM,IG,IG)=RHS(IBM,IG,IG)+(GAR(IBM)+B2*DIFF(IBM))* + > PHI(IBM,IG) + ENDDO + CALL LCMGET(KPMAC,'NUSIGF',NUF) + DO IBM=1,NMIL + DO IFIS=1,NFIS + DO JG=1,NG + LHS(IBM,JG,IG)=LHS(IBM,JG,IG)+CHI(IBM,IFIS,JG)* + > NUF(IBM,IFIS)*PHI(IBM,IG) + ENDDO + ENDDO + ENDDO + ENDDO +*---- +* COMPUTE THE ACTUAL AND REFERENCE ABSORPTION AND FISSION RATES +*---- + DO IG=1,NG + OUTG(IG)=0.0 + DO IBM=1,NMIL + OUTG(IG)=OUTG(IG)+SUM(LHS(IBM,IG,:NG))/ZKEFF- + 1 SUM(RHS(IBM,IG,:NG)) + ENDDO + IF(OUTG(IG).LT.-1.0E-6) THEN + WRITE(HSMG,'(21HFPSOUT: INCONSISTENT ,A,17H LEAKAGE IN GROUP, + 1 I4,7H. LEAK=,1P,E13.4)') TEXT9,IG,OUTG(IG) + CALL XABORT(HSMG) + ENDIF + IF(IPRINT.GT.1) WRITE(6,130) IG,TEXT9,OUTG(IG) + ENDDO +*---- +* SCRATCH STORAGE DEALLOCATION +*---- + DEALLOCATE(DIFF,DIFHOM,NUF,CHI,WORK,GAR,IPOS,NJJ,IJJ) + DEALLOCATE(LHS,RHS,PHI) + RETURN +* + 120 FORMAT(/9H FPSOUT: ,A,33H EFFECTIVE MULTIPLICATION FACTOR=,1P, + 1 E12.4) + 130 FORMAT(/8H FPSOUT:,5X,6HGROUP=,I4,1X,A,9H LEAKAGE=,1P,E12.4) + END diff --git a/Dragon/src/FPSPH.f b/Dragon/src/FPSPH.f new file mode 100644 index 0000000..96db43a --- /dev/null +++ b/Dragon/src/FPSPH.f @@ -0,0 +1,472 @@ +*DECK FPSPH + SUBROUTINE FPSPH(NENTRY,HENTRY,IENTRY,JENTRY,KENTRY) +* +*----------------------------------------------------------------------- +* +*Purpose: +* Perform a single SPH factor fixed point iteration +* +*Copyright: +* Copyright (C) 2019 Ecole Polytechnique de Montreal +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version +* +*Author(s): +* A. Hebert +* +*Parameters: input +* NENTRY number of data structures transfered to this module. +* HENTRY name of the data structures. +* IENTRY data structure type where: +* IENTRY=1 for LCM memory object; +* IENTRY=2 for XSM file; +* IENTRY=3 for sequential binary file; +* IENTRY=4 for sequential ASCII file. +* JENTRY access permission for the data structure where: +* JENTRY=0 for a data structure in creation mode; +* JENTRY=1 for a data structure in modifications mode; +* JENTRY=2 for a data structure in read-only mode. +* KENTRY data structure pointer. +* +*Comments: +* The FPSPH: calling specifications are: +* OPTIM := FPSPH: [ OPTIM ] MACROLIB MACROREF :: (fpsph\_data) ; +* where +* OPTIM : name of the \emph{optimize} object (L\_OPTIMIZE signature) +* containing the SPH factors. At the first call, object OPTIM must appear on +* LHS to receive its initial values. On subsequent calls, object OPTIM must +* appear on both LHS and RHS to be able to update the previous values. +* MACROLIB : name of the read-only extended \emph{macrolib} object +* (L\_MACROLIB signature) containing the macroscopic cross sections used by +* the macro-calculation and fluxes produced by the macro-calculation. +* MACROREF : name of the read-only extended \emph{macrolib} object +* (L\_MACROLIB signature) containing the reference macroscopic cross +* sections and fluxes. +* (fpsph\_data) : structure containing the data to the module FPSPH: +* +*----------------------------------------------------------------------- +* + USE GANLIB +*---- +* SUBROUTINE ARGUMENTS +*---- + INTEGER NENTRY,IENTRY(NENTRY),JENTRY(NENTRY) + TYPE(C_PTR) KENTRY(NENTRY) + CHARACTER HENTRY(NENTRY)*12 +*---- +* LOCAL VARIABLES +*---- + PARAMETER (NSTATE=40) + TYPE(C_PTR) IPOPT,IPMAC1,IPMAC2,JPMAC1,JPMAC2,KPMAC1,KPMAC2 + CHARACTER HSIGN*12,TEXT12*12 + INTEGER ISTATE(NSTATE),DNVTST + DOUBLE PRECISION OPTPRR(NSTATE),DFLOTT,ZNORM1,ZNORM2,EPSPH,ERRT, + > ERR2,ERROR,SPHMIN,SPHMAX +*---- +* ALLOCATABLE ARRAYS +*---- + REAL, ALLOCATABLE, DIMENSION(:) :: SPH,FLUX1,FLUX2,OUTG1,OUTG2 + DOUBLE PRECISION, ALLOCATABLE, DIMENSION(:) :: VARV,VAROLD,XMIN, + > XMAX,P,FF,UD + DOUBLE PRECISION, ALLOCATABLE, DIMENSION(:,:) :: DFF,TDFF +*---- +* PARAMETER VALIDATION. +*---- + IF(NENTRY.NE.3) CALL XABORT('FPSPH: THREE PARAMETERS EXPECTED.') + IF((IENTRY(1).NE.1).AND.(IENTRY(1).NE.2)) CALL XABORT('FPSPH: LCM' + > //' OBJECT EXPECTED AT LHS.') + IF(JENTRY(1).EQ.0)THEN + HSIGN='L_OPTIMIZE' + CALL LCMPTC(KENTRY(1),'SIGNATURE',12,HSIGN) + ELSE IF(JENTRY(1).EQ.1)THEN + CALL LCMGTC(KENTRY(1),'SIGNATURE',12,HSIGN) + IF(HSIGN.NE.'L_OPTIMIZE')THEN + CALL XABORT('FPSPH: SIGNATURE OF '//HENTRY(2)//' IS '//HSIGN// + > '. L_OPTIMIZE EXPECTED.') + ENDIF + ELSE IF(JENTRY(1).EQ.2)THEN + CALL XABORT('FPSPH: OPTIMIZE OBJECT IN CREATION OR MODIFICATIO' + > //'N MODE EXPECTED.') + ENDIF + IPOPT=KENTRY(1) + IF(JENTRY(1).EQ.1) THEN + CALL LCMGET(IPOPT,'STATE-VECTOR',ISTATE) + NVAR=ISTATE(1) + NFUNC=ISTATE(2)+1 + ITER=ISTATE(5) + IMETH=ISTATE(8) + CALL LCMGET(IPOPT,'OPT-PARAM-R',OPTPRR) + EPSPH=OPTPRR(3) + CALL LCMGET(IPOPT,'DEL-STATE',ISTATE) + NGRP=ISTATE(1) + NMIX=ISTATE(2) + ICONT=ISTATE(4) + NGR1=ISTATE(5) + NGR2=ISTATE(6) + NALBP=ISTATE(9) + IF((ICONT.NE.3).AND.(ICONT.NE.4)) CALL XABORT('FPSPH: SPH FACT' + > //'ORS EXPECTED IN OPTIMIZE OBJECT.') + IF(NVAR.NE.(NGR2-NGR1+1)*(NMIX+NALBP)) CALL XABORT('FPSPH: INC' + > //'OHERENT NUMBER OF DECISION VARIABLES.') + ELSE + ITER=0 + IMETH=3 + EPSPH=1.0D-4 + NGRP=0 + NMIX=0 + ENDIF + DO I=2,3 + IF((JENTRY(I).NE.2).OR.((IENTRY(I).NE.1).AND.(IENTRY(I).NE.2))) + 1 CALL XABORT('FPSPH: LCM OBJECT IN READ-ONLY MODE EXPECTED AT R' + 2 //'HS.') + ENDDO + ITER=ITER+1 +*---- +* RECOVER THE ACTUAL MACROLIB. +*---- + CALL LCMGTC(KENTRY(2),'SIGNATURE',12,HSIGN) + IF(HSIGN.EQ.'L_MACROLIB') THEN + IPMAC1=KENTRY(2) + ELSE IF(HSIGN.EQ.'L_LIBRARY') THEN + IPMAC1=LCMGID(KENTRY(5),'MACROLIB') + ELSE + TEXT12=HENTRY(2) + CALL XABORT('FPSPH: SIGNATURE OF '//TEXT12//' IS '//HSIGN// + > '. ACTUAL L_MACROLIB OR L_LIBRARY EXPECTED.') + ENDIF + CALL LCMGET(IPMAC1,'STATE-VECTOR',ISTATE) + IF(JENTRY(1).EQ.0) THEN + NGRP=ISTATE(1) + NMIX=ISTATE(2) + ELSE IF(ISTATE(1).NE.NGRP) THEN + CALL XABORT('FPSPH: INVALID NUMBER OF GROUPS.') + ELSE IF(ISTATE(2).NE.NMIX) THEN + CALL XABORT('FPSPH: INVALID NUMBER OF MIXTURES.') + ENDIF + NFIS1=ISTATE(4) + ILEAKS=ISTATE(9) +*---- +* RECOVER THE REFERENCE MACROLIB. +*---- + CALL LCMGTC(KENTRY(3),'SIGNATURE',12,HSIGN) + IF(HSIGN.EQ.'L_MACROLIB') THEN + IPMAC2=KENTRY(3) + ELSE IF(HSIGN.EQ.'L_LIBRARY') THEN + IPMAC2=LCMGID(KENTRY(3),'MACROLIB') + ELSE + TEXT12=HENTRY(3) + CALL XABORT('FPSPH: SIGNATURE OF '//TEXT12//' IS '//HSIGN// + 1 '. REFERENCE L_MACROLIB OR L_LIBRARY EXPECTED.') + ENDIF + CALL LCMGET(IPMAC2,'STATE-VECTOR',ISTATE) + IF(ISTATE(1).NE.NGRP) THEN + CALL XABORT('FPSPH: INVALID NUMBER OF REFERENCE GROUPS.') + ELSE IF(ISTATE(2).NE.NMIX) THEN + CALL XABORT('FPSPH: INVALID NUMBER OF REFERENCE MIXTURES.') + ELSE IF(ISTATE(9).NE.ILEAKS) THEN + CALL XABORT('FPSPH: INVALID TYPE OF LEAKAGE.') + ENDIF + NFIS2=ISTATE(4) + NALBP=ISTATE(8) + IF(NALBP.GT.1) CALL XABORT('FPSPH: NALBP>1 NOT SUPPORTED.') +*---- +* READ INPUT PARAMETERS +*---- + IPICK=0 + IPRINT=1 + SPHMIN=0.0D0 + SPHMAX=10.0D0 + IF(JENTRY(1).EQ.0) THEN + IMC=2 + NGR1=1 + NGR2=NGRP + ENDIF + 10 CALL REDGET(INDIC,NITMA,FLOTT,TEXT12,DFLOTT) + IF(INDIC.EQ.10) GO TO 50 + IF(INDIC.NE.3) CALL XABORT('FPSPH: CHARACTER DATA EXPECTED') + IF(TEXT12(1:4).EQ.'EDIT') THEN + CALL REDGET(INDIC,IPRINT,FLOTT,TEXT12,DFLOTT) + IF(INDIC.NE.1) CALL XABORT('FPSPH: INTEGER DATA EXPECTED FOR I' + 1 //'PRINT') + ELSE IF(TEXT12.EQ.'SPH') THEN +* READ THE TYPE OF SPH CORRECTION. + CALL REDGET(INDIC,NITMA,FLOTT,TEXT12,DFLOTT) + IF(INDIC.NE.3) CALL XABORT('FPSPH: CHARACTER DATA EXPECTED(2).') + IF(TEXT12.EQ.'PN') THEN + IMC=1 + ELSE IF(TEXT12.EQ.'SN') THEN + IMC=2 + ELSE + CALL XABORT('FPSPH: INVALID TYPE OF SPH CORRECTION.') + ENDIF + ELSE IF(TEXT12.EQ.'GRPMIN') THEN +* READ THE MINIMUM GROUP INDEX. + CALL REDGET(INDIC,NGR1,FLOTT,TEXT12,DFLOTT) + IF(INDIC.NE.1) CALL XABORT('FPSPH: INTEGER DATA EXPECTED(4).') + IF((NGR1.LE.0).OR.(NGR1.GT.NGRP)) CALL XABORT('FPSPH: INVALID ' + > //'VALUE OF GRPMIN.') + ELSE IF(TEXT12.EQ.'GRPMAX') THEN +* READ THE MAXIMUM GROUP INDEX. + CALL REDGET(INDIC,NGR2,FLOTT,TEXT12,DFLOTT) + IF(INDIC.NE.1) CALL XABORT('FPSPH: INTEGER DATA EXPECTED(5).') + IF((NGR2.LT.NGR1).OR.(NGR2.GT.NGRP)) CALL XABORT('FPSPH: INVAL' + > //'ID VALUE OF GRPMAX.') + ELSE IF(TEXT12.EQ.'OUT-STEP-EPS') THEN +* Set the tolerence used for SPH iterations. + CALL REDGET(INDIC,NITMA,FLOTT,TEXT12,DFLOTT) + IF(INDIC.EQ.2) THEN + EPSPH=FLOTT + ELSE IF(INDIC.EQ.4) THEN + EPSPH=DFLOTT + ELSE + CALL XABORT('FPSPH: REAL OR DOUBLE PRECISION VALUE EXPECTED.') + ENDIF + ELSE IF(TEXT12.EQ.'VAR-VAL-MIN') THEN +* Set the minimum value for SPH dactors. + CALL REDGET(INDIC,NITMA,FLOTT,TEXT12,DFLOTT) + IF(INDIC.EQ.2) THEN + SPHMIN=FLOTT + ELSE IF(INDIC.EQ.4) THEN + SPHMIN=DFLOTT + ELSE + CALL XABORT('FPSPH: REAL OR DOUBLE PRECISION VALUE EXPECTED.') + ENDIF + ELSE IF(TEXT12.EQ.'VAR-VAL-MAX') THEN +* Set the maximum value for SPH dactors. + CALL REDGET(INDIC,NITMA,FLOTT,TEXT12,DFLOTT) + IF(INDIC.EQ.2) THEN + SPHMAX=FLOTT + ELSE IF(INDIC.EQ.4) THEN + SPHMAX=DFLOTT + ELSE + CALL XABORT('FPSPH: REAL OR DOUBLE PRECISION VALUE EXPECTED.') + ENDIF + ELSE IF(TEXT12.EQ.'OUT-CONV-TST') THEN +* Convergence test + IPICK=1 + GO TO 50 + ELSE IF(TEXT12(1:1).EQ.';') THEN + GO TO 50 + ELSE + CALL XABORT('FPSPH: '//TEXT12//' IS AN INVALID KEYWORD') + ENDIF + GO TO 10 +*---- +* RECOVER SPH FACTORS FROM PREVIOUS ITERATION +*---- + 50 NPERT=(NGR2-NGR1+1)*(NMIX+NALBP) + ALLOCATE(VARV(NPERT),VAROLD(NPERT),XMIN(NPERT),XMAX(NPERT)) + CALL LCMLEN(IPOPT,'VAR-VAL-MIN',ILONG,ITYLCM) + IF(ILONG.EQ.0) THEN + XMIN(:NPERT)=SPHMIN + CALL LCMPUT(IPOPT,'VAR-VAL-MIN',NPERT,4,XMIN) + ELSE + CALL LCMGET(IPOPT,'VAR-VAL-MIN',XMIN) + ENDIF + CALL LCMLEN(IPOPT,'VAR-VAL-MAX',ILONG,ITYLCM) + IF(ILONG.EQ.0) THEN + XMAX(:NPERT)=SPHMAX + CALL LCMPUT(IPOPT,'VAR-VAL-MAX',NPERT,4,XMAX) + ELSE + CALL LCMGET(IPOPT,'VAR-VAL-MAX',XMAX) + ENDIF + CALL LCMLEN(IPOPT,'VAR-VALUE',ILONG,ITYLCM) + IF(ILONG.EQ.0) THEN + VAROLD(:NPERT)=1.0D0 + ELSE + CALL LCMGET(IPOPT,'VAR-VALUE',VAROLD) + ENDIF +*---- +* PERFORM A FIXED POINT SPH ITERATION +*---- + IF(IPRINT.GT.0) WRITE(6,'(/34H FPSPH: COMPUTE SPH FACTORS AT ITE, + > 6HRATION,I5,12H WITH METHOD,I2,1H.)') ITER,IMETH + IF(IMETH.EQ.3) THEN + IPERT=0 + JPMAC1=LCMGID(IPMAC1,'GROUP') + JPMAC2=LCMGID(IPMAC2,'GROUP') + ALLOCATE(SPH(NMIX+NALBP),FLUX1(NMIX),FLUX2(NMIX),OUTG1(NGRP), + > OUTG2(NGRP)) + IF(IPRINT.GT.4) WRITE(6,'(/32H FPSPH: SPH FACTORS AT ITERATION, + > I5)') ITER + IF(NALBP.GT.0) THEN + CALL FPSOUT(IPMAC1,IPRINT,NGRP,NMIX,NFIS1,ILEAKS,' MACRO', + > OUTG1) + CALL FPSOUT(IPMAC2,IPRINT,NGRP,NMIX,NFIS2,ILEAKS,'REFERENCE', + > OUTG2) + ENDIF + DO 120 IGR=NGR1,NGR2 + SPH(:NMIX+NALBP)=1.0 + KPMAC1=LCMGIL(JPMAC1,IGR) + KPMAC2=LCMGIL(JPMAC2,IGR) + CALL LCMGET(KPMAC1,'FLUX-INTG',FLUX1) + CALL LCMGET(KPMAC2,'FLUX-INTG',FLUX2) + DO 60 IBM=1,NMIX + SPH(IBM)=FLUX2(IBM)/FLUX1(IBM) + 60 CONTINUE + DO 70 IAL=1,NALBP + IF(OUTG1(IGR).NE.0.0) THEN + SPH(NMIX+IAL)=REAL(VAROLD(IPERT+NMIX+1))*OUTG2(IGR)/OUTG1(IGR) + ENDIF + 70 CONTINUE + ZNORM1=0.0D0 + ZNORM2=0.0D0 + DO 80 IBM=1,NMIX + ZNORM1=ZNORM1+FLUX2(IBM)/SPH(IBM) + ZNORM2=ZNORM2+FLUX2(IBM) + 80 CONTINUE + ZNORM1=ZNORM1/ZNORM2 + IF(IPRINT.GT.1) THEN + WRITE(6,'(/14H FPSPH: GROUP=,I4,22H NORMALIZATION FACTOR=,1P, + > E12.4)') IGR,ZNORM1 + ENDIF + DO 90 IBM=1,NMIX+NALBP + SPH(IBM)=SPH(IBM)*REAL(ZNORM1) + 90 CONTINUE + DO 100 IBM=1,NMIX + IPERT=IPERT+1 + VARV(IPERT)=SPH(IBM) + 100 CONTINUE + DO 110 IAL=1,NALBP + IPERT=IPERT+1 + VARV(IPERT)=SPH(NMIX+IAL) + 110 CONTINUE + 120 CONTINUE + DEALLOCATE(OUTG2,OUTG1,FLUX2,FLUX1,SPH) +*---- +* PERFORM A NEWTONIAN SPH ITERATION +*---- + ELSE IF(IMETH.EQ.4) THEN + ALLOCATE(P(NPERT),FF(NFUNC),DFF(NPERT,NFUNC),TDFF(NFUNC,NPERT), + > UD(NPERT)) + CALL LCMGET(IPOPT,'FOBJ-CST-VAL',FF) + CALL LCMGET(IPOPT,'GRADIENT',DFF) + TDFF=TRANSPOSE(DFF) + CALL ALST2F(NFUNC,NFUNC,NPERT,TDFF,UD) + CALL ALST2S(NFUNC,NFUNC,NPERT,TDFF,UD,FF,P) + DO 130 IPERT=1,NPERT + VARV(IPERT)=VAROLD(IPERT)-P(IPERT) + 130 CONTINUE + DEALLOCATE(UD,TDFF,DFF,FF,P) + ENDIF +*---- +* APPLY CONSTRAINTS ON SPH FACTORS +*---- + DO 135 IPERT=1,NPERT + VARV(IPERT)=MAX(VARV(IPERT),XMIN(IPERT)) + VARV(IPERT)=MIN(VARV(IPERT),XMAX(IPERT)) + 135 ENDDO +*---- +* PRINT SPH FACTORS +*---- + IF(IPRINT.GT.4) THEN + ALLOCATE(SPH(NMIX+NALBP)) + IPERT=0 + DO 150 IGR=NGR1,NGR2 + DO 140 IBM=1,NMIX+NALBP + IPERT=IPERT+1 + SPH(IBM)=REAL(VARV(IPERT)) + 140 CONTINUE + WRITE(6,200) 'NSPH',IGR,(SPH(IBM),IBM=1,NMIX+NALBP) + 150 CONTINUE + DEALLOCATE(SPH) + ENDIF +*---- +* TEST CONVERGENCE +*---- + ICONV=0 + IF(JENTRY(1).EQ.1) THEN + ERROR=0.0 + ERR2=0.0 + DO 160 IPERT=1,NPERT + ERRT=ABS((VARV(IPERT)-VAROLD(IPERT))/VARV(IPERT)) + ERR2=ERR2+ERRT*ERRT + ERROR=MAX(ERROR,ERRT) + 160 CONTINUE + ERR2=SQRT(ERR2/REAL(NPERT)) + IF(IPRINT.GT.0) WRITE(6,230) ITER,ERROR,ERR2 + IF(ERR2.LT.EPSPH) THEN + ICONV=1 + IF(IPRINT.GT.0) WRITE(6,220) ITER + ENDIF + ELSE + ERR2=1.0E10 + ENDIF +*---- +* PUT OPTIMIZE OBJECT INFORMATION +*---- + CALL LCMPUT(IPOPT,'VAR-VALUE',NPERT,4,VARV) + DEALLOCATE(XMAX,XMIN,VAROLD,VARV) + IF(JENTRY(1).EQ.0)THEN + ISTATE(:NSTATE)=0 + ISTATE(1)=NGRP + ISTATE(2)=NMIX + ISTATE(3)=1 + ISTATE(4)=2+IMC + ISTATE(5)=NGR1 + ISTATE(6)=NGR2 + ISTATE(7)=1 + ISTATE(8)=NMIX + ISTATE(9)=NALBP + IF(IPRINT.GT.0) WRITE(6,210) (ISTATE(I),I=1,6) + CALL LCMPUT(IPOPT,'DEL-STATE',NSTATE,1,ISTATE) + ISTATE(:NSTATE)=0 + ISTATE(1)=NPERT + ISTATE(8)=IMETH ! set to fixed point or Newtonian method + CALL LCMPUT(IPOPT,'STATE-VECTOR',NSTATE,1,ISTATE) + OPTPRR(:NSTATE)=0.0D0 + OPTPRR(1)=1.0D0 + OPTPRR(2)=0.1D0 + OPTPRR(3)=EPSPH + OPTPRR(4)=1.0D-4 + OPTPRR(5)=1.0D-4 + CALL LCMPUT(IPOPT,'OPT-PARAM-R',NSTATE,4,OPTPRR) + ELSE + CALL LCMGET(IPOPT,'STATE-VECTOR',ISTATE) + ISTATE(1)=NPERT + ISTATE(4)=ICONV ! convergence index + ISTATE(5)=ITER ! number of iterations + ISTATE(8)=IMETH ! set to fixed point or Newtonian method + CALL LCMPUT(IPOPT,'STATE-VECTOR',NSTATE,1,ISTATE) + ENDIF +*---- +* RECOVER THE CONVERGENCE FLAGS AND SAVE IT IN A CLE-2000 VARIABLE +*---- + IF(IPICK.EQ.1) THEN + CALL REDGET(INDIC,NITMA,FLOTT,TEXT12,DFLOTT) + IF(INDIC.NE.-5) CALL XABORT('FPSPH: OUTPUT LOGICAL EXPECTED.') + INDIC=5 + IF(ICONV.EQ.0) THEN + DNVTST=-1 ! not converged + ELSE IF(ICONV.EQ.1) THEN + DNVTST=1 ! converged + ENDIF + CALL REDPUT(INDIC,DNVTST,FLOTT,TEXT12,DFLOTT) + CALL REDGET(INDIC,NITMA,FLOTT,TEXT12,DFLOTT) + IF(INDIC.EQ.-4) THEN + INDIC=4 + CALL REDPUT(INDIC,NITMA,FLOTT,TEXT12,ERR2) + CALL REDGET(INDIC,NITMA,FLOTT,TEXT12,DFLOTT) + ENDIF + IF((INDIC.NE.3).OR.(TEXT12.NE.';')) THEN + CALL XABORT('FPSPH: ; CHARACTER EXPECTED.') + ENDIF + ENDIF + RETURN +* + 200 FORMAT(/25H FPSPH: VALUES OF VECTOR ,A,9H IN GROUP,I5,4H ARE/ + > (1X,1P,10E13.5)) + 210 FORMAT(/18H DEL-STATE OPTIONS/18H -----------------/ + 1 7H NGRP ,I8,28H (NUMBER OF ENERGY GROUPS)/ + 2 7H NMIX ,I8,32H (NUMBER OF MATERIAL MIXTURES)/ + 3 7H ITYPE ,I8,13H (NOT USED)/ + 4 7H IDELTA,I8,34H (=3/4: USE PN-TYPE/USE SN-TYPE)/ + 5 7H NGR1 ,I8,24H (MINIMUM GROUP INDEX)/ + 6 7H NGR2 ,I8,24H (MAXIMUM GROUP INDEX)) + 220 FORMAT(/39H FPSPH: CONVERGENCE OF SPH ALGORITHM IN,I5, + > 12H ITERATIONS.) + 230 FORMAT(/13H FPSPH: ITER=,I3,4X,6HERROR=,1P,E10.3,1X,5HERR2=, + > E10.3) + END diff --git a/Dragon/src/KDRDRV.F b/Dragon/src/KDRDRV.F index 0aed297..1e63352 100644 --- a/Dragon/src/KDRDRV.F +++ b/Dragon/src/KDRDRV.F @@ -127,6 +127,8 @@ CALL FMT(NENTRY,HENTRY,IENTRY,JENTRY,KENTRY) ELSE IF(HMODUL.EQ.'SPH:') THEN CALL SPH(NENTRY,HENTRY,IENTRY,JENTRY,KENTRY) + ELSE IF(HMODUL.EQ.'FPSPH:') THEN + CALL FPSPH(NENTRY,HENTRY,IENTRY,JENTRY,KENTRY) ELSE IF(HMODUL.EQ.'CFC:') THEN CALL CFC(NENTRY,HENTRY,IENTRY,JENTRY,KENTRY) ELSE IF(HMODUL.EQ.'SENS:') THEN diff --git a/Dragon/src/LIBA30.f b/Dragon/src/LIBA30.f index 7c5e47a..8f5043f 100644 --- a/Dragon/src/LIBA30.f +++ b/Dragon/src/LIBA30.f @@ -430,7 +430,7 @@ *---- WRITE(RECNAM,'(9HIsotopes/,A,11H/HomoRates/)') TRIM(HNISOR) IF(.NOT.hdf5_group_exists(IPAP2,TRIM(RECNAM))) THEN - WRITE(HSMG,'(38HLIBA30: missing HomoRates in group ,A,1H.)') + WRITE(HSMG,'(35HLIBA30: missing HomoRates in group ,A,1H.)') 1 TRIM(RECNAM) CALL XABORT(HSMG) ENDIF diff --git a/Dragon/src/XDRCRE.f b/Dragon/src/XDRCRE.f index 7c0d1c0..455fe80 100644 --- a/Dragon/src/XDRCRE.f +++ b/Dragon/src/XDRCRE.f @@ -164,6 +164,9 @@ ELSE IF(NAMMOD .EQ. 'SPH: ') THEN USE='Superhomogenization (SPH) calculation' AUT='A. Hebert' + ELSE IF(NAMMOD .EQ. 'FPSPH:') THEN + USE='Single SPH factor fixed point iteration' + AUT='A. Hebert' ELSE IF(NAMMOD .EQ. 'CFC: ') THEN USE='Construction of a feedback database for CANDU reactors' AUT='M. T. Sissaoui' |