Changeset 7646 for trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90

Timestamp:

2017-02-06T10:25:03+01:00 (7 years ago)

Author:

timgraham

Message:

Merge of dev_merge_2016 into trunk. UPDATE TO ARCHFILES NEEDED for XIOS2.
LIM_SRC_s/limrhg.F90 to follow in next commit due to change of kind (I'm unable to do it in this commit).
Merged using the following steps:

1) svn merge --reintegrate ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk .
2) Resolve minor conflicts in sette.sh and namelist_cfg for ORCA2LIM3 (due to a change in trunk after branch was created)
3) svn commit
4) svn switch ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk
5) svn merge ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2016/dev_merge_2016 .
6) At this stage I checked out a clean copy of the branch to compare against what is about to be committed to the trunk.
6) svn commit #Commit code to the trunk

In this commit I have also reverted a change to Fcheck_archfile.sh which was causing problems on the Paris machine.

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90 (modified) (3 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90

@@ -13 +13 @@
    USE oce             ! ocean dynamics and tracers variables
    USE dom_oce         ! ocean space and time domain variables
+   USE trc_oce, ONLY: l_offline         ! ocean space and time domain variables
    USE zdf_oce         ! ocean vertical physics
    USE in_out_manager  ! I/O manager
@@ -21 +22 @@
    USE wrk_nemo        ! work arrays
    USE timing          ! Timing
-   USE trc_oce, ONLY : lk_offline ! offline flag
 
    IMPLICIT NONE
@@ -128 +128 @@
          END DO
       END DO
-      ! no need to output in offline mode
-      IF( .NOT.lk_offline ) THEN   
-         IF ( iom_use("mldr10_1") ) THEN
-            IF( ln_isfcav ) THEN
-               CALL iom_put( "mldr10_1", hmlp - risfdep)   ! mixed layer thickness
-            ELSE
-               CALL iom_put( "mldr10_1", hmlp )            ! mixed layer depth
+      !
+      IF( .NOT.l_offline ) THEN
+         IF( iom_use("mldr10_1") ) THEN
+            IF( ln_isfcav ) THEN  ;  CALL iom_put( "mldr10_1", hmlp - risfdep)   ! mixed layer thickness
+            ELSE                  ;  CALL iom_put( "mldr10_1", hmlp )            ! mixed layer depth
             END IF
          END IF
-         IF ( iom_use("mldkz5") ) THEN
-            IF( ln_isfcav ) THEN
-               CALL iom_put( "mldkz5"  , hmld - risfdep )   ! turbocline thickness
-            ELSE
-               CALL iom_put( "mldkz5"  , hmld )             ! turbocline depth
+         IF( iom_use("mldkz5") ) THEN
+            IF( ln_isfcav ) THEN  ;  CALL iom_put( "mldkz5"  , hmld - risfdep )   ! turbocline thickness
+            ELSE                  ;  CALL iom_put( "mldkz5"  , hmld )             ! turbocline depth
             END IF
-         END IF
+         ENDIF
       ENDIF