Changeset 6793 for branches/UKMO/dev_r5518_GO6_package/NEMOGCM/TOOLS

Timestamp:

2016-07-06T13:59:38+02:00 (8 years ago)

Author:

davestorkey

Message:

Merge in changes r6482:6692 from the nemo_v3_6_STABLE branch. Only part that changes results for GO6 configurations is a bug fix for the TVD advection scheme put in at r6692.
Custom merge into /branches/UKMO/dev_r5518_GO6_package/NEMOGCM: r6692 cf. r6688 of /branches/2015/nemo_v3_6_STABLE/NEMOGCM@6791

Custom merge into /branches/UKMO/dev_r5518_GO6_package/NEMOGCM: r6688 cf. r6482 of /branches/2015/nemo_v3_6_STABLE/NEMOGCM@6791

File:

• branches/UKMO/dev_r5518_GO6_package/NEMOGCM/TOOLS/REBUILD_NEMO/icb_combrest.py (modified) (1 diff)

branches/UKMO/dev_r5518_GO6_package/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'))
 #