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 6450 – NEMO

Changeset 6450


Ignore:
Timestamp:
2016-04-07T18:23:30+02:00 (8 years ago)
Author:
dancopsey
Message:

Merged in changeset 5242 of dev_r5021_nn_etau_revision

Location:
branches/UKMO/dev_r5518_GC3p0_package/NEMOGCM
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/UKMO/dev_r5518_GC3p0_package/NEMOGCM/CONFIG/SHARED/field_def.xml

    r6444 r6450  
    490490        <field id="aht2d"        long_name="lateral eddy diffusivity"       standard_name="ocean_tracer_xy_laplacian_diffusivity"      unit="m2/s"   grid_ref="grid_W_2D" /> 
    491491        <field id="aht2d_eiv"    long_name="EIV lateral eddy diffusivity"   standard_name="ocean_tracer_bolus_laplacian_diffusivity"   unit="m2/s"   grid_ref="grid_W_2D" /> 
     492        <!-- variables added for nn_etau revision testing --> 
     493        <field id="htau"         long_name="e-decay length scale of nn_etau TKE"       unit="m"        grid_ref="grid_W_2D" /> 
     494        <field id="tke"          long_name="Turbulent Kinetic Energy"                  unit="m2/s2"    /> 
     495        <field id="tke_niw"      long_name="Turbulent Kinetic Energy due to near-inertial wave breaking"  unit="m2/s2" /> 
    492496      </field_group> 
    493497           

  • branches/UKMO/dev_r5518_GC3p0_package/NEMOGCM/CONFIG/SHARED/namelist_ref

    r6444 r6450  
    945945                           !        = 0  constant 10 m length scale 
    946946                           !        = 1  0.5m at the equator to 30m poleward of 40 degrees 
     947                           !        = 2  dependent on local mixed-layer depth  
     948                           !        = 3  0.5m to 15m poleward of 20 degrees 
     949                           !        = 4  0.5m to 10m/30m poleward of 13/40 degrees north/south 
     950                           !        = 5  0.5m to 10m poleward of 13 degrees north/south, 
     951                           !             10m to 30m between 30/45 degrees south 
     952   rn_c        =   0.8     !  fraction of extra TKE added within the mixed layer (if nn_htau=2) 
    947953/ 
    948954!------------------------------------------------------------------------ 

  • branches/UKMO/dev_r5518_GC3p0_package/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90

    r6448 r6450  
    779779         &                 nn_etau , nn_htau  , rn_efr , rn_c    
    780780      !!---------------------------------------------------------------------- 
    781       ! 
    782       ! NB. Default values of namelist parameters should be set in the reference namelist 
    783       !     but setting this one here because we aren't set up to use the reference namelist 
    784       !     properly yet.  
    785       rn_c = 0.8_wp 
    786781 
    787782      REWIND( numnam_ref )              ! Namelist namzdf_tke in reference namelist : Turbulent Kinetic Energy 
Note: See TracChangeset for help on using the changeset viewer.