Changeset 6020 for branches/UKMO/icebergs_restart_single_file/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfddm.F90

Timestamp:

2015-12-08T12:39:53+01:00 (8 years ago)

Author:

timgraham

Message:

Merged with head of trunk

File:

• branches/UKMO/icebergs_restart_single_file/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfddm.F90 (modified) (2 diffs)

branches/UKMO/icebergs_restart_single_file/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfddm.F90

@@ -9 +9 @@
    !!            3.6  ! 2013-04  (G. Madec, F. Roquet) zrau compute locally using interpolation of alpha & beta
    !!----------------------------------------------------------------------
-#if defined key_zdfddm   ||   defined key_esopa
+#if defined key_zdfddm
    !!----------------------------------------------------------------------
    !!   'key_zdfddm' :                                     double diffusion
@@ -162 +162 @@
          ! ------------------
          ! Constant eddy coefficient: reset to the background value
-!CDIR NOVERRCHK
          DO jj = 1, jpj
-!CDIR NOVERRCHK
             DO ji = 1, jpi
                zinr = 1._wp / zrau(ji,jj)