Changeset 7923 for branches/UKMO/dev_r5518_GO6_package_XIOS_read/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90

Timestamp:

2017-04-18T15:26:56+02:00 (7 years ago)

Author:

andmirek

Message:

merge changes up to 7573

File:

• branches/UKMO/dev_r5518_GO6_package_XIOS_read/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90 (modified) (3 diffs)

branches/UKMO/dev_r5518_GO6_package_XIOS_read/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90

@@ -147 +147 @@
       ! no need to output in offline mode
       IF( .NOT.lk_offline ) THEN   
-      IF( kt >= nit000 ) THEN               ! workaround for calls before SOMETHING reads the XIOS namelist
          IF ( iom_use("mldr10_1") ) THEN
             IF( ln_isfcav ) THEN
@@ -162 +161 @@
             END IF
          END IF
-      ENDIF
       ENDIF
       
@@ -482 +480 @@
          mld_diags(5) = sn_mld5
 
-         IF( nn_mld_diag > 0 ) THEN
+         IF( lwp .AND. (nn_mld_diag > 0) ) THEN
             WRITE(numout,*) '=============== Vertically-interpolated mixed layer ================'
             WRITE(numout,*) '(Diagnostic number, nn_mld_type, rn_zref, rn_dT_crit, rn_iso_frac)'