diff options
| author | HEBERT Alain <alain.hebert@polymtl.ca> | 2025-12-01 04:40:21 -0500 |
|---|---|---|
| committer | HEBERT Alain <alain.hebert@polymtl.ca> | 2025-12-01 04:40:21 -0500 |
| commit | 3106f08451b6ad788e4f37510c068fc50c9abe86 (patch) | |
| tree | f6c715cf649827c919dd155a94be439e03151a02 /Donjon | |
| parent | d87cf2b7386ddef30f84802366aec3a9515681c8 (diff) | |
| parent | f19b43f7cd3f1cbbe01ffd00b060ed1bd254aafb (diff) | |
Merge branch '17-correct-the-sph-option-in-module-bref-for-cases-with-many-feeding-assemblies' into 'main'
#17: Correct the SPH option in module BREF: for cases with many feeding assemblies
See merge request dragon/5.1!30
Diffstat (limited to 'Donjon')
| -rwxr-xr-x | Donjon/data/Reflector_beavrs_APEX_DF-RT_proc/REFL_APEX.c2m | 2 | ||||
| -rwxr-xr-x | Donjon/data/Reflector_beavrs_DF-NEM_proc/REFL_MPO.c2m | 2 | ||||
| -rwxr-xr-x | Donjon/data/Reflector_beavrs_DF-RT_Jeff3p1SHEM295_mco_proc/REFL_MCO.c2m | 2 | ||||
| -rw-r--r-- | Donjon/src/ACRDRV.f | 16 | ||||
| -rw-r--r-- | Donjon/src/ACRRGR.f | 16 |
5 files changed, 19 insertions, 19 deletions
diff --git a/Donjon/data/Reflector_beavrs_APEX_DF-RT_proc/REFL_APEX.c2m b/Donjon/data/Reflector_beavrs_APEX_DF-RT_proc/REFL_APEX.c2m index 8d55fb4..c206ee0 100755 --- a/Donjon/data/Reflector_beavrs_APEX_DF-RT_proc/REFL_APEX.c2m +++ b/Donjon/data/Reflector_beavrs_APEX_DF-RT_proc/REFL_APEX.c2m @@ -342,7 +342,7 @@ WHILE IndexCB iBoreMax < DO !---------------------------------------------------------- ! APEX reflector creation !---------------------------------------------------------- - IF htype 'DF-RT' = htype 'DF-RT-SPN' = + THEN + IF OptSph 'SPH' = THEN Edition := EDI: MacrRefl :: EDIT 1 SAVE ; ELSE Edition := EDI: MacrRefl :: EDIT 1 ADFM SAVE ; diff --git a/Donjon/data/Reflector_beavrs_DF-NEM_proc/REFL_MPO.c2m b/Donjon/data/Reflector_beavrs_DF-NEM_proc/REFL_MPO.c2m index 6073dea..fb4810b 100755 --- a/Donjon/data/Reflector_beavrs_DF-NEM_proc/REFL_MPO.c2m +++ b/Donjon/data/Reflector_beavrs_DF-NEM_proc/REFL_MPO.c2m @@ -369,7 +369,7 @@ WHILE IndexCB iBoreMax < DO !---------------------------------------------------------- ! MPO reflector creation !---------------------------------------------------------- - IF htype 'DF-RT' = htype 'DF-RT-SPN' = + THEN + IF OptSph 'SPH' = THEN Edition := EDI: MacrRefl :: EDIT 1 SAVE ; ELSE Edition := EDI: MacrRefl :: EDIT 1 ADFM SAVE ; diff --git a/Donjon/data/Reflector_beavrs_DF-RT_Jeff3p1SHEM295_mco_proc/REFL_MCO.c2m b/Donjon/data/Reflector_beavrs_DF-RT_Jeff3p1SHEM295_mco_proc/REFL_MCO.c2m index d823ce7..06cc603 100755 --- a/Donjon/data/Reflector_beavrs_DF-RT_Jeff3p1SHEM295_mco_proc/REFL_MCO.c2m +++ b/Donjon/data/Reflector_beavrs_DF-RT_Jeff3p1SHEM295_mco_proc/REFL_MCO.c2m @@ -360,7 +360,7 @@ WHILE IndexCB iBoreMax < DO !---------------------------------------------------------- ! MPO reflector creation !---------------------------------------------------------- - IF htype 'DF-RT' = htype 'DF-RT-SPN' = + THEN + IF OptSph 'SPH' = THEN Edition := EDI: MacrRefl :: EDIT 1 SAVE ; ELSE Edition := EDI: MacrRefl :: EDIT 1 ADFM SAVE ; diff --git a/Donjon/src/ACRDRV.f b/Donjon/src/ACRDRV.f index f306c2a..9263bf4 100644 --- a/Donjon/src/ACRDRV.f +++ b/Donjon/src/ACRDRV.f @@ -106,17 +106,17 @@ DEALLOCATE(TEXT132V1) ENDIF IF(NPAR.GT.0) THEN - CALL hdf5_read_data(IPAPX,"/paramdescrip/PARNAM",PARKEY) - CALL hdf5_read_data(IPAPX,"/paramdescrip/PARFMT",PARFMT) + CALL hdf5_read_data(IPAPX,"/paramdescrip/PARNAM",PARKEY) + CALL hdf5_read_data(IPAPX,"/paramdescrip/PARFMT",PARFMT) + IF(IMPX.GT.1) THEN + WRITE(IOUT,*) 'NPAR=',NPAR,SIZE(PARKEY,1) + DO I=1,NPAR + WRITE(IOUT,*)'PARKEY(',I,')=',PARKEY(I),' PARFMT=',PARFMT(I) + ENDDO + ENDIF ENDIF TERP(:NCAL,:NMIX)=0.0 MIXC(:NMIX)=0 - IF(IMPX.GT.1) THEN - WRITE(IOUT,*) 'NPAR=',NPAR,SIZE(PARKEY,1) - DO I=1,NPAR - WRITE(IOUT,*)'PARKEY(',I,')=',PARKEY(I),' PARFMT=',PARFMT(I) - ENDDO - ENDIF *---- * READ (INTERP_DATA) AND SET VALI, VALR AND VALH PARAMETERS * CORRESPONDING TO THE INTERPOLATION POINT. FILL MUPLET FOR diff --git a/Donjon/src/ACRRGR.f b/Donjon/src/ACRRGR.f index 544c480..2f49228 100644 --- a/Donjon/src/ACRRGR.f +++ b/Donjon/src/ACRRGR.f @@ -132,14 +132,14 @@ DEALLOCATE(TEXT132V1) ENDIF IF(NPAR.GT.0) THEN - CALL hdf5_read_data(IPAPX,"/paramdescrip/PARNAM",PARKEY) - CALL hdf5_read_data(IPAPX,"/paramdescrip/PARFMT",PARFMT) - ENDIF - IF(IMPX.GT.1) THEN - WRITE(IOUT,*) 'NPAR=',NPAR,SIZE(PARKEY,1) - DO I=1,NPAR - WRITE(IOUT,*)'PARKEY(',I,')=',PARKEY(I),' PARFMT=',PARFMT(I) - ENDDO + CALL hdf5_read_data(IPAPX,"/paramdescrip/PARNAM",PARKEY) + CALL hdf5_read_data(IPAPX,"/paramdescrip/PARFMT",PARFMT) + IF(IMPX.GT.1) THEN + WRITE(IOUT,*) 'NPAR=',NPAR,SIZE(PARKEY,1) + DO I=1,NPAR + WRITE(IOUT,*)'PARKEY(',I,')=',PARKEY(I),' PARFMT=',PARFMT(I) + ENDDO + ENDIF ENDIF TERP(:NCAL,:NMIX)=0.0 MIXC(:NMIX)=0 |