Changeset 5602 for branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/CONFIG/GYRE_PISCES

Timestamp:

2015-07-16T13:55:15+02:00 (9 years ago)

Author:

cbricaud

Message:

merge change from trunk rev 5003 to 5519 ( rev where branche 3.6_stable were created )

Location:

branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/CONFIG/GYRE_PISCES/EXP00

Files:

• iodef.xml (modified) (4 diffs)
• namelist_cfg (modified) (1 diff)

branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/iodef.xml

@@ -43 +43 @@
      <field field_ref="empmr"        name="sowaflup"  />
      <field field_ref="qsr"          name="soshfldo"  />
-          <field field_ref="saltflx"      name="sosfldow"  />
+      <field field_ref="saltflx"      name="sosfldow"  />
      <field field_ref="qt"           name="sohefldo"  />
      <field field_ref="mldr10_1"     name="somxl010"  />
      <field field_ref="mldkz5"       name="somixhgt"  />
-           <!-- variables available with MLE
-          <field field_ref="Lf_NHpf"    name="Lf_NHpf"  long_name="MLE:_Lf=NH/f"     />
-      -->
         </file>
    
@@ -55 +52 @@
           <field field_ref="uoce"         name="vozocrtx"  />
           <field field_ref="utau"         name="sozotaux"  />
-          <!-- variables available with MLE
-          <field field_ref="psiu_mle"     name="psiu_mle"  long_name="MLE_streamfunction_along_i-axis" />
-     -->
         </file>
    
@@ -63 +57 @@
           <field field_ref="voce"         name="vomecrty"  /> 
           <field field_ref="vtau"         name="sometauy"  /> 
-          <!-- variables available with MLE
-          <field field_ref="psiv_mle"     name="psiv_mle"  long_name="MLE_streamfunction_along_j-axis" />
-     -->
         </file>
    
@@ -132 +123 @@
     
    <axis_definition>  
-      <axis id="deptht" long_name="Vertical T levels" unit="m" positive="down" />
-      <axis id="depthu" long_name="Vertical U levels" unit="m" positive="down" />
-      <axis id="depthv" long_name="Vertical V levels" unit="m" positive="down" />
-      <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" />
-      <axis id="nfloat" long_name="Float number"      unit="-"  />
-      <axis id="icbcla" long_name="Iceberg class"     unit="-"  />
+      <axis id="deptht"  long_name="Vertical T levels"  unit="m" positive="down" />
+      <axis id="depthu"  long_name="Vertical U levels"  unit="m" positive="down" />
+      <axis id="depthv"  long_name="Vertical V levels"  unit="m" positive="down" />
+      <axis id="depthw"  long_name="Vertical W levels"  unit="m" positive="down" />
+      <axis id="nfloat"  long_name="Float number"       unit="1"                 />
+      <axis id="icbcla"  long_name="Iceberg class"      unit="1"                 />
+      <axis id="ncatice" long_name="Ice category"       unit="1"                 />
+      <axis id="iax_20C" long_name="20 degC isotherm"   unit="degC"              />
+      <axis id="iax_28C" long_name="28 degC isotherm"   unit="degC"              />
    </axis_definition> 
     

branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/namelist_cfg

@@ -155 +155 @@
 !-----------------------------------------------------------------------
    ln_tradmp   =  .false.  !  add a damping termn (T) or not (F)
-   nn_zdmp     =    1      !  vertical   shape =0    damping throughout the water column
-   nn_file     =    1      !  create a damping.coeff NetCDF file (=1) or not (=0)
 /
 !-----------------------------------------------------------------------