xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #189 fix the grid deltaScripts to work with static data and fix rollback" into development

Browse source 
Former-commit-id: 021ee5d07c [formerly a87b97364a] [formerly 2dcc3f39c0] [formerly 021ee5d07c [formerly a87b97364a] [formerly 2dcc3f39c0] [formerly 31df83ff4d [formerly 2dcc3f39c0 [formerly b8af2ed2192ead1043f56355dc8a9a05ce035c3d]]]]
Former-commit-id: 31df83ff4d
Former-commit-id: 3d7f30f2b2 [formerly 6561e80beb] [formerly 29fa7eb312fb3b93bf26704b57a3f9a4ea70924a [formerly 1bf0b7d23a]]
Former-commit-id: 4a8177d554e31d72554e0505f3c49d6b89ea7adf [formerly 1b1fd7d92c]
Former-commit-id: b8b07cfe89
This commit is contained in:
Richard Peter 2012-10-31 21:28:48 -05:00 • committed by Gerrit Code Review
commit 20957d91e2
2 changed files with 35 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
deltaScripts/unified_grid/convert_grib_data.py
View file

@ -97,8 +97,6 @@ def convertModel(modelName):
secondaryId = "Version" + version
ensembleId = convertPert(pert)
newdatauri = "/grid/" + datatime + "/" + modelName + "/" + secondaryId + "/" + ensembleId + "/" + gridcoverageid + "/" + paramabbrev + "/" + masterlevel + "/" + levelone + "/" + leveltwo
if paramabbrev.startswith("static") and gribforecasttime != 0:
continue
hdfTime -= time()
try:
forecast = int(gribforecasttime)/3600
@ -106,26 +104,26 @@ def convertModel(modelName):
newgrp = newdatauri
dataset="Data"
if paramabbrev.startswith("static"):
forecast = 0
prevgrp = "/"
newgrp = "/" + gridcoveragename
newgrp = "/" + gridcoverageid
dataset=paramabbrev
filebase = "/%s-%s-FH-%.3d.h5" % (modelName, gribreftime.split(":")[0].replace(" ", "-"), forecast)
hdf5file = gridFiles + masterlevel + filebase
if lastFile != None and lastFile.filename != hdf5file:
#print "Closing", lastFile.filename
lastFile.close()
lastFile = None
if lastFile == None:
if not(exists(hdf5file)):
t0 = time()
if not(isdir(gridFiles + masterlevel)):
mkdir(gridFiles + masterlevel)
move(gribFiles + masterlevel + filebase, gridFiles + masterlevel)
hdfTime -= (time() - t0)
#print "Opening", hdf5file
lastFile = h5py.File(hdf5file)
copyH5(lastFile, prevgrp, newgrp, dataset)
if not(paramabbrev.startswith("static")) or forecast == 0:
if lastFile != None and lastFile.filename != hdf5file:
#print "Closing", lastFile.filename
lastFile.close()
lastFile = None
if lastFile == None:
if not(exists(hdf5file)):
t0 = time()
if not(isdir(gridFiles + masterlevel)):
mkdir(gridFiles + masterlevel)
move(gribFiles + masterlevel + filebase, gridFiles + masterlevel)
hdfTime -= (time() - t0)
#print "Opening", hdf5file
lastFile = h5py.File(hdf5file)
copyH5(lastFile, prevgrp, newgrp, dataset)
except:
print modelName, "Error", gribdatauri
print sys.exc_info()[1]

40
deltaScripts/unified_grid_rollback/convert_grib_data.py
View file

@ -87,8 +87,6 @@ def convertModel(modelName):
secondaryId = "Version" + version
ensembleId = convertPert(pert)
newdatauri = "/grid/" + datatime + "/" + modelName + "/" + secondaryId + "/" + ensembleId + "/" + gridcoverageid + "/" + paramabbrev + "/" + masterlevel + "/" + levelone + "/" + leveltwo
if paramabbrev.startswith("static") and gribforecasttime != 0:
continue
hdfTime -= time()
try:
forecast = int(gribforecasttime)/3600
@ -96,26 +94,26 @@ def convertModel(modelName):
newgrp = newdatauri
dataset="Data"
if paramabbrev.startswith("static"):
forecast = 0
prevgrp = "/"
newgrp = "/" + gridcoveragename
prevgrp = "/"+ gridcoverageid
newgrp = "/"
dataset=paramabbrev
filebase = "/%s-%s-FH-%.3d.h5" % (modelName, gribreftime.split(":")[0].replace(" ", "-"), forecast)
hdf5file = gribFiles + masterlevel + filebase
if lastFile != None and lastFile.filename != hdf5file:
#print "Closing", lastFile.filename
lastFile.close()
lastFile = None
if lastFile == None:
if not(exists(hdf5file)):
t0 = time()
if not(isdir(gribFiles + masterlevel)):
mkdir(gribFiles + masterlevel)
move(gridFiles + masterlevel + filebase, gribFiles)
hdfTime -= (time() - t0)
#print "Opening", hdf5file
lastFile = h5py.File(hdf5file)
copyH5(lastFile, newgrp, prevgrp, dataset)
if not(paramabbrev.startswith("static")) or forecast == 0:
filebase = "/%s-%s-FH-%.3d.h5" % (modelName, gribreftime.split(":")[0].replace(" ", "-"), forecast)
hdf5file = gribFiles + masterlevel + filebase
if lastFile != None and lastFile.filename != hdf5file:
#print "Closing", lastFile.filename
lastFile.close()
lastFile = None
if lastFile == None:
if not(exists(hdf5file)):
t0 = time()
if not(isdir(gribFiles + masterlevel)):
mkdir(gribFiles + masterlevel)
move(gridFiles + masterlevel + filebase, gribFiles + masterlevel)
hdfTime -= (time() - t0)
#print "Opening", hdf5file
lastFile = h5py.File(hdf5file)
copyH5(lastFile, newgrp, prevgrp, dataset)
except:
print modelName, "Error", gribdatauri
print sys.exc_info()[1]