From ebc0ccf848a4f674c5fee5d2a10197cb33bd9d81 Mon Sep 17 00:00:00 2001 From: mjames-upc Date: Mon, 20 Mar 2017 19:01:57 -0600 Subject: [PATCH] merge dynamicserialize from AWIPS2_Dev_Builds master_16.4.1 --- .../nws/ncep/common/dataplugin/__init__.py | 1 + .../ncep/common/dataplugin/atcf/__init__.py | 8 ++ .../atcf/request/RetrieveAtcfDeckRequest.py | 14 +++ .../dataplugin/atcf/request/__init__.py | 9 ++ .../gempak/request/GetGridDataRequest.py | 91 ++++++++++--------- .../gempak/request/GetGridInfoRequest.py | 20 ++-- .../gempak/request/GetGridNavRequest.py | 20 ++-- .../gempak/request/GetStationsRequest.py | 7 ++ .../gempak/request/GetTimesRequest.py | 6 ++ .../gempak/request/GetTimesResponse.py | 6 ++ .../dataplugin/gempak/request/Station.py | 62 +++++++------ .../gempak/request/StationDataRequest.py | 34 ++++--- .../gempak/request/SurfaceDataRequest.py | 48 ++++++++++ .../gempak/request/UpperAirDataRequest.py | 48 ++++++++++ .../dataplugin/gempak/request/__init__.py | 23 +++-- 15 files changed, 291 insertions(+), 106 deletions(-) create mode 100644 dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/atcf/__init__.py create mode 100644 dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/atcf/request/RetrieveAtcfDeckRequest.py create mode 100644 dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/atcf/request/__init__.py create mode 100644 dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/SurfaceDataRequest.py create mode 100644 dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/UpperAirDataRequest.py diff --git a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/__init__.py b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/__init__.py index 66b19b3..adba431 100644 --- a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/__init__.py +++ b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/__init__.py @@ -2,6 +2,7 @@ # File auto-generated by PythonFileGenerator __all__ = [ + 'atcf', 'gempak', 'gpd', 'pgen' diff --git a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/atcf/__init__.py b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/atcf/__init__.py new file mode 100644 index 0000000..a944c4e --- /dev/null +++ b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/atcf/__init__.py @@ -0,0 +1,8 @@ + +# File auto-generated by PythonFileGenerator + +__all__ = [ + 'request' + ] + + diff --git a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/atcf/request/RetrieveAtcfDeckRequest.py b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/atcf/request/RetrieveAtcfDeckRequest.py new file mode 100644 index 0000000..9fdc815 --- /dev/null +++ b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/atcf/request/RetrieveAtcfDeckRequest.py @@ -0,0 +1,14 @@ + +# File auto-generated against equivalent DynamicSerialize Java class + +class RetrieveAtcfDeckRequest(object): + + def __init__(self): + self.deckID = None + + def getDeckID(self): + return self.deckID + + def setDeckID(self, deckID): + self.deckID = deckID + diff --git a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/atcf/request/__init__.py b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/atcf/request/__init__.py new file mode 100644 index 0000000..1d83f34 --- /dev/null +++ b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/atcf/request/__init__.py @@ -0,0 +1,9 @@ + +# File auto-generated by PythonFileGenerator + +__all__ = [ + 'RetrieveAtcfDeckRequest' + ] + +from RetrieveAtcfDeckRequest import RetrieveAtcfDeckRequest + diff --git a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetGridDataRequest.py b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetGridDataRequest.py index 839d5fb..9d72ee0 100644 --- a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetGridDataRequest.py +++ b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetGridDataRequest.py @@ -1,53 +1,23 @@ # File auto-generated against equivalent DynamicSerialize Java class +# +# SOFTWARE HISTORY +# +# Date Ticket# Engineer Description +# ------------ ---------- ----------- -------------------------- +# Sep 16, 2016 pmoyer Generated class GetGridDataRequest(object): def __init__(self): - self.pluginName = None - self.modelId = None - self.reftime = None - self.fcstsec = None - self.level1 = None - self.level2 = None self.vcoord = None + self.level2 = None + self.modelId = None self.parm = None - - def getPluginName(self): - return self.pluginName - - def setPluginName(self, pluginName): - self.pluginName = pluginName - - def getModelId(self): - return self.modelId - - def setModelId(self, modelId): - self.modelId = modelId - - def getReftime(self): - return self.reftime - - def setReftime(self, reftime): - self.reftime = reftime - - def getFcstsec(self): - return self.fcstsec - - def setFcstSec(self, fcstsec): - self.fcstsec = fcstsec - - def getLevel1(self): - return self.level1 - - def setLevel1(self, level1): - self.level1 = level1 - - def getLevel2(self): - return self.level2 - - def setLevel2(self, level2): - self.level2 = level2 + self.level1 = None + self.reftime = None + self.pluginName = None + self.fcstsec = None def getVcoord(self): return self.vcoord @@ -55,8 +25,45 @@ class GetGridDataRequest(object): def setVcoord(self, vcoord): self.vcoord = vcoord + def getLevel2(self): + return self.level2 + + def setLevel2(self, level2): + self.level2 = level2 + + def getModelId(self): + return self.modelId + + def setModelId(self, modelId): + self.modelId = modelId + def getParm(self): return self.parm def setParm(self, parm): self.parm = parm + + def getLevel1(self): + return self.level1 + + def setLevel1(self, level1): + self.level1 = level1 + + def getReftime(self): + return self.reftime + + def setReftime(self, reftime): + self.reftime = reftime + + def getPluginName(self): + return self.pluginName + + def setPluginName(self, pluginName): + self.pluginName = pluginName + + def getFcstsec(self): + return self.fcstsec + + def setFcstsec(self, fcstsec): + self.fcstsec = fcstsec + diff --git a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetGridInfoRequest.py b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetGridInfoRequest.py index 7b73d0a..4d8a426 100644 --- a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetGridInfoRequest.py +++ b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetGridInfoRequest.py @@ -1,20 +1,20 @@ # File auto-generated against equivalent DynamicSerialize Java class +# +# SOFTWARE HISTORY +# +# Date Ticket# Engineer Description +# ------------ ---------- ----------- -------------------------- +# Sep 16, 2016 pmoyer Generated class GetGridInfoRequest(object): def __init__(self): - self.pluginName = None self.modelId = None self.reftime = None + self.pluginName = None self.fcstsec = None - def getPluginName(self): - return self.pluginName - - def setPluginName(self, pluginName): - self.pluginName = pluginName - def getModelId(self): return self.modelId @@ -27,6 +27,12 @@ class GetGridInfoRequest(object): def setReftime(self, reftime): self.reftime = reftime + def getPluginName(self): + return self.pluginName + + def setPluginName(self, pluginName): + self.pluginName = pluginName + def getFcstsec(self): return self.fcstsec diff --git a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetGridNavRequest.py b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetGridNavRequest.py index c86032f..c64776d 100644 --- a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetGridNavRequest.py +++ b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetGridNavRequest.py @@ -1,17 +1,17 @@ # File auto-generated against equivalent DynamicSerialize Java class +# +# SOFTWARE HISTORY +# +# Date Ticket# Engineer Description +# ------------ ---------- ----------- -------------------------- +# Sep 16, 2016 pmoyer Generated class GetGridNavRequest(object): def __init__(self): - self.pluginName = None self.modelId = None - - def getPluginName(self): - return self.pluginName - - def setPluginName(self, pluginName): - self.pluginName = pluginName + self.pluginName = None def getModelId(self): return self.modelId @@ -19,3 +19,9 @@ class GetGridNavRequest(object): def setModelId(self, modelId): self.modelId = modelId + def getPluginName(self): + return self.pluginName + + def setPluginName(self, pluginName): + self.pluginName = pluginName + diff --git a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetStationsRequest.py b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetStationsRequest.py index 57ef8c4..cc5cd51 100644 --- a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetStationsRequest.py +++ b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetStationsRequest.py @@ -1,5 +1,11 @@ # File auto-generated against equivalent DynamicSerialize Java class +# +# SOFTWARE HISTORY +# +# Date Ticket# Engineer Description +# ------------ ---------- ----------- -------------------------- +# Sep 16, 2016 pmoyer Generated class GetStationsRequest(object): @@ -11,3 +17,4 @@ class GetStationsRequest(object): def setPluginName(self, pluginName): self.pluginName = pluginName + diff --git a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetTimesRequest.py b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetTimesRequest.py index 0c50bbc..11d9cab 100644 --- a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetTimesRequest.py +++ b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetTimesRequest.py @@ -1,5 +1,11 @@ # File auto-generated against equivalent DynamicSerialize Java class +# +# SOFTWARE HISTORY +# +# Date Ticket# Engineer Description +# ------------ ---------- ----------- -------------------------- +# Sep 16, 2016 pmoyer Generated class GetTimesRequest(object): diff --git a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetTimesResponse.py b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetTimesResponse.py index 439a1ef..d22ca67 100644 --- a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetTimesResponse.py +++ b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetTimesResponse.py @@ -1,5 +1,11 @@ # File auto-generated against equivalent DynamicSerialize Java class +# +# SOFTWARE HISTORY +# +# Date Ticket# Engineer Description +# ------------ ---------- ----------- -------------------------- +# Sep 16, 2016 pmoyer Generated class GetTimesResponse(object): diff --git a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/Station.py b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/Station.py index 971dcbf..8959f2b 100644 --- a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/Station.py +++ b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/Station.py @@ -1,28 +1,24 @@ # File auto-generated against equivalent DynamicSerialize Java class +# +# SOFTWARE HISTORY +# +# Date Ticket# Engineer Description +# ------------ ---------- ----------- -------------------------- +# Sep 16, 2016 pmoyer Generated + +import numpy class Station(object): def __init__(self): - self.stationId = None - self.wmoIndex = None self.elevation = None - self.country = None self.state = None - self.latitude = None + self.stationId = None self.longitude = None - - def getStationId(self): - return self.stationId - - def setStationId(self, stationId): - self.stationId = stationId - - def getWmoIndex(self): - return self.wmoIndex - - def setWmoIndex(self, wmoIndex): - self.wmoIndex = wmoIndex + self.latitude = None + self.wmoIndex = None + self.country = None def getElevation(self): return self.elevation @@ -30,27 +26,39 @@ class Station(object): def setElevation(self, elevation): self.elevation = elevation - def getCountry(self): - return self.country - - def setCountry(self, country): - self.country = country - def getState(self): return self.state def setState(self, state): self.state = state - def getLatitude(self): - return self.latitude + def getStationId(self): + return self.stationId - def setLatitude(self, latitude): - self.latitude = latitude + def setStationId(self, stationId): + self.stationId = stationId def getLongitude(self): return self.longitude def setLongitude(self, longitude): - self.longitude = longitude + self.longitude = numpy.float64(longitude) + + def getLatitude(self): + return self.latitude + + def setLatitude(self, latitude): + self.latitude = numpy.float64(latitude) + + def getWmoIndex(self): + return self.wmoIndex + + def setWmoIndex(self, wmoIndex): + self.wmoIndex = wmoIndex + + def getCountry(self): + return self.country + + def setCountry(self, country): + self.country = country diff --git a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/StationDataRequest.py b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/StationDataRequest.py index f428ded..5244b95 100644 --- a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/StationDataRequest.py +++ b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/StationDataRequest.py @@ -1,39 +1,45 @@ # File auto-generated against equivalent DynamicSerialize Java class +# +# SOFTWARE HISTORY +# +# Date Ticket# Engineer Description +# ------------ ---------- ----------- -------------------------- +# Sep 16, 2016 pmoyer Generated class StationDataRequest(object): def __init__(self): - self.pluginName = None - self.stationId = None self.refTime = None + self.pluginName = None self.parmList = None + self.stationId = None self.partNumber = None - def getPluginName(self): - return self.pluginName - - def setPluginName(self, pluginName): - self.pluginName = pluginName - - def getStationId(self): - return self.stationId - - def setStationId(self, stationId): - self.stationId = stationId - def getRefTime(self): return self.refTime def setRefTime(self, refTime): self.refTime = refTime + def getPluginName(self): + return self.pluginName + + def setPluginName(self, pluginName): + self.pluginName = pluginName + def getParmList(self): return self.parmList def setParmList(self, parmList): self.parmList = parmList + def getStationId(self): + return self.stationId + + def setStationId(self, stationId): + self.stationId = stationId + def getPartNumber(self): return self.partNumber diff --git a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/SurfaceDataRequest.py b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/SurfaceDataRequest.py new file mode 100644 index 0000000..a13efdb --- /dev/null +++ b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/SurfaceDataRequest.py @@ -0,0 +1,48 @@ + +# File auto-generated against equivalent DynamicSerialize Java class +# +# SOFTWARE HISTORY +# +# Date Ticket# Engineer Description +# ------------ ---------- ----------- -------------------------- +# Sep 16, 2016 pmoyer Generated + +class SurfaceDataRequest(object): + + def __init__(self): + self.refTime = None + self.pluginName = None + self.parmList = None + self.stationId = None + self.partNumber = None + + def getRefTime(self): + return self.refTime + + def setRefTime(self, refTime): + self.refTime = refTime + + def getPluginName(self): + return self.pluginName + + def setPluginName(self, pluginName): + self.pluginName = pluginName + + def getParmList(self): + return self.parmList + + def setParmList(self, parmList): + self.parmList = parmList + + def getStationId(self): + return self.stationId + + def setStationId(self, stationId): + self.stationId = stationId + + def getPartNumber(self): + return self.partNumber + + def setPartNumber(self, partNumber): + self.partNumber = partNumber + diff --git a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/UpperAirDataRequest.py b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/UpperAirDataRequest.py new file mode 100644 index 0000000..bf247ca --- /dev/null +++ b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/UpperAirDataRequest.py @@ -0,0 +1,48 @@ + +# File auto-generated against equivalent DynamicSerialize Java class +# +# SOFTWARE HISTORY +# +# Date Ticket# Engineer Description +# ------------ ---------- ----------- -------------------------- +# Sep 16, 2016 pmoyer Generated + +class UpperAirDataRequest(object): + + def __init__(self): + self.refTime = None + self.pluginName = None + self.parmList = None + self.stationId = None + self.partNumber = None + + def getRefTime(self): + return self.refTime + + def setRefTime(self, refTime): + self.refTime = refTime + + def getPluginName(self): + return self.pluginName + + def setPluginName(self, pluginName): + self.pluginName = pluginName + + def getParmList(self): + return self.parmList + + def setParmList(self, parmList): + self.parmList = parmList + + def getStationId(self): + return self.stationId + + def setStationId(self, stationId): + self.stationId = stationId + + def getPartNumber(self): + return self.partNumber + + def setPartNumber(self, partNumber): + self.partNumber = partNumber + diff --git a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/__init__.py b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/__init__.py index 615510b..9ef0c44 100644 --- a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/__init__.py +++ b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/__init__.py @@ -2,21 +2,26 @@ # File auto-generated by PythonFileGenerator __all__ = [ - 'GetTimesRequest', + 'GetGridDataRequest', + 'GetGridInfoRequest', + 'GetGridNavRequest', 'GetStationsRequest', + 'GetTimesRequest', 'GetTimesResponse', 'Station', 'StationDataRequest', - 'GetGridDataRequest', - 'GetGridInfoRequest', - 'GetGridNavRequest' + 'SurfaceDataRequest', + 'UpperAirDataRequest' ] -from GetTimesRequest import GetTimesRequest -from GetStationsRequest import GetStationsRequest -from GetTimesResponse import GetTimesResponse -from Station import Station -from StationDataRequest import StationDataRequest from GetGridDataRequest import GetGridDataRequest from GetGridInfoRequest import GetGridInfoRequest from GetGridNavRequest import GetGridNavRequest +from GetStationsRequest import GetStationsRequest +from GetTimesRequest import GetTimesRequest +from GetTimesResponse import GetTimesResponse +from Station import Station +from StationDataRequest import StationDataRequest +from SurfaceDataRequest import SurfaceDataRequest +from UpperAirDataRequest import UpperAirDataRequest +