Changeset 12229 for NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs

Timestamp:

2019-12-12T17:41:04+01:00 (4 years ago)

Author:

acc

Message:

2019/dev_r11943_MERGE_2019: Merge in dev_AGRIF-01-05_merged. Fully SETTE tested

Location:

NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SHARED

Files:

• axis_def_nemo.xml (modified) (1 diff)
• field_def_nemo-oce.xml (modified) (6 diffs)
• namelist_ref (modified) (1 diff)

NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SHARED/axis_def_nemo.xml

@@ -22 +22 @@
       <axis id="basin"   long_name="Sub-basin mask (1=Global 2=Atlantic 3=Indo-Pacific 4=Indian, 5=Pacific)"  unit="1" />
       <axis id="nstrait" long_name="Number of straits" unit="1" />
+      <!-- ABL vertical axis definition -->
+      <axis id="ght_abl" long_name="ABL Vertical T levels" unit="m" positive="up"   />
+      <axis id="ghw_abl" long_name="ABL Vertical W levels" unit="m" positive="up"   />
       <axis id="section"     n_glo="16" />
       <axis id="section_ice" n_glo="4" />

NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SHARED/field_def_nemo-oce.xml

@@ -127 +127 @@
         <field id="toce_vmean300"     field_ref="toce_e3t_vsum300"  unit="degree_C"     grid_ref="grid_T_vsum"  detect_missing_value="true" > toce_e3t_vsum300/e3t_vsum300 </field>
 
+        <!-- AGRIF sponge -->
+        <field id="agrif_spt"         long_name=" AGRIF t-sponge coefficient"   unit=" " />
 
         <!-- t-eddy viscosity coefficients (ldfdyn) -->
@@ -420 +422 @@
    </field_group>
    
-   <!-- scalar variables -->
-   <field_group id="SBC_0D"  grid_ref="grid_1point" >
-   </field_group>
 
       </field_group> <!-- SBC -->
@@ -492 +491 @@
         <field id="uoces"        long_name="ocean transport along i-axis times salinity (CRS)"                                                  unit="1e-3*m/s"   grid_ref="grid_U_3D" />
         <field id="ssuww"        long_name="ocean surface wind work along i-axis"                   standard_name="surface_x_wind_work"         unit="N/m*s"                            > utau * ssu </field>
-
+        <!-- AGRIF sponge -->
+        <field id="agrif_spu"    long_name=" AGRIF u-sponge coefficient"   unit=" " />
         <!-- u-eddy diffusivity coefficients (available if ln_traldf_OFF=F) -->
         <field id="ahtu_2d"      long_name=" surface u-eddy diffusivity coefficient"   unit="m2/s or m4/s" />
@@ -550 +550 @@
         <field id="voces"        long_name="ocean transport along j-axis times salinity (CRS)"                                                  unit="1e-3*m/s"   grid_ref="grid_V_3D" />
         <field id="ssvww"        long_name="ocean surface wind work along j-axis"                   standard_name="surface_y_wind_work"         unit="N/m*s"                            > vtau * ssv </field>
-
+        <!-- AGRIF sponge -->
+        <field id="agrif_spv"    long_name=" AGRIF v-sponge coefficient"   unit=" " />
         <!-- v-eddy diffusivity coefficients (available if ln_traldf_OFF=F) -->
         <field id="ahtv_2d"      long_name=" surface v-eddy diffusivity coefficient"     unit="m2/s or (m4/s)^1/2" />
@@ -639 +640 @@
       
       <!-- F grid -->
+      <!-- AGRIF sponge -->
+      <field id="agrif_spf"    long_name=" AGRIF f-sponge coefficient"   unit=" " />
       <!-- f-eddy viscosity coefficients (ldfdyn) -->
       <field id="ahmf_2d"      long_name=" surface f-eddy viscosity coefficient"   unit="m2/s or m4/s" />
@@ -691 +694 @@
 
       
-      <!-- variables available with key_float -->
+      <!-- variables available with ln_floats -->
 
       <field_group id="floatvar" grid_ref="grid_T_nfloat"  operation="instant" >

NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SHARED/namelist_ref

@@ -633 +633 @@
 &namagrif      !  AGRIF zoom                                            ("key_agrif")
 !-----------------------------------------------------------------------
+   ln_agrif_2way = .true.  !  activate two way nesting
    ln_spc_dyn    = .true.  !  use 0 as special value for dynamics
    rn_sponge_tra = 2880.   !  coefficient for tracer   sponge layer [m2/s]
    rn_sponge_dyn = 2880.   !  coefficient for dynamics sponge layer [m2/s]
+   rn_trelax_tra = 0.01    !  inverse of relaxation time (in steps) for tracers []
+   rn_trelax_dyn = 0.01    !  inverse of relaxation time (in steps) for dynamics []
    ln_chk_bathy  = .false. !  =T  check the parent bathymetry
 /