Skip to content

updated integratedbathy to pull topobathy #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SBFRF wants to merge 3 commits into
base: development
Choose a base branch
from
Open

updated integratedbathy to pull topobathy #24

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d6c0039
updated integratedbathy to pull topobathy
SBFRF Sep 21, 2021
7b0bb4d
fixed call on GDTB for bathy wasn't picking up on forcing call to a s…
SBFRF Apr 28, 2022
de3ea9a
fixed merge issue, was using 'type' and inbuilt variable
SBFRF Apr 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions getDataFRF.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -2716,7 +2716,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,
Expand Down Expand Up @@ -2850,6 +2850,7 @@ def getBathyIntegratedTransect(self, method=1, ForcedSurveyDate=None, **kwargs):
'lon': lon, }
# then its a survey, get the survey number
if 'surveyNumber' in self.ncfile.variables.keys():

gridDict['surveyNumber'] = self.ncfile['surveyNumber'][idx]

return gridDict
Expand Down