Fixes 389 #390
Fixes 389 #390
Conversation
| @@ -139,7 +139,7 @@ | |||
| refdate_str = 'minutes since '+ref_date+' 00:00:00 +00:00', | |||
| dir_output = dir_output, | |||
| list_quantities = list_quantities, | |||
| tstart=pd.Timestamp(date_min)-pd.Timedelta(hours=12), tstop=pd.Timestamp(date_max)+pd.Timedelta(hours=12), #TODO: to account for noon-fields of CMEMS, build in safety? | |||
| tstart=pd.Timestamp(date_min), tstop=pd.Timestamp(date_max), | |||
There was a problem hiding this comment.
you can also remove pd.Timestamp() around date_min and date_max
dfm_tools/modelbuilder.py
Outdated
| @@ -43,7 +43,7 @@ def preprocess_interpolate_nc_to_bc(ext_bnd, | |||
| else: | |||
| #open regulargridDataset and do some basic stuff (time selection, renaming depth/lat/lon/varname, converting units, etc) | |||
| data_xr_vars = dfmt.open_dataset_extra(dir_pattern=dir_pattern, quantity=quantity, | |||
| tstart=tstart, tstop=tstop, | |||
| tstart=pd.Timestamp(tstart)-pd.Timedelta(hours=12), tstop=pd.Timestamp(tstop)+pd.Timedelta(hours=12), | |||
There was a problem hiding this comment.
I thought of several usecases where 12 hours would not suffice, for instance if you would have a model with tstop = '2020-12-01 23:00', the CMEMS tstop would be '2020-12-02 11:00', which is just too short of getting the noon field of that day. In this usecase we would also have to extend date_max in download_CMEMS(), I did not thought of that yesterday. Therefore, I have created the function dfmt.round_timestamp_to_outer_noon(). Could you update your branch and add a line like this in this function and in download_CMEMS()?:
tstart, tstop = dfmt.round_timestamp_to_outer_noon(tstart,tstop)
I also added a test for it, you could check the PR for the changes: https://github.com/Deltares/dfm_tools/pull/392/files
dfm_tools/download.py
Outdated
| #make sure the data fully covers the desired spatial extent. Download 1 additional grid cell (resolution is 1/12 degrees) in each direction | ||
| delta_latlon = 0.085 # which is slightly more than grid resolution (~1/12 degrees) #TODO: we could make use of ds.latitude.step/ds.longitude.step when the grid resolution is stored in a global | ||
| longitude_min, longitude_max, latitude_min, latitude_max = extend_domain(lon_min=longitude_min, lon_max=longitude_max, lat_min=latitude_min, lat_max=latitude_max, delta_latlon=delta_latlon) |
There was a problem hiding this comment.
As above, I suggest to replace these lines with:
#make sure the data fully covers the desired spatial extent. Download 2 additional grid cells (resolution is 1/12 degrees, but a bit more/less in alternating cells) in each direction
lon_min -= 2/12
lon_max += 2/12
lat_min -= 2/12
lat_max += 2/12
dfm_tools/download.py
Outdated
| #make sure the data fully covers the desired spatial extent. Download 1 additional grid cell (resolution is 1/4 degrees) in both direction | ||
| longitude_min, longitude_max, latitude_min, latitude_max = extend_domain(lon_min=longitude_min, lon_max=longitude_max, lat_min=latitude_min, lat_max=latitude_max, delta_latlon=1/4) |
There was a problem hiding this comment.
I suggest to remove the extend_domain() function since and replace these lines with:
#make sure the data fully covers the desired spatial extent. Download 1 additional grid cell (resolution is 1/4 degrees) in both directions
lon_min -= 1/4
lon_max += 1/4
lat_min -= 1/4
lat_max += 1/4
I know it is against re-using code in functions, but this one is so simple and we hardcode delta_latlon anyway.
…when-downloading-era5-and-cmems-data
|
Kudos, SonarCloud Quality Gate passed!
|
veenstrajelmer
deleted the
389-slightly-extend-spatial-and-time-domain-when-downloading-era5-and-cmems-data
branch
No description provided.