Merge pull request #860 from openego/fixes/#859-drop-non-converged-time-steps

Fixes/#859 drop non converged time steps

Author: ClaraBuettner

etrago/execute/__init__.py

@@ -1018,9 +1018,15 @@ def drop_foreign_components(network):
 
     if not pf_solve[~pf_solve.converged].count().max() == 0:
         logger.warning(
-            "PF of %d snapshots not converged.",
+            "PF of %d snapshots not converged. \n"
+            "Generation time series are set to zero for these time steps.",
             pf_solve[~pf_solve.converged].count().max(),
         )
+        network.generators_t.p.loc[~pf_solve.converged, :] *= 0
+        network.generators_t.q.loc[~pf_solve.converged, :] *= 0
+        network.storage_units_t.p.loc[~pf_solve.converged, :] *= 0
+        network.storage_units_t.q.loc[~pf_solve.converged, :] *= 0
+
     if calc_losses:
         calc_line_losses(network, pf_solve["converged"])
 
@@ -1053,9 +1059,10 @@ def drop_foreign_components(network):
         etrago.export_to_csv(path)
         pf_solve.to_csv(os.path.join(path, "pf_solution.csv"), index=True)
 
+        # Save un-solved disaggregated network
         if args["spatial_disaggregation"]:
             etrago.disaggregated_network.export_to_csv_folder(
-                path + "/disaggregated_network"
+                args["csv_export"] + "/disaggregated_network"
             )
 
     return network

etrago/network.py

@@ -226,7 +226,7 @@ def __init__(
                         ignore_standard_types,
                     )
 
-                if self.args["method"]["market_optimization"]:
+                if self.args["method"]["market_optimization"]["active"]:
                     try:
                         self.market_model = Network(
                             csv_folder_name + "/market",