fgreg commented on a change in pull request #61: SDAP-105 DOMS matchup netcdf
and csv generation
URL:
https://github.com/apache/incubator-sdap-nexus/pull/61#discussion_r243469298
##########
File path: analysis/webservice/algorithms/doms/BaseDomsHandler.py
##########
@@ -293,254 +313,68 @@ def create(executionId, results, params, details):
dataset.geospatial_lon_resolution = "point"
dataset.geospatial_lat_units = "degrees_north"
dataset.geospatial_lon_units = "degrees_east"
- dataset.geospatial_vertical_min = 0.0
- dataset.geospatial_vertical_max = params["radiusTolerance"]
+ dataset.geospatial_vertical_min = float(params["depthMin"])
+ dataset.geospatial_vertical_max = float(params["depthMax"])
dataset.geospatial_vertical_units = "m"
dataset.geospatial_vertical_resolution = "point"
dataset.geospatial_vertical_positive = "down"
- dataset.time_to_complete = details["timeToComplete"]
- dataset.num_insitu_matched = details["numInSituMatched"]
- dataset.num_gridded_checked = details["numGriddedChecked"]
- dataset.num_gridded_matched = details["numGriddedMatched"]
- dataset.num_insitu_checked = details["numInSituChecked"]
+ dataset.DOMS_TimeWindow = params["timeTolerance"] / 60 / 60
+ dataset.DOMS_TimeWindow_Units = "hours"
+ dataset.DOMS_SearchRadius = float(params["radiusTolerance"])
+ dataset.DOMS_SearchRadius_Units = "m"
+ # dataset.URI_Subset = "http://webservice subsetting query request"
+ dataset.URI_Matchup = "http://{webservice}/domsresults?id="; +
executionId + "&output=NETCDF"
+ dataset.DOMS_ParameterPrimary = params["parameter"] if "parameter" in
params else ""
+ dataset.DOMS_platforms = params["platforms"]
+ dataset.DOMS_primary = params["primary"]
+ dataset.DOMS_time_to_complete = details["timeToComplete"]
+ dataset.DOMS_time_to_complete_units = "seconds"
+
+ # insituDatasets = params["matchup"].split(",")
+ insituDatasets = params["matchup"]
+ insituLinks = set()
+ for insitu in insituDatasets:
+ if insitu == "samos":
+ insituLinks.add("http://samos.coaps.fsu.edu/html/nav.php?s=2";)
+ if insitu == "icoads":
+ insituLinks.add("https://rda.ucar.edu/datasets/ds548.1/";)
+ if insitu == "spurs":
+ insituLinks.add("https://podaac.jpl.nasa.gov/spurs";)
+ dataset.DOMS_DatasetMetadata = ', '.join(insituLinks)
- dataset.date_modified = datetime.now().strftime('%Y%m%d %H:%M:%S')
- dataset.date_created = datetime.now().strftime('%Y%m%d %H:%M:%S')
-
- DomsNetCDFFormatter.__addNetCDFConstants(dataset)
-
- idList = []
- primaryIdList = []
- DomsNetCDFFormatter.__packDataIntoDimensions(idList, primaryIdList,
results)
-
- idDim = dataset.createDimension("id", size=None)
- primaryIdDim = dataset.createDimension("primary_id", size=None)
-
- idVar = dataset.createVariable("id", "i4", ("id",), chunksizes=(2048,))
- primaryIdVar = dataset.createVariable("primary_id", "i4",
("primary_id",), chunksizes=(2048,))
-
- idVar[:] = idList
- primaryIdVar[:] = primaryIdList
+ platforms = set()
+ for primaryValue in results:
+ platforms.add(primaryValue['platform'])
+ for match in primaryValue['matches']:
+ platforms.add(match['platform'])
+ dataset.platform = ', '.join(platforms)
- DomsNetCDFFormatter.__createDimension(dataset, results, "lat", "f4",
"y")
- DomsNetCDFFormatter.__createDimension(dataset, results, "lon", "f4",
"x")
+ #Create Satellite group, variables, and attributes
+ satelliteGroup = dataset.createGroup("SatelliteData")
+ satelliteWriter = DomsNetCDFValueWriter(satelliteGroup)
- DomsNetCDFFormatter.__createDimension(dataset, results,
"sea_water_temperature_depth", "f4",
- "sea_water_temperature_depth")
- DomsNetCDFFormatter.__createDimension(dataset, results,
"sea_water_temperature", "f4", "sea_water_temperature")
- DomsNetCDFFormatter.__createDimension(dataset, results,
"sea_water_salinity_depth", "f4",
- "sea_water_salinity_depth")
- DomsNetCDFFormatter.__createDimension(dataset, results,
"sea_water_salinity", "f4", "sea_water_salinity")
+ # Create InSitu group, variables, and attributes
+ insituGroup = dataset.createGroup("InsituData")
Review comment:
Same deal here with string for insitu group name
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
