refactor: group endogenous and exogenous params together

pypsa-meets-earth · Nov 21, 2024 · cd0fd4d · cd0fd4d
1 parent 0d67965
commit cd0fd4d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/config.default.yaml b/config.default.yaml
@@ -456,12 +456,12 @@ fossil_reserves:
   oil: 100 #TWh Maybe redundant
 
 export:
-  h2export: [10] # Yearly export demand in TWh. Only considered, if ["export"]["endogenous"] is set to false
   endogenous: false # If true, the export demand is endogenously determined by the model
   endogenous_price: 400 # EUR/MWh # Market price, for wich the hydrogen for endogenous exports is sold. Only considered, if ["export"]["endogenous"] is set to true.
   store: true # [True, False] # specifies whether 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: "ship" # use "ship" or "constant". Currently only possible when ["export"]["endogenous"] is set to false
+  h2export: [10] # Yearly export demand in TWh. Only considered, if ["export"]["endogenous"] is set to false
+  export_profile: "ship" # use "ship" or "constant". Only considered, if ["export"]["endogenous"] is set to false
   ship:
     ship_capacity: 0.4 # TWh # 0.05 TWh for new ones, 0.003 TWh for Susio Frontier, 0.4 TWh according to Hampp2021: "Corresponds to 11360 t H2 (l) with LHV of 33.3333 Mwh/t_H2. Cihlar et al 2020 based on IEA 2019, Table 3-B"
     travel_time: 288 # hours # From Agadir to Rotterdam and back (12*24)

diff --git a/test/config.test_myopic.yaml b/test/config.test_myopic.yaml
@@ -69,12 +69,12 @@ fossil_reserves:
 
 
 export:
-  h2export: [120] # Yearly export demand in TWh. Only considered, if ["export"]["endogenous"] is set to false
   endogenous: false # If true, the export demand is endogenously determined by the model
   endogenous_price: 400 # EUR/MWh # Market price, for wich the hydrogen for endogenous exports is sold. Only considered, if ["export"]["endogenous"] is set to true.
   store: true # [True, False] # specifies whether 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: "ship" # use "ship" or "constant". Currently only possible when ["export"]["endogenous"] is set to false
+  h2export: [120] # Yearly export demand in TWh. Only considered, if ["export"]["endogenous"] is set to false
+  export_profile: "ship" # use "ship" or "constant". Only considered, if ["export"]["endogenous"] is set to false
   ship:
     ship_capacity: 0.4 # TWh # 0.05 TWh for new ones, 0.003 TWh for Susio Frontier, 0.4 TWh according to Hampp2021: "Corresponds to 11360 t H2 (l) with LHV of 33.3333 Mwh/t_H2. Cihlar et al 2020 based on IEA 2019, Table 3-B"
     travel_time: 288 # hours # From Agadir to Rotterdam and back (12*24)