diff options
Diffstat (limited to 'Dragon')
| -rw-r--r-- | Dragon/Makefile | 2 | ||||
| -rw-r--r-- | Dragon/data/rep900_mco.x2m | 300 | ||||
| -rw-r--r-- | Dragon/src/LIBNRG.F | 56 |
3 files changed, 190 insertions, 168 deletions
diff --git a/Dragon/Makefile b/Dragon/Makefile index 026013c..2a029cb 100644 --- a/Dragon/Makefile +++ b/Dragon/Makefile @@ -35,7 +35,7 @@ tests : ./rdragon -c $(fcompilerSuite) -p $(nomp) -q iaea2d.x2m ./rdragon -c $(fcompilerSuite) -p $(nomp) -q g2s_prestation.x2m ./rdragon -c $(fcompilerSuite) -p $(nomp) -q salmacro.x2m -# ./rdragon -c $(fcompilerSuite) -p $(nomp) -q tmacro.x2m + ./rdragon -c $(fcompilerSuite) -p $(nomp) -q tmacro.x2m ./rdragon -c $(fcompilerSuite) -p $(nomp) -q VanDerGucht.x2m ./rdragon -c $(fcompilerSuite) -p $(nomp) -q VanDerGucht-295.x2m ./rdragon -c $(fcompilerSuite) -p $(nomp) -q uo2_295_kec1_openMP.x2m diff --git a/Dragon/data/rep900_mco.x2m b/Dragon/data/rep900_mco.x2m index 7b8cbed..d5ea030 100644 --- a/Dragon/data/rep900_mco.x2m +++ b/Dragon/data/rep900_mco.x2m @@ -3,6 +3,7 @@ * Auteur : R. Vallerent * PWR branch calculation and production of a Multicompo * Le Tellier extended type +* Limit the maximum burnup to 39000 MWd/tonne to reduce multicompo size *---- * Define STRUCTURES and MODULES used *---- @@ -36,9 +37,9 @@ STRING Library := "DLIBJ3_281" ; *---- * Calculation data *---- -REAL Kinf1 Kinf2 Keff2 B2 ; +REAL kinf Kinf1 Kinf2 Keff2 B2 ; INTEGER iBoreMax := 5 ; -INTEGER iAutopMax := 9 ; +INTEGER iAutopMax := 6 ; INTEGER iTfMax := 5 ; INTEGER iTcaMax := 3 ; INTEGER iDcaMax := 4 ; @@ -80,7 +81,7 @@ ENDIF ; INTEGER maxstep ; IF Fuel "MOX" = THEN - EVALUATE maxstep := 55 ; + EVALUATE maxstep := 50 ; DONNEES := UTL: :: CREA burn <<maxstep>> = @@ -92,11 +93,10 @@ IF Fuel "MOX" = THEN 20000.0 21000.0 22000.0 23000.0 24000.0 25000.0 26000.0 27000.0 28000.0 29000.0 30000.0 31000.0 32000.0 33000.0 34000.0 35000.0 36000.0 37000.0 - 38000.0 39000.0 40000.0 50000.0 60000.0 70000.0 - 80000.0 + 38000.0 39000.0 ; ELSEIF Fuel "UOX" = THEN - EVALUATE maxstep := 67 ; + EVALUATE maxstep := 63 ; DONNEES := UTL: :: CREA burn <<maxstep>> = @@ -108,10 +108,9 @@ ELSEIF Fuel "UOX" = THEN 9000.0 9500.0 10000.0 10500.0 11000.0 11500.0 12000.0 12500.0 13000.0 13500.0 14000.0 14500.0 15000.0 15500.0 16000.0 16500.0 17000.0 17500.0 - 18000.0 18500.0 19000.0 19500.0 20000.0 22000.0 - 24000.0 26000.0 28000.0 30000.0 32000.0 34000.0 - 36000.0 38000.0 40000.0 50000.0 60000.0 70000.0 - 80000.0 + 18000.0 18500.0 19000.0 19500.0 20000.0 21000.0 + 23000.0 25000.0 27000.0 29000.0 31000.0 33000.0 + 35000.0 37000.0 39000.0 ; ELSE ECHO "Fuel incorrect" ; @@ -123,8 +122,7 @@ DONNEES := UTL: DONNEES :: 0.0 500.0 1000.0 1500.0 2000.0 CREA autop <<iAutopMax>> = - 0.0 4000.0 8000.0 12000.0 24000.0 36000.0 - 40000.0 60000.0 80000.0 + 0.0 4000.0 8000.0 13000.0 25000.0 39000.0 CREA tf <<iTfMax>> = 550.0 800.0 1150.0 1500.0 2000.0 @@ -256,6 +254,10 @@ ENDIF ; ************************************************************************ * BEGIN LIBRARY READING * ************************************************************************ +ECHO "nominal fuel temperature=" temp_comb_0 ; +ECHO "nominal coolant temperature=" temp_mode_0 ; +ECHO "nominal coolant density=" dens_mod_0 ; +ECHO "nominal boron concentration=" pbore_0 ; IF TypeCal "Public" = THEN IF Fuel "MOX" = THEN LIBRARY := Mix_MOX_32 :: @@ -326,7 +328,7 @@ EDIOBJ := DELETE: EDIOBJ ; ************************************************************************ WHILE istep maxstep < DO EVALUATE istep := istep 1 + ; - ECHO "istep vaut" istep "sur" maxstep ; + ECHO "nominal burnup istep =" istep "over" maxstep ; EVALUATE BUbeg Tbeg := BUend Tend ; GREP: DONNEES :: GETVAL 'burn' <<istep>> >>BUend<< ; @@ -349,12 +351,6 @@ WHILE istep maxstep < DO BURN164 LIBRARY TRACKSS TRACKN1 TRACKN2 TRKFILN2 :: <<istep>> <<Fuel>> <<NbRegions>> <<BUend>> <<BUnextSS>> <<Fuelpwr>> ; - IF BUend BUnextSS - ABS 1E-5 < THEN - EVALUATE iautop := iautop 1 + ; - IF iautop iAutopMax <= THEN - GREP: DONNEES :: GETVAL 'autop' <<iautop>> >>BUnextSS<< ; - ENDIF ; - ENDIF ; ************************************************************************ * 2-GROUPS ENERGY CONDENSATION AND HOMOGENISATION * @@ -365,33 +361,49 @@ WHILE istep maxstep < DO ************************************************************************ * MULTICOMPO FEEDING * ************************************************************************ - IF TypeCompo "PinByPin" = THEN - COMPO := COMPO: COMPO EDIOBJ BURN164 LIBRARY :: - EDIT 2 - STEP UP 'EDI2A' - 'ppmBore' <<pbore_0>> - 'DCA' <<dens_mod_0>> - SET <<Tend>> DAY ; - ELSEIF TypeCompo "Assembly" = THEN - COMPO := COMPO: COMPO EDIOBJ BURN164 LIBRARY :: - EDIT 2 - STEP UP 'EDI2B' - 'ppmBore' <<pbore_0>> - 'DCA' <<dens_mod_0>> - SET <<Tend>> DAY ; - ELSE - ECHO "TypeCompo incorrect" ; - ABORT: ; + IF BUend BUnextSS - ABS 1E-5 < THEN + ECHO "Multicompo feeding" ; + IF TypeCompo "PinByPin" = THEN + COMPO := COMPO: COMPO EDIOBJ BURN164 LIBRARY :: + EDIT 2 + STEP UP 'EDI2A' + 'ppmBore' <<pbore_0>> + 'DCA' <<dens_mod_0>> + SET <<Tend>> DAY ; + ELSEIF TypeCompo "Assembly" = THEN + COMPO := COMPO: COMPO EDIOBJ BURN164 LIBRARY :: + EDIT 2 + STEP UP 'EDI2B' + 'ppmBore' <<pbore_0>> + 'DCA' <<dens_mod_0>> + SET <<Tend>> DAY ; + ELSE + ECHO "TypeCompo incorrect" ; + ABORT: ; + ENDIF ; ENDIF ; EDIOBJ := DELETE: EDIOBJ ; + IF BUend BUnextSS - ABS 1E-5 < THEN + EVALUATE iautop := iautop 1 + ; + IF iautop iAutopMax <= THEN + GREP: DONNEES :: GETVAL 'autop' <<iautop>> >>BUnextSS<< ; + ENDIF ; + ENDIF ; + ENDWHILE ; ! reference burnup loop IF Fuel "MOX" = THEN - assertS FLUX2 :: K-INFINITY 1 0.8468311 ; + GREP: FLUX2 :: GETVAL 'K-INFINITY' 1 >>kinf<< ; + ECHO "MOX Kinf=" kinf ; + assertS FLUX2 :: K-INFINITY 1 0.9599275 ; ELSEIF Fuel "UOX" = NbRegions 20 = * THEN - assertS FLUX2 :: K-INFINITY 1 0.7621447 ; + GREP: FLUX2 :: GETVAL 'K-INFINITY' 1 >>kinf<< ; + ECHO "UOX Kinf(20 regions)=" kinf ; + assertS FLUX2 :: K-INFINITY 1 0.9213967 ; ELSEIF Fuel "UOX" = NbRegions 32 = * THEN - assertS FLUX2 :: K-INFINITY 1 0.7621409 ; + GREP: FLUX2 :: GETVAL 'K-INFINITY' 1 >>kinf<< ; + ECHO "UOX Kinf(32 regions)=" kinf ; + assertS FLUX2 :: K-INFINITY 1 0.9213964 ; ENDIF ; LIBRARY LIBRARY2 LIBEQ := DELETE: LIBRARY LIBRARY2 LIBEQ ; @@ -409,7 +421,7 @@ ECHO "$$$ Boron loop" ; INTEGER iBoreStep := 0 ; WHILE iBoreStep iBoreMax < DO EVALUATE iBoreStep := iBoreStep 1 + ; - ECHO "iBoreStep vaut" iBoreStep "sur" iBoreMax ; + ECHO "iBoreStep =" iBoreStep "over" iBoreMax ; GREP: DONNEES :: GETVAL 'ppmBore' <<iBoreStep>> >>pbore<< ; ************************************************************************ * BEGIN LIBRARY READING * @@ -448,7 +460,7 @@ ECHO "BUnextSS=" BUnextSS ; ************************************************************************ WHILE istep maxstep < DO EVALUATE istep := istep 1 + ; - ECHO "branch istep vaut" istep "sur" maxstep ; + ECHO "branch burnup istep =" istep "over" maxstep ; EVALUATE BUbeg Tbeg := BUend Tend ; GREP: DONNEES :: GETVAL 'burn' <<istep>> >>BUend<< ; @@ -482,12 +494,6 @@ WHILE istep maxstep < DO :: <<istep>> <<Fuel>> <<NbRegions>> <<BUend>> <<BUnextSS>> <<Fuelpwr>> ; ENDIF ; - IF BUend BUnextSS - ABS 1E-5 < THEN - EVALUATE iautop := iautop 1 + ; - IF iautop iAutopMax <= THEN - GREP: DONNEES :: GETVAL 'autop' <<iautop>> >>BUnextSS<< ; - ENDIF ; - ENDIF ; ************************************************************************ * 2-GROUPS ENERGY CONDENSATION AND HOMOGENISATION * @@ -498,25 +504,35 @@ WHILE istep maxstep < DO ************************************************************************ * MULTICOMPO FEEDING * ************************************************************************ - IF pbore pbore_0 = THEN - ECHO "Duplicate branch calculation at pbore=" pbore ; - ELSEIF TypeCompo "PinByPin" = THEN - COMPO := COMPO: COMPO EDIOBJ BURN164 LIBRARY :: - EDIT 2 - STEP UP 'EDI2A' - 'ppmBore' <<pbore>> - 'DCA' <<dens_mod_0>> - SET <<Tend>> DAY ; - ELSEIF TypeCompo "Assembly" = THEN - COMPO := COMPO: COMPO EDIOBJ BURN164 LIBRARY :: - EDIT 2 - STEP UP 'EDI2B' - 'ppmBore' <<pbore>> - 'DCA' <<dens_mod_0>> - SET <<Tend>> DAY ; + IF BUend BUnextSS - ABS 1E-5 < THEN + ECHO "Multicompo feeding" ; + IF pbore pbore_0 = THEN + ECHO "Duplicate branch calculation at pbore=" pbore ; + ELSEIF TypeCompo "PinByPin" = THEN + COMPO := COMPO: COMPO EDIOBJ BURN164 LIBRARY :: + EDIT 2 + STEP UP 'EDI2A' + 'ppmBore' <<pbore>> + 'DCA' <<dens_mod_0>> + SET <<Tend>> DAY ; + ELSEIF TypeCompo "Assembly" = THEN + COMPO := COMPO: COMPO EDIOBJ BURN164 LIBRARY :: + EDIT 2 + STEP UP 'EDI2B' + 'ppmBore' <<pbore>> + 'DCA' <<dens_mod_0>> + SET <<Tend>> DAY ; + ENDIF ; ENDIF ; EDIOBJ := DELETE: EDIOBJ ; + IF BUend BUnextSS - ABS 1E-5 < THEN + EVALUATE iautop := iautop 1 + ; + IF iautop iAutopMax <= THEN + GREP: DONNEES :: GETVAL 'autop' <<iautop>> >>BUnextSS<< ; + ENDIF ; + ENDIF ; + ENDWHILE ; ! burnup loop LIBRARY LIBRARY2 LIBEQ := DELETE: LIBRARY LIBRARY2 LIBEQ ; @@ -529,7 +545,6 @@ ENDWHILE ; ! boron loop ************************************************************************ ************************************************************************ - ************************************************************************ * FUEL TEMPERATURE LOOP * ************************************************************************ @@ -537,7 +552,7 @@ ECHO "$$$ Fuel temperature loop" ; INTEGER iTfStep := 0 ; WHILE iTfStep iTfMax < DO EVALUATE iTfStep := iTfStep 1 + ; - ECHO "iTfStep vaut" iTfStep "sur" iTfMax ; + ECHO "iTfStep =" iTfStep "over" iTfMax ; GREP: DONNEES :: GETVAL 'tf' <<iTfStep>> >>temp_comb<< ; ************************************************************************ * BEGIN LIBRARY READING * @@ -576,7 +591,7 @@ ECHO "BUnextSS=" BUnextSS ; ************************************************************************ WHILE istep maxstep < DO EVALUATE istep := istep 1 + ; - ECHO "branch istep vaut" istep "sur" maxstep ; + ECHO "branch burnup istep =" istep "over" maxstep ; EVALUATE BUbeg Tbeg := BUend Tend ; GREP: DONNEES :: GETVAL 'burn' <<istep>> >>BUend<< ; @@ -610,12 +625,6 @@ WHILE istep maxstep < DO :: <<istep>> <<Fuel>> <<NbRegions>> <<BUend>> <<BUnextSS>> <<Fuelpwr>> ; ENDIF ; - IF BUend BUnextSS - ABS 1E-5 < THEN - EVALUATE iautop := iautop 1 + ; - IF iautop iAutopMax <= THEN - GREP: DONNEES :: GETVAL 'autop' <<iautop>> >>BUnextSS<< ; - ENDIF ; - ENDIF ; ************************************************************************ * 2-GROUPS ENERGY CONDENSATION AND HOMOGENISATION * @@ -626,25 +635,35 @@ WHILE istep maxstep < DO ************************************************************************ * MULTICOMPO FEEDING * ************************************************************************ - IF temp_comb temp_comb_0 = THEN - ECHO "Duplicate branch calculation at temp_comb=" temp_comb ; - ELSEIF TypeCompo "PinByPin" = THEN - COMPO := COMPO: COMPO EDIOBJ BURN164 LIBRARY :: - EDIT 2 - STEP UP 'EDI2A' - 'ppmBore' <<pbore_0>> - 'DCA' <<dens_mod_0>> - SET <<Tend>> DAY ; - ELSEIF TypeCompo "Assembly" = THEN - COMPO := COMPO: COMPO EDIOBJ BURN164 LIBRARY :: - EDIT 2 - STEP UP 'EDI2B' - 'ppmBore' <<pbore_0>> - 'DCA' <<dens_mod_0>> - SET <<Tend>> DAY ; + IF BUend BUnextSS - ABS 1E-5 < THEN + ECHO "Multicompo feeding" ; + IF temp_comb temp_comb_0 = THEN + ECHO "Duplicate branch calculation at temp_comb=" temp_comb ; + ELSEIF TypeCompo "PinByPin" = THEN + COMPO := COMPO: COMPO EDIOBJ BURN164 LIBRARY :: + EDIT 2 + STEP UP 'EDI2A' + 'ppmBore' <<pbore_0>> + 'DCA' <<dens_mod_0>> + SET <<Tend>> DAY ; + ELSEIF TypeCompo "Assembly" = THEN + COMPO := COMPO: COMPO EDIOBJ BURN164 LIBRARY :: + EDIT 2 + STEP UP 'EDI2B' + 'ppmBore' <<pbore_0>> + 'DCA' <<dens_mod_0>> + SET <<Tend>> DAY ; + ENDIF ; ENDIF ; EDIOBJ := DELETE: EDIOBJ ; + IF BUend BUnextSS - ABS 1E-5 < THEN + EVALUATE iautop := iautop 1 + ; + IF iautop iAutopMax <= THEN + GREP: DONNEES :: GETVAL 'autop' <<iautop>> >>BUnextSS<< ; + ENDIF ; + ENDIF ; + ENDWHILE ; ! burnup loop LIBRARY LIBRARY2 LIBEQ := DELETE: LIBRARY LIBRARY2 LIBEQ ; @@ -657,7 +676,6 @@ ENDWHILE ; ! fuel temperature loop ************************************************************************ ************************************************************************ - ************************************************************************ * MODERATOR TEMPERATURE LOOP * ************************************************************************ @@ -665,7 +683,7 @@ ECHO "$$$ Moderator temperature loop" ; INTEGER iTcaStep := 0 ; WHILE iTcaStep iTcaMax < DO EVALUATE iTcaStep := iTcaStep 1 + ; - ECHO "iTcaStep vaut" iTcaStep "sur" iTcaMax ; + ECHO "iTcaStep =" iTcaStep "over" iTcaMax ; GREP: DONNEES :: GETVAL 'tca' <<iTcaStep>> >>temp_mode<< ; ************************************************************************ * BEGIN LIBRARY READING * @@ -704,7 +722,7 @@ ECHO "BUnextSS=" BUnextSS ; ************************************************************************ WHILE istep maxstep < DO EVALUATE istep := istep 1 + ; - ECHO "branch istep vaut" istep "sur" maxstep ; + ECHO "branch burnup istep =" istep "over" maxstep ; EVALUATE BUbeg Tbeg := BUend Tend ; GREP: DONNEES :: GETVAL 'burn' <<istep>> >>BUend<< ; @@ -738,12 +756,6 @@ WHILE istep maxstep < DO :: <<istep>> <<Fuel>> <<NbRegions>> <<BUend>> <<BUnextSS>> <<Fuelpwr>> ; ENDIF ; - IF BUend BUnextSS - ABS 1E-5 < THEN - EVALUATE iautop := iautop 1 + ; - IF iautop iAutopMax <= THEN - GREP: DONNEES :: GETVAL 'autop' <<iautop>> >>BUnextSS<< ; - ENDIF ; - ENDIF ; ************************************************************************ * 2-GROUPS ENERGY CONDENSATION AND HOMOGENISATION * @@ -754,25 +766,35 @@ WHILE istep maxstep < DO ************************************************************************ * MULTICOMPO FEEDING * ************************************************************************ - IF temp_mode temp_mode_0 = THEN - ECHO "Duplicate branch calculation at temp_mode=" temp_mode ; - ELSEIF TypeCompo "PinByPin" = THEN - COMPO := COMPO: COMPO EDIOBJ BURN164 LIBRARY :: - EDIT 2 - STEP UP 'EDI2A' - 'ppmBore' <<pbore_0>> - 'DCA' <<dens_mod_0>> - SET <<Tend>> DAY ; - ELSEIF TypeCompo "Assembly" = THEN - COMPO := COMPO: COMPO EDIOBJ BURN164 LIBRARY :: - EDIT 2 - STEP UP 'EDI2B' - 'ppmBore' <<pbore_0>> - 'DCA' <<dens_mod_0>> - SET <<Tend>> DAY ; + IF BUend BUnextSS - ABS 1E-5 < THEN + ECHO "Multicompo feeding" ; + IF temp_mode temp_mode_0 = THEN + ECHO "Duplicate branch calculation at temp_mode=" temp_mode ; + ELSEIF TypeCompo "PinByPin" = THEN + COMPO := COMPO: COMPO EDIOBJ BURN164 LIBRARY :: + EDIT 2 + STEP UP 'EDI2A' + 'ppmBore' <<pbore_0>> + 'DCA' <<dens_mod_0>> + SET <<Tend>> DAY ; + ELSEIF TypeCompo "Assembly" = THEN + COMPO := COMPO: COMPO EDIOBJ BURN164 LIBRARY :: + EDIT 2 + STEP UP 'EDI2B' + 'ppmBore' <<pbore_0>> + 'DCA' <<dens_mod_0>> + SET <<Tend>> DAY ; + ENDIF ; ENDIF ; EDIOBJ := DELETE: EDIOBJ ; + IF BUend BUnextSS - ABS 1E-5 < THEN + EVALUATE iautop := iautop 1 + ; + IF iautop iAutopMax <= THEN + GREP: DONNEES :: GETVAL 'autop' <<iautop>> >>BUnextSS<< ; + ENDIF ; + ENDIF ; + ENDWHILE ; ! burnup loop LIBRARY LIBRARY2 LIBEQ := DELETE: LIBRARY LIBRARY2 LIBEQ ; @@ -785,7 +807,6 @@ ENDWHILE ; ! moderator temperature loop ************************************************************************ ************************************************************************ - ************************************************************************ * MODERATOR DENSITY LOOP * ************************************************************************ @@ -793,7 +814,7 @@ ECHO "$$$ Moderator density loop" ; INTEGER iDcaStep := 0 ; WHILE iDcaStep iDcaMax < DO EVALUATE iDcaStep := iDcaStep 1 + ; - ECHO "iDcaStep vaut" iDcaStep "sur" iDcaMax ; + ECHO "iDcaStep =" iDcaStep "over" iDcaMax ; GREP: DONNEES :: GETVAL 'dca' <<iDcaStep>> >>dens_mod<< ; ************************************************************************ * BEGIN LIBRARY READING * @@ -832,7 +853,7 @@ ECHO "BUnextSS=" BUnextSS ; ************************************************************************ WHILE istep maxstep < DO EVALUATE istep := istep 1 + ; - ECHO "branch istep vaut" istep "sur" maxstep ; + ECHO "branch burnup istep =" istep "over" maxstep ; EVALUATE BUbeg Tbeg := BUend Tend ; GREP: DONNEES :: GETVAL 'burn' <<istep>> >>BUend<< ; @@ -866,12 +887,6 @@ WHILE istep maxstep < DO :: <<istep>> <<Fuel>> <<NbRegions>> <<BUend>> <<BUnextSS>> <<Fuelpwr>> ; ENDIF ; - IF BUend BUnextSS - ABS 1E-5 < THEN - EVALUATE iautop := iautop 1 + ; - IF iautop iAutopMax <= THEN - GREP: DONNEES :: GETVAL 'autop' <<iautop>> >>BUnextSS<< ; - ENDIF ; - ENDIF ; ************************************************************************ * 2-GROUPS ENERGY CONDENSATION AND HOMOGENISATION * @@ -882,25 +897,34 @@ WHILE istep maxstep < DO ************************************************************************ * MULTICOMPO FEEDING * ************************************************************************ - IF dens_mod dens_mod_0 = THEN - ECHO "Duplicate branch calculation at dens_mod=" dens_mod ; - ELSEIF TypeCompo "PinByPin" = THEN - COMPO := COMPO: COMPO EDIOBJ BURN164 LIBRARY :: - EDIT 2 - STEP UP 'EDI2A' - 'ppmBore' <<pbore_0>> - 'DCA' <<dens_mod>> - SET <<Tend>> DAY ; - ELSEIF TypeCompo "Assembly" = THEN - COMPO := COMPO: COMPO EDIOBJ BURN164 LIBRARY :: - EDIT 2 - STEP UP 'EDI2B' - 'ppmBore' <<pbore_0>> - 'DCA' <<dens_mod>> - SET <<Tend>> DAY ; + IF BUend BUnextSS - ABS 1E-5 < THEN + ECHO "Multicompo feeding" ; + IF dens_mod dens_mod_0 = THEN + ECHO "Duplicate branch calculation at dens_mod=" dens_mod ; + ELSEIF TypeCompo "PinByPin" = THEN + COMPO := COMPO: COMPO EDIOBJ BURN164 LIBRARY :: + EDIT 2 + STEP UP 'EDI2A' + 'ppmBore' <<pbore_0>> + 'DCA' <<dens_mod>> + SET <<Tend>> DAY ; + ELSEIF TypeCompo "Assembly" = THEN + COMPO := COMPO: COMPO EDIOBJ BURN164 LIBRARY :: + EDIT 2 + STEP UP 'EDI2B' + 'ppmBore' <<pbore_0>> + 'DCA' <<dens_mod>> + SET <<Tend>> DAY ; + ENDIF ; ENDIF ; EDIOBJ := DELETE: EDIOBJ ; + IF BUend BUnextSS - ABS 1E-5 < THEN + EVALUATE iautop := iautop 1 + ; + IF iautop iAutopMax <= THEN + GREP: DONNEES :: GETVAL 'autop' <<iautop>> >>BUnextSS<< ; + ENDIF ; + ENDIF ; ENDWHILE ; ! burnup loop LIBRARY LIBRARY2 LIBEQ := DELETE: LIBRARY LIBRARY2 LIBEQ ; diff --git a/Dragon/src/LIBNRG.F b/Dragon/src/LIBNRG.F index fc00e9d..ebe4b09 100644 --- a/Dragon/src/LIBNRG.F +++ b/Dragon/src/LIBNRG.F @@ -40,7 +40,7 @@ *---- PARAMETER (IOUT=6,LRIND=256,IACTO=2,IACTC=1,ILIBDA=4, > NMTYP=8) - CHARACTER HSMG*131,HMTYP(NMTYP)*1,HFORMAT*132 + CHARACTER HSMG*131,HMTYP(NMTYP)*1 #if defined(HDF5_LIB) CHARACTER CFILNA1*64 #endif /* defined(HDF5_LIB) */ @@ -106,9 +106,9 @@ *---- IUNIT=KDROPN(NAMFIL,IACTO,ILIBDA,LRIND) IF(IUNIT.LE.0) THEN - HFORMAT='(27HLIBNRG: WIMS-AECL LIBRARY '',A16,8H'' CANNOT'// - > '30H BE OPENED BY KDROPN (ERRCODE=,I2,2H).)' - WRITE(HSMG,HFORMAT) NAMFIL,IUNIT + WRITE(HSMG,'(27HLIBNRG: WIMS-AECL LIBRARY '',A,7H'' CANNO,'// + > '31HT BE OPENED BY KDROPN (ERRCODE=,I2,2H).)') TRIM(NAMFIL), + > IUNIT CALL XABORT(HSMG) ENDIF CALL OPNIND(IUNIT,MASTER,LMASTB) @@ -124,9 +124,8 @@ *---- IUNIT=KDROPN(NAMFIL,IACTO,ILIBIN,LRIND) IF(IUNIT.LE.0) THEN - HFORMAT='(22HLIBNRG: WIMS LIBRARY '',A16,9H'' CANNOT '// - > '29HBE OPENED BY KDROPN (ERRCODE=,I2,2H).)' - WRITE(HSMG,HFORMAT) NAMFIL,IUNIT + WRITE(HSMG,'(22HLIBNRG: WIMS LIBRARY '',A,11H'' CANNOT BE,'// + > '27H OPENED BY KDROPN (ERRCODE=,I2,2H).)') TRIM(NAMFIL),IUNIT CALL XABORT(HSMG) ENDIF READ(IUNIT) (NPZ(II),II=1,LPZ-1) @@ -136,9 +135,9 @@ READ(IUNIT) (ENERG(J),J=1,NGRI+1) IERR=KDRCLS(IUNIT,IACTC) IF(IERR.LT.0) THEN - HFORMAT='(22HLIBNRG: WIMS LIBRARY '',A16,9H'' CANNOT '// - > '29HBE CLOSED BY KDRCLS (ERRCODE=,I2,2H).)' - WRITE(HSMG,HFORMAT) NAMFIL,IERR + WRITE(HSMG,'(22HLIBNRG: WIMS LIBRARY '',A,9H'' CANNOT ,'// + > '29HBE OPENED BY KDROPN (ERRCODE=,I2,2H).)') TRIM(NAMFIL), + > IUNIT CALL XABORT(HSMG) ENDIF ELSE IF(NAMLBT.EQ.'APLIB1') THEN @@ -147,9 +146,9 @@ *---- IUNIT=KDROPN(NAMFIL,IACTO,ILIBIN,LRIND) IF(IUNIT.LE.0) THEN - HFORMAT='(26HLIBNRG: APOLLO-1 LIBRARY '',A16,9H'' CANNOT '// - > '29HBE OPENED BY KDROPN (ERRCODE=,I2,2H).)' - WRITE(HSMG,HFORMAT) NAMFIL,IUNIT + WRITE(HSMG,'(26HLIBNRG: APOLLO-1 LIBRARY '',A,7H'' CANNO,'// + > '31HT BE OPENED BY KDROPN (ERRCODE=,I2,2H).)') TRIM(NAMFIL), + > IUNIT CALL XABORT(HSMG) ENDIF REWIND(IUNIT) @@ -177,9 +176,9 @@ ENDIF IERR=KDRCLS(IUNIT,IACTC) IF(IERR.LT.0) THEN - HFORMAT='(26HLIBNRG: APOLLO-1 LIBRARY '',A16,9H'' CANNOT '// - > '29HBE CLOSED BY KDRCLS (ERRCODE=,I2,2H).)' - WRITE(HSMG,HFORMAT) NAMFIL,IERR + WRITE(HSMG,'(26HLIBNRG: APOLLO-1 LIBRARY '',A,7H'' CANNO,'// + > '31HT BE CLOSED BY KDRCLS (ERRCODE=,I2,2H).)') TRIM(NAMFIL), + > IERR CALL XABORT(HSMG) ENDIF ELSE IF(NAMLBT.EQ.'APLIB2') THEN @@ -221,9 +220,9 @@ *---- IUNIT=KDROPN(NAMFIL,IACTO,ILIBIN,LRIND) IF(IUNIT.LE.0) THEN - HFORMAT='(23HLIBNRG: MATXS LIBRARY '',A16,11H'' CANNOT BE'// - > '27H OPENED BY KDROPN (ERRCODE=,I2,2H).)' - WRITE(HSMG,HFORMAT) NAMFIL,IUNIT + WRITE(HSMG,'(23HLIBNRG: MATXS LIBRARY '',A,9H'' CANNOT ,'// + > '29HBE OPENED BY KDROPN (ERRCODE=,I2,2H).)') TRIM(NAMFIL), + > IUNIT CALL XABORT(HSMG) ENDIF NWDS=3 @@ -263,9 +262,9 @@ CALL XDRCLS(IUNIT) IERR=KDRCLS(IUNIT,IACTC) IF(IERR.LT.0) THEN - HFORMAT='(23HLIBNRG: MATXS LIBRARY '',A16,11H'' CANNOT BE'// - > '27H CLOSED BY KDRCLS (ERRCODE=,I2,2H).)' - WRITE(HSMG,HFORMAT) NAMFIL,IERR + WRITE(HSMG,'(23HLIBNRG: MATXS LIBRARY '',A,9H'' CANNOT ,'// + > '29HBE CLOSED BY KDRCLS (ERRCODE=,I2,2H).)') TRIM(NAMFIL), + > IERR CALL XABORT(HSMG) ENDIF ELSE IF(NAMLBT.EQ.'MATXS2') THEN @@ -275,9 +274,9 @@ IF(NAMFIL(:1).EQ.'_') ILIBIN=3 IUNIT=KDROPN(NAMFIL,IACTO,ILIBIN,LRIND) IF(IUNIT.LE.0) THEN - HFORMAT='(24HLIBNRG: MATXS2 LIBRARY '',A16,10H'' CANNOT B'// - > '28HE OPENED BY KDROPN (ERRCODE=,I2,2H).)' - WRITE(HSMG,HFORMAT) NAMFIL,IUNIT + WRITE(HSMG,'(24HLIBNRG: MATXS2 LIBRARY '',A,9H'' CANNOT ,'// + > '29HBE OPENED BY KDROPN (ERRCODE=,I2,2H).)') TRIM(NAMFIL), + > IUNIT CALL XABORT(HSMG) ENDIF NWDS=6 @@ -337,10 +336,9 @@ ENDIF IERR=KDRCLS(IUNIT,IACTC) IF(IERR.LT.0) THEN - HFORMAT='(24HLIBNRG: MATXS2 LIBRARY '',A16,10H'' CANNOT B'// - > '28HE CLOSED BY KDRCLS (ERRCODE=,I2,2H).)' - WRITE(HSMG,HFORMAT) NAMFIL,IERR - CALL XABORT(HSMG) + WRITE(HSMG,'(24HLIBNRG: MATXS2 LIBRARY '',A,9H'' CANNOT ,'// + > '29HBE CLOSED BY KDRCLS (ERRCODE=,I2,2H).)') TRIM(NAMFIL), + > IERR ENDIF ELSE IF(NAMLBT.EQ.'NDAS') THEN *--- |