Skip to content

Commit

Permalink
Merge pull request #111 from c-hydro/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
ltrotter authored Oct 28, 2024
2 parents 8a32ae9 + e4456ba commit 81ae2d1
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 11 deletions.
7 changes: 1 addition & 6 deletions door/data_sources/cds/era5_downloader.py
Original file line number Diff line number Diff line change
Expand Up @@ -190,12 +190,7 @@ def _get_data_ts(self,


request = self.build_request(timestep, space_bounds)
success = self.download(request, tmp_destination, min_size = 200, missing_action = 'w')

# if the download fail interrupt
if not success:
self.log.error(f'Download failed, skipping block')
return
success = self.download(request, tmp_destination, min_size = 100, missing_action = 'e')

# this will create a list of xarray datasets, one for each "well-formed" cube in the grib file,
# this is needed because requesting multiple variables at once will return a single grib file that might contain multiple cubes
Expand Down
2 changes: 1 addition & 1 deletion door/data_sources/earthdata/cmr_downloader.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def get_last_published_ts(self,
return timestep

def get_last_published_date(self, **kwargs) -> datetime:
return self.get_last_published_ts(**kwargs).start
return self.get_last_published_ts(**kwargs).end

def download(self, url_list: list[str], destination: str, trials = 100) -> list[str]:
"""
Expand Down
6 changes: 3 additions & 3 deletions door/data_sources/earthdata/grace_downloader.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ class GRACEDownloader(CMRDownloader):
'tws' : {
'provider' : 'POCLOUD',
'freq' : 'monthly',
'version' : {'post2018': 'RL06.1v04', 'pre2018': 'RL06v04'},
'product_id' : {'post2018':'TELLUS_GRFO_L3_JPL_RL06.1_LND_v04', 'pre2018':'TELLUS_GRAC_L3_JPL_RL06_LND_v04'}
}
'version' : {'post2018': 'RL06.3v04', 'pre2018': 'RL06v04'},
'product_id' : {'post2018': 'TELLUS_GRFO_L3_JPL_RL06.3_LND_v04', 'pre2018':'TELLUS_GRAC_L3_JPL_RL06_LND_v04'}
}
}

available_variables = {
Expand Down
2 changes: 1 addition & 1 deletion door/tools
Submodule tools updated 1 files
+5 −5 data/remote_dataset.py

0 comments on commit 81ae2d1

Please sign in to comment.