Changeset 15259
- Timestamp:
- 2021-09-14T16:41:21+02:00 (3 years ago)
- Location:
- NEMO/branches/UKMO/NEMO_4.0.4_EAP_rheology
- Files:
-
- 7 edited
-
cfgs/METO_GO/EXPREF/file_def_nemo-ice-BASIC-10D.xml (modified) (3 diffs)
-
cfgs/METO_GO/EXPREF/file_def_nemo-ice-BASIC-1M.xml (modified) (2 diffs)
-
cfgs/METO_GO/EXPREF/file_def_nemo-ice-CMIP6-10D.xml (modified) (3 diffs)
-
cfgs/METO_GO/EXPREF/file_def_nemo-ice-CMIP6-1M.xml (modified) (2 diffs)
-
src/ICE/icedyn_rdgrft.F90 (modified) (2 diffs)
-
src/ICE/icedyn_rhg_eap.F90 (modified) (4 diffs)
-
src/ICE/iceupdate.F90 (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/UKMO/NEMO_4.0.4_EAP_rheology/cfgs/METO_GO/EXPREF/file_def_nemo-ice-BASIC-10D.xml
r14998 r15259 12 12 <file_definition type="one_file" name="@expname@_@freq@_@startdate@_@enddate@" sync_freq="1mo" min_digits="4"> 13 13 14 <file_group id="10d" output_freq="10d" output_level="10" enabled=".TRUE."> <!-- 10d files --> 14 <file_group id="10d" output_freq="10d" output_level="10" enabled=".TRUE."> <!-- 10d files --> 15 15 <file id="file21" name_suffix="_icemod" description="ice variables" enabled=".true." > 16 16 … … 25 25 <field field_ref="icevolu" name="sivolu" /> 26 26 <field field_ref="iceconc" name="siconc" /> 27 <field field_ref="iceconc" name="siconc_inst" operation="instant" /> 27 28 <field field_ref="icesalt" name="sisali" /> 28 29 <field field_ref="iceapnd" name="siapnd" /> … … 56 57 <field field_ref="intstrx" name="intstrx" /> 57 58 <field field_ref="intstry" name="intstry" /> 58 59 59 60 60 61 <!-- rheology --> 61 <field field_ref="icediv" name="sidive " />62 <field field_ref="iceshe" name="sishea " />62 <field field_ref="icediv" name="sidive_inst" operation="instant" /> 63 <field field_ref="iceshe" name="sishea_inst" operation="instant" /> 63 64 <field field_ref="icestr" name="sistre" /> 64 <field field_ref="normstr" name="normstr" /> 65 <field field_ref="sheastr" name="sheastr" /> 65 <field field_ref="icestr" name="sistre_inst" operation="instant" /> 66 <field field_ref="normstr" name="normstr_inst" operation="instant" /> 67 <field field_ref="sheastr" name="sheastr_inst" operation="instant" /> 66 68 <field field_ref="isig1" name="isig1" /> 67 69 <field field_ref="isig2" name="isig2" /> 68 70 <field field_ref="isig3" name="isig3" /> 69 71 <field field_ref="aniso" name="aniso" /> 72 <field field_ref="aniso" name="aniso_inst" operation="instant" /> 73 <field field_ref="icedlt" name="icedlt" /> 74 <field field_ref="sig1_pnorm" name="sig1_pnorm_inst" operation="instant" /> 75 <field field_ref="sig2_pnorm" name="sig2_pnorm_inst" operation="instant" /> 76 <field field_ref="yield11" name="yield11_inst" operation="instant" /> 77 <field field_ref="yield22" name="yield22_inst" operation="instant" /> 78 <field field_ref="yield12" name="yield12_inst" operation="instant" /> 79 <field field_ref="beta_evp" name="beta_evp" /> 80 <field field_ref="uice_cvg" name="uice_cvg" /> 81 70 82 71 72 83 <!-- heat fluxes --> 73 84 <field field_ref="qt_oce_ai" name="qt_oce_ai" /> -
NEMO/branches/UKMO/NEMO_4.0.4_EAP_rheology/cfgs/METO_GO/EXPREF/file_def_nemo-ice-BASIC-1M.xml
r14998 r15259 25 25 <field field_ref="icevolu" name="sivolu" /> 26 26 <field field_ref="iceconc" name="siconc" /> 27 <field field_ref="iceconc" name="siconc_inst" operation="instant" /> 27 28 <field field_ref="icesalt" name="sisali" /> 28 29 <field field_ref="iceapnd" name="siapnd" /> … … 59 60 60 61 <!-- rheology --> 61 <field field_ref="icediv" name="sidive " />62 <field field_ref="iceshe" name="sishea " />62 <field field_ref="icediv" name="sidive_inst" operation="instant" /> 63 <field field_ref="iceshe" name="sishea_inst" operation="instant" /> 63 64 <field field_ref="icestr" name="sistre" /> 64 <field field_ref="normstr" name="normstr" /> 65 <field field_ref="sheastr" name="sheastr" /> 65 <field field_ref="icestr" name="sistre_inst" operation="instant"/> 66 <field field_ref="normstr" name="normstr_inst" operation="instant"/> 67 <field field_ref="sheastr" name="sheastr_inst" operation="instant"/> 66 68 <field field_ref="isig1" name="isig1" /> 67 69 <field field_ref="isig2" name="isig2" /> 68 70 <field field_ref="isig3" name="isig3" /> 69 71 <field field_ref="aniso" name="aniso" /> 70 72 <field field_ref="aniso" name="aniso_inst" operation="instant" /> 73 <field field_ref="icedlt" name="icedlt" /> 74 <field field_ref="sig1_pnorm" name="sig1_pnorm_inst" operation="instant" /> 75 <field field_ref="sig2_pnorm" name="sig2_pnorm_inst" operation="instant" /> 76 <field field_ref="yield11" name="yield11_inst" operation="instant" /> 77 <field field_ref="yield22" name="yield22_inst" operation="instant" /> 78 <field field_ref="yield12" name="yield12_inst" operation="instant" /> 79 <field field_ref="beta_evp" name="beta_evp" /> 80 <field field_ref="uice_cvg" name="uice_cvg" /> 81 71 82 72 83 <!-- heat fluxes --> -
NEMO/branches/UKMO/NEMO_4.0.4_EAP_rheology/cfgs/METO_GO/EXPREF/file_def_nemo-ice-CMIP6-10D.xml
r14998 r15259 12 12 <file_definition type="one_file" name="@expname@_@freq@_@startdate@_@enddate@" sync_freq="1mo" min_digits="4"> 13 13 14 <file_group id="10d" output_freq="10d" output_level="10" enabled=".TRUE."> <!-- 10d files --> 14 <file_group id="10d" output_freq="10d" output_level="10" enabled=".TRUE."> <!-- 10d files --> 15 15 <file id="file21" name_suffix="_icemod" description="ice variables" enabled=".true." > 16 16 … … 25 25 <field field_ref="icevolu" name="sivolu" /> 26 26 <field field_ref="iceconc" name="siconc" /> 27 <field field_ref="iceconc" name="siconc_inst" operation="instant" /> 27 28 <field field_ref="icesalt" name="sisali" /> 28 29 <field field_ref="iceapnd" name="siapnd" /> … … 54 55 <field field_ref="utau_oi" name="utau_oi" /> 55 56 <field field_ref="vtau_oi" name="vtau_oi" /> 57 <field field_ref="intstrx" name="intstrx" /> 58 <field field_ref="intstry" name="intstry" /> 59 56 60 57 61 <!-- rheology --> 58 <field field_ref="icediv" name="sidive " />59 <field field_ref="iceshe" name="sishea " />62 <field field_ref="icediv" name="sidive_inst" operation="instant" /> 63 <field field_ref="iceshe" name="sishea_inst" operation="instant" /> 60 64 <field field_ref="icestr" name="sistre" /> 61 <field field_ref="normstr" name="normstr" /> 62 <field field_ref="sheastr" name="sheastr" /> 65 <field field_ref="icestr" name="sistre_inst" operation="instant" /> 66 <field field_ref="normstr" name="normstr_inst" operation="instant" /> 67 <field field_ref="sheastr" name="sheastr_inst" operation="instant" /> 63 68 <field field_ref="isig1" name="isig1" /> 64 69 <field field_ref="isig2" name="isig2" /> 65 70 <field field_ref="isig3" name="isig3" /> 66 71 <field field_ref="aniso" name="aniso" /> 72 <field field_ref="aniso" name="aniso_inst" operation="instant" /> 73 <field field_ref="icedlt" name="icedlt" /> 74 <field field_ref="sig1_pnorm" name="sig1_pnorm_inst" operation="instant" /> 75 <field field_ref="sig2_pnorm" name="sig2_pnorm_inst" operation="instant" /> 76 <field field_ref="yield11" name="yield11_inst" operation="instant" /> 77 <field field_ref="yield22" name="yield22_inst" operation="instant" /> 78 <field field_ref="yield12" name="yield12_inst" operation="instant" /> 79 <field field_ref="beta_evp" name="beta_evp" /> 80 <field field_ref="uice_cvg" name="uice_cvg" /> 81 82 67 83 <!-- heat fluxes --> 68 84 <field field_ref="qt_oce_ai" name="qt_oce_ai" /> -
NEMO/branches/UKMO/NEMO_4.0.4_EAP_rheology/cfgs/METO_GO/EXPREF/file_def_nemo-ice-CMIP6-1M.xml
r14998 r15259 25 25 <field field_ref="icevolu" name="sivolu" /> 26 26 <field field_ref="iceconc" name="siconc" /> 27 <field field_ref="iceconc" name="siconc_inst" operation="instant" /> 27 28 <field field_ref="icesalt" name="sisali" /> 28 29 <field field_ref="iceapnd" name="siapnd" /> … … 54 55 <field field_ref="utau_oi" name="utau_oi" /> 55 56 <field field_ref="vtau_oi" name="vtau_oi" /> 57 <field field_ref="intstrx" name="intstrx" /> 58 <field field_ref="intstry" name="intstry" /> 59 56 60 57 61 <!-- rheology --> 58 <field field_ref="icediv" name="sidive " />59 <field field_ref="iceshe" name="sishea " />62 <field field_ref="icediv" name="sidive_inst" operation="instant" /> 63 <field field_ref="iceshe" name="sishea_inst" operation="instant" /> 60 64 <field field_ref="icestr" name="sistre" /> 61 <field field_ref="normstr" name="normstr" /> 62 <field field_ref="sheastr" name="sheastr" /> 65 <field field_ref="icestr" name="sistre_inst" operation="instant"/> 66 <field field_ref="normstr" name="normstr_inst" operation="instant"/> 67 <field field_ref="sheastr" name="sheastr_inst" operation="instant"/> 63 68 <field field_ref="isig1" name="isig1" /> 64 69 <field field_ref="isig2" name="isig2" /> 65 70 <field field_ref="isig3" name="isig3" /> 66 71 <field field_ref="aniso" name="aniso" /> 72 <field field_ref="aniso" name="aniso_inst" operation="instant" /> 73 <field field_ref="icedlt" name="icedlt" /> 74 <field field_ref="sig1_pnorm" name="sig1_pnorm_inst" operation="instant" /> 75 <field field_ref="sig2_pnorm" name="sig2_pnorm_inst" operation="instant" /> 76 <field field_ref="yield11" name="yield11_inst" operation="instant" /> 77 <field field_ref="yield22" name="yield22_inst" operation="instant" /> 78 <field field_ref="yield12" name="yield12_inst" operation="instant" /> 79 <field field_ref="beta_evp" name="beta_evp" /> 80 <field field_ref="uice_cvg" name="uice_cvg" /> 81 82 67 83 <!-- heat fluxes --> 68 84 <field field_ref="qt_oce_ai" name="qt_oce_ai" /> -
NEMO/branches/UKMO/NEMO_4.0.4_EAP_rheology/src/ICE/icedyn_rdgrft.F90
r14998 r15259 187 187 ! closing_net = rate at which open water area is removed + ice area removed by ridging 188 188 ! - ice area added in new ridges 189 closing_net(ji) = rn_csrdg * 0.5_wp * ( zdelt(ji) - ABS( zdivu(ji) ) ) - MIN( zdivu(ji), 0._wp )190 189 IF( ln_rhg_EVP ) closing_net(ji) = rn_csrdg * 0.5_wp * ( zdelt(ji) - ABS( zdivu(ji) ) ) - MIN( zdivu(ji), 0._wp ) 191 190 IF( ln_rhg_EAP ) closing_net(ji) = zconv(ji) … … 773 772 ! !--------------------------------------------------! 774 773 strength(:,:) = rn_pstar * SUM( v_i(:,:,:), dim=3 ) * EXP( -rn_crhg * ( 1._wp - SUM( a_i(:,:,:), dim=3 ) ) ) 775 ! ismooth = 1 ! original code 776 ismooth = 0 ! try for EAP stability 774 ismooth = 1 ! original code 775 ! ismooth = 0 ! try for EAP stability 776 ! 777 777 ! !--------------------------------------------------! 778 778 ELSE ! Zero strength ! -
NEMO/branches/UKMO/NEMO_4.0.4_EAP_rheology/src/ICE/icedyn_rhg_eap.F90
r14998 r15259 799 799 800 800 ! convergence test 801 IF( nn_rhg_chkcvg == 2 ) CALL rhg_cvg ( kt, jter, nn_nevp, u_ice, v_ice, zu_ice, zv_ice )801 IF( nn_rhg_chkcvg == 2 ) CALL rhg_cvg_eap( kt, jter, nn_nevp, u_ice, v_ice, zu_ice, zv_ice ) 802 802 ! 803 803 ! ! ==================== ! … … 1044 1044 1045 1045 1046 SUBROUTINE rhg_cvg ( kt, kiter, kitermax, pu, pv, pub, pvb )1046 SUBROUTINE rhg_cvg_eap( kt, kiter, kitermax, pu, pv, pub, pvb ) 1047 1047 !!---------------------------------------------------------------------- 1048 !! *** ROUTINE rhg_cvg ***1048 !! *** ROUTINE rhg_cvg_eap *** 1049 1049 !! 1050 1050 !! ** Purpose : check convergence of oce rheology … … 1072 1072 IF( lwp ) THEN 1073 1073 WRITE(numout,*) 1074 WRITE(numout,*) 'rhg_cvg : ice rheology convergence control'1074 WRITE(numout,*) 'rhg_cvg_eap : ice rheology convergence control' 1075 1075 WRITE(numout,*) '~~~~~~~' 1076 1076 ENDIF … … 1111 1111 ENDIF 1112 1112 1113 END SUBROUTINE rhg_cvg 1113 END SUBROUTINE rhg_cvg_eap 1114 1114 1115 1115 -
NEMO/branches/UKMO/NEMO_4.0.4_EAP_rheology/src/ICE/iceupdate.F90
r14075 r15259 146 146 ! 147 147 ! the non-solar is simply derived from the solar flux 148 qns(ji,jj) = qt_oce_ai(ji,jj) - zqsr148 qns(ji,jj) = qt_oce_ai(ji,jj) - qsr(ji,jj) 149 149 150 150 ! Mass flux at the atm. surface
Note: See TracChangeset
for help on using the changeset viewer.
