Skip to content
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

Mjo date fix #763

Merged
merged 4 commits into from
Mar 14, 2025
Merged

Mjo date fix #763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a1f05a1
small fix
bitterbark Jan 8, 2025
3d91475
Merge branch 'NOAA-GFDL:main' into fix_catalog_cesm
bitterbark Feb 25, 2025
08fd40c
Fix time range to work with YYYYMMDD or YYYYMMDDHH as well as origina…
bitterbark Mar 5, 2025
df8cb75
fix for dataset/time requested case
bitterbark Mar 13, 2025
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
43 changes: 35 additions & 8 deletions diagnostics/MJO_suite/daily_netcdf.ncl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,36 @@ begin
end if
end ; procedure debug_print

undef("check_date_format")
function check_date_format(date_in,date_type,routine_name,debug)
begin
if (date_in.lt.1.e4) then ; input just YYYY, need to add MMDDHH
if (date_type.eq."start") then
date_suffix = 101*100
else if (date_type.eq."end") then
date_suffix = 1231*10
else
print("ERROR: "+routine_name+" No date_type given to function check_date_format")
end if
end if

debug_print("Incoming "+date_type+" date YYYY format: "+date_in,routine_name,debug)
date_out = date_in*1000000+ date_suffix
debug_print("Corrected "+date_type+" date to:"+date_out,routine_name,debug)

else
if (date_in .lt. 100000000) ; YYYYMMDD
debug_print("Incoming "+date_type+" date YYYYMMDD format: "+date_in,routine_name,debug)
date_out = date_in*100 ;; HH = 00
debug_print("Corrected "+date_type+" date to:"+date_out,routine_name,debug)
else
debug_print("Found start date format YYYYMMDDHH: "+yr,routine_name,debug)
date_out = date_in
end if ; YYYYMMDD
end if ; YYYY

return date_out
end ; function check_date_format

begin
; read daily output files from CAM2 and process the data
Expand Down Expand Up @@ -63,12 +93,10 @@ nd = dimsizes(time_all)
i2 = nd(0) - 1
debug_print("Time range in file: "+time_all(0)+" -"+time_all(i2),routine_name,debug)

; in hours to match cd_calendar/ut_calendar output YYYYMMDDHH
; uses 18 hrs for endtime since 6-hourly is the most high res we expect
; should still work for daily, just finds YYYY123100
start_time = yr1*1000000+101*100
end_time = yr2*1000000+1231*100+18
debug_print("Time range requested: "+start_time+" "+end_time,routine_name,debug)
; Check if date came in as YYYYMMDD or YYYY (historic)
start_time = check_date_format(yr1,"start",routine_name,debug)
end_time = check_date_format(yr2,"end",routine_name,debug)

tol = 24 ; 24 hours tolerance allows for different time resolutions
do i=0,dimsizes(time_all)-1
; debug_print("examining times "+i+" "+time_all(i),routine_name,debug)
Expand Down Expand Up @@ -108,8 +136,7 @@ if ( isMonotonic(date) .ne. 1 ) then
exit ; exit on error
end if

; DRB: used to do pr, rlut separately. Folding them into the loop instead.
; **here first just use read_model_file for pr here, then put into var loop below
; First just use read_model_file for pr here, then put into var loop below
; precipitation rate (pr)
print("daily_netcdf.ncl reading "+file_pr+" for making precip file!")

Expand Down
12 changes: 11 additions & 1 deletion src/preprocessor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -927,13 +927,17 @@ def crop_date_range(self, case_date_range: util.DateRange, xr_ds, time_coord) ->
date_range_cf_start = self.cast_to_cftime(case_date_range.start.lower, cal)
date_range_cf_end = self.cast_to_cftime(case_date_range.end.lower, cal)

# dataset has no overlap with the user-specified date range
if ds_start < date_range_cf_start and ds_end < date_range_cf_start or \
ds_end > date_range_cf_end and ds_start > date_range_cf_end:
new_xr_ds = None
# dataset falls entirely within user-specified date range
elif ds_start >= date_range_cf_start and ds_end <= date_range_cf_end:
new_xr_ds = xr_ds.sel({time_coord.name: slice(ds_start, ds_end)})
# dataset overlaps user-specified date range start
# dataset overlaps user-specified date range start (corrected)
elif ds_start <= date_range_cf_start <= ds_end <= date_range_cf_end:
new_xr_ds = xr_ds.sel({time_coord.name: slice(date_range_cf_start, ds_end)})
# dataset overlaps user-specified date range start (orig)
elif date_range_cf_start < ds_start and \
date_range_cf_start <= ds_end <= date_range_cf_end:
new_xr_ds = xr_ds.sel({time_coord.name: slice(date_range_cf_start, ds_end)})
Expand All @@ -943,6 +947,12 @@ def crop_date_range(self, case_date_range: util.DateRange, xr_ds, time_coord) ->
# dataset contains all of requested date range
elif date_range_cf_start >= ds_start and date_range_cf_end <= ds_end:
new_xr_ds = xr_ds.sel({time_coord.name: slice(date_range_cf_start, date_range_cf_end)})
else:
print(f'ERROR: new_xr_ds is unset because of incompatibility of time:')
print(f' Dataset start: {ds_start=}')
print(f' Dataset end : {ds_end=}')
print(f' Requested start: {date_range_cf_start=}')
print(f' Requested end : {date_range_cf_end=}')

return new_xr_ds

Expand Down
Loading