Merge pull request #113 from oemof/fix/hotfixes

Fix/hotfixes
oemof · Apr 28, 2020 · 27791fc · 27791fc
2 parents a682b36 + 382f0ec
commit 27791fc
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 109 deletions.
diff --git a/examples/solar_thermal_collector/flat_plate_collector_example_facade.py b/examples/solar_thermal_collector/flat_plate_collector_example_facade.py
@@ -160,5 +160,5 @@
     title='Heat of the collector')
 ax.grid()
 ax.legend()
-plt.savefig('compare_precalculations.png')
+plt.savefig('results/heat_of_the_collector.png')
 plt.show()
diff --git a/examples/solar_thermal_collector/flat_plate_collector_example_investment.py b/examples/solar_thermal_collector/flat_plate_collector_example_investment.py
@@ -170,15 +170,13 @@
 # save model results to csv
 results = outputlib.processing.results(model)
 
-collector_inflow = outputlib.views.node(
-    results, 'solar_collector-inflow')['sequences']
-thermal_bus = outputlib.views.node(results, 'thermal')['sequences']
 electricity_bus = outputlib.views.node(results, 'electricity')['sequences']
-df = pd.DataFrame()
-df = df.append(collector_inflow)
-df = df.join(thermal_bus, lsuffix='_1')
-df = df.join(electricity_bus, lsuffix='_1')
-df.to_csv(results_path + 'flat_plate_investment_results.csv')
+thermal_bus = outputlib.views.node(results, 'thermal')['sequences']
+solar_bus = outputlib.views.node(results, 'solar')['sequences']
+df = pd.merge(
+    pd.merge(electricity_bus, thermal_bus, left_index=True, right_index=True),
+    solar_bus, left_index=True, right_index=True)
+df.to_csv(results_path + 'flat_plate_results.csv')
 
 # Example plot
 plot_collector_heat(precalc_data, periods, eta_0)
diff --git a/examples/solar_thermal_collector/plots.py b/examples/solar_thermal_collector/plots.py
@@ -18,7 +18,7 @@ def plot_collector_heat(data_precalc, periods, eta_0):
     t = list(range(1, periods + 1))
 
     fig, ax = plt.subplots()
-    ax.plot(t, heat_calc, label='CSP precalculation')
+    ax.plot(t, heat_calc, label='Solar thermal precalculation')
     ax.plot(t, heat_compare, label='constant efficiency')
     ax.set(
         xlabel='time in h',
@@ -27,7 +27,7 @@ def plot_collector_heat(data_precalc, periods, eta_0):
     )
     ax.grid()
     ax.legend()
-    plt.savefig('compare_precalculations.png')
+    plt.savefig('results/compare_precalculations.png')
     plt.show()
 
     return
diff --git a/examples/solar_thermal_collector/results/flate_plate_precalcs.csv b/examples/solar_thermal_collector/results/flate_plate_precalcs.csv
diff --git a/examples/solar_thermal_collector/results/thermal_bus_flat_plate.csv b/examples/solar_thermal_collector/results/thermal_bus_flat_plate.csv