Fix tools/025gridGeneration/interpWOA05.py

mom-ocean · Oct 2, 2014 · b61eeb3 · b61eeb3
1 parent 7194bb0
commit b61eeb3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/tools/python/025gridGeneration/Makefile b/tools/python/025gridGeneration/Makefile
@@ -50,8 +50,8 @@ topog.nc: edit_topog.nc
 	./ice9.py edit_topog.nc --output topog.nc
 
 ocean_topog.nc: topog.nc
-	module load nco; /usr/local/nco-4.0.3/bin/ncks -h -d ny,40,  topog.nc ocean_topog.nc
-	/usr/local/nco-4.0.3/bin/ncap -h -s 'jEdit=jEdit-40' --overwrite ocean_topog.nc ocean_topog.nc
+	module load nco; ncks -h -d ny,40,  topog.nc ocean_topog.nc
+	module load nco;ncap -h -s 'jEdit=jEdit-40' --overwrite ocean_topog.nc ocean_topog.nc
 	./addDimension.py ocean_topog.nc ntiles 1
 # Removes rows 1-40
 # Adjusts jEdit values

diff --git a/tools/python/025gridGeneration/interpWOA05.py b/tools/python/025gridGeneration/interpWOA05.py
@@ -1,8 +1,11 @@
 #!/usr/bin/env python
 
-from midas import *
+from midas.rectgrid import *
+import netCDF4 as nc
+import numpy as np
+
 sgrid=supergrid(file='/archive/gold/datasets/OM4_025/mosaic.v20140610.unpacked/ocean_hgrid.nc',cyclic_x=True,tripolar_n=True)
-grid=rectgrid(supergrid=sgrid)
+grid=quadmesh(supergrid=sgrid)
 grid.lath=grid.y_T[:,grid.im/4]
 grid.latq=grid.y_T_bounds[:,grid.im/4]
 grid.D=nc.Dataset('/archive/gold/datasets/OM4_025/mosaic.v20140610.unpacked/ocean_topog.nc').variables['depth'][:]