Changeset 11869 for NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/TOP/trcstp.F90

Timestamp:

2019-11-06T17:01:36+01:00 (4 years ago)

Author:

acc

Message:

Branch 2019/fix_sn_cfctl_ticket2328. Changes to enable correct functionality for the sn_cfctl%l_mppout and sn_cfctl%l_mpptop options. These changes also introduce a sn_cfctl%l_oasout option to toggle the OASIS setup information (sbccpl.F90, only) which was yet another misuse of ln_ctl. The next step may be to remove most references to ln_ctl altogether and provide a single control mechanism. TBD. See ticket #2328

File:

• NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/TOP/trcstp.F90 (modified) (2 diffs)

NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/TOP/trcstp.F90

@@ -77 +77 @@
             cvol(:,:,jk) = e1e2t(:,:) * e3t_n(:,:,jk) * tmask(:,:,jk)
          END DO
-         IF ( ln_ctl .OR. kt == nitrst .OR. ( ln_check_mass .AND. kt == nitend )              &
+         IF ( ll_trcstat .OR. kt == nitrst .OR. ( ln_check_mass .AND. kt == nitend )   &
             & .OR. iom_use( "pno3tot" ) .OR. iom_use( "ppo4tot" ) .OR. iom_use( "psiltot" )   &
             & .OR. iom_use( "palktot" ) .OR. iom_use( "pfertot" ) )                           &
@@ -89 +89 @@
       IF( MOD( kt , nn_dttrc ) == 0 ) THEN      ! only every nn_dttrc time step
          !
-         IF(ln_ctl) THEN
+         IF(ln_ctl .OR. sn_cfctl%l_mpptop) THEN
             WRITE(charout,FMT="('kt =', I4,'  d/m/y =',I2,I2,I4)") kt, nday, nmonth, nyear
             CALL prt_ctl_trc_info(charout)