Changeset 13512 for NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3
- Timestamp:
- 2020-09-24T13:57:53+02:00 (4 years ago)
- Location:
- NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3
- Files:
-
- 5 edited
-
cfgs/SHARED/axis_def_nemo.xml (modified) (1 diff)
-
cfgs/SHARED/domain_def_nemo.xml (modified) (1 diff)
-
cfgs/SHARED/field_def_nemo-oce.xml (modified) (5 diffs)
-
cfgs/SHARED/grid_def_nemo.xml (modified) (1 diff)
-
src/OCE/IOM/iom.F90 (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/cfgs/SHARED/axis_def_nemo.xml
r12377 r13512 14 14 <axis id="depthv" long_name="Vertical V levels" unit="m" positive="down" /> 15 15 <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" /> 16 <axis id="depthf" long_name="Vertical F levels" unit="m" positive="down" /> 16 17 <axis id="nfloat" long_name="Float number" unit="-" /> 17 18 <axis id="icbcla" long_name="Iceberg class" unit="1" /> -
NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/cfgs/SHARED/domain_def_nemo.xml
r12276 r13512 181 181 <domain id="EqW" domain_ref="grid_W" > <zoom_domain id="EqW"/> </domain> 182 182 183 <!-- F grid --> 184 <domain id="grid_F" long_name="grid F"/> 185 183 186 <!-- zonal mean grid --> 184 187 <domain_group id="gznl"> -
NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/cfgs/SHARED/field_def_nemo-oce.xml
r13214 r13512 161 161 <field id="tosmint_pot" long_name="vertical integral of potential temperature times density" standard_name="integral_wrt_depth_of_product_of_density_and_potential_temperature" unit="(kg m2) degree_C" /> 162 162 163 163 <field id="ht" long_name="water column height at T point" standard_name="water_column_height_T" unit="m" /> 164 164 <field id="ssh" long_name="sea surface height" standard_name="sea_surface_height_above_geoid" unit="m" /> 165 165 <field id="ssh2" long_name="square of sea surface height" standard_name="square_of_sea_surface_height_above_geoid" unit="m2" > ssh * ssh </field > … … 182 182 <!-- Energy - horizontal divergence --> 183 183 <field id="eken" long_name="kinetic energy" standard_name="specific_kinetic_energy_of_sea_water" unit="m2/s2" grid_ref="grid_T_3D" /> 184 <field id="sKE" long_name="surface kinetic energy" standard_name="specific_kinetic_energy_of_sea_water" unit="m2/s2" grid_ref="grid_T_2D" /> 184 185 <field id="hdiv" long_name="horizontal divergence" unit="s-1" grid_ref="grid_T_3D" /> 185 186 … … 488 489 489 490 <field_group id="grid_U" grid_ref="grid_U_2D"> 491 <field id="hu" long_name="water column height at U point" standard_name="water_column_height_U" unit="m" /> 490 492 <field id="e2u" long_name="U-cell width in meridional direction" standard_name="cell_width" unit="m" /> 491 493 <field id="e3u" long_name="U-cell thickness" standard_name="cell_thickness" unit="m" grid_ref="grid_U_3D" /> … … 558 560 <field id="e3v" long_name="V-cell thickness" standard_name="cell_thickness" unit="m" grid_ref="grid_V_3D" /> 559 561 <field id="e3v_0" long_name="Initial V-cell thickness" standard_name="ref_cell_thickness" unit="m" grid_ref="grid_V_3D" /> 562 <field id="hv" long_name="water column height at V point" standard_name="water_column_height_V" unit="m" /> 560 563 <field id="vtau" long_name="Wind Stress along j-axis" standard_name="surface_downward_y_stress" unit="N/m2" /> 561 564 <field id="voce" long_name="ocean current along j-axis" standard_name="sea_water_y_velocity" unit="m/s" grid_ref="grid_V_3D" /> … … 658 661 659 662 <!-- F grid --> 663 <field_group id="grid_F" grid_ref="grid_F_2D"> 664 <field id="e3f" long_name="F-cell thickness" standard_name="cell_thickness" unit="m" grid_ref="grid_F_3D" /> 665 <field id="e3f_0" long_name="F-cell thickness" standard_name="cell_thickness" unit="m" grid_ref="grid_F_3D" /> 666 <field id="hf" long_name="water column height at F point" standard_name="water_column_height_F" unit="m" /> 667 <field id="sKEf" long_name="surface kinetic energy at F point" standard_name="specific_kinetic_energy_of_sea_water" unit="m2/s2" /> 668 <field id="relvor" long_name="relative vorticity" standard_name="relative_vorticity" unit="1/s" /> 669 <field id="plavor" long_name="planetary vorticity" standard_name="planetary_vorticity" unit="1/s" /> 670 <field id="relpotvor" long_name="relative potential vorticity" standard_name="relpot_vorticity" unit="1/m.s" /> 671 <field id="abspotvor" long_name="absolute potential vorticity" standard_name="abspot_vorticity" unit="1/m.s" /> 672 <field id="Ens" long_name="enstrophy" standard_name="enstrophy" unit="1/m2.s2" /> 673 </field_group> 674 660 675 <!-- AGRIF sponge --> 661 676 <field id="agrif_spf" long_name=" AGRIF f-sponge coefficient" unit=" " /> -
NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/cfgs/SHARED/grid_def_nemo.xml
r12377 r13512 53 53 <domain domain_ref="grid_W" /> 54 54 <axis axis_ref="depthw" /> 55 </grid> 56 <!-- --> 57 <grid id="grid_F_2D" > 58 <domain domain_ref="grid_F" /> 59 </grid> 60 <!-- --> 61 <grid id="grid_F_3D" > 62 <domain domain_ref="grid_F" /> 63 <axis axis_ref="depthf" /> 55 64 </grid> 56 65 <!-- --> -
NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/src/OCE/IOM/iom.F90
r13295 r13512 157 157 CALL set_grid( "V", glamv, gphiv, .FALSE., .FALSE. ) 158 158 CALL set_grid( "W", glamt, gphit, .FALSE., .FALSE. ) 159 CALL set_grid( "F", glamf, gphif, .FALSE., .FALSE. ) 159 160 CALL set_grid_znl( gphit ) 160 161 ! … … 163 164 CALL iom_set_domain_attr("grid_U", area = real( e1e2u(Nis0:Nie0, Njs0:Nje0), dp)) 164 165 CALL iom_set_domain_attr("grid_V", area = real( e1e2v(Nis0:Nie0, Njs0:Nje0), dp)) 165 CALL iom_set_domain_attr("grid_W", area = real( e1e2t(Nis0:Nie0, Njs0:Nje0), dp)) 166 CALL iom_set_domain_attr("grid_W", area = REAL( e1e2t(Nis0:Nie0, Njs0:Nje0), dp)) 167 CALL iom_set_domain_attr("grid_F", area = real( e1e2f(Nis0:Nie0, Njs0:Nje0), dp)) 166 168 CALL set_grid_bounds( "T", glamf, gphif, glamt, gphit ) 167 169 CALL set_grid_bounds( "U", glamv, gphiv, glamu, gphiu ) 168 170 CALL set_grid_bounds( "V", glamu, gphiu, glamv, gphiv ) 169 171 CALL set_grid_bounds( "W", glamf, gphif, glamt, gphit ) 172 CALL set_grid_bounds( "F", glamt, gphit, glamf, gphif ) 170 173 ENDIF 171 174 ENDIF … … 174 177 CALL dom_grid_crs ! Save the parent grid information & Switch to coarse grid domain 175 178 ! 176 CALL set_grid( "T", glamt_crs, gphit_crs, .FALSE., .FALSE. ) 177 CALL set_grid( "U", glamu_crs, gphiu_crs, .FALSE., .FALSE. ) 178 CALL set_grid( "V", glamv_crs, gphiv_crs, .FALSE., .FALSE. ) 179 CALL set_grid( "W", glamt_crs, gphit_crs, .FALSE., .FALSE. ) 179 CALL set_grid( "T", glamt_crs, gphit_crs, .FALSE., .FALSE. ) 180 CALL set_grid( "U", glamu_crs, gphiu_crs, .FALSE., .FALSE. ) 181 CALL set_grid( "V", glamv_crs, gphiv_crs, .FALSE., .FALSE. ) 182 CALL set_grid( "W", glamt_crs, gphit_crs, .FALSE., .FALSE. ) 180 183 CALL set_grid_znl( gphit_crs ) 181 184 ! … … 200 203 CALL iom_set_axis_attr( "depthv", paxis = gdept_1d ) 201 204 CALL iom_set_axis_attr( "depthw", paxis = gdepw_1d ) 205 CALL iom_set_axis_attr( "depthf", paxis = gdept_1d ) 202 206 203 207 ! ABL … … 221 225 CALL iom_set_axis_attr( "depthv", bounds=zw_bnds ) 222 226 CALL iom_set_axis_attr( "depthw", bounds=zt_bnds ) 227 CALL iom_set_axis_attr( "depthf", bounds=zw_bnds ) 223 228 224 229 ! ABL
Note: See TracChangeset
for help on using the changeset viewer.
