Skip to content

Commit

Permalink
Merge pull request #35 from NOAA-PMEL/strausz-working
Browse files Browse the repository at this point in the history
Fixed a couple things...
  • Loading branch information
shaunwbell authored Oct 30, 2024
2 parents d9ecad7 + 169186d commit c6109a6
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions ARGOS_service_data_converter.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def get_data(fobj=None):
header=None,
names=header,
index_col=False,
error_bad_lines=False,
on_bad_lines='warn',
dtype={
"year": str,
"doy": str,
Expand Down Expand Up @@ -172,7 +172,7 @@ def get_data(fobj=None):
header=None,
names=header,
index_col=False,
error_bad_lines=False,
on_bad_lines='warn',
dtype={
"year": str,
"doy": str,
Expand Down Expand Up @@ -320,7 +320,7 @@ def get_data(fobj=None, time="current"):
names=header,
index_col=False,
usecols=columns,
error_bad_lines=False,
on_bad_lines='warn',
dtype=dtype,
parse_dates=[["year", "doy", "hhmm"]],
date_parser=argo_to_datetime,
Expand Down
8 changes: 4 additions & 4 deletions getARGO_SOAP.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
History:
2018-03-14: Make it so either the program number or platform id can be submitted
2024-10-30: Remove 'data' directory hard coded into download path
Note:
To get an idea of all functions available
python -mzeep http://ws-argos.clsamerica.com/argosDws/services/DixService?wsdl
Expand Down Expand Up @@ -105,10 +105,10 @@

datestr = startDate.strftime('%Y%m%d%H%M%S')+'_'+endDate.strftime('%Y%m%d%H%M%S')
if args.idMode in ['programNumber']:
with open("data/" + ".".join(['ARGO_'+datestr,filetype]), 'w') as f:
with open(".".join(['ARGO_'+datestr,filetype]), 'w') as f:
f.write(result)
elif args.idMode in ['platformId']:
with open("data/" + ".".join(['ARGO_'+args.idnumber+'_'+datestr,filetype]), 'w') as f:
with open(".".join(['ARGO_'+args.idnumber+'_'+datestr,filetype]), 'w') as f:
f.write(result)
else:
print("No file written")
print("No file written")

0 comments on commit c6109a6

Please sign in to comment.