Changeset 7560 for branches/UKMO/dev_r5518_GO6_package

Timestamp:

2017-01-16T10:59:36+01:00 (7 years ago)

Author:

timgraham

Message:

Changes to remove erroneous output. NO RESULTS CHANGE.
1) traadv_tvd was causing trd_trc to be called when l_trdtrc=FALSE
2) zdf_mxl_zint was missing an IF(lwp) so output was being written from every processor.

Location:

branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC

Files:

• TRA/traadv_tvd.F90 (modified) (1 diff)
• ZDF/zdfmxl.F90 (modified) (1 diff)

branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_tvd.F90

@@ -100 +100 @@
          IF(lwp) WRITE(numout,*) '~~~~~~~~~~~'
          !
-         l_trd = .FALSE.
-         l_trans = .FALSE.
-         IF( ( cdtype == 'TRA' .AND. l_trdtra ) .OR. ( cdtype == 'TRC' .AND. l_trdtrc ) ) l_trd = .TRUE.
-         IF( cdtype == 'TRA' .AND. (iom_use("uadv_heattr") .OR. iom_use("vadv_heattr") ) ) l_trans = .TRUE.
       ENDIF
+      l_trd = .FALSE.
+      l_trans = .FALSE.
+      IF( ( cdtype == 'TRA' .AND. l_trdtra ) .OR. ( cdtype == 'TRC' .AND. l_trdtrc ) ) l_trd = .TRUE.
+      IF( cdtype == 'TRA' .AND. (iom_use("uadv_heattr") .OR. iom_use("vadv_heattr") ) ) l_trans = .TRUE.
       !
       IF( l_trd .OR. l_trans )  THEN

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

@@ -480 +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)'