Merge pull request #380 from hazemakhalek/bright

Adapt model and scenarios after initial runs

Snakefile

@@ -284,15 +284,15 @@ rule prepare_res_potentials:
         ),
     output:
         **{
-            f"{tech}_{year}_{discountrate}_potential_s{simpl}_{clusters}": f"resources/custom_renewables/{tech}/{tech}_{year}_{discountrate}_potential_s{{simpl}}_{{clusters}}.csv"
+            f"{tech}_{year}_{discountrate}_potential_s{simpl}_{clusters}": f"resources/custom_renewables/{tech}/{tech}_{year}_{discountrate}_potential_s{simpl}_{clusters}.csv"
             for tech in config["custom_data"]["renewables"]
             for year in config["scenario"]["planning_horizons"]
             for discountrate in config["costs"]["discountrate"]
             for simpl in config["scenario"]["simpl"]
             for clusters in config["scenario"]["clusters"]
         },
         **{
-            f"{tech}_{year}_{discountrate}_installable_s{simpl}_{clusters}": f"resources/custom_renewables/{tech}/{tech}_{year}_{discountrate}_installable_s{{simpl}}_{{clusters}}.csv"
+            f"{tech}_{year}_{discountrate}_installable_s{simpl}_{clusters}": f"resources/custom_renewables/{tech}/{tech}_{year}_{discountrate}_installable_s{simpl}_{clusters}.csv"
             for tech in config["custom_data"]["renewables"]
             for year in config["scenario"]["planning_horizons"]
             for discountrate in config["costs"]["discountrate"]
@@ -310,15 +310,15 @@ rule override_respot:
         countries=config["countries"],
     input:
         **{
-            f"custom_res_pot_{tech}_{year}_{discountrate}_s{simpl}_{clusters}": f"resources/custom_renewables/{tech}/{tech}_{year}_{discountrate}_potential_s{{simpl}}_{{clusters}}.csv"
+            f"custom_res_pot_{tech}_{year}_{discountrate}_s{simpl}_{clusters}": f"resources/custom_renewables/{tech}/{tech}_{year}_{discountrate}_potential_s{simpl}_{clusters}.csv"
             for tech in config["custom_data"]["renewables"]
             for year in config["scenario"]["planning_horizons"]
             for discountrate in config["costs"]["discountrate"]
             for simpl in config["scenario"]["simpl"]
             for clusters in config["scenario"]["clusters"]
         },
         **{
-            f"custom_res_ins_{tech}_{year}_{discountrate}_s{simpl}_{clusters}": f"resources/custom_renewables/{tech}/{tech}_{year}_{discountrate}_installable_s{{simpl}}_{{clusters}}.csv"
+            f"custom_res_ins_{tech}_{year}_{discountrate}_s{simpl}_{clusters}": f"resources/custom_renewables/{tech}/{tech}_{year}_{discountrate}_installable_s{simpl}_{clusters}.csv"
             for tech in config["custom_data"]["renewables"]
             for year in config["scenario"]["planning_horizons"]
             for discountrate in config["costs"]["discountrate"]

config.bright_BI.yaml

@@ -6,7 +6,7 @@ summary_dir: results/
 costs_dir: data/ #TODO change to the equivalent of technology data
 
 run:
-  name: 092524_test
+  name: TEST_Octoober9th_BI_20kTWkmH2net_oilpipeline_dac_adaptedemissionICEMORE_co2seq70_3H_newscenario_correctPorts
   name_subworkflow: ""  # scenario name of the pypsa-earth subworkflow
   shared_cutouts: true  # set to true to share the default cutout(s) across runs
                         # Note: value false requires build_cutout to be enabled
@@ -28,19 +28,19 @@ scenario:
   opts:
   - "Co2L"
   sopts:
-  - "8H"
+  - "3H"
   demand:
   - "BI" # BI/DE/GH
 
 policy_config:
   hydrogen:
-    temporal_matching: "no_res_matching" #either "h2_yearly_matching", "h2_monthly_matching", "no_res_matching"
+    temporal_matching: "h2_monthly_matching" #either "h2_yearly_matching", "h2_monthly_matching", "no_res_matching"
     spatial_matching: false
     additionality: true # RE electricity is equal to the amount required for additional hydrogen export compared to the 0 export case ("reference_case")
     allowed_excess: 1.0
     is_reference: false # Whether or not this network is a reference case network, relevant only if additionality is _true_
     remove_h2_load: false #Whether or not to remove the h2 load from the network, relevant only if is_reference is _true_
-    path_to_ref: "" # Path to the reference case network for additionality calculation, relevant only if additionality is _true_ and is_reference is _false_
+    path_to_ref: "/nimble/home/haz43975/pypsa-earth-sec/results/TEST_Octoober9th_BI_20kTWkmH2net_oilpipeline_dac_adaptedemissionICEMORE_co2seq70_3H_newscenario/postnetworks/elec_s_11_ec_lv1.0_Co2L_3H_2035_0.071_BI_0export.nc" # Path to the reference case network for additionality calculation, relevant only if additionality is _true_ and is_reference is _false_
     re_country_load: false # Set to "True" to force the RE electricity to be equal to the electricity required for hydrogen export and the country electricity load. "False" excludes the country electricity load from the constraint.
 
 clustering_options:
@@ -64,7 +64,7 @@ fossil_reserves:
 
 
 export:
-  h2export: [0,10,20,30,40,50,60,70,80,90,100] # Yearly export demand in TWh
+  h2export: [200] #[10,20,30,40,50,60,70,80,90,100] # Yearly export demand in TWh
   store: false # [True, False] # specifies wether an export store to balance demand is implemented
   store_capital_costs: "no_costs" # ["standard_costs", "no_costs"] # specifies the costs of the export store. "standard_costs" takes CAPEX of "hydrogen storage tank type 1 including compressor"
   export_profile: "constant" # use "ship" or "constant"
@@ -88,7 +88,7 @@ custom_data:
   add_existing: false
   custom_sectors: false
   gas_network: false # If "True" then a custom .csv file must be placed in "resources/custom_data/pipelines.csv" , If "False" the user can choose btw "greenfield" or Model built-in datasets. Please refer to ["sector"] below.
-
+  biomass_to_oil_mobility: 0.56
   rename_industry_carriers: {"Electricity": "electricity", "Biofuels": "solid biomass", "Heat": "low-temperature heat", "Natural Gas": "gas", "Coal": "coal", "Hydrogen": "hydrogen", "Oil": "oil"}
 
 costs: # Costs used in PyPSA-Earth-Sec. Year depends on the wildcard planning_horizon in the scenario section
@@ -190,8 +190,8 @@ sector:
     network_data_GGIT_status: ['Construction', 'Operating', 'Idle', 'Shelved', 'Mothballed', 'Proposed']
   hydrogen:
     network: true
-    network_limit: 10000 #GWkm
-    network_routes: gas # "gas or "greenfield". If "gas"  ->  the network data are fetched from ["sector"]["gas"]["network_data"]. If "greenfield"  -> the network follows the topology of electrical transmission lines
+    network_limit: 25000 #GWkm
+    network_routes: greenfield # "gas or "greenfield". If "gas"  ->  the network data are fetched from ["sector"]["gas"]["network_data"]. If "greenfield"  -> the network follows the topology of electrical transmission lines
     gas_network_repurposing: true # If true -> ["sector"]["gas"]["network"] is automatically false
     underground_storage: false
     hydrogen_colors: false
@@ -349,8 +349,8 @@ sector:
     GH_2050: 0.320
     DE_2050: 0.593
 
-  co2_network: false
-  co2_sequestration_potential: 0 #MtCO2/a sequestration potential for Europe
+  co2_network: true
+  co2_sequestration_potential: 70 #MtCO2/a sequestration potential for Europe
   co2_sequestration_cost: 10 #EUR/tCO2 for sequestration of CO2
   hydrogen_underground_storage: false
   shipping_hydrogen_liquefaction: false
@@ -359,8 +359,11 @@ sector:
   shipping_hydrogen_share: #1.0
     BU_2030: 0.00
     BI_2030: 0.00
+    BI_2035: 0.014
     GH_2030: 0.00
+    GH_2035: 0.014
     DE_2030: 0.00
+    DE_2035: 0.014
     AP_2030: 0.00
     NZ_2030: 0.10
     DF_2030: 0.05
@@ -377,7 +380,7 @@ sector:
   marginal_cost_storage: 0
   methanation: true
   helmeth: true
-  dac: false
+  dac: true
   SMR: true
   SMR CC: true
   cc_fraction: 0.9
@@ -630,3 +633,5 @@ plotting:
     biomass EOP: "green"
     biomass: "green"
     high-temp electrolysis: "magenta"
+    oil pipeline: "grey"
+    agriculture biomass: "green"