From d18fbdf10be85bbcd967d63c75dacb61e32ee8e1 Mon Sep 17 00:00:00 2001 From: Guilhem Lavaux Date: Wed, 31 Oct 2012 15:00:43 -0400 Subject: [PATCH] Ported python code to netCDF4 package (support most recent netcdf4 on-disk fornat) --- .../void_python_tools/backend/backend.py | 16 +++++++++------- .../void_python_tools/backend/launchers.py | 16 +++++++++------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/python_tools/void_python_tools/backend/backend.py b/python_tools/void_python_tools/backend/backend.py index 4fc1c8a..5209d25 100755 --- a/python_tools/void_python_tools/backend/backend.py +++ b/python_tools/void_python_tools/backend/backend.py @@ -13,8 +13,10 @@ import glob import subprocess import sys from pylab import figure -from Scientific.IO.NetCDF import NetCDFFile -import Scientific.N as Num +from netCDF4 import Dataset + +NetCDFFile = Dataset +ncFloat='f8' # Double precision class Stack: zMin = 0.0 @@ -760,7 +762,7 @@ def launchCombine(sample, stack, voidDir=None, logFile=None, dataTemp = np.append(dataTemp, dataTemp2) outFile = NetCDFFile(voidDir+"/posx.nc", mode='w') outFile.createDimension("dim", len(dataTemp)) - v = outFile.createVariable("array", Num.Float, ("dim",)) + v = outFile.createVariable("array", ncFloat, ("dim",)) v[:] = dataTemp outFile.close() @@ -773,7 +775,7 @@ def launchCombine(sample, stack, voidDir=None, logFile=None, dataTemp = np.append(dataTemp, dataTemp2) outFile = NetCDFFile(voidDir+"/posy.nc", mode='w') outFile.createDimension("dim", len(dataTemp)) - v = outFile.createVariable("array", Num.Float, ("dim",)) + v = outFile.createVariable("array", ncFloat, ("dim",)) v[:] = dataTemp outFile.close() @@ -786,7 +788,7 @@ def launchCombine(sample, stack, voidDir=None, logFile=None, dataTemp = np.append(dataTemp, dataTemp2) outFile = NetCDFFile(voidDir+"/posz.nc", mode='w') outFile.createDimension("dim", len(dataTemp)) - v = outFile.createVariable("array", Num.Float, ("dim",)) + v = outFile.createVariable("array", ncFloat, ("dim",)) v[:] = dataTemp outFile.close() @@ -799,7 +801,7 @@ def launchCombine(sample, stack, voidDir=None, logFile=None, dataTemp = np.append(dataTemp, dataTemp2) outFile = NetCDFFile(voidDir+"/redshifts.nc", mode='w') outFile.createDimension("dim", len(dataTemp)) - v = outFile.createVariable("array", Num.Float, ("dim",)) + v = outFile.createVariable("array", ncFloat, ("dim",)) v[:] = dataTemp outFile.close() @@ -812,7 +814,7 @@ def launchCombine(sample, stack, voidDir=None, logFile=None, dataTemp = np.append(dataTemp, dataTemp2) outFile = NetCDFFile(voidDir+"/indexes.nc", mode='w') outFile.createDimension("dim", len(dataTemp)) - v = outFile.createVariable("array", Num.Float, ("dim",)) + v = outFile.createVariable("array", ncFloat, ("dim",)) v[:] = dataTemp outFile.close() diff --git a/python_tools/void_python_tools/backend/launchers.py b/python_tools/void_python_tools/backend/launchers.py index 888639a..9368c33 100755 --- a/python_tools/void_python_tools/backend/launchers.py +++ b/python_tools/void_python_tools/backend/launchers.py @@ -14,11 +14,13 @@ import glob import subprocess import sys from pylab import figure -from Scientific.IO.NetCDF import NetCDFFile -import Scientific.N as Num +from netCDF4 import Dataset from void_python_tools.backend.classes import * import void_python_tools.apTools as vp +NetCDFFile = Dataset +ncFloat = 'f8' # Double precision + # ----------------------------------------------------------------------------- def launchGenerate(sample, binPath, workDir=None, inputDataDir=None, zobovDir=None, figDir=None, logFile=None, useLCDM=False, @@ -626,7 +628,7 @@ def launchCombine(sample, stack, voidDir=None, logFile=None, dataTemp = np.append(dataTemp, dataTemp2) outFile = NetCDFFile(voidDir+"/posx.nc", mode='w') outFile.createDimension("dim", len(dataTemp)) - v = outFile.createVariable("array", Num.Float, ("dim",)) + v = outFile.createVariable("array", ncFloat, ("dim",)) v[:] = dataTemp outFile.close() @@ -639,7 +641,7 @@ def launchCombine(sample, stack, voidDir=None, logFile=None, dataTemp = np.append(dataTemp, dataTemp2) outFile = NetCDFFile(voidDir+"/posy.nc", mode='w') outFile.createDimension("dim", len(dataTemp)) - v = outFile.createVariable("array", Num.Float, ("dim",)) + v = outFile.createVariable("array", ncFloat, ("dim",)) v[:] = dataTemp outFile.close() @@ -652,7 +654,7 @@ def launchCombine(sample, stack, voidDir=None, logFile=None, dataTemp = np.append(dataTemp, dataTemp2) outFile = NetCDFFile(voidDir+"/posz.nc", mode='w') outFile.createDimension("dim", len(dataTemp)) - v = outFile.createVariable("array", Num.Float, ("dim",)) + v = outFile.createVariable("array", ncFloat, ("dim",)) v[:] = dataTemp outFile.close() @@ -665,7 +667,7 @@ def launchCombine(sample, stack, voidDir=None, logFile=None, dataTemp = np.append(dataTemp, dataTemp2) outFile = NetCDFFile(voidDir+"/redshifts.nc", mode='w') outFile.createDimension("dim", len(dataTemp)) - v = outFile.createVariable("array", Num.Float, ("dim",)) + v = outFile.createVariable("array", ncFloat, ("dim",)) v[:] = dataTemp outFile.close() @@ -678,7 +680,7 @@ def launchCombine(sample, stack, voidDir=None, logFile=None, dataTemp = np.append(dataTemp, dataTemp2) outFile = NetCDFFile(voidDir+"/indexes.nc", mode='w') outFile.createDimension("dim", len(dataTemp)) - v = outFile.createVariable("array", Num.Float, ("dim",)) + v = outFile.createVariable("array", ncFloat, ("dim",)) v[:] = dataTemp outFile.close()