Changeset 9366 for branches/UKMO/test_moci_test_suite_namelist_read/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftmx.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/zdftmx.F90 (modified) (5 diffs)

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

@@ -35 +35 @@
    PUBLIC   zdf_tmx_init    ! called in opa module 
    PUBLIC   zdf_tmx_alloc   ! called in nemogcm module
+   PRIVATE  tmx_namelist
 
    LOGICAL, PUBLIC, PARAMETER ::   lk_zdftmx = .TRUE.    !: tidal mixing flag
@@ -380 +381 @@
       CALL wrk_alloc( jpi,jpj, zem2, zek1, zkz, zfact, zhdep )
       CALL wrk_alloc( jpi,jpj,jpk, zpc )
+      IF(lwm) THEN 
+         REWIND( numnam_ref )              ! Namelist namzdf_tmx in reference namelist : Tidal Mixing
+         READ  ( numnam_ref, namzdf_tmx, IOSTAT = ios, ERR = 901)
+901      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namzdf_tmx in reference namelist', lwm )
+         REWIND( numnam_cfg )              ! Namelist namzdf_tmx in configuration namelist : Tidal Mixing
+         READ  ( numnam_cfg, namzdf_tmx, IOSTAT = ios, ERR = 902 )
+902      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namzdf_tmx in configuration namelist', lwm )
+      ENDIF
+
+      IF(lwm) WRITE ( numond, namzdf_tmx )
       
-      REWIND( numnam_ref )              ! Namelist namzdf_tmx in reference namelist : Tidal Mixing
-      READ  ( numnam_ref, namzdf_tmx, IOSTAT = ios, ERR = 901)
-901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namzdf_tmx in reference namelist', lwp )
-
-      REWIND( numnam_cfg )              ! Namelist namzdf_tmx in configuration namelist : Tidal Mixing
-      READ  ( numnam_cfg, namzdf_tmx, IOSTAT = ios, ERR = 902 )
-902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namzdf_tmx in configuration namelist', lwp )
-      IF(lwm) WRITE ( numond, namzdf_tmx )
+      call tmx_namelist()
 
       IF(lwp) THEN                   ! Control print
@@ -560 +564 @@
       !
    END SUBROUTINE zdf_tmx_init
+
+   SUBROUTINE tmx_namelist()
+     !!---------------------------------------------------------------------
+     !!                   ***  ROUTINE tmx_namelist  ***
+     !!                     
+     !! ** Purpose :   Broadcast namelist variables read by procesor lwm
+     !!
+     !! ** Method  :   use lib_mpp
+     !!----------------------------------------------------------------------
+#if defined key_mpp_mpi
+      CALL mpp_bcast(rn_htmx)
+      CALL mpp_bcast(rn_n2min)
+      CALL mpp_bcast(rn_tfe)
+      CALL mpp_bcast(rn_me)
+      CALL mpp_bcast(ln_tmx_itf)
+      CALL mpp_bcast(rn_tfe_itf)
+#endif
+
+   END SUBROUTINE tmx_namelist
 
 #elif defined key_zdftmx_new
@@ -966 +989 @@
       IF( nn_timing == 1 )  CALL timing_start('zdf_tmx_init')
       !
-      REWIND( numnam_ref )              ! Namelist namzdf_tmx in reference namelist : Wave-driven mixing
-      READ  ( numnam_ref, namzdf_tmx_new, IOSTAT = ios, ERR = 901)
-901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namzdf_tmx in reference namelist', lwp )
-      !
-      REWIND( numnam_cfg )              ! Namelist namzdf_tmx in configuration namelist : Wave-driven mixing
-      READ  ( numnam_cfg, namzdf_tmx_new, IOSTAT = ios, ERR = 902 )
-902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namzdf_tmx in configuration namelist', lwp )
+      IF(lwm) THEN
+         REWIND( numnam_ref )              ! Namelist namzdf_tmx in reference namelist : Wave-driven mixing
+         READ  ( numnam_ref, namzdf_tmx_new, IOSTAT = ios, ERR = 901)
+901      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namzdf_tmx in reference namelist', lwp )
+      !
+         REWIND( numnam_cfg )              ! Namelist namzdf_tmx in configuration namelist : Wave-driven mixing
+         READ  ( numnam_cfg, namzdf_tmx_new, IOSTAT = ios, ERR = 902 )
+902      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namzdf_tmx in configuration namelist', lwp )
+      ENDIF
       IF(lwm) WRITE ( numond, namzdf_tmx_new )
+
+      CALL tmx_namelist()
       !
       IF(lwp) THEN                  ! Control print
@@ -1048 +1075 @@
    END SUBROUTINE zdf_tmx_init
 
+   SUBROUTINE tmx_namelist()
+     !!---------------------------------------------------------------------
+     !!                   ***  ROUTINE tmx_namelist  ***
+     !!                     
+     !! ** Purpose :   Broadcast namelist variables read by procesor lwm
+     !!
+     !! ** Method  :   use lib_mpp
+     !!----------------------------------------------------------------------
+#if defined key_mpp_mpi
+      CALL mpp_bcast(nn_zpyc)
+      CALL mpp_bcast(ln_mevar)
+      CALL mpp_bcast(ln_tsdiff)
+#endif
+   END SUBROUTINE tmx_namelist
+
 #else
    !!----------------------------------------------------------------------