Merge pull request #381 from hazemakhalek/bright

Update config files

Snakefile

@@ -849,25 +849,37 @@ rule build_industrial_distribution_key:  #default data
         "scripts/build_industrial_distribution_key.py"
 
 
-rule build_base_industry_totals:  #default data
-    params:
-        base_year=config["demand_data"]["base_year"],
-        countries=config["countries"],
-        other_industries=config["demand_data"]["other_industries"],
-    input:
-        #industrial_production_per_country="data/industrial_production_per_country.csv",
-        #unsd_path="data/demand/unsd/data/",
-        energy_totals_base="data/energy_totals_base.csv",
-        transactions_path="data/unsd_transactions.csv",
-    output:
-        base_industry_totals="resources/demand/base_industry_totals_{planning_horizons}_{demand}.csv",
-    threads: 1
-    resources:
-        mem_mb=1000,
-    benchmark:
-        "benchmarks/build_base_industry_totals_{planning_horizons}_{demand}"
-    script:
-        "scripts/build_base_industry_totals.py"
+if config["custom_data"]["industry_demand"]:
+
+    rule copy_industry_demand:
+        input:
+            source="data_custom/industry_demand_{demand}_{planning_horizons}.csv",
+        output:
+            destination="resources/demand/industry_demand_{demand}_{planning_horizons}.csv",
+        shell:
+            "cp {input.source} {output.destination}"
+
+else:
+
+    rule build_base_industry_totals:  #default data
+        params:
+            base_year=config["demand_data"]["base_year"],
+            countries=config["countries"],
+            other_industries=config["demand_data"]["other_industries"],
+        input:
+            #industrial_production_per_country="data/industrial_production_per_country.csv",
+            #unsd_path="data/demand/unsd/data/",
+            energy_totals_base="data/energy_totals_base.csv",
+            transactions_path="data/unsd_transactions.csv",
+        output:
+            base_industry_totals="resources/demand/base_industry_totals_{planning_horizons}_{demand}.csv",
+        threads: 1
+        resources:
+            mem_mb=1000,
+        benchmark:
+            "benchmarks/build_base_industry_totals_{planning_horizons}_{demand}"
+        script:
+            "scripts/build_base_industry_totals.py"
 
 
 rule build_industry_demand:  #default data
@@ -881,7 +893,9 @@ rule build_industry_demand:  #default data
         industrial_distribution_key="resources/demand/industrial_distribution_key_elec_s{simpl}_{clusters}_{planning_horizons}.csv",
         #industrial_production_per_country_tomorrow="resources/demand/industrial_production_per_country_tomorrow_{planning_horizons}_{demand}.csv",
         #industrial_production_per_country="data/industrial_production_per_country.csv",
-        base_industry_totals="resources/demand/base_industry_totals_{planning_horizons}_{demand}.csv",
+        base_industry_totals=lambda wildcards: "resources/demand/base_industry_totals_{planning_horizons}_{demand}.csv"
+        if not config["custom_data"]["industry_demand"]
+        else [],
         industrial_database="data/industrial_database.csv",
         costs=CDIR + "costs_{planning_horizons}.csv",
         industry_growth_cagr="data/demand/industry_growth_cagr.csv",

config.bright_BI.yaml

@@ -6,7 +6,7 @@ summary_dir: results/
 costs_dir: data/ #TODO change to the equivalent of technology data
 
 run:
-  name: TEST_Octoober9th_BI_20kTWkmH2net_oilpipeline_dac_adaptedemissionICEMORE_co2seq70_3H_newscenario_correctPorts
+  name: U_BI_AdaptedScenario
   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
@@ -40,7 +40,7 @@ policy_config:
     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: "/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_
+    path_to_ref: "/nimble/home/haz43975/pypsa-earth-sec/results/U_BI_AdaptedScenario/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: [200] #[10,20,30,40,50,60,70,80,90,100] # Yearly export demand in TWh
+  h2export: [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"
@@ -298,56 +298,46 @@ sector:
       Co2L0.00: 0.01
 
   land_transport_fuel_cell_share: # 1 means all FCEVs HERE
-    BU_2030: 0.00
-    BI_2030: 0.00
-    GH_2030: 0.20
+    BI_2030: 0.006
+    GH_2030: 0.036
     DE_2030: 0.00
-    AP_2030: 0.004
-    NZ_2030: 0.02
-    DF_2030: 0.01
     AB_2030: 0.01
-    BU_2050: 0.00
-    AP_2050: 0.06
-    NZ_2050: 0.28
-    DF_2050: 0.08
-    BI_2035: 0.001
-    GH_2035: 0.039
+    BI_2035: 0.023
+    GH_2035: 0.133
     DE_2035: 0.00
-    BI_2040: 0.002
-    GH_2040: 0.099
+    BI_2040: 0.055
+    GH_2040: 0.266
     DE_2040: 0.00
-    BI_2045: 0.010
-    GH_2045: 0.197
-    DE_2045: 0.00
-    BI_2050: 0.039
-    GH_2050: 0.336
-    DE_2050: 0.00
+    BI_2045: 0.102
+    GH_2045: 0.410
+    DE_2045: 0.021
+    BI_2050: 0.188
+    GH_2050: 0.584
+    DE_2050: 0.056
 
   land_transport_electric_share: # 1 means all EVs  # This leads to problems when non-zero HERE
-    BU_2030: 0.00
-    BI_2030: 0.002
-    GH_2030: 0.002
-    DE_2030: 0.005
-    AP_2030: 0.075
-    NZ_2030: 0.13
-    DF_2030: 0.01
+    BI_2030: 0.022
+    GH_2030: 0.018
+    DE_2030: 0.038
     AB_2030: 0.01
-    BU_2050: 0.00
-    AP_2050: 0.42
-    NZ_2050: 0.68
-    DF_2050: 0.011
-    BI_2035: 0.014
-    GH_2035: 0.031
-    DE_2035: 0.053
-    BI_2040: 0.044
-    GH_2040: 0.092
-    DE_2040: 0.152
-    BI_2045: 0.066
-    GH_2045: 0.197
-    DE_2045: 0.332
-    BI_2050: 0.090
-    GH_2050: 0.320
-    DE_2050: 0.593
+    BI_2035: 0.065
+    GH_2035: 0.054
+    DE_2035: 0.133
+    BI_2040: 0.112
+    GH_2040: 0.090
+    DE_2040: 0.264
+    BI_2045: 0.183
+    GH_2045: 0.164
+    DE_2045: 0.457
+    BI_2050: 0.287
+    GH_2050: 0.263
+    DE_2050: 0.742
+
+  bio_transport_share: # 1 means all EVs  # This leads to problems when non-zero HERE
+    BI_2035: 0.356
+    GH_2035: 0.237
+    DE_2035: 0.253
+
 
   co2_network: true
   co2_sequestration_potential: 70 #MtCO2/a sequestration potential for Europe
@@ -357,24 +347,21 @@ sector:
   shipping_average_efficiency: 0.575 #For conversion of fuel oil to propulsion in 2011
 
   shipping_hydrogen_share: #1.0
-    BU_2030: 0.00
-    BI_2030: 0.00
+    BI_2030: 0.0
+    GH_2030: 0.0
+    DE_2030: 0.0
     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
-    AB_2030: 0.05
-    BU_2050: 0.00
-    BI_2050: 0.24
+    BI_2040: 0.064
+    GH_2040: 0.064
+    DE_2040: 0.065
+    BI_2045: 0.128
+    GH_2045: 0.130
+    DE_2045: 0.131
+    BI_2050: 0.240
     GH_2050: 0.248
     DE_2050: 0.254
-    AP_2050: 0.25
-    NZ_2050: 0.36
-    DF_2050: 0.12
 
   gadm_level: 1
   marginal_cost_storage: 0
@@ -635,3 +622,4 @@ plotting:
     high-temp electrolysis: "magenta"
     oil pipeline: "grey"
     agriculture biomass: "green"
+    land transport biomass: "green"

config.bright_BI_ref.yaml

@@ -6,7 +6,7 @@ summary_dir: results/
 costs_dir: data/ #TODO change to the equivalent of technology data
 
 run:
-  name: TEST_Octoober9th_BI_20kTWkmH2net_oilpipeline_dac_adaptedemissionICEMORE_co2seq70_3H_newscenario_correctPorts_addBioTransport
+  name: U_BI_AdaptedScenario
   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
@@ -311,82 +311,45 @@ sector:
       Co2L0.00: 0.01
 
   land_transport_fuel_cell_share: # 1 means all FCEVs HERE
-    BU_2030: 0.00
-    BI_2030: 0.00
-    GH_2030: 0.20
+    BI_2030: 0.006
+    GH_2030: 0.036
     DE_2030: 0.00
-    AP_2030: 0.004
-    NZ_2030: 0.02
-    DF_2030: 0.01
     AB_2030: 0.01
-    BU_2050: 0.00
-    AP_2050: 0.06
-    NZ_2050: 0.28
-    DF_2050: 0.08
-    BI_2035: 0.001
-    GH_2035: 0.039
+    BI_2035: 0.023
+    GH_2035: 0.133
     DE_2035: 0.00
-    BI_2040: 0.002
-    GH_2040: 0.099
+    BI_2040: 0.055
+    GH_2040: 0.266
     DE_2040: 0.00
-    BI_2045: 0.010
-    GH_2045: 0.197
-    DE_2045: 0.00
-    BI_2050: 0.039
-    GH_2050: 0.336
-    DE_2050: 0.00
+    BI_2045: 0.102
+    GH_2045: 0.410
+    DE_2045: 0.021
+    BI_2050: 0.188
+    GH_2050: 0.584
+    DE_2050: 0.056
 
   land_transport_electric_share: # 1 means all EVs  # This leads to problems when non-zero HERE
-    BU_2030: 0.00
-    BI_2030: 0.002
-    GH_2030: 0.002
-    DE_2030: 0.005
-    AP_2030: 0.075
-    NZ_2030: 0.13
-    DF_2030: 0.01
+    BI_2030: 0.022
+    GH_2030: 0.018
+    DE_2030: 0.038
     AB_2030: 0.01
-    BU_2050: 0.00
-    AP_2050: 0.42
-    NZ_2050: 0.68
-    DF_2050: 0.011
-    BI_2035: 0.014
-    GH_2035: 0.031
-    DE_2035: 0.053
-    BI_2040: 0.044
-    GH_2040: 0.092
-    DE_2040: 0.152
-    BI_2045: 0.066
-    GH_2045: 0.197
-    DE_2045: 0.332
-    BI_2050: 0.090
-    GH_2050: 0.320
-    DE_2050: 0.593
+    BI_2035: 0.065
+    GH_2035: 0.054
+    DE_2035: 0.133
+    BI_2040: 0.112
+    GH_2040: 0.090
+    DE_2040: 0.264
+    BI_2045: 0.183
+    GH_2045: 0.164
+    DE_2045: 0.457
+    BI_2050: 0.287
+    GH_2050: 0.263
+    DE_2050: 0.742
 
   bio_transport_share: # 1 means all EVs  # This leads to problems when non-zero HERE
-    BU_2030: 0.00
-    BI_2030: 0.002
-    GH_2030: 0.002
-    DE_2030: 0.005
-    AP_2030: 0.075
-    NZ_2030: 0.13
-    DF_2030: 0.01
-    AB_2030: 0.01
-    BU_2050: 0.00
-    AP_2050: 0.42
-    NZ_2050: 0.68
-    DF_2050: 0.011
-    BI_2035: 0.50
-    GH_2035: 0.33
-    DE_2035: 0.053
-    BI_2040: 0.044
-    GH_2040: 0.092
-    DE_2040: 0.152
-    BI_2045: 0.066
-    GH_2045: 0.197
-    DE_2045: 0.332
-    BI_2050: 0.090
-    GH_2050: 0.320
-    DE_2050: 0.593
+    BI_2035: 0.356
+    GH_2035: 0.237
+    DE_2035: 0.253
 
   co2_network: true
   co2_sequestration_potential: 70 #MtCO2/a sequestration potential for Europe
@@ -396,24 +359,21 @@ sector:
   shipping_average_efficiency: 0.575 #For conversion of fuel oil to propulsion in 2011
 
   shipping_hydrogen_share: #1.0
-    BU_2030: 0.00
-    BI_2030: 0.00
+    BI_2030: 0.0
+    GH_2030: 0.0
+    DE_2030: 0.0
     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
-    AB_2030: 0.05
-    BU_2050: 0.00
-    BI_2050: 0.24
+    BI_2040: 0.064
+    GH_2040: 0.064
+    DE_2040: 0.065
+    BI_2045: 0.128
+    GH_2045: 0.130
+    DE_2045: 0.131
+    BI_2050: 0.240
     GH_2050: 0.248
     DE_2050: 0.254
-    AP_2050: 0.25
-    NZ_2050: 0.36
-    DF_2050: 0.12
 
   gadm_level: 1
   marginal_cost_storage: 0
@@ -674,3 +634,4 @@ plotting:
     high-temp electrolysis: "magenta"
     oil pipeline: "grey"
     agriculture biomass: "green"
+    land transport biomass: "green"