Changeset 5986 for branches

Timestamp:

2015-12-02T17:50:16+01:00 (8 years ago)

Author:

davestorkey

Message:

UKMO/icebergs_restart_single_file branch: tidy up.

File:

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

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

@@ -60 +60 @@
       INTEGER                      ::   idim, ivar, iatt
       INTEGER                      ::   jn, iunlim_dim, ibergs_in_file
-      INTEGER                      ::   iclass
-      INTEGER, DIMENSION(1)        ::   istrt, ilngth, idata
-      INTEGER, DIMENSION(2)        ::   istrt2, ilngth2
-      INTEGER, DIMENSION(nkounts)  ::   idata2
-      REAL(wp), DIMENSION(1)       ::   zdata                                         ! need 1d array to read in with
-                                                                                            ! start and count arrays
+      INTEGER                      ::   ii,ij,iclass
+      REAL(wp), DIMENSION(nkounts) ::   zdata      
       LOGICAL                      ::   ll_found_restart
       CHARACTER(len=256)           ::   cl_path
@@ -72 +68 @@
       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) :: zdata_in
-      INTEGER                      ::   ii,ij
       !!----------------------------------------------------------------------
 
@@ -100 +94 @@
            &     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, jpdom_unknown, 'number'       , (/zdata(:)/) , ktime=jn, kstart=(/1/), kcount=(/nkounts/) )
+               localberg%number(:) = INT(zdata(:))
                CALL iom_get( ncid, 'mass_scaling' , localberg%mass_scaling, ktime=jn )
                CALL iom_get( ncid, 'lon'          , localpt%lon           , ktime=jn )
@@ -111 +105 @@
                CALL iom_get( ncid, 'width'        , localpt%width         , ktime=jn )
                CALL iom_get( ncid, 'length'       , localpt%length        , ktime=jn )
-               CALL iom_get( ncid, 'year'         , zdata_in(1,1)         , ktime=jn )
-               localpt%year = INT(zdata_in(1,1))
+               CALL iom_get( ncid, 'year'         , zdata(1)              , ktime=jn )
+               localpt%year = INT(zdata(1))
                CALL iom_get( ncid, 'day'          , localpt%day           , ktime=jn )
                CALL iom_get( ncid, 'mass_of_bits' , localpt%mass_of_bits  , ktime=jn )
@@ -132 +126 @@
       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' , (/zdata_in(1,:)/) )
-      num_bergs(:) = INT(zdata_in(1,:))
+      CALL iom_get( ncid, jpdom_unknown, 'kount' , (/zdata(:)/) )
+      num_bergs(:) = INT(zdata(:))
 
       ! Sanity check