Changeset 2926 for branches/2011/dev_r2802_NOCL_Smagorinsky/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn.F90

Timestamp:

2011-10-14T17:18:45+02:00 (13 years ago)

Author:

hliu

Message:

Undoing change wrongly committed in r2887. for Maria Luneva

File:

• branches/2011/dev_r2802_NOCL_Smagorinsky/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn.F90 (modified) (6 diffs)

branches/2011/dev_r2802_NOCL_Smagorinsky/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn.F90

@@ -38 +38 @@
    !! NEMO/OPA 3.3 , NEMO Consortium (2010)
    !! $Id$ 
-   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
-   !!----------------------------------------------------------------------
-
+   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
+   !!----------------------------------------------------------------------
 CONTAINS
 
@@ -63 +62 @@
       !!----------------------------------------------------------------------
       INTEGER ::   ioptio         ! ???
-      LOGICAL :: ll_print = .FALSE.    ! Logical flag for printing viscosity coef.
+      LOGICAL ::   ll_print = .FALSE.    ! Logical flag for printing viscosity coef.
       !! 
       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 ,cmsmag1,cmsmag2
+         &                 rn_ahm_0_lap   , rn_ahmb_0      , rn_ahm_0_blp
       !!----------------------------------------------------------------------
 
@@ -86 +85 @@
          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,*) '      smagorinsky coefficient for laplacian       cmsmag1    = ' , cmsmag1
-         WRITE(numout,*) '      smagorinsky coefficient for bilaplacian     cmsmag2    = ' , cmsmag2
       ENDIF
 
@@ -131 +128 @@
       ! Lateral eddy viscosity
       ! ======================
-#if defined key_dynldf_smag && ! defined key_dynldf_c3d
-      IF(lwp) WRITE(numout,*) '   key_dynldf_smag can not be used without key_dynldf_c3d'
-#endif
-
 #if defined key_dynldf_c3d
       CALL ldf_dyn_c3d( ll_print )   ! ahm = 3D coef. = F( longitude, latitude, depth )
@@ -213 +206 @@
       REAL(wp), INTENT(in   )                         ::   pwam       ! width of inflection
       REAL(wp), INTENT(in   )                         ::   pbot       ! bottom value (0<pbot<= 1)
-      REAL(wp), INTENT(in   ), DIMENSION        (jpk) ::   pdep       ! depth of the gridpoint (T, U, V, F)
-      REAL(wp), INTENT(inout), DIMENSION(jpi,jpj,jpk) ::   pah        ! adimensional vertical profile
+      REAL(wp), INTENT(in   ), DIMENSION          (:) ::   pdep       ! depth of the gridpoint (T, U, V, F)
+      REAL(wp), INTENT(inout), DIMENSION      (:,:,:) ::   pah        ! adimensional vertical profile
       !!
       INTEGER  ::   jk           ! dummy loop indices
@@ -255 +248 @@
       REAL(wp), INTENT(in   )                         ::   pwam       ! width of inflection
       REAL(wp), INTENT(in   )                         ::   pbot       ! bottom value (0<pbot<= 1)
-      REAL(wp), INTENT(in   ), DIMENSION(jpi,jpj,jpk) ::   pdep       ! dep of the gridpoint (T, U, V, F)
-      REAL(wp), INTENT(inout), DIMENSION(jpi,jpj,jpk) ::   pah        ! adimensional vertical profile
+      REAL(wp), INTENT(in   ), DIMENSION      (:,:,:) ::   pdep       ! dep of the gridpoint (T, U, V, F)
+      REAL(wp), INTENT(inout), DIMENSION      (:,:,:) ::   pah        ! adimensional vertical profile
       !!
       INTEGER  ::   jk           ! dummy loop indices