Merge pull request #820 from openego/fixes/#795-fix-market-optimization-various-scenarios

Adjust PtH2 and CHP model only in powerd-scenarios

Author: ClaraBuettner

etrago/execute/market_optimization.py

@@ -433,13 +433,19 @@ def build_market_model(self, unit_commitment=False):
         "p_min_pu",
     ] = -1.0
 
-    self.pre_market_model = adjust_PtH2_model(self)
-    logger.info("PtH2-Model adjusted in pre_market_network")
-
-    self.pre_market_model = adjust_chp_model(self)
-    logger.info(
-        "CHP model in foreign countries adjusted in pre_market_network"
-    )
+    if self.args["scn_name"] in [
+        "eGon100RE",
+        "powerd2025",
+        "powerd2030",
+        "powerd2035",
+    ]:
+        self.pre_market_model = adjust_PtH2_model(self)
+        logger.info("PtH2-Model adjusted in pre_market_network")
+
+        self.pre_market_model = adjust_chp_model(self)
+        logger.info(
+            "CHP model in foreign countries adjusted in pre_market_network"
+        )
 
     # Set country tags for market model
     self.buses_by_country(apply_on="pre_market_model")