Ignore:
Timestamp:
2019-10-23T17:49:24+02:00 (2 years ago)
Author:
acc
Message:

Branch 2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps. Begin merge prepartions by merging changes on the trunk since this branch creation. Do this in staged commits in case of issues. First stage is to merge and commit changes to cfgs directory (cd cfgs; svn merge -r 10721:11740 svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/NEMO/trunk/cfgs ./)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/cfgs/SHARED/field_def_nemo-oce.xml

    r10809 r11777  
    108108        <field id="tpt_dep"      long_name="T-point depth"                  standard_name="depth_below_geoid"   unit="m"   grid_ref="grid_T_3D" /> 
    109109        <field id="e3tdef"       long_name="T-cell thickness deformation"                                       unit="%"   grid_ref="grid_T_3D" /> 
     110 
     111        <!-- variables available with ln_diacfl=.true. --> 
     112        <field id="cfl_cu"       long_name="u-courant number"   unit="#" /> 
     113        <field id="cfl_cv"       long_name="v-courant number"   unit="#" /> 
     114        <field id="cfl_cw"       long_name="w-courant number"   unit="#" /> 
     115 
    110116      </field_group> <!-- grid_T --> 
    111117 
     
    337343   </field_group> 
    338344    
    339    <!-- scalar variables --> 
    340    <field_group id="SBC_0D"  grid_ref="grid_1point" > 
    341    </field_group> 
    342345 
    343346      </field_group> <!-- SBC --> 
     
    494497      <field id="ahmf_3d"      long_name=" 3D      f-eddy viscosity coefficient"   unit="m2/s or m4/s"  grid_ref="grid_T_3D"/> 
    495498 
    496       <field_group id="scalar"  grid_ref="grid_T_2D"  > 
     499      <field_group id="scalar"  grid_ref="grid_scalar"  > 
    497500         <!-- Need to have a salinity reference climatological file : sali_ref_clim_monthly --> 
    498501        <field id="voltot"     long_name="global total volume"                          standard_name="sea_water_volume"                               unit="m3"   /> 
     
    521524      </field_group> 
    522525       
    523       <!-- variables available with key_float --> 
     526      <!-- variables available with ln_floats --> 
    524527 
    525528      <field_group id="floatvar" grid_ref="grid_T_nfloat"  operation="instant" > 
Note: See TracChangeset for help on using the changeset viewer.