Changeset 11869 for NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/TRA/trabbl.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/OCE/TRA/trabbl.F90 (modified) (2 diffs)

NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/TRA/trabbl.F90

@@ -119 +119 @@
          !
          CALL tra_bbl_dif( tsb, tsa, jpts )
-         IF( ln_ctl )  &
+         IF( ln_ctl .OR. sn_cfctl%l_mppout )  &
          CALL prt_ctl( tab3d_1=tsa(:,:,:,jp_tem), clinfo1=' bbl_ldf  - Ta: ', mask1=tmask, &
             &          tab3d_2=tsa(:,:,:,jp_sal), clinfo2=           ' Sa: ', mask2=tmask, clinfo3='tra' )
@@ -132 +132 @@
          !
          CALL tra_bbl_adv( tsb, tsa, jpts )
-         IF(ln_ctl)   &
+         IF(ln_ctl .OR. sn_cfctl%l_mppout)   &
          CALL prt_ctl( tab3d_1=tsa(:,:,:,jp_tem), clinfo1=' bbl_adv  - Ta: ', mask1=tmask,   &
             &          tab3d_2=tsa(:,:,:,jp_sal), clinfo2=           ' Sa: ', mask2=tmask, clinfo3='tra' )