Changeset 3375 for branches/2012/dev_r3337_NOCS10_ICB/NEMOGCM/NEMO/OPA_SRC/ICB/icbrst.F90

Timestamp:

2012-04-30T14:06:55+02:00 (12 years ago)

Author:

sga

Message:

NEMO branch dev_r3337_NOCS10_ICB: some simplifications of inherited code

File:

• branches/2012/dev_r3337_NOCS10_ICB/NEMOGCM/NEMO/OPA_SRC/ICB/icbrst.F90 (modified) (4 diffs)

branches/2012/dev_r3337_NOCS10_ICB/NEMOGCM/NEMO/OPA_SRC/ICB/icbrst.F90

@@ -64 +64 @@
       REAL(wp), DIMENSION(1)       ::   zdata                                         ! need 1d array to read in with
                                                                                             ! start and count arrays
-      LOGICAL                      ::   ll_found_restart, ll_multiPErestart=.FALSE.
+      LOGICAL                      ::   ll_found_restart
       CHARACTER(len=80)            ::   cl_filename
       CHARACTER(len=NF90_MAX_NAME) ::   cl_dname
@@ -74 +74 @@
 
       ! Find a restart file
-      ll_multiPErestart=.FALSE.
-      DO
-         cl_filename = ' '
-         cl_filename = 'restart_icebergs.nc'
-         INQUIRE( file=TRIM(cl_filename), exist=ll_found_restart )
-         IF ( ll_found_restart ) EXIT
+      cl_filename = ' '
+      IF ( lk_mpp ) THEN
          cl_filename = ' '
          WRITE( cl_filename, '("restart_icebergs_",I4.4,".nc")' ) narea-1
          INQUIRE( file=TRIM(cl_filename), exist=ll_found_restart )
-         IF ( ll_found_restart ) THEN
-            ll_multiPErestart = .TRUE.
-            EXIT
-         ENDIF
-         IF (nn_verbose_level >= 0 .AND. lwp) &
-            WRITE( numout, '(a)' ) 'read_restart_bergs: no restart file found'
-         ll_multiPErestart = .TRUE.                         ! force checking in a MPP if no file found on this PE
-         EXIT
-      ENDDO
+      ELSE
+         cl_filename = 'restart_icebergs.nc'
+         INQUIRE( file=TRIM(cl_filename), exist=ll_found_restart )
+      ENDIF
 
       IF ( .NOT. ll_found_restart) THEN                     ! only do the following if a file was found
@@ -220 +211 @@
          WRITE(numout,'(2(a,i5))') 'icebergs, read_restart_bergs: # bergs =',jn,' on PE',narea-1
       IF( lk_mpp ) THEN
-         IF (ll_multiPErestart) CALL mpp_sum(ibergs_in_file) ! In case PE 0 didn't open a file
+         CALL mpp_sum(ibergs_in_file)
          CALL mpp_sum(jn)
       ENDIF
@@ -247 +238 @@
       IF( .NOT. ASSOCIATED(griddata) ) ALLOCATE( griddata(jpi,jpj,1) )
 
-      WRITE(cl_filename,'("icebergs_",I8.8,"_restart_",I4.4,".nc")') kt, narea-1
+      IF( lk_mpp ) THEN
+         WRITE(cl_filename,'("icebergs_",I8.8,"_restart_",I4.4,".nc")') kt, narea-1
+      ELSE
+         WRITE(cl_filename,'("icebergs_",I8.8,"_restart.nc")') kt
+      ENDIF
       IF (nn_verbose_level >= 0) WRITE(numout,'(2a)') 'icebergs, write_restart: creating ',TRIM(cl_filename)