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

NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/SBC/sbcblk.F90

@@ -507 +507 @@
 
 
-      IF(ln_ctl) THEN
+      IF(ln_ctl .OR. sn_cfctl%l_mppout) THEN
          CALL prt_ctl( tab2d_1=zqla  , clinfo1=' blk_oce: zqla   : ', tab2d_2=Ce_atm , clinfo2=' Ce_oce  : ' )
          CALL prt_ctl( tab2d_1=zqsb  , clinfo1=' blk_oce: zqsb   : ', tab2d_2=Ch_atm , clinfo2=' Ch_oce  : ' )
@@ -553 +553 @@
       ENDIF
       !
-      IF(ln_ctl) THEN
+      IF(ln_ctl .OR. sn_cfctl%l_mppout) THEN
          CALL prt_ctl(tab2d_1=zqsb , clinfo1=' blk_oce: zqsb   : ', tab2d_2=zqlw , clinfo2=' zqlw  : ')
          CALL prt_ctl(tab2d_1=zqla , clinfo1=' blk_oce: zqla   : ', tab2d_2=qsr  , clinfo2=' qsr   : ')
@@ -764 +764 @@
       !
       !
-      IF(ln_ctl) THEN
+      IF(ln_ctl .OR. sn_cfctl%l_mppout) THEN
          CALL prt_ctl(tab2d_1=utau_ice  , clinfo1=' blk_ice: utau_ice : ', tab2d_2=vtau_ice  , clinfo2=' vtau_ice : ')
          CALL prt_ctl(tab2d_1=wndm_ice  , clinfo1=' blk_ice: wndm_ice : ')
@@ -914 +914 @@
       END WHERE
       !
-      IF(ln_ctl) THEN
+      IF(ln_ctl .OR. sn_cfctl%l_mppout) THEN
          CALL prt_ctl(tab3d_1=qla_ice , clinfo1=' blk_ice: qla_ice  : ', tab3d_2=z_qsb   , clinfo2=' z_qsb    : ', kdim=jpl)
          CALL prt_ctl(tab3d_1=z_qlw   , clinfo1=' blk_ice: z_qlw    : ', tab3d_2=dqla_ice, clinfo2=' dqla_ice : ', kdim=jpl)