Changeset 11869 for NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/SAO/nemogcm.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/SAO/nemogcm.F90 (modified) (3 diffs)

NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/SAO/nemogcm.F90

@@ -242 +242 @@
 
       IF( ln_ctl .OR. sn_cfctl%l_mppout )   &
-         &                 CALL prt_ctl_init        ! Print control
-
-                           CALL istate_init     ! ocean initial state (Dynamics and tracers)
+         &                 CALL prt_ctl_init       ! Print control
+
+                           CALL istate_init        ! ocean initial state (Dynamics and tracers)
    END SUBROUTINE nemo_init
 
@@ -307 +307 @@
       !                             ! Parameter control
       !
-      IF( ln_ctl ) THEN                 ! sub-domain area indices for the control prints
+      IF( ln_ctl .OR. sn_cfctl%l_mppout ) THEN                         ! sub-domain area indices for the control prints
          IF( lk_mpp .AND. jpnij > 1 ) THEN
             isplt = jpni   ;   jsplt = jpnj   ;   ijsplt = jpni*jpnj   ! the domain is forced to the real split domain
@@ -429 +429 @@
       sn_cfctl%l_mppout  = setto
       sn_cfctl%l_mpptop  = setto
+      sn_cfctl%l_oasout  = setto
    END SUBROUTINE nemo_set_cfctl