Changeset 9383 for branches/UKMO/test_moci_test_suite_namelist_read/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90

Timestamp:

2018-03-08T10:22:55+01:00 (6 years ago)

Author:

andmirek

Message:

#2050 fixes and changes

File:

• branches/UKMO/test_moci_test_suite_namelist_read/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) (3 diffs)

branches/UKMO/test_moci_test_suite_namelist_read/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90

@@ -49 +49 @@
 
    PUBLIC   dom_zgr        ! called by dom_init.F90
-   PRIVATE  zgr_namelist
+   PRIVATE  zgr_namelist, sco_namelist
 
    !                              !!* Namelist namzgr_sco *
@@ -111 +111 @@
          REWIND( numnam_ref )              ! Namelist namzgr in reference namelist : Vertical coordinate
          READ  ( numnam_ref, namzgr, IOSTAT = ios, ERR = 901 )
-      ENDIF
-901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namzgr in reference namelist', lwp )
-      IF(lwp) THEN
+901      CONTINUE
+      ENDIF
+      call mpp_bcast(ios)
+      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namzgr in reference namelist', lwp )
+      IF(lwm) THEN
          REWIND( numnam_cfg )              ! Namelist namzgr in configuration namelist : Vertical coordinate
          READ  ( numnam_cfg, namzgr, IOSTAT = ios, ERR = 902 )
-      ENDIF
-902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namzgr in configuration namelist', lwp )
+902      CONTINUE
+      ENDIF
+      call mpp_bcast(ios)
+      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namzgr in configuration namelist', lwp )
+
       IF(lwm) WRITE ( numond, namzgr )
+
+      call zgr_namelist()
 
       IF(lwp) THEN                     ! Control print
@@ -1829 +1836 @@
          REWIND( numnam_ref )              ! Namelist namzgr_sco in reference namelist : Sigma-stretching parameters
          READ  ( numnam_ref, namzgr_sco, IOSTAT = ios, ERR = 901)
-901      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namzgr_sco in reference namelist', lwm )
+901      CONTINUE
+      ENDIF
+      call mpp_bcast(ios)
+      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namzgr_sco in reference namelist', lwp )
+      IF(lwm) THEN
          REWIND( numnam_cfg )              ! Namelist namzgr_sco in configuration namelist : Sigma-stretching parameters
          READ  ( numnam_cfg, namzgr_sco, IOSTAT = ios, ERR = 902 )
-902      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namzgr_sco in configuration namelist', lwm )
-      ENDIF
+902      CONTINUE
+      ENDIF
+      call mpp_bcast(ios)
+      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namzgr_sco in configuration namelist', lwp )
+
       IF(lwm) WRITE ( numond, namzgr_sco )