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

branches/UKMO/test_moci_test_suite_namelist_read/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90

@@ -127 +127 @@
          REWIND( numnam_ref )              ! Namelist nambdy in reference namelist :Unstructured open boundaries  
          READ  ( numnam_ref, nambdy, IOSTAT = ios, ERR = 901)
-901      IF( ios /= 0 ) CALL ctl_nam ( ios , 'nambdy in reference namelist', lwm )
+901      CONTINUE
+      ENDIF
+      call mpp_bcast(ios)
+      IF( ios /= 0 ) CALL ctl_nam ( ios , 'nambdy in reference namelist', lwp )
+      IF(lwm) THEN
          REWIND( numnam_cfg )              ! Namelist nambdy in configuration namelist :Unstructured open boundaries
          READ  ( numnam_cfg, nambdy, IOSTAT = ios, ERR = 902 )
-902      IF( ios /= 0 ) CALL ctl_nam ( ios , 'nambdy in configuration namelist', lwm )
+902      CONTINUE
       ENDIF
+      call mpp_bcast(ios)
+      IF( ios /= 0 ) CALL ctl_nam ( ios , 'nambdy in configuration namelist', lwp )
 
       IF(lwm) WRITE ( numond, nambdy )
@@ -426 +432 @@
             IF(lwm) THEN
                READ  ( numnam_cfg, nambdy_index, IOSTAT = ios, ERR = 904 )
-904            IF( ios /= 0 ) CALL ctl_nam ( ios , 'nambdy_index in configuration namelist', lwm )
+904            CONTINUE
             ENDIF
+            call mpp_bcast(ios)
+            IF( ios /= 0 ) CALL ctl_nam ( ios , 'nambdy_index in configuration namelist', lwp )
+
             IF(lwm) WRITE ( numond, nambdy_index )
  
@@ -1782 +1791 @@
 #if defined key_mpp_mpi
       CALL mpp_bcast(nb_bdy)
-      CALL mpp_bcast(ln_coords_file)
+      CALL mpp_bcast(ln_coords_file, jp_bdy)
       CALL mpp_bcast(cn_coords_file, 80)
       CALL mpp_bcast(ln_mask_file)
@@ -1794 +1803 @@
       CALL mpp_bcast(ln_tra_dmp)
       CALL mpp_bcast(ln_dyn3d_dmp)
-      CALL mpp_bcast(rn_time_dmp)
-      CALL mpp_bcast(rn_time_dmp_out)
+      CALL mpp_bcast(rn_time_dmp, jp_bdy)
+      CALL mpp_bcast(rn_time_dmp_out, jp_bdy)
       CALL mpp_bcast(cn_ice_lim, 20)
       CALL mpp_bcast(nn_ice_lim_dta)
-      CALL mpp_bcast(rn_ice_tem)
-      CALL mpp_bcast(rn_ice_sal)
-      CALL mpp_bcast(rn_ice_age)
+      CALL mpp_bcast(rn_ice_tem, jp_bdy)
+      CALL mpp_bcast(rn_ice_sal, jp_bdy)
+      CALL mpp_bcast(rn_ice_age, jp_bdy)
       CALL mpp_bcast(ln_vol)
       CALL mpp_bcast(nn_volctl)