Changeset 9383 for branches/UKMO/test_moci_test_suite_namelist_read/NEMOGCM/NEMO/OPA_SRC/DOM/domain.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/domain.F90 (modified) (4 diffs)

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

@@ -163 +163 @@
          REWIND( numnam_ref )              ! Namelist namrun in reference namelist : Parameters of the run
          READ  ( numnam_ref, namrun, IOSTAT = ios, ERR = 901)
-901      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namrun in reference namelist', lwm )
+901      CONTINUE
+      ENDIF
+      call mpp_bcast(ios)
+      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namrun in reference namelist', lwp )
+      IF(lwm) THEN
          REWIND( numnam_cfg )              ! Namelist namrun in configuration namelist : Parameters of the run
          READ  ( numnam_cfg, namrun, IOSTAT = ios, ERR = 902 )
-902      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namrun in configuration namelist', lwm )
-      ENDIF
+902      CONTINUE
+      ENDIF
+      call mpp_bcast(ios)
+      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namrun in configuration namelist', lwp )
 
       IF(lwm) WRITE ( numond, namrun )
@@ -259 +265 @@
          REWIND( numnam_ref )              ! Namelist namdom in reference namelist : space & time domain (bathymetry, mesh, timestep)
          READ  ( numnam_ref, namdom, IOSTAT = ios, ERR = 903)
-903      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namdom in reference namelist', lwm )
+903      CONTINUE
+      ENDIF
+      call mpp_bcast(ios)
+      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namdom in reference namelist', lwp )
+      IF(lwm) THEN
          REWIND( numnam_cfg )              ! Namelist namdom in configuration namelist : space & time domain (bathymetry, mesh, timestep)
          READ  ( numnam_cfg, namdom, IOSTAT = ios, ERR = 904 )
-904      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namdom in configuration namelist', lwm )
-      ENDIF
+904      CONTINUE
+      ENDIF
+      call mpp_bcast(ios)
+      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namdom in configuration namelist', lwp )
 
       IF(lwm) WRITE ( numond, namdom )
@@ -327 +339 @@
          REWIND( numnam_ref )              ! Namelist namcla in reference namelist : Cross land advection
          READ  ( numnam_ref, namcla, IOSTAT = ios, ERR = 905)
-905      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namcla in reference namelist', lwm )
+905      CONTINUE
+      ENDIF
+      call mpp_bcast(ios)
+      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namcla in reference namelist', lwp )
+      IF(lwm) THEN
          REWIND( numnam_cfg )              ! Namelist namcla in configuration namelist : Cross land advection
          READ  ( numnam_cfg, namcla, IOSTAT = ios, ERR = 906 )
-906      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namcla in configuration namelist', lwm )
-      ENDIF
+906      CONTINUE
+      ENDIF
+      call mpp_bcast(ios)
+      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namcla in configuration namelist', lwp )
+
       IF(lwm) WRITE( numond, namcla )
 
@@ -354 +373 @@
          REWIND( numnam_ref )              ! Namelist namnc4 in reference namelist : NETCDF
          READ  ( numnam_ref, namnc4, IOSTAT = ios, ERR = 907)
-907      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namnc4 in reference namelist', lwm )
+907      CONTINUE
+      ENDIF
+      call mpp_bcast(ios)
+      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namnc4 in reference namelist', lwp )
+      IF(lwm) THEN
          REWIND( numnam_cfg )              ! Namelist namnc4 in configuration namelist : NETCDF
          READ  ( numnam_cfg, namnc4, IOSTAT = ios, ERR = 908 )
-908      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namnc4 in configuration namelist', lwm )
-      ENDIF
+908      CONTINUE
+      ENDIF
+      call mpp_bcast(ios)
+      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namnc4 in configuration namelist', lwp )
 
       IF(lwm) WRITE( numond, namnc4 )