Changeset 6622 for trunk

Timestamp:

2016-05-25T16:24:04+02:00 (8 years ago)

Author:

davestorkey

Message:

Bug fix for icb_combrest.py. See ticket #1708.

Location:

trunk/NEMOGCM

Files:

• NEMO/OPA_SRC/ICB/icbrst.F90 (modified) (2 diffs)
• TOOLS/REBUILD_NEMO/icb_combrest.py (modified) (1 diff)

trunk/NEMOGCM/NEMO/OPA_SRC/ICB/icbrst.F90

@@ -94 +94 @@
            &     ij .GE. nldj+njmpp-1 .AND. ij .LE. nlej+njmpp-1 ) THEN           
 
-               CALL iom_get( ncid, jpdom_unknown, 'number'       , zdata(:) , ktime=jn, kstart=(/1/), kcount=(/nkounts/) )
+               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 )
@@ -126 +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(:) )
+      CALL iom_get( ncid, jpdom_unknown, 'kount' , zdata )
       num_bergs(:) = INT(zdata(:))
 

trunk/NEMOGCM/TOOLS/REBUILD_NEMO/icb_combrest.py

@@ -169 +169 @@
     sys.exit(15)
   fo = Dataset(pathout, 'w')
-  for dim in ['x','y','c']:
+  for dim in ['x','y','c','k']:
     indim = fi.dimensions[dim]
     fo.createDimension(dim, len(indim))
-  for var in ['calving','calving_hflx','stored_ice','stored_heat']:
+  for var in ['kount','calving','calving_hflx','stored_ice','stored_heat']:
     invar = fi.variables[var]
     fo.createVariable(var, invar.datatype, invar.dimensions)
     fo.variables[var][:] = invar[:]
-    fo.variables[var].long_name = invar.long_name
-    fo.variables[var].units = invar.units
+    if "long_name" in invar.ncattrs():
+        fo.variables[var].long_name = invar.long_name
+    if "units" in invar.ncattrs():
+        fo.variables[var].units = invar.units
   os.remove(pathout.replace('.nc','_WORK.nc'))
 #