New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 12824 for NEMO/branches/UKMO – NEMO

Changeset 12824 for NEMO/branches/UKMO


Ignore:
Timestamp:
2020-04-28T15:54:51+02:00 (4 years ago)
Author:
cguiavarch
Message:

Updating xml files: removing 4strait grid as option local not available with XIOS2.0, updating ORCA2_ICE_PISCES to pass sette test

Location:
NEMO/branches/UKMO/NEMO_4.0.2_GO8_package/cfgs
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • NEMO/branches/UKMO/NEMO_4.0.2_GO8_package/cfgs/ORCA2_ICE_PISCES/EXPREF/file_def_nemo-ice.xml

    r12276 r12824  
    2828       <field field_ref="iceapnd"          name="siapnd" /> 
    2929       <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 
    3333       <!-- heat --> 
    3434       <field field_ref="icetemp"          name="sitemp" /> 

  • NEMO/branches/UKMO/NEMO_4.0.2_GO8_package/cfgs/ORCA2_ICE_PISCES/EXPREF/file_def_nemo-oce.xml

    r12276 r12824  
    1414        <file id="file11" name_suffix="_grid_T" description="ocean T grid variables" > 
    1515          <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"   /> 
    2020          <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> 
    2222          <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> 
    2424          <field field_ref="mldkz5"   /> 
    2525          <field field_ref="mldr10_1" /> 

  • NEMO/branches/UKMO/NEMO_4.0.2_GO8_package/cfgs/SHARED/field_def_nemo-ice.xml

    r12660 r12824  
    244244         <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> 
    245245         <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> 
    248246 
    249247         <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> 
    250248         <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> 
    253249 
    254250         <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> 
    255251         <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> 
    258252 
    259253         <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> 
    260254         <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> 
    263255 
    264256         <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> 
    265257         <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> 
    268258 
    269259         <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> 
    270260         <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> 
     261 
    277262 
    278263   </field_group> <!-- SBC_2D --> 

  • NEMO/branches/UKMO/NEMO_4.0.2_GO8_package/cfgs/SHARED/field_def_nemo-oce.xml

    r12660 r12824  
    2222        <field id="e3t_surf"     long_name="T-cell thickness"   field_ref="e3t"  standard_name="cell_thickness"     unit="m"   grid_ref="grid_T_surface_extract"/> 
    2323        <field id="e3t_0"        long_name="Initial T-cell thickness"            standard_name="ref_cell_thickness" unit="m"   grid_ref="grid_T_3D" /> 
    24          
     24        <field id="e3tb"         long_name="bottom T-cell thickness"             standard_name="bottom_cell_thickness" unit="m"   grid_ref="grid_T_2D"/> 
     25        <field id="e3t_300"      field_ref="e3t"                grid_ref="grid_T_zoom_300"       detect_missing_value="true" /> 
     26   <field id="e3t_vsum300"  field_ref="e3t_300"            grid_ref="grid_T_vsum"   detect_missing_value="true" /> 
     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        <field id="volcello"     long_name="Ocean Volume"                   standard_name="ocean_volume"   unit="m3"       grid_ref="grid_T_3D"/> 
     29 
    2530        <!-- EOS80 --> 
    2631        <field id="toce_pot"         long_name="potential temperature"           standard_name="sea_water_potential_temperature"      unit="degC"     grid_ref="grid_T_3D"/> 
    … …  
    637642         <field id="uoce_e3u_ave_vsum"    long_name="Vertical sum of u*e3u"                           field_ref="uoce_e3u_ave"         grid_ref="grid_U_vsum"     /> 
    638643         <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> 
    639          <field id="uocetr_strait"        long_name="Total transport across lines in i-direction"     field_ref="uocetr_vsum_section"  grid_ref="grid_U_4strait" /> 
    640          <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> 
    641644 
    642645         <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> 
    643646         <field id="voce_e3v_ave_vsum"    long_name="Vertical sum of v*e3v"                           field_ref="voce_e3v_ave"         grid_ref="grid_V_vsum"      /> 
    644647         <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> 
    645          <field id="vocetr_strait"        long_name="Total transport across lines in j-direction"     field_ref="vocetr_vsum_section"  grid_ref="grid_V_4strait"  /> 
    646          <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> 
    647  
    648          <field id="masstr_strait"        long_name="Sea water transport across line"                                                  grid_ref="grid_4strait"  > u_masstr_strait + v_masstr_strait </field> 
     648 
    649649      </field_group> 
    650650 

  • NEMO/branches/UKMO/NEMO_4.0.2_GO8_package/cfgs/SHARED/grid_def_nemo.xml

    r12660 r12824  
    2020         <domain domain_ref="grid_T" /> 
    2121         <axis axis_ref="deptht" /> 
    22        </grid> 
    23         <!--  --> 
    24        <grid id="grid_T_3DS" > 
    25          <domain domain_ref="grid_T" /> 
    26          <axis axis_ref="profsed" /> 
    2722       </grid> 
    2823        <!--  --> 
    … …  
    6762       </grid> 
    6863        <!--  --> 
    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  
    10564       <grid id="grid_ptr_W_GLO"> 
    10665         <domain  domain_ref="ptr" /> 
    … …  
    155114       </grid> 
    156115 
    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 grid 
    167  
    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  
    178116 
    179117       <grid id="grid_T_zoom_300"> 
    … …  
    191129         <scalar/> 
    192130       </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> 
    261131  
    262132      <!-- scalars --> 

  • NEMO/branches/UKMO/NEMO_4.0.2_GO8_package/cfgs/SHARED/namelist_ref

    r12660 r12824  
    739739&nameos        !   ocean Equation Of Seawater                           (default: NO selection) 
    740740!----------------------------------------------------------------------- 
    741    ln_teos10   = .false.         !  = Use TEOS-10 
     741   ln_teos10   = .true.         !  = Use TEOS-10 
    742742   ln_eos80    = .false.         !  = Use EOS80 
    743743   ln_seos     = .false.         !  = Use S-EOS (simplified Eq.) 
Note: See TracChangeset for help on using the changeset viewer.