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

NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OFF/dtadyn.F90

@@ -176 +176 @@
       CALL eos( tsn, rhd, rhop, gdept_0(:,:,:) ) ! In any case, we need rhop
       !
-      IF(ln_ctl) THEN                  ! print control
+      IF(ln_ctl .OR. sn_cfctl%l_mppout) THEN     ! print control
          CALL prt_ctl(tab3d_1=tsn(:,:,:,jp_tem), clinfo1=' tn      - : ', mask1=tmask,  kdim=jpk   )
          CALL prt_ctl(tab3d_1=tsn(:,:,:,jp_sal), clinfo1=' sn      - : ', mask1=tmask,  kdim=jpk   )
@@ -444 +444 @@
       CALL eos    ( tsn, rhd, rhop, gdept_0(:,:,:) ) ! In any case, we need rhop
 
-      IF(ln_ctl) THEN                  ! print control
+      IF(ln_ctl .OR. sn_cfctl%l_mppout) THEN                  ! print control
          CALL prt_ctl(tab3d_1=tsn(:,:,:,jp_tem), clinfo1=' tn      - : ', mask1=tmask,  kdim=jpk   )
          CALL prt_ctl(tab3d_1=tsn(:,:,:,jp_sal), clinfo1=' sn      - : ', mask1=tmask,  kdim=jpk   )