allow sequestration potential attributes to be string
This commit is contained in:
parent
fd239e2688
commit
6bc1363080
@ -515,7 +515,11 @@ sector:
|
|||||||
regional_coal_demand: false
|
regional_coal_demand: false
|
||||||
regional_co2_sequestration_potential:
|
regional_co2_sequestration_potential:
|
||||||
enable: false
|
enable: false
|
||||||
attribute: ['conservative estimate Mt', 'conservative estimate GAS Mt', 'conservative estimate OIL Mt', 'conservative estimate aquifer Mt']
|
attribute:
|
||||||
|
- conservative estimate Mt
|
||||||
|
- conservative estimate GAS Mt
|
||||||
|
- conservative estimate OIL Mt
|
||||||
|
- conservative estimate aquifer Mt
|
||||||
include_onshore: false
|
include_onshore: false
|
||||||
min_size: 3
|
min_size: 3
|
||||||
max_size: 25
|
max_size: 25
|
||||||
|
@ -71,7 +71,7 @@ boilers,--,"{true, false}",Add option for transforming gas into heat using gas b
|
|||||||
resistive_heaters,--,"{true, false}",Add option for transforming electricity into heat using resistive heaters (independently from gas boilers)
|
resistive_heaters,--,"{true, false}",Add option for transforming electricity into heat using resistive heaters (independently from gas boilers)
|
||||||
oil_boilers,--,"{true, false}",Add option for transforming oil into heat using boilers
|
oil_boilers,--,"{true, false}",Add option for transforming oil into heat using boilers
|
||||||
biomass_boiler,--,"{true, false}",Add option for transforming biomass into heat using boilers
|
biomass_boiler,--,"{true, false}",Add option for transforming biomass into heat using boilers
|
||||||
overdimension_individual_heating,--,float,Add option for overdimensioning individual heating systems by a certain factor. This allows them to cover heat demand peaks e.g. 10% higher than those in the data with a setting of 1.1.
|
overdimension_individual_heating,--,"float",Add option for overdimensioning individual heating systems by a certain factor. This allows them to cover heat demand peaks e.g. 10% higher than those in the data with a setting of 1.1.
|
||||||
chp,--,"{true, false}",Add option for using Combined Heat and Power (CHP)
|
chp,--,"{true, false}",Add option for using Combined Heat and Power (CHP)
|
||||||
micro_chp,--,"{true, false}",Add option for using Combined Heat and Power (CHP) for decentral areas.
|
micro_chp,--,"{true, false}",Add option for using Combined Heat and Power (CHP) for decentral areas.
|
||||||
solar_thermal,--,"{true, false}",Add option for using solar thermal to generate heat.
|
solar_thermal,--,"{true, false}",Add option for using solar thermal to generate heat.
|
||||||
@ -90,7 +90,7 @@ regional_methanol_demand,--,"{true, false}",Spatially resolve methanol demand. S
|
|||||||
regional_oil_demand,--,"{true, false}",Spatially resolve oil demand. Set to true if regional CO2 constraints needed.
|
regional_oil_demand,--,"{true, false}",Spatially resolve oil demand. Set to true if regional CO2 constraints needed.
|
||||||
regional_co2 _sequestration_potential,,,
|
regional_co2 _sequestration_potential,,,
|
||||||
-- enable,--,"{true, false}",Add option for regionally-resolved geological carbon dioxide sequestration potentials based on `CO2StoP <https://setis.ec.europa.eu/european-co2-storage-database_en>`_.
|
-- enable,--,"{true, false}",Add option for regionally-resolved geological carbon dioxide sequestration potentials based on `CO2StoP <https://setis.ec.europa.eu/european-co2-storage-database_en>`_.
|
||||||
-- attribute,--,list,List of names of the attributes for the sequestration potential
|
-- attribute,--,string or list,Name (or list of names) of the attribute(s) for the sequestration potential
|
||||||
-- include_onshore,--,"{true, false}",Add options for including onshore sequestration potentials
|
-- include_onshore,--,"{true, false}",Add options for including onshore sequestration potentials
|
||||||
-- min_size,Gt ,float,Any sites with lower potential than this value will be excluded
|
-- min_size,Gt ,float,Any sites with lower potential than this value will be excluded
|
||||||
-- max_size,Gt ,float,The maximum sequestration potential for any one site.
|
-- max_size,Gt ,float,The maximum sequestration potential for any one site.
|
||||||
|
|
@ -10,7 +10,7 @@ Release Notes
|
|||||||
Upcoming Release
|
Upcoming Release
|
||||||
================
|
================
|
||||||
|
|
||||||
* correct estimation of CO2 sequestration potential to including hydrocarbon fields (gas + oil) or saline aquifers
|
* Include gas and oil fields and saline aquifers in estimation of CO2 sequestration potential.
|
||||||
|
|
||||||
* bugfix: convert Strings to pathlib.Path objects as input to ConfigSettings
|
* bugfix: convert Strings to pathlib.Path objects as input to ConfigSettings
|
||||||
|
|
||||||
|
@ -23,6 +23,8 @@ def area(gdf):
|
|||||||
def allocate_sequestration_potential(
|
def allocate_sequestration_potential(
|
||||||
gdf, regions, attr="conservative estimate Mt", threshold=3
|
gdf, regions, attr="conservative estimate Mt", threshold=3
|
||||||
):
|
):
|
||||||
|
if isinstance(attr, str):
|
||||||
|
attr = [attr]
|
||||||
gdf = gdf.loc[gdf[attr].sum(axis=1) > threshold, attr + ["geometry"]]
|
gdf = gdf.loc[gdf[attr].sum(axis=1) > threshold, attr + ["geometry"]]
|
||||||
gdf["area_sqkm"] = area(gdf)
|
gdf["area_sqkm"] = area(gdf)
|
||||||
overlay = gpd.overlay(regions, gdf, keep_geom_type=True)
|
overlay = gpd.overlay(regions, gdf, keep_geom_type=True)
|
||||||
|
Loading…
Reference in New Issue
Block a user