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 6140 for trunk/NEMOGCM/CONFIG/SHARED/field_def.xml – NEMO

Ignore:
Timestamp:
2015-12-21T12:35:23+01:00 (8 years ago)
Author:
timgraham
Message:

Merge of branches/2015/dev_merge_2015 back into trunk. Merge excludes NEMOGCM/TOOLS/OBSTOOLS/ for now due to issues with the change of file type. Will sort these manually with further commits.

Branch merged as follows:
In the working copy of branch ran:
svn merge svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@HEAD
Small conflicts due to bug fixes applied to trunk since the dev_merge_2015 was copied. Bug fixes were applied to the branch as well so these were easy to resolve.
Branch committed at this stage

In working copy run:
svn switch svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk
to switch working copy

Run:
svn merge --reintegrate svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2015/dev_merge_2015
to merge the branch into the trunk and then commit - no conflicts at this stage.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEMOGCM/CONFIG/SHARED/field_def.xml

    r5930 r6140  
    4040         <field id="sstgrad2"     long_name="square of module of sst gradient"                                                        unit="degC2/m2" /> 
    4141         <field id="sbt"          long_name="sea bottom temperature"                                                                  unit="degC"     /> 
    42      
     42         <field id="sst_wl"       long_name="Delta SST of warm layer"                                                                 unit="degC"     /> 
     43         <field id="sst_cs"       long_name="Delta SST of cool skin"                                                                  unit="degC"     /> 
     44    <field id="temp_3m"      long_name="temperature at 3m"                                                                       unit="degC"     /> 
     45          
    4346         <field id="sss"          long_name="sea surface salinity"             standard_name="sea_surface_salinity"   unit="1e-3" /> 
    4447         <field id="sss2"         long_name="square of sea surface salinity"                                          unit="1e-6"  > sss * sss </field > 
     
    197200 
    198201         <!-- * variable related to ice shelf forcing * --> 
    199          <field id="fwfisf"       long_name="Ice shelf melting"                             unit="kg/m2/s"  /> 
    200          <field id="qisf"         long_name="Ice Shelf Heat Flux"                           unit="W/m2"     /> 
    201          <field id="isfgammat"    long_name="transfert coefficient for isf (temperature)"   unit="m/s"      /> 
    202          <field id="isfgammas"    long_name="transfert coefficient for isf (salinity)"      unit="m/s"      /> 
    203          <field id="stbl"         long_name="salinity in the Losh tbl"                      unit="1e-3"     /> 
    204          <field id="ttbl"         long_name="temperature in the Losh tbl"                   unit="degC"     /> 
     202         <field id="fwfisf"       long_name="Ice shelf melting"                                            unit="Kg/m2/s"  /> 
     203         <field id="qisf"         long_name="Ice Shelf Heat Flux"                                          unit="W/m2"     /> 
     204         <field id="isfgammat"    long_name="transfert coefficient for isf (temperature) "                 unit="m/s"      /> 
     205         <field id="isfgammas"    long_name="transfert coefficient for isf (salinity)    "                 unit="m/s"      /> 
     206    <field id="stbl"         long_name="salinity in the Losh tbl                    "                 unit="PSU"      /> 
     207    <field id="ttbl"         long_name="temperature in the Losh tbl                 "                 unit="C"        /> 
     208    <field id="utbl"         long_name="zonal current in the Losh tbl at T point    "                 unit="m/s"      /> 
     209    <field id="vtbl"         long_name="merid current in the Losh tbl at T point    "                 unit="m/s"      /> 
     210    <field id="thermald"     long_name="thermal driving of ice shelf melting        "                 unit="C"        /> 
     211    <field id="tfrz"         long_name="top freezing point (used to compute melt)   "                 unit="C"        /> 
     212    <field id="tinsitu"      long_name="top insitu temperature (used to cmpt melt)  "                 unit="C"        /> 
     213    <field id="ustar"        long_name="ustar at T point used in ice shelf melting  "                 unit="m/s"      /> 
    205214 
    206215         <!-- *_oce variables available with ln_blk_clio or ln_blk_core --> 
     
    672681      <field id="ketrd_hpg"     long_name="ke-trend: hydrostatic pressure gradient"          unit="W/s^3"                        /> 
    673682      <field id="ketrd_spg"     long_name="ke-trend: surface     pressure gradient"          unit="W/s^3"                        /> 
     683      <field id="ketrd_spgexp"  long_name="ke-trend: surface pressure gradient (explicit)"   unit="W/s^3"                        /> 
     684      <field id="ketrd_spgflt"  long_name="ke-trend: surface pressure gradient (filter)"     unit="W/s^3"                        /> 
     685      <field id="ssh_flt"       long_name="filtered contribution to ssh (dynspg_flt)"        unit="m"       grid_ref="grid_T_2D" /> 
    674686      <field id="w0"            long_name="surface vertical velocity"                        unit="m/s"     grid_ref="grid_T_2D" /> 
    675687      <field id="pw0_exp"       long_name="surface pressure flux due to ssh"                 unit="W/s^2"   grid_ref="grid_T_2D" /> 
     
    713725     <field id="utrd_hpg"       long_name="i-trend: hydrostatic pressure gradient"          unit="m/s^2"                        /> 
    714726     <field id="utrd_spg"       long_name="i-trend: surface     pressure gradient"          unit="m/s^2"                        /> 
     727     <field id="utrd_spgexp"    long_name="i-trend: surface pressure gradient (explicit)"   unit="m/s^2"                        /> 
     728     <field id="utrd_spgflt"    long_name="i-trend: surface pressure gradient (filtered)"   unit="m/s^2"                        /> 
    715729     <field id="utrd_keg"       long_name="i-trend: KE gradient         or hor. adv."       unit="m/s^2"                        /> 
    716730     <field id="utrd_rvo"       long_name="i-trend: relative  vorticity or metric term"     unit="m/s^2"                        /> 
     
    731745     <field id="vtrd_hpg"       long_name="j-trend: hydrostatic pressure gradient"          unit="m/s^2"                        /> 
    732746     <field id="vtrd_spg"       long_name="j-trend: surface     pressure gradient"          unit="m/s^2"                        /> 
     747     <field id="vtrd_spgexp"    long_name="j-trend: surface pressure gradient (explicit)"   unit="m/s^2"                        /> 
     748     <field id="vtrd_spgflt"    long_name="j-trend: surface pressure gradient (filtered)"   unit="m/s^2"                        /> 
    733749     <field id="vtrd_keg"       long_name="j-trend: KE gradient         or hor. adv."       unit="m/s^2"                        /> 
    734750     <field id="vtrd_rvo"       long_name="j-trend: relative  vorticity or metric term"     unit="m/s^2"                        /> 
     
    10321048      <field field_ref="woce"         name="wo"       long_name="ocean vertical velocity"  /> 
    10331049    </field_group> 
    1034      
     1050 
     1051       <!-- TMB diagnostic output --> 
     1052    <field_group  id="1h_grid_T_tmb" grid_ref="grid_T_2D" operation="instant"> 
     1053     <field id="top_temp"           name="votemper_top"  unit="degC"  /> 
     1054     <field id="mid_temp"           name="votemper_mid"  unit="degC"  /> 
     1055     <field id="bot_temp"           name="votemper_bot"  unit="degC"  /> 
     1056     <field id="top_sal"            name="vosaline_top"  unit="psu"   /> 
     1057     <field id="mid_sal"            name="vosaline_mid"  unit="psu"   /> 
     1058     <field id="bot_sal"            name="vosaline_bot"  unit="psu"   /> 
     1059     <field id="sshnmasked"         name="sossheig"      unit="m"     />  
     1060   </field_group> 
     1061    <field_group  id="1h_grid_U_tmb" grid_ref="grid_U_2D" operation="instant"> 
     1062     <field id="top_u"           name="vozocrtx_top"  unit="m/s"  /> 
     1063     <field id="mid_u"           name="vozocrtx_mid"  unit="m/s"  /> 
     1064     <field id="bot_u"           name="vozocrtx_bot"  unit="m/s"  /> 
     1065     <field id="baro_u"          name="vobtcrtx"      unit="m/s"  /> 
     1066   </field_group> 
     1067    <field_group  id="1h_grid_V_tmb" grid_ref="grid_V_2D" operation="instant"> 
     1068     <field id="top_v"           name="vomecrty_top"  unit="m/s"  /> 
     1069     <field id="mid_v"           name="vomecrty_mid"  unit="m/s"  /> 
     1070     <field id="bot_v"           name="vomecrty_bot"  unit="m/s"  /> 
     1071     <field id="baro_v"          name="vobtcrty"      unit="m/s"  /> 
     1072   </field_group> 
     1073       <!-- 25h diagnostic output --> 
     1074      <field_group id="25h_grid_T" grid_ref="grid_T_3D" operation="instant"> 
     1075   <field id="temper25h"         name="potential temperature 25h mean"    unit="degC" /> 
     1076   <field id="tempis25h"         name="insitu temperature 25h mean"    unit="degC" /> 
     1077   <field id="salin25h"          name="salinity 25h mean"                 unit="psu"  /> 
     1078   <field id="ssh25h"            name="sea surface height 25h mean"  grid_ref="grid_T_2D"      unit="m"    /> 
     1079      </field_group> 
     1080 
     1081      <field_group id="25h_grid_U" grid_ref="grid_U_3D" operation="instant" > 
     1082   <field id="vozocrtx25h"         name="i current 25h mean"    unit="m/s"   /> 
     1083      </field_group> 
     1084 
     1085      <field_group id="25h_grid_V" grid_ref="grid_V_3D" operation="instant"> 
     1086   <field id="vomecrty25h"         name="j current 25h mean"    unit="m/s"    /> 
     1087      </field_group> 
     1088 
     1089      <field_group id="25h_grid_W" grid_ref="grid_W_3D" operation="instant"> 
     1090   <field id="vomecrtz25h"         name="k current 25h mean"                 unit="m/s"      /> 
     1091   <field id="avt25h"             name="vertical diffusivity25h mean"       unit="m2/s" /> 
     1092   <field id="avm25h"              name="vertical viscosity 25h mean"        unit="m2/s" /> 
     1093   <field id="tke25h"              name="turbulent kinetic energy 25h mean" /> 
     1094   <field id="mxln25h"             name="mixing length 25h mean"             unit="m" /> 
     1095      </field_group> 
     1096 
     1097 
    10351098 
    10361099   </field_definition> 
Note: See TracChangeset for help on using the changeset viewer.