Changeset 11872 for NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/SBC/sbcblk.F90

Timestamp:

2019-11-07T17:55:13+01:00 (4 years ago)

Author:

acc

Message:

Branch 2019/fix_sn_cfctl_ticket2328. See #2328. Replacement of ln_ctl and activation of full functionality with
sn_cfctl structure. These changes rename structure components l_mppout and l_mpptop as l_prtctl and l_prttrc
and introduce l_glochk to activate former ln_ctl code in stpctl.F90 to perform global location of min and max
checks. Also added is l_allon which can be used to activate all output (much like the former ln_ctl). If l_allon
is .false. then l_config decides whether or not the suboptions are used.

   sn_cfctl%l_glochk = .FALSE.    ! Range sanity checks are local (F) or global (T). Set T for debugging only
   sn_cfctl%l_allon  = .FALSE.    ! IF T activate all options. If F deactivate all unless l_config is T
   sn_cfctl%l_config = .TRUE.     ! IF .true. then control which reports are written with the remaining options

Note, these changes pass SETTE tests but all references to ln_ctl need to be removed from the sette scripts.

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 .OR. sn_cfctl%l_mppout) THEN
+      IF(sn_cfctl%l_prtctl) 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 .OR. sn_cfctl%l_mppout) THEN
+      IF(sn_cfctl%l_prtctl) 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 .OR. sn_cfctl%l_mppout) THEN
+      IF(sn_cfctl%l_prtctl) 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 .OR. sn_cfctl%l_mppout) THEN
+      IF(sn_cfctl%l_prtctl) 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)