Changeset 7923 for branches/UKMO/dev_r5518_GO6_package_XIOS_read/NEMOGCM/NEMO/OPA_SRC/ZDF

Timestamp:

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

Author:

andmirek

Message:

merge changes up to 7573

Location:

branches/UKMO/dev_r5518_GO6_package_XIOS_read/NEMOGCM/NEMO/OPA_SRC/ZDF

Files:

• zdfevd.F90 (modified) (2 diffs)
• zdfmxl.F90 (modified) (3 diffs)
• zdftmx.F90 (modified) (1 diff)

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

@@ -19 +19 @@
    USE zdf_oce         ! ocean vertical physics variables
    USE zdfkpp          ! KPP vertical mixing
+   USE trd_oce         ! trends: ocean variables
+   USE trdtra          ! trends manager: tracers 
    USE in_out_manager  ! I/O manager
    USE iom             ! for iom_put
@@ -122 +124 @@
       zavt_evd(:,:,:) = avt(:,:,:) - zavt_evd(:,:,:)   ! change in avt due to evd
       CALL iom_put( "avt_evd", zavt_evd )              ! output this change
+      IF( l_trdtra ) CALL trd_tra( kt, 'TRA', jp_tem, jptra_evd, zavt_evd )
       !
       IF( nn_timing == 1 )  CALL timing_stop('zdf_evd')

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)'

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

@@ -918 +918 @@
          CALL iom_put( "pcmap_tmx", pcmap_tmx )
       ENDIF
-      CALL iom_put( "bn2", rn2 )
       CALL iom_put( "emix_tmx", emix_tmx )