Skip to content

Commit 461348c

Browse files
committed
more proper place to convert the bool to int
1 parent 858708c commit 461348c

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

enacts/crop_suitability/maproom_crop_suit.py

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -261,30 +261,32 @@ def crop_suitability(
261261
seasonal_tmax = tmax.sel(T=tmax['T.season']==target_season)
262262
seasonal_tmin = tmin.sel(T=tmin['T.season']==target_season)
263263

264-
seasonal_avg_tmax_suitability = 1*(
264+
seasonal_avg_tmax_suitability = (
265265
seasonal_tmax.groupby("T.year").mean() <= max_temp
266266
)
267-
seasonal_avg_tmin_suitability = 1*(
267+
seasonal_avg_tmin_suitability = (
268268
seasonal_tmin.groupby("T.year").mean() >= min_temp
269269
)
270270

271-
seasonal_avg_temp_amplitude_suitability = 1*(
271+
seasonal_avg_temp_amplitude_suitability = (
272272
(seasonal_tmax - seasonal_tmin).groupby("T.year").mean() <= temp_range
273273
)
274274

275-
seasonal_wet_days_suitability = 1*(
275+
seasonal_wet_days_suitability = (
276276
(seasonal_precip >= wet_day_def).groupby("T.year").sum() >= min_wet_days
277277
)
278278

279-
seasonal_total_precip_suitability = 1*(
279+
seasonal_total_precip_suitability = (
280280
(seasonal_precip.groupby("T.year").sum() <= upper_wet_threshold) &
281281
(seasonal_precip.groupby("T.year").sum() >= lower_wet_threshold)
282282
)
283283

284284
crop_suit = (
285-
seasonal_avg_tmax_suitability + seasonal_avg_tmin_suitability +
286-
seasonal_avg_temp_amplitude_suitability + seasonal_total_precip_suitability +
287-
seasonal_wet_days_suitability
285+
seasonal_avg_tmax_suitability.astype(int) +
286+
seasonal_avg_tmin_suitability.astype(int) +
287+
seasonal_avg_temp_amplitude_suitability.astype(int) +
288+
seasonal_total_precip_suitability.astype(int) +
289+
seasonal_wet_days_suitability.astype(int)
288290
)
289291

290292
crop_suitability = xr.Dataset(

0 commit comments

Comments
 (0)