Changeset 3634 for branches/2012/dev_NOC_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_bilapg.F90

Timestamp:

2012-11-22T18:32:14+01:00 (11 years ago)

Author:

acc

Message:

Branch dev_NOC_2012_r3555. #1006. Step 11: merge in changes from the 2012/dev_r3452_NOCL02_Smagorinsky branch

File:

• branches/2012/dev_NOC_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_bilapg.F90 (modified) (2 diffs)

branches/2012/dev_NOC_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_bilapg.F90

@@ -414 +414 @@
          ! II.3 Divergence of vertical fluxes added to the horizontal divergence
          ! ---------------------------------------------------------------------
-
-         IF( kahm == 1 ) THEN
+         IF( (kahm -nkahm_smag) ==1 ) THEN
             ! multiply the laplacian by the eddy viscosity coefficient
             DO jk = 1, jpkm1
@@ -430 +429 @@
                END DO
             END DO
-         ELSEIF( kahm == 2 ) THEN
+         ELSEIF( (kahm +nkahm_smag ) == 2 ) THEN
             ! second call, no multiplication
             DO jk = 1, jpkm1