diff options
| -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 | ||||
| -rw-r--r-- | Dragon/src/BREANM.f | 5 | ||||
| -rw-r--r-- | Dragon/src/BRENEM.f | 5 | ||||
| -rw-r--r-- | Dragon/src/BRERT.f | 5 |
8 files changed, 34 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 diff --git a/Dragon/src/BREANM.f b/Dragon/src/BREANM.f index 99287ef..345268d 100644 --- a/Dragon/src/BREANM.f +++ b/Dragon/src/BREANM.f @@ -155,6 +155,11 @@ ENDIF ENDIF *---- +* THE SPH PARAMETERS ARE NOT DEGENERATE IN NON-FUNDAMENTAL MODE +* CONDITION. THE ONLY SOLUTION CORRESPONDS TO J_FUEL=1 +*---- + IF(ISPH.EQ.1) J_FUEL=1 +*---- * NGET NORMALIZATION OF THE DISCONTINUITY FACTORS *---- IF(J_FUEL.GT.0) THEN diff --git a/Dragon/src/BRENEM.f b/Dragon/src/BRENEM.f index 3e0a281..862ea80 100644 --- a/Dragon/src/BRENEM.f +++ b/Dragon/src/BRENEM.f @@ -169,6 +169,11 @@ ENDIF ENDIF *---- +* THE SPH PARAMETERS ARE NOT DEGENERATE IN NON-FUNDAMENTAL MODE +* CONDITION. THE ONLY SOLUTION CORRESPONDS TO J_FUEL=1 +*---- + IF(ISPH.EQ.1) J_FUEL=1 +*---- * NGET NORMALIZATION OF THE DISCONTINUITY FACTORS *---- IF(J_FUEL.GT.0) THEN diff --git a/Dragon/src/BRERT.f b/Dragon/src/BRERT.f index 3dd87fb..10d4155 100644 --- a/Dragon/src/BRERT.f +++ b/Dragon/src/BRERT.f @@ -214,6 +214,11 @@ ENDIF ENDIF *---- +* THE SPH PARAMETERS ARE NOT DEGENERATE IN NON-FUNDAMENTAL MODE +* CONDITION. THE ONLY SOLUTION CORRESPONDS TO J_FUEL=1 +*---- + IF(ISPH.EQ.1) J_FUEL=1 +*---- * NGET NORMALIZATION OF THE DISCONTINUITY FACTORS *---- IF(J_FUEL.GT.0) THEN |