Merge branch 'merge-pypsa-eur-sec' of github.com:PyPSA/pypsa-eur into merge-pypsa-eur-sec
This commit is contained in:
commit
7c98cd10a6
@ -160,7 +160,10 @@ def add_power_capacities_installed_before_baseyear(n, grouping_years, costs, bas
|
|||||||
mean = df_agg.loc[biomass_i, "DateIn"].mean()
|
mean = df_agg.loc[biomass_i, "DateIn"].mean()
|
||||||
df_agg.loc[biomass_i, "DateIn"] = df_agg.loc[biomass_i, "DateIn"].fillna(int(mean))
|
df_agg.loc[biomass_i, "DateIn"] = df_agg.loc[biomass_i, "DateIn"].fillna(int(mean))
|
||||||
# Fill missing DateOut
|
# Fill missing DateOut
|
||||||
dateout = df_agg.loc[biomass_i, "DateIn"] + snakemake.config["costs"]['fill_values']["lifetime"]
|
dateout = (
|
||||||
|
df_agg.loc[biomass_i, "DateIn"]
|
||||||
|
+ snakemake.config["costs"]["fill_values"]["lifetime"]
|
||||||
|
)
|
||||||
df_agg.loc[biomass_i, "DateOut"] = df_agg.loc[biomass_i, "DateOut"].fillna(dateout)
|
df_agg.loc[biomass_i, "DateOut"] = df_agg.loc[biomass_i, "DateOut"].fillna(dateout)
|
||||||
|
|
||||||
# drop assets which are already phased out / decommissioned
|
# drop assets which are already phased out / decommissioned
|
||||||
@ -654,7 +657,7 @@ if __name__ == "__main__":
|
|||||||
.to_pandas()
|
.to_pandas()
|
||||||
.reindex(index=n.snapshots)
|
.reindex(index=n.snapshots)
|
||||||
)
|
)
|
||||||
default_lifetime = snakemake.config["costs"]['fill_values']["lifetime"]
|
default_lifetime = snakemake.config["costs"]["fill_values"]["lifetime"]
|
||||||
add_heating_capacities_installed_before_baseyear(
|
add_heating_capacities_installed_before_baseyear(
|
||||||
n,
|
n,
|
||||||
baseyear,
|
baseyear,
|
||||||
|
Loading…
Reference in New Issue
Block a user