Changeset 5242

Timestamp:

2015-04-29T15:56:02+02:00 (9 years ago)

Author:

davestorkey

Message:

UKMO nn_etau revision branch: update namelist_ref and field_def.xml.

Location:

branches/UKMO/dev_r5021_nn_etau_revision/NEMOGCM

Files:

• CONFIG/SHARED/field_def.xml (modified) (1 diff)
• CONFIG/SHARED/namelist_ref (modified) (1 diff)
• NEMO/OPA_SRC/ZDF/zdftke.F90 (modified) (1 diff)

branches/UKMO/dev_r5021_nn_etau_revision/NEMOGCM/CONFIG/SHARED/field_def.xml

@@ -422 +422 @@
         <field id="aht2d"        long_name="lateral eddy diffusivity"                    unit="m2/s"   grid_ref="grid_W_2D" />
         <field id="aht2d_eiv"    long_name="EIV lateral eddy diffusivity"                unit="m2/s"   grid_ref="grid_W_2D"/>
+        <!-- variables added for nn_etau revision testing -->
+        <field id="htau"         long_name="e-decay length scale of nn_etau TKE"       unit="m"        grid_ref="grid_W_2D" />
+        <field id="tke"          long_name="Turbulent Kinetic Energy"                  unit="m2/s2"    />
+        <field id="tke_niw"      long_name="Turbulent Kinetic Energy due to near-inertial wave breaking"  unit="m2/s2" />
       </field_group>
           

branches/UKMO/dev_r5021_nn_etau_revision/NEMOGCM/CONFIG/SHARED/namelist_ref

@@ -944 +944 @@
                            !        = 0  constant 10 m length scale
                            !        = 1  0.5m at the equator to 30m poleward of 40 degrees
+                           !        = 2  dependent on local mixed-layer depth 
+                           !        = 3  0.5m to 15m poleward of 20 degrees
+                           !        = 4  0.5m to 10m/30m poleward of 13/40 degrees north/south
+                           !        = 5  0.5m to 10m poleward of 13 degrees north/south,
+                           !             10m to 30m between 30/45 degrees south
+   rn_c        =   0.8     !  fraction of extra TKE added within the mixed layer (if nn_htau=2)
 /
 !------------------------------------------------------------------------

branches/UKMO/dev_r5021_nn_etau_revision/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90

@@ -731 +731 @@
          &                 nn_etau , nn_htau  , rn_efr , rn_c   
       !!----------------------------------------------------------------------
-      !
-      ! NB. Default values of namelist parameters should be set in the reference namelist
-      !     but setting this one here because we aren't set up to use the reference namelist
-      !     properly yet. 
-      rn_c = 0.8_wp
 
       REWIND( numnam_ref )              ! Namelist namzdf_tke in reference namelist : Turbulent Kinetic Energy