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

Issue #189 fix the grid deltaScripts to work with static data and fix rollback

Browse source 
Former-commit-id: c682788130 [formerly b5f84376f0 [formerly 79dca17198b19df77c7eb1074e492a16516efc22]]
Former-commit-id: b5f84376f0
Former-commit-id: 05e3b37896
This commit is contained in:
Ben Steffensmeier 2012-10-31 15:35:51 -05:00
parent ca1037e96b
commit b71fed5578
2 changed files with 35 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
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,12 +104,12 @@ 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 not(paramabbrev.startswith("static")) or forecast == 0:
if lastFile != None and lastFile.filename != hdf5file:
#print "Closing", lastFile.filename
lastFile.close()

10
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,10 +94,10 @@ def convertModel(modelName):
newgrp = newdatauri
dataset="Data"
if paramabbrev.startswith("static"):
forecast = 0
prevgrp = "/"
newgrp = "/" + gridcoveragename
prevgrp = "/"+ gridcoverageid
newgrp = "/"
dataset=paramabbrev
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:
@ -111,7 +109,7 @@ def convertModel(modelName):
t0 = time()
if not(isdir(gribFiles + masterlevel)):
mkdir(gribFiles + masterlevel)
move(gridFiles + masterlevel + filebase, gribFiles)
move(gridFiles + masterlevel + filebase, gribFiles + masterlevel)
hdfTime -= (time() - t0)
#print "Opening", hdf5file
lastFile = h5py.File(hdf5file)