Skip to content

Commit 357c237

Browse files
committed
Merge branch 'clean_segment_class' into pint_addition
2 parents 4b2083a + bff9c7c commit 357c237

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

regional_mom6/regional_mom6.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2532,7 +2532,7 @@ def setup_era5(self, era5_path):
25322532
)
25332533

25342534
rawdata[fname].time.attrs = {
2535-
"calendar": "julian",
2535+
"calendar": "gregorian",
25362536
"units": f"hours since {self.date_range[0].strftime('%Y-%m-%d %H:%M:%S')}",
25372537
} ## Fix up calendar to match
25382538

@@ -2586,7 +2586,7 @@ class segment:
25862586
25872587
Data should be at daily temporal resolution, iterating upwards
25882588
from the provided startdate. Function ignores the time metadata
2589-
and puts it on Julian calendar.
2589+
and puts it on gregorian calendar.
25902590
25912591
Note:
25922592
Only supports z-star (z*) vertical coordinate.
@@ -2643,7 +2643,7 @@ def regrid_velocity_tracers(
26432643
rotational_method=rot.RotationMethod.EXPAND_GRID,
26442644
regridding_method="bilinear",
26452645
time_units="days",
2646-
calendar="julian",
2646+
calendar="gregorian",
26472647
fill_method=rgd.fill_missing_data,
26482648
):
26492649
"""
@@ -2689,7 +2689,6 @@ def regrid_velocity_tracers(
26892689
self.orientation,
26902690
)
26912691

2692-
# TODO: Check if regridding 3 times is noticeably slower on A grids (shouldn't be, the regridders are created efficiently in the first place)
26932692
u_regridded = regridders["u"](
26942693
rawseg[reprocessed_var_map["u_var_name"]].rename(
26952694
{

0 commit comments

Comments
 (0)