Changeset 3019 for branches

Timestamp:

2011-10-28T10:55:06+02:00 (13 years ago)

Author:

edblockley

Message:

5th commit for rebuild branch; Fixing a small bug in the rebuild to ensure that the rebuild dimension no.s are properly set when the names are specified in the namelist. Also changing indimlens to SHARED rather than PRIVATE for OMP loops to satisfy certain compilers. see ticket:#871

File:

• branches/2011/dev_r2802_UKMET3_rebuild/NEMOGCM/TOOLS/REBUILD_NEMO/src/rebuild_nemo.f90 (modified) (6 diffs)

branches/2011/dev_r2802_UKMET3_rebuild/NEMOGCM/TOOLS/REBUILD_NEMO/src/rebuild_nemo.f90

@@ -237 +237 @@
          ENDIF
       ELSE ! l_findDims = false
-         IF( TRIM(dimname) == TRIM(dims(1))) dimlen = global_sizes(1)
-         IF( TRIM(dimname) == TRIM(dims(2))) dimlen = global_sizes(2)
+         IF( TRIM(dimname) == TRIM(dims(1))) THEN
+            dimlen = global_sizes(1)
+            rebuild_dims(1) = idim
+         ENDIF
+         IF( rbdims > 1 .AND. TRIM(dimname) == TRIM(dims(2))) THEN
+            dimlen = global_sizes(2)
+            rebuild_dims(2) = idim
+         ENDIF
       ENDIF
 
@@ -565 +571 @@
 !$OMP  PARALLEL DO DEFAULT(NONE)                                                          &
 !$OMP& PRIVATE(ifile,ncid,xtype,start_pos,local_sizes,InMin,InMax,natts,                  &
-!$OMP&         ndims,attid,attname,dimids,indimlens,idim,dimname,dimlen,unlimitedDimId,   &
+!$OMP&         ndims,attid,attname,dimids,idim,dimname,dimlen,unlimitedDimId,             &
 !$OMP&         halo_start,halo_end,idomain,jdomain,rdomain,di,dj,dr,                      &
 !$OMP&         localdata_1d_i2,localdata_1d_i4,localdata_1d_sp,localdata_1d_dp,           &
@@ -572 +578 @@
 !$OMP&         localdata_4d_i2,localdata_4d_i4,localdata_4d_sp,localdata_4d_dp,           &
 !$OMP&         localdata_1d_i1,localdata_2d_i1,localdata_3d_i1,localdata_4d_i1)           &
-!$OMP& SHARED(jv,nvars,varname,filenames,ValMin,ValMax,outdimlens,rbdims,                 &
+!$OMP& SHARED(jv,nvars,varname,filenames,ValMin,ValMax,indimlens,outdimlens,rbdims,       &
 !$OMP&        ndomain,outid,chunksize,istop,l_valid,nthreads,inncids,rebuild_dims,        &
 !$OMP&        globaldata_1d_i2,globaldata_1d_i4,globaldata_1d_sp,globaldata_1d_dp,        &
@@ -590 +596 @@
             CALL check_nf90( nf90_inquire_variable( ncid, jv, varname, xtype, ndims, dimids, natts ), istop )
             CALL check_nf90( nf90_inquire( ncid, unlimitedDimId = unlimitedDimId ), istop )
-            DO idim = 1, ndims
-               CALL check_nf90( nf90_inquire_dimension( ncid, idim, dimname, dimlen ), istop )
-               indimlens(idim) = dimlen    
-            END DO
 !$OMP END CRITICAL
 
@@ -934 +936 @@
 
             IF( nthreads == 1 .AND. istop /= nf90_noerr )  THEN
-               WRITE(numerr,*) '*** NEMO rebuild failed with ', istop,' ERRORS! ***'
+               WRITE(numerr,*) '*** NEMO rebuild failed! ***'
                STOP
             ENDIF
@@ -943 +945 @@
 !3.6 Abort if any of the OMP threads failed
          IF( istop /= nf90_noerr )  THEN
-            WRITE(numerr,*) '*** NEMO rebuild failed with ', istop,' ERRORS! ***'
+            WRITE(numerr,*) '*** NEMO rebuild failed! ***'
             STOP
          ENDIF