From d6c0039ffaa8635ed2cf4d32855e867d72c913b4 Mon Sep 17 00:00:00 2001 From: Spicer Bak Date: Tue, 21 Sep 2021 17:17:21 -0400 Subject: [PATCH 1/2] updated integratedbathy to pull topobathy --- getDataFRF.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/getDataFRF.py b/getDataFRF.py index 3279aa1..a115138 100644 --- a/getDataFRF.py +++ b/getDataFRF.py @@ -87,7 +87,7 @@ def getnc(dataLoc, callingClass, epoch1=0, epoch2=0, dtRound=60, cutrange=100000 THREDDSloc = chlDataLoc pName = u'frf' except: - print('Could not aquire socket using CHLdata') + print('Could not acquire socket using CHLdata') THREDDSloc = chlDataLoc pName = u'frf' @@ -2845,7 +2845,7 @@ def getBathyIntegratedTransect(self, method=1, ForcedSurveyDate=None, **kwargs): 'lat': lat, 'lon': lon, } # then its a survey, get the survey number - if ('cBKF_T' not in kwargs) and ('cBKF' not in kwargs): + if type == None: gridDict['surveyNumber'] = self.ncfile['surveyNumber'][idx] return gridDict From 7b0bb4d8f0065e4f3b4dbd2695debb070757d0e6 Mon Sep 17 00:00:00 2001 From: Spicer Bak Date: Thu, 28 Apr 2022 17:52:43 +0000 Subject: [PATCH 2/2] fixed call on GDTB for bathy wasn't picking up on forcing call to a specific server --- getDataFRF.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/getDataFRF.py b/getDataFRF.py index a115138..d3c58b9 100644 --- a/getDataFRF.py +++ b/getDataFRF.py @@ -2712,7 +2712,7 @@ def getBathyIntegratedTransect(self, method=1, ForcedSurveyDate=None, **kwargs): #################################################################### # go ahead and assign the ncfile first.... self.ncfile, self.allEpoch = getnc(dataLoc=self.dataloc, callingClass=self.callingClass, - dtRound=1 * 60, start=self.start, end=self.end) + dtRound=1 * 60, start=self.start, end=self.end, server=self.server) try: self.bathydataindex = gettime(allEpoch=self.allEpoch, epochStart=self.epochd1,