Skip to content

Commit 8db5bf0

Browse files
committed
fixing typo, better names
1 parent 80f931b commit 8db5bf0

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

enacts/calc.py

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ def cess_date_from_rain(
420420
of soil moisture less than `dry_thresh` .
421421
Soil moisture is estimated through a simple water balance model
422422
driven by rainfall `daily_rain` , evapotranspiration `et`, soil capacity `taw`
423-
and initislized at soil moisture value `sminit` .
423+
and initialized at soil moisture value `sminit` .
424424
425425
Parameters
426426
----------
@@ -763,13 +763,13 @@ def seasonal_onset_date(
763763
end_month = first_end_date.dt.month.values
764764

765765
# Apply daily grouping by season
766-
grouped_daily_data = daily_tobegroupedby_season(
766+
seasonally_labeled_daily_data = daily_tobegroupedby_season(
767767
daily_rain, search_start_day, search_start_month, end_day, end_month
768768
)
769769
# Apply onset_date
770770
seasonal_data = (
771-
grouped_daily_data[daily_rain.name]
772-
.groupby(grouped_daily_data["seasons_starts"])
771+
seasonally_labeled_daily_data[daily_rain.name]
772+
.groupby(seasonally_labeled_daily_data["seasons_starts"])
773773
.map(
774774
onset_date,
775775
wet_thresh=wet_thresh,
@@ -784,7 +784,7 @@ def seasonal_onset_date(
784784
.rename({"seasons_starts": time_dim})
785785
)
786786
# Get the seasons ends
787-
seasons_ends = grouped_daily_data["seasons_ends"].rename({"group": time_dim})
787+
seasons_ends = seasonally_labeled_daily_data["seasons_ends"].rename({"group": time_dim})
788788
seasonal_onset_date = xr.merge([seasonal_data, seasons_ends])
789789

790790
# Tip to get dates from timedelta search_start_day
@@ -852,21 +852,21 @@ def seasonal_cess_date_from_sm(
852852
end_month = first_end_date.dt.month.values
853853

854854
# Apply daily grouping by season
855-
grouped_daily_data = daily_tobegroupedby_season(
855+
seasonally_labeled_daily_data = daily_tobegroupedby_season(
856856
soil_moisture, search_start_day, search_start_month, end_day, end_month
857857
)
858858
# Apply cess_date
859859
seasonal_data = (
860-
grouped_daily_data[soil_moisture.name]
861-
.groupby(grouped_daily_data["seasons_starts"])
860+
seasonally_labeled_daily_data[soil_moisture.name]
861+
.groupby(seasonally_labeled_daily_data["seasons_starts"])
862862
.map(
863863
cess_date_from_sm,
864864
dry_thresh=dry_thresh,
865865
dry_spell_length_thresh=dry_spell_length_thresh,
866866
)
867867
).rename("cess_delta")
868868
# Get the seasons ends
869-
seasons_ends = grouped_daily_data["seasons_ends"].rename({"group": time_dim})
869+
seasons_ends = seasonally_labeled_daily_data["seasons_ends"].rename({"group": time_dim})
870870
seasonal_cess_date = xr.merge([seasonal_data, seasons_ends])
871871

872872
# Tip to get dates from timedelta search_start_day
@@ -905,13 +905,13 @@ def seasonal_cess_date_from_rain(
905905
end_month = first_end_date.dt.month.values
906906

907907
# Apply daily grouping by season
908-
grouped_daily_data = daily_tobegroupedby_season(
908+
seasonally_labeled_daily_data = daily_tobegroupedby_season(
909909
daily_rain, search_start_day, search_start_month, end_day, end_month
910910
)
911911
# Apply cess_date
912912
seasonal_data = (
913-
grouped_daily_data[daily_rain.name]
914-
.groupby(grouped_daily_data["seasons_starts"])
913+
seasonally_labeled_daily_data[daily_rain.name]
914+
.groupby(seasonally_labeled_daily_data["seasons_starts"])
915915
.map(
916916
cess_date_from_rain,
917917
dry_thresh=dry_thresh,
@@ -922,7 +922,7 @@ def seasonal_cess_date_from_rain(
922922
)
923923
).rename("cess_delta")
924924
# Get the seasons ends
925-
seasons_ends = grouped_daily_data["seasons_ends"].rename({"group": time_dim})
925+
seasons_ends = seasonally_labeled_daily_data["seasons_ends"].rename({"group": time_dim})
926926
seasonal_cess_date = xr.merge([seasonal_data, seasons_ends])
927927

928928
# Tip to get dates from timedelta search_start_day
@@ -973,16 +973,16 @@ def seasonal_sum(
973973
Examples
974974
--------
975975
"""
976-
grouped_daily_data = daily_tobegroupedby_season(
976+
seasonally_labeled_daily_data = daily_tobegroupedby_season(
977977
daily_data, start_day, start_month, end_day, end_month
978978
)
979979
seasonal_data = (
980-
grouped_daily_data[daily_data.name]
981-
.groupby(grouped_daily_data["seasons_starts"])
980+
seasonally_labeled_daily_data[daily_data.name]
981+
.groupby(seasonally_labeled_daily_data["seasons_starts"])
982982
.sum(dim=time_dim, skipna=True, min_count=min_count)
983983
# .rename({"seasons_starts": time_dim})
984984
)
985-
seasons_ends = grouped_daily_data["seasons_ends"].rename({"group": time_dim})
985+
seasons_ends = seasonally_labeled_daily_data["seasons_ends"].rename({"group": time_dim})
986986
summed_seasons = xr.merge([seasonal_data, seasons_ends])
987987
return summed_seasons
988988

0 commit comments

Comments
 (0)