Changeset 3497 for branches/2012/dev_r3452_NOCL02_Smagorinsky/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn.F90

Timestamp:

2012-10-12T18:14:36+02:00 (12 years ago)

Author:

hliu

Message:

Upload code files for Smagorinsky viscosity/diffusivity work, documentation to be converted to latex format and uploaded soon. See the ticket (coming in minutes)

File:

• branches/2012/dev_r3452_NOCL02_Smagorinsky/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn.F90 (modified) (3 diffs)

branches/2012/dev_r3452_NOCL02_Smagorinsky/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn.F90

@@ -67 +67 @@
       NAMELIST/namdyn_ldf/ ln_dynldf_lap  , ln_dynldf_bilap,                  &
          &                 ln_dynldf_level, ln_dynldf_hor  , ln_dynldf_iso,   &
-         &                 rn_ahm_0_lap   , rn_ahmb_0      , rn_ahm_0_blp
-      !!----------------------------------------------------------------------
+         &                 rn_ahm_0_lap   , rn_ahmb_0      , rn_ahm_0_blp ,   &
+         &                 rn_cmsmag_1    , rn_cmsmag_2    , rn_cmsh,         &
+         &                 rn_ahm_m_lap   , rn_ahm_m_blp
+
+   !!----------------------------------------------------------------------
 
       REWIND( numnam )                  ! Read Namelist namdyn_ldf : Lateral physics
@@ -86 +89 @@
          WRITE(numout,*) '      background viscosity                    rn_ahmb_0       = ', rn_ahmb_0
          WRITE(numout,*) '      horizontal bilaplacian eddy viscosity   rn_ahm_0_blp    = ', rn_ahm_0_blp
+         WRITE(numout,*) '      upper limit for laplacian eddy visc     rn_ahm_m_lap    = ', rn_ahm_m_lap
+         WRITE(numout,*) '      upper limit for bilap eddy viscosity    rn_ahm_m_blp    = ', rn_ahm_m_blp
+
       ENDIF
 
@@ -142 +148 @@
       IF(lwp) WRITE(numout,*) '        ahm1 = ahm2 = ahm0 =  ',ahm0
 #endif
+     nkahm_smag = 0
+#if defined key_dynldf_smag
+     nkahm_smag = 1
+#endif
+
       !
    END SUBROUTINE ldf_dyn_init