Changeset 5879 for branches/UKMO/icebergs_restart_single_file/NEMOGCM/NEMO/OPA_SRC/ICB/icbrst.F90

Timestamp:

2015-11-12T15:52:57+01:00 (8 years ago)

Author:

davestorkey

Message:

UKMO icebergs_single_restart_branch: Bug fixes. This version of the code now produces
bit-comparable results with old code if starting from multiple restarts or a single
restart file.

File:

• branches/UKMO/icebergs_restart_single_file/NEMOGCM/NEMO/OPA_SRC/ICB/icbrst.F90 (modified) (7 diffs)

branches/UKMO/icebergs_restart_single_file/NEMOGCM/NEMO/OPA_SRC/ICB/icbrst.F90

@@ -70 +70 @@
       TYPE(iceberg)                ::   localberg ! NOT a pointer but an actual local variable
       TYPE(point)                  ::   localpt   ! NOT a pointer but an actual local variable
-      REAL(wp), DIMENSION(1,nkounts) ::   rdata_in 
+      REAL(wp), DIMENSION(1,nkounts) :: zdata_in
+      INTEGER                      ::   ii,ij
       !!----------------------------------------------------------------------
 
@@ -83 +84 @@
 
          ibergs_in_file = iom_file(ncid)%lenuld
-         IF(lwp) WRITE(numout,*) '>>> Number of bergs in local file : ',ibergs_in_file
          DO jn = 1,ibergs_in_file
 
@@ -92 +92 @@
             CALL iom_get( ncid, 'yj'     ,localpt%yj  , ktime=jn )
 
-            IF(lwp) WRITE(numout, *) '>>> Found iceberg ',jn,' at (i,j) ',localpt%xi,',',localpt%yj
-            IF(lwp) WRITE(numout, *) '>>> nldi, nlei, nldj, nlej, nimpp, njmpp ',nldi, nlei, nldj, nlej, nimpp, njmpp
-
-            ! Only proceed if this iceberg is on the local processor (including halos).
-            IF ( localpt%xi .GE. nimpp .AND. localpt%xi .LE. nimpp+jpi-1 .AND. &
-           &     localpt%yj .GE. njmpp .AND. localpt%yj .LE. njmpp+jpj-1 ) THEN           
-
-               CALL iom_get( ncid, jpdom_unknown, 'number'       , (/rdata_in(1,:)/) , ktime=jn, kstart=(/1/), kcount=(/nkounts/) )
-               localberg%number(:) = INT(rdata_in(1,:))
+            ii = INT( localpt%xi + 0.5 )
+            ij = INT( localpt%yj + 0.5 )
+            ! Only proceed if this iceberg is on the local processor (excluding halos).
+            IF ( ii .GE. nldi+nimpp-1 .AND. ii .LE. nlei+nimpp-1 .AND. &
+           &     ij .GE. nldj+njmpp-1 .AND. ij .LE. nlej+njmpp-1 ) THEN           
+
+               CALL iom_get( ncid, jpdom_unknown, 'number'       , (/zdata_in(1,:)/) , ktime=jn, kstart=(/1/), kcount=(/nkounts/) )
+               localberg%number(:) = INT(zdata_in(1,:))
                CALL iom_get( ncid, 'mass_scaling' , localberg%mass_scaling, ktime=jn )
                CALL iom_get( ncid, 'lon'          , localpt%lon           , ktime=jn )
@@ -110 +109 @@
                CALL iom_get( ncid, 'width'        , localpt%width         , ktime=jn )
                CALL iom_get( ncid, 'length'       , localpt%length        , ktime=jn )
-               CALL iom_get( ncid, 'year'         , rdata_in(1,1)         , ktime=jn )
-               localpt%year = INT(rdata_in(1,1))
+               CALL iom_get( ncid, 'year'         , zdata_in(1,1)         , ktime=jn )
+               localpt%year = INT(zdata_in(1,1))
                CALL iom_get( ncid, 'day'          , localpt%day           , ktime=jn )
                CALL iom_get( ncid, 'mass_of_bits' , localpt%mass_of_bits  , ktime=jn )
@@ -117 +116 @@
 
                !
-               IF(lwp) WRITE(numout, *) '>>> Initialising iceberg ',jn,' at (i,j) ',localpt%xi,',',localpt%yj
                CALL icb_utl_add( localberg, localpt )
 
@@ -132 +130 @@
       CALL iom_get( ncid, jpdom_autoglo_xy, 'stored_ice'  , berg_grid%stored_ice, kstart=(/1,1,1/), kcount=(/1,1,nclasses/) )
       
-      CALL iom_get( ncid, jpdom_unknown, 'kount' , (/rdata_in(1,:)/) )
-      num_bergs(:) = INT(rdata_in(1,:))
+      CALL iom_get( ncid, jpdom_unknown, 'kount' , (/zdata_in(1,:)/) )
+      num_bergs(:) = INT(zdata_in(1,:))
 
       ! Finish up
@@ -143 +141 @@
          WRITE(numout,'(2(a,i5))') 'icebergs, read_restart_bergs: # bergs =',jn,' on PE',narea-1
       IF( lk_mpp ) THEN
-         CALL mpp_sum(ibergs_in_file)
+         ! Only mpp_sum ibergs_in_file if we are reading from multiple restart files. 
+         WRITE(numout,*) 'iom_file(ncid)%name : ',iom_file(ncid)%name
+         WRITE(numout,*) "INDEX(iom_file(ncid)%name,'icebergs.nc' ) : ",INDEX(iom_file(ncid)%name,'icebergs.nc' )
+         IF( INDEX(iom_file(ncid)%name,'icebergs.nc' ) .EQ. 0 ) CALL mpp_sum(ibergs_in_file)
          CALL mpp_sum(jn)
       ENDIF