Changeset 9366 for branches/UKMO/test_moci_test_suite_namelist_read/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfddm.F90

Timestamp:

2018-02-28T16:29:13+01:00 (6 years ago)

Author:

andmirek

Message:

#2050 first version. Compiled OK in moci test suite

File:

• branches/UKMO/test_moci_test_suite_namelist_read/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfddm.F90 (modified) (3 diffs)

branches/UKMO/test_moci_test_suite_namelist_read/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfddm.F90

@@ -34 +34 @@
    PUBLIC   zdf_ddm_init  ! called by opa.F90
    PUBLIC   zdf_ddm_alloc ! called by nemogcm.F90
+   PRIVATE  ddm_namelist
 
    LOGICAL , PUBLIC, PARAMETER ::   lk_zdfddm = .TRUE.  !: double diffusive mixing flag
@@ -239 +240 @@
       !!----------------------------------------------------------------------
       !
-      REWIND( numnam_ref )              ! Namelist namzdf_ddm in reference namelist : Double diffusion mixing scheme
-      READ  ( numnam_ref, namzdf_ddm, IOSTAT = ios, ERR = 901)
-901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namzdf_ddm in reference namelist', lwp )
-
-      REWIND( numnam_cfg )              ! Namelist namzdf_ddm in configuration namelist : Double diffusion mixing scheme
-      READ  ( numnam_cfg, namzdf_ddm, IOSTAT = ios, ERR = 902 )
-902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namzdf_ddm in configuration namelist', lwp )
+      IF(lwm) THEN
+         REWIND( numnam_ref )              ! Namelist namzdf_ddm in reference namelist : Double diffusion mixing scheme
+         READ  ( numnam_ref, namzdf_ddm, IOSTAT = ios, ERR = 901)
+901      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namzdf_ddm in reference namelist', lwm )
+         REWIND( numnam_cfg )              ! Namelist namzdf_ddm in configuration namelist : Double diffusion mixing scheme
+         READ  ( numnam_cfg, namzdf_ddm, IOSTAT = ios, ERR = 902 )
+902      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namzdf_ddm in configuration namelist', lwm )
+      ENDIF
+
       IF(lwm) WRITE ( numond, namzdf_ddm )
       !
+
+      CALL ddm_namelist()
+
       IF(lwp) THEN                    ! Parameter print
          WRITE(numout,*)
@@ -264 +270 @@
    END SUBROUTINE zdf_ddm_init
 
+   SUBROUTINE ddm_namelist()
+     !!---------------------------------------------------------------------
+     !!                   ***  ROUTINE ddm_namelist  ***
+     !!                     
+     !! ** Purpose :   Broadcast namelist variables read by procesor lwm
+     !!
+     !! ** Method  :   use lib_mpp
+     !!----------------------------------------------------------------------
+#if defined key_mpp_mpi
+      CALL mpp_bcast(rn_avts)
+      CALL mpp_bcast(rn_hsbfr)
+#endif
+   END SUBROUTINE ddm_namelist
 #else
    !!----------------------------------------------------------------------