Changeset 12923
- Timestamp:
- 2020-05-14T13:26:25+02:00 (3 years ago)
- Location:
- NEMO/branches/UKMO/NEMO_4.0.2_GO8_package_ENHANCE-02_ISF_nemo
- Files:
-
- 13 edited
-
cfgs/METO_GO/EXPREF/file_def_nemo-ice-BASIC-10D.xml (modified) (1 diff)
-
cfgs/METO_GO/EXPREF/file_def_nemo-ice-BASIC-1M.xml (modified) (1 diff)
-
cfgs/METO_GO/EXPREF/file_def_nemo-ice-CMIP6-10D.xml (modified) (1 diff)
-
cfgs/METO_GO/EXPREF/file_def_nemo-ice-CMIP6-1M.xml (modified) (1 diff)
-
cfgs/ORCA2_ICE_PISCES/EXPREF/file_def_nemo-ice.xml (modified) (1 diff)
-
cfgs/ORCA2_ICE_PISCES/EXPREF/file_def_nemo-oce.xml (modified) (1 diff)
-
cfgs/SHARED/field_def_nemo-ice.xml (modified) (3 diffs)
-
cfgs/SHARED/field_def_nemo-oce.xml (modified) (2 diffs)
-
cfgs/SHARED/grid_def_nemo.xml (modified) (4 diffs)
-
cfgs/SHARED/namelist_ref (modified) (1 diff)
-
src/ICE/icewri.F90 (modified) (1 diff)
-
src/OCE/DOM/dommsk.F90 (modified) (1 diff)
-
src/OCE/ZDF/zdftke.F90 (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/UKMO/NEMO_4.0.2_GO8_package_ENHANCE-02_ISF_nemo/cfgs/METO_GO/EXPREF/file_def_nemo-ice-BASIC-10D.xml
r12574 r12923 86 86 <field field_ref="icetemp_cat" name="sitemcat"/> 87 87 <field field_ref="snwtemp_cat" name="sntemcat"/> 88 88 89 <!-- mass balance --> 90 <field field_ref="dmithd" name="sidmassth" /> 91 <field field_ref="dmidyn" name="sidmassdyn" /> 92 <field field_ref="dmiopw" name="sidmassgrowthwat" /> 93 <field field_ref="dmibog" name="sidmassgrowthbot" /> 94 <field field_ref="dmisni" name="sidmasssi" /> 95 <field field_ref="dmisub" name="sidmassevapsubl" /> 96 <field field_ref="dmisum" name="sidmassmelttop" /> 97 <field field_ref="dmibom" name="sidmassmeltbot" /> 98 <field field_ref="dmilam" name="sidmassmeltlat" /> 99 <field field_ref="dmsspr" name="sndmasssnf" /> 100 <field field_ref="dmsmel" name="sndmassmelt" /> 101 <field field_ref="dmssub" name="sndmasssubl" /> 102 <field field_ref="dmsdyn" name="sndmassdyn" /> 103 <field field_ref="dmsssi" name="sndmasssi" /> 104 89 105 </file> 90 106 -
NEMO/branches/UKMO/NEMO_4.0.2_GO8_package_ENHANCE-02_ISF_nemo/cfgs/METO_GO/EXPREF/file_def_nemo-ice-BASIC-1M.xml
r12574 r12923 86 86 <field field_ref="icetemp_cat" name="sitemcat"/> 87 87 <field field_ref="snwtemp_cat" name="sntemcat"/> 88 88 89 <!-- mass balance --> 90 <field field_ref="dmithd" name="sidmassth" /> 91 <field field_ref="dmidyn" name="sidmassdyn" /> 92 <field field_ref="dmiopw" name="sidmassgrowthwat" /> 93 <field field_ref="dmibog" name="sidmassgrowthbot" /> 94 <field field_ref="dmisni" name="sidmasssi" /> 95 <field field_ref="dmisub" name="sidmassevapsubl" /> 96 <field field_ref="dmisum" name="sidmassmelttop" /> 97 <field field_ref="dmibom" name="sidmassmeltbot" /> 98 <field field_ref="dmilam" name="sidmassmeltlat" /> 99 <field field_ref="dmsspr" name="sndmasssnf" /> 100 <field field_ref="dmsmel" name="sndmassmelt" /> 101 <field field_ref="dmssub" name="sndmasssubl" /> 102 <field field_ref="dmsdyn" name="sndmassdyn" /> 103 <field field_ref="dmsssi" name="sndmasssi" /> 104 89 105 </file> 90 106 -
NEMO/branches/UKMO/NEMO_4.0.2_GO8_package_ENHANCE-02_ISF_nemo/cfgs/METO_GO/EXPREF/file_def_nemo-ice-CMIP6-10D.xml
r12574 r12923 87 87 <field field_ref="snwtemp_cat" name="sntemcat"/> 88 88 89 <!-- mass balance --> 90 <field field_ref="dmithd" name="sidmassth" /> 91 <field field_ref="dmidyn" name="sidmassdyn" /> 92 <field field_ref="dmiopw" name="sidmassgrowthwat" /> 93 <field field_ref="dmibog" name="sidmassgrowthbot" /> 94 <field field_ref="dmisni" name="sidmasssi" /> 95 <field field_ref="dmisub" name="sidmassevapsubl" /> 96 <field field_ref="dmisum" name="sidmassmelttop" /> 97 <field field_ref="dmibom" name="sidmassmeltbot" /> 98 <field field_ref="dmilam" name="sidmassmeltlat" /> 99 <field field_ref="dmsspr" name="sndmasssnf" /> 100 <field field_ref="dmsmel" name="sndmassmelt" /> 101 <field field_ref="dmssub" name="sndmasssubl" /> 102 <field field_ref="dmsdyn" name="sndmassdyn" /> 103 <field field_ref="dmsssi" name="sndmasssi" /> 104 89 105 </file> 90 106 -
NEMO/branches/UKMO/NEMO_4.0.2_GO8_package_ENHANCE-02_ISF_nemo/cfgs/METO_GO/EXPREF/file_def_nemo-ice-CMIP6-1M.xml
r12574 r12923 87 87 <field field_ref="snwtemp_cat" name="sntemcat"/> 88 88 89 <!-- mass balance --> 90 <field field_ref="dmithd" name="sidmassth" /> 91 <field field_ref="dmidyn" name="sidmassdyn" /> 92 <field field_ref="dmiopw" name="sidmassgrowthwat" /> 93 <field field_ref="dmibog" name="sidmassgrowthbot" /> 94 <field field_ref="dmisni" name="sidmasssi" /> 95 <field field_ref="dmisub" name="sidmassevapsubl" /> 96 <field field_ref="dmisum" name="sidmassmelttop" /> 97 <field field_ref="dmibom" name="sidmassmeltbot" /> 98 <field field_ref="dmilam" name="sidmassmeltlat" /> 99 <field field_ref="dmsspr" name="sndmasssnf" /> 100 <field field_ref="dmsmel" name="sndmassmelt" /> 101 <field field_ref="dmssub" name="sndmasssubl" /> 102 <field field_ref="dmsdyn" name="sndmassdyn" /> 103 <field field_ref="dmsssi" name="sndmasssi" /> 104 89 105 </file> 90 106 -
NEMO/branches/UKMO/NEMO_4.0.2_GO8_package_ENHANCE-02_ISF_nemo/cfgs/ORCA2_ICE_PISCES/EXPREF/file_def_nemo-ice.xml
r12276 r12923 28 28 <field field_ref="iceapnd" name="siapnd" /> 29 29 <field field_ref="icevpnd" name="sivpnd" /> 30 <field field_ref="sst_m " name="sst_m" />31 <field field_ref="sss_m " name="sss_m" />32 30 <field field_ref="sst_m_pot" name="sst_m_pot" /> 31 <field field_ref="sss_m_abs" name="sss_m_abs" /> 32 33 33 <!-- heat --> 34 34 <field field_ref="icetemp" name="sitemp" /> -
NEMO/branches/UKMO/NEMO_4.0.2_GO8_package_ENHANCE-02_ISF_nemo/cfgs/ORCA2_ICE_PISCES/EXPREF/file_def_nemo-oce.xml
r12276 r12923 14 14 <file id="file11" name_suffix="_grid_T" description="ocean T grid variables" > 15 15 <field field_ref="e3t" /> 16 <field field_ref="toce " name="thetao" operation="instant" freq_op="5d" > @toce_e3t / @e3t </field>17 <field field_ref="soce " name="so" operation="instant" freq_op="5d" > @soce_e3t / @e3t </field>18 <field field_ref="sst " name="tos" />19 <field field_ref="sss " name="sos" />16 <field field_ref="toce_con" name="thetao_con" operation="instant" freq_op="5d" > @toce_con_e3t / @e3t </field> 17 <field field_ref="soce_abs" name="so_abs" operation="instant" freq_op="5d" > @soce_abs_e3t / @e3t </field> 18 <field field_ref="sst_con" name="tos_con" /> 19 <field field_ref="sss_abs" name="sos_abs" /> 20 20 <field field_ref="ssh" name="zos" /> 21 <field field_ref="sst " name="tosstd" long_name="sea surface temperature standard deviation" operation="instant" freq_op="5d" > sqrt( @sst2 - @sst * @sst) </field>21 <field field_ref="sst_con" name="tosstd_con" long_name="sea surface temperature standard deviation" operation="instant" freq_op="5d" > sqrt( @sst2_con - @sst_con * @sst_con ) </field> 22 22 <field field_ref="ssh" name="zosstd" long_name="sea surface height above geoid standard deviation" operation="instant" freq_op="5d" > sqrt( @ssh2 - @ssh * @ssh ) </field> 23 <field field_ref="sst " name="sstdcy" long_name="amplitude of sst diurnal cycle" operation="average" freq_op="1d" > @sstmax - @sstmin </field>23 <field field_ref="sst_con" name="sstdcy_con" long_name="amplitude of sst diurnal cycle" operation="average" freq_op="1d" > @sstmax_con - @sstmin_con </field> 24 24 <field field_ref="mldkz5" /> 25 25 <field field_ref="mldr10_1" /> -
NEMO/branches/UKMO/NEMO_4.0.2_GO8_package_ENHANCE-02_ISF_nemo/cfgs/SHARED/field_def_nemo-ice.xml
r12660 r12923 213 213 <field id="dmisum" long_name="sea-ice mass change through surface melting" standard_name="tendency_of_sea_ice_amount_due_to_surface_melting" unit="kg/m2/s" /> 214 214 <field id="dmibom" long_name="sea-ice mass change through bottom melting" standard_name="tendency_of_sea_ice_amount_due_to_basal_melting" unit="kg/m2/s" /> 215 <field id="dmilam" long_name="sea-ice mass change through lateral melting" standard_name="tendency_of_sea_ice_amount_due_to_lateral_melting" unit="kg/m2/s" /> 215 216 <field id="dmsspr" long_name="snow mass change through snow fall" standard_name="snowfall_flux" unit="kg/m2/s" /> 216 217 <field id="dmsmel" long_name="snow mass change through melt" standard_name="surface_snow_melt_flux" unit="kg/m2/s" /> … … 244 245 <field id="xmtrpice_ave" long_name="Monthly average of x-ice mass transport" field_ref="xmtrpice" grid_ref="grid_U_2D" freq_op="1mo" freq_offset="_reset_" > @xmtrpice </field> 245 246 <field id="xmtrpice_section" grid_ref="grid_U_scalar" > xmtrpice_ave </field> 246 <field id="xmtrpice_strait" field_ref="xmtrpice_section" grid_ref="grid_U_4strait_ice" />247 <field id="xstrait_mifl" field_ref="xmtrpice_strait" grid_ref="grid_U_4strait_ice_hsum" unit="kg/s" detect_missing_value="true" > this * maskMFO_u_ice </field>248 247 249 248 <field id="ymtrpice_ave" long_name="Monthly average of y-ice mass transport" field_ref="ymtrpice" grid_ref="grid_V_2D" freq_op="1mo" freq_offset="_reset_" > @ymtrpice </field> 250 249 <field id="ymtrpice_section" grid_ref="grid_V_scalar" > ymtrpice_ave </field> 251 <field id="ymtrpice_strait" field_ref="ymtrpice_section" grid_ref="grid_V_4strait_ice" />252 <field id="ystrait_mifl" field_ref="ymtrpice_strait" grid_ref="grid_V_4strait_ice_hsum" unit="kg/s" detect_missing_value="true" > this * maskMFO_v_ice </field>253 250 254 251 <field id="xmtrpsnw_ave" long_name="Monthly average of x-snow mass transport" field_ref="xmtrpsnw" grid_ref="grid_U_2D" freq_op="1mo" freq_offset="_reset_" > @xmtrpsnw </field> 255 252 <field id="xmtrpsnw_section" grid_ref="grid_U_scalar" > xmtrpsnw_ave </field> 256 <field id="xmtrpsnw_strait" field_ref="xmtrpsnw_section" grid_ref="grid_U_4strait_ice" />257 <field id="xstrait_msfl" field_ref="xmtrpsnw_strait" grid_ref="grid_U_4strait_ice_hsum" unit="kg/s" detect_missing_value="true" > this * maskMFO_u_ice </field>258 253 259 254 <field id="ymtrpsnw_ave" long_name="Monthly average of y-snow mass transport" field_ref="ymtrpsnw" grid_ref="grid_V_2D" freq_op="1mo" freq_offset="_reset_" > @ymtrpsnw </field> 260 255 <field id="ymtrpsnw_section" grid_ref="grid_V_scalar" > ymtrpsnw_ave </field> 261 <field id="ymtrpsnw_strait" field_ref="ymtrpsnw_section" grid_ref="grid_V_4strait_ice" />262 <field id="ystrait_msfl" field_ref="ymtrpsnw_strait" grid_ref="grid_V_4strait_ice_hsum" unit="kg/s" detect_missing_value="true" > this * maskMFO_v_ice </field>263 256 264 257 <field id="xatrp_ave" long_name="Monthly average of x-ice area transport" field_ref="xatrp" grid_ref="grid_U_2D" freq_op="1mo" freq_offset="_reset_" > @xatrp </field> 265 258 <field id="xatrp_section" grid_ref="grid_U_scalar" > xatrp_ave </field> 266 <field id="xatrp_strait" field_ref="xatrp_section" grid_ref="grid_U_4strait_ice" />267 <field id="xstrait_arfl" field_ref="xatrp_strait" grid_ref="grid_U_4strait_ice_hsum" unit="kg/s" detect_missing_value="true" > this * maskMFO_u_ice </field>268 259 269 260 <field id="yatrp_ave" long_name="Monthly average of y-ice area transport" field_ref="yatrp" grid_ref="grid_V_2D" freq_op="1mo" freq_offset="_reset_" > @yatrp </field> 270 261 <field id="yatrp_section" grid_ref="grid_V_scalar" > yatrp_ave </field> 271 <field id="yatrp_strait" field_ref="yatrp_section" grid_ref="grid_V_4strait_ice" /> 272 <field id="ystrait_arfl" field_ref="yatrp_strait" grid_ref="grid_V_4strait_ice_hsum" unit="m2/s" detect_missing_value="true" > this * maskMFO_v_ice </field> 273 274 <field id="strait_mifl" long_name="Sea ice mass flux through straits" standard_name="sea_ice_mass_transport_across_line" unit="kg/s" freq_op="1mo" grid_ref="grid_4strait_ice" > xstrait_mifl + ystrait_mifl </field> 275 <field id="strait_msfl" long_name="Snow mass flux through straits" standard_name="snow_mass_transport_across_line" unit="kg/s" freq_op="1mo" grid_ref="grid_4strait_ice" > xstrait_msfl + ystrait_msfl </field> 276 <field id="strait_arfl" long_name="Sea ice area flux through straits" standard_name="sea_area_mass_transport_across_line" unit="m2/s" freq_op="1mo" grid_ref="grid_4strait_ice" > xstrait_arfl + ystrait_arfl </field> 262 277 263 278 264 </field_group> <!-- SBC_2D --> … … 565 551 <field field_ref="dmisum" name="sidmassmelttop" /> 566 552 <field field_ref="dmibom" name="sidmassmeltbot" /> 553 <field field_ref="dmilam" name="sidmassmeltlat" /> 567 554 <field field_ref="dmsspr" name="sndmasssnf" /> 568 555 <field field_ref="dmsmel" name="sndmassmelt" /> -
NEMO/branches/UKMO/NEMO_4.0.2_GO8_package_ENHANCE-02_ISF_nemo/cfgs/SHARED/field_def_nemo-oce.xml
r12767 r12923 27 27 <field id="masscello" long_name="Sea Water Mass per unit area" standard_name="sea_water_mass_per_unit_area" unit="kg/m2" grid_ref="grid_T_3D"/> 28 28 <field id="volcello" long_name="Ocean Volume" standard_name="ocean_volume" unit="m3" grid_ref="grid_T_3D"/> 29 29 <field id="e3tb" long_name="bottom T-cell thickness" standard_name="bottom_cell_thickness" unit="m" grid_ref="grid_T_2D"/> 30 <field id="e3t_300" field_ref="e3t" grid_ref="grid_T_zoom_300" detect_missing_value="true" /> 31 <field id="e3t_vsum300" field_ref="e3t_300" grid_ref="grid_T_vsum" detect_missing_value="true" /> 32 <field id="masscello" long_name="Sea Water Mass per unit area" standard_name="sea_water_mass_per_unit_area" unit="kg/m2" grid_ref="grid_T_3D"/> 33 <field id="volcello" long_name="Ocean Volume" standard_name="ocean_volume" unit="m3" grid_ref="grid_T_3D"/> 34 30 35 <!-- EOS80 --> 31 36 <field id="toce_pot" long_name="potential temperature" standard_name="sea_water_potential_temperature" unit="degC" grid_ref="grid_T_3D"/> … … 655 660 <field id="uoce_e3u_ave_vsum" long_name="Vertical sum of u*e3u" field_ref="uoce_e3u_ave" grid_ref="grid_U_vsum" /> 656 661 <field id="uocetr_vsum_section" long_name="Total 2D transport in i-direction" field_ref="uoce_e3u_ave_vsum" grid_ref="grid_U_scalar" detect_missing_value="true"> this * e2u </field> 657 <field id="uocetr_strait" long_name="Total transport across lines in i-direction" field_ref="uocetr_vsum_section" grid_ref="grid_U_4strait" />658 <field id="u_masstr_strait" long_name="Sea water transport across line in i-direction" field_ref="uocetr_strait" grid_ref="grid_U_4strait_hsum" unit="kg/s"> this * maskMFO_u * $rau0 </field>659 662 660 663 <field id="voce_e3v_ave" long_name="Monthly average of v*e3v" field_ref="voce_e3v" freq_op="1mo" freq_offset="_reset_" > @voce_e3v </field> 661 664 <field id="voce_e3v_ave_vsum" long_name="Vertical sum of v*e3v" field_ref="voce_e3v_ave" grid_ref="grid_V_vsum" /> 662 665 <field id="vocetr_vsum_section" long_name="Total 2D transport of in j-direction" field_ref="voce_e3v_ave_vsum" grid_ref="grid_V_scalar" detect_missing_value="true"> this * e1v </field> 663 <field id="vocetr_strait" long_name="Total transport across lines in j-direction" field_ref="vocetr_vsum_section" grid_ref="grid_V_4strait" /> 664 <field id="v_masstr_strait" long_name="Sea water transport across line in j-direction" field_ref="vocetr_strait" grid_ref="grid_V_4strait_hsum" unit="kg/s"> this * maskMFO_v * $rau0 </field> 665 666 <field id="masstr_strait" long_name="Sea water transport across line" grid_ref="grid_4strait" > u_masstr_strait + v_masstr_strait </field> 666 667 667 </field_group> 668 668 -
NEMO/branches/UKMO/NEMO_4.0.2_GO8_package_ENHANCE-02_ISF_nemo/cfgs/SHARED/grid_def_nemo.xml
r12660 r12923 20 20 <domain domain_ref="grid_T" /> 21 21 <axis axis_ref="deptht" /> 22 </grid>23 <!-- -->24 <grid id="grid_T_3DS" >25 <domain domain_ref="grid_T" />26 <axis axis_ref="profsed" />27 22 </grid> 28 23 <!-- --> … … 67 62 </grid> 68 63 <!-- --> 69 70 71 <grid id="grid_znl_T_2D">72 <domain domain_ref="gznl" />73 <axis axis_ref="basin" />74 </grid>75 76 <grid id="grid_znl_T_3D">77 <domain domain_ref="gznl" />78 <axis axis_ref="deptht" />79 <axis axis_ref="basin" />80 </grid>81 82 <grid id="grid_znl_W_3D">83 <domain domain_ref="gznl" />84 <axis axis_ref="depthw" />85 <axis axis_ref="basin" />86 </grid>87 88 <grid id="grid_ptr_T_2D">89 <domain domain_ref="ptr" />90 <axis axis_ref="basin" />91 </grid>92 93 <grid id="grid_ptr_T_3D">94 <domain domain_ref="ptr" />95 <axis axis_ref="deptht" />96 <axis axis_ref="basin" />97 </grid>98 99 <grid id="grid_ptr_W_3D">100 <domain domain_ref="ptr" />101 <axis axis_ref="depthw" />102 <axis axis_ref="basin" />103 </grid>104 105 64 <grid id="grid_ptr_W_GLO"> 106 65 <domain domain_ref="ptr" /> … … 155 114 </grid> 156 115 157 <!-- for ORCA2 grid -->158 <grid id="cumul_U">159 <axis axis_ref="cumul_U" n_glo="182" >160 <reduce_domain local="true" operation="sum" direction="jDir" />161 <reduce_axis operation="sum" />162 </axis>163 <axis axis_ref="depthu" />164 </grid>165 166 <!-- for eORCA1 grid167 168 <grid id="cumul_U">169 <axis axis_ref="cumul_U" n_glo="362" >170 <reduce_domain local="true" operation="sum" direction="jDir" />171 <reduce_axis operation="sum" />172 </axis>173 <axis axis_ref="depthu" />174 </grid>175 176 -->177 178 116 179 117 <grid id="grid_T_zoom_300"> … … 191 129 <scalar/> 192 130 </grid> 193 194 <grid id="grid_U_4strait">195 <domain domain_ref="grid_U" />196 <axis axis_ref="section">197 <duplicate_scalar/>198 </axis>199 </grid>200 201 <grid id="grid_V_4strait">202 <domain domain_ref="grid_V" />203 <axis axis_ref="section">204 <duplicate_scalar/>205 </axis>206 </grid>207 208 <grid id="grid_U_4strait_hsum">209 <scalar >210 <reduce_domain operation="sum" local="true"/>211 <reduce_scalar operation="sum" />212 </scalar>213 <axis axis_ref="section"/>214 </grid>215 216 <grid id="grid_V_4strait_hsum">217 <scalar >218 <reduce_domain operation="sum" local="true"/>219 <reduce_scalar operation="sum" />220 </scalar>221 <axis axis_ref="section"/>222 </grid>223 224 <grid id="grid_4strait">225 <axis axis_ref="section"/>226 </grid>227 228 <grid id="grid_U_4strait_ice">229 <domain domain_ref="grid_U" />230 <axis axis_ref="section_ice">231 <duplicate_scalar/>232 </axis>233 </grid>234 235 <grid id="grid_V_4strait_ice">236 <domain domain_ref="grid_V" />237 <axis axis_ref="section_ice">238 <duplicate_scalar/>239 </axis>240 </grid>241 242 <grid id="grid_U_4strait_ice_hsum">243 <scalar >244 <reduce_domain operation="sum" local="true"/>245 <reduce_scalar operation="sum" />246 </scalar>247 <axis axis_ref="section_ice"/>248 </grid>249 250 <grid id="grid_V_4strait_ice_hsum">251 <scalar >252 <reduce_domain operation="sum" local="true"/>253 <reduce_scalar operation="sum" />254 </scalar>255 <axis axis_ref="section_ice"/>256 </grid>257 258 <grid id="grid_4strait_ice">259 <axis axis_ref="section_ice"/>260 </grid>261 131 262 132 <!-- scalars --> -
NEMO/branches/UKMO/NEMO_4.0.2_GO8_package_ENHANCE-02_ISF_nemo/cfgs/SHARED/namelist_ref
r12721 r12923 759 759 &nameos ! ocean Equation Of Seawater (default: NO selection) 760 760 !----------------------------------------------------------------------- 761 ln_teos10 = . false. ! = Use TEOS-10761 ln_teos10 = .true. ! = Use TEOS-10 762 762 ln_eos80 = .false. ! = Use EOS80 763 763 ln_seos = .false. ! = Use S-EOS (simplified Eq.) -
NEMO/branches/UKMO/NEMO_4.0.2_GO8_package_ENHANCE-02_ISF_nemo/src/ICE/icewri.F90
r12660 r12923 177 177 IF( iom_use('dmisum') ) CALL iom_put( 'dmisum', - wfx_sum ) ! Sea-ice mass change through surface melting 178 178 IF( iom_use('dmibom') ) CALL iom_put( 'dmibom', - wfx_bom ) ! Sea-ice mass change through bottom melting 179 IF( iom_use('dmilam') ) CALL iom_put( 'dmilam', - wfx_lam ) ! Sea-ice mass change through lateral melting 179 180 IF( iom_use('dmtsub') ) CALL iom_put( 'dmtsub', - wfx_sub ) ! Sea-ice mass change through evaporation and sublimation 180 181 IF( iom_use('dmssub') ) CALL iom_put( 'dmssub', - wfx_snw_sub ) ! Snow mass change through sublimation -
NEMO/branches/UKMO/NEMO_4.0.2_GO8_package_ENHANCE-02_ISF_nemo/src/OCE/DOM/dommsk.F90
r12747 r12923 95 95 INTEGER :: ios 96 96 !! 97 INTEGER :: inum ! logical unit for shlat2d98 97 REAL(wp) :: zshlat !: locally modified shlat for some strait 99 98 REAL(wp), ALLOCATABLE, DIMENSION(:,:) :: zshlat2d -
NEMO/branches/UKMO/NEMO_4.0.2_GO8_package_ENHANCE-02_ISF_nemo/src/OCE/ZDF/zdftke.F90
r12658 r12923 220 220 END DO 221 221 END DO 222 IF ( ln_isfcav ) THEN223 DO jj = 2, jpjm1 ! en(mikt(ji,jj)) = rn_emin224 DO ji = fs_2, fs_jpim1 ! vector opt.225 en(ji,jj,mikt(ji,jj)) = rn_emin * tmask(ji,jj,1)226 END DO227 END DO228 ENDIF229 222 ! 230 223 ! !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< … … 617 610 DO jj = 2, jpjm1 618 611 DO ji = fs_2, fs_jpim1 ! vector opt. 619 p_avt(ji,jj,jk) = MAX( apdlr(ji,jj,jk) * p_avt(ji,jj,jk), avtb_2d(ji,jj) * avtb(jk) ) * tmask(ji,jj,jk)612 p_avt(ji,jj,jk) = MAX( apdlr(ji,jj,jk) * p_avt(ji,jj,jk), avtb_2d(ji,jj) * avtb(jk) ) * wmask(ji,jj,jk) 620 613 END DO 621 614 END DO
Note: See TracChangeset
for help on using the changeset viewer.
