Merge 3a33876 into 7494c75

oemof · Mar 25, 2020 · 4bd1be5 · 4bd1be5
2 parents 7494c75 + 3a33876
commit 4bd1be5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -59,9 +59,5 @@ target/
 # IDE
 .idea
 
-# data from Franzi
-CSP_data/
-CSP_results/
-
 # results
-examples/flat_plate_collector/results/
+examples/**/results
diff --git a/examples/concentrating_solar_power/csp_collector_plot_example.py b/examples/concentrating_solar_power/csp_collector_plot_example.py
@@ -54,7 +54,7 @@
        title='Heat of the collector')
 ax.grid()
 ax.legend()
-plt.savefig('compare_precalculations.png')
+plt.savefig('results/compare_collector_heat_method1.png')
 
 # plot showing the difference between a constant efficiency and the efficiency
 # depending on the ambient temperature for the same irradiance and hour of the
@@ -83,4 +83,4 @@
 ax.grid()
 ax.legend()
 plt.show()
-plt.savefig('compare_temp_dependency.png')
+plt.savefig('results/compare_temp_dependency_method1.png')
diff --git a/examples/concentrating_solar_power/csp_collector_plot_example_andasol.py b/examples/concentrating_solar_power/csp_collector_plot_example_andasol.py
@@ -60,7 +60,7 @@
        title='Heat of the collector')
 ax.grid()
 ax.legend()
-plt.savefig('compare_precalculations.png')
+plt.savefig('results/compare_collector_heat_method2.png')
 
 # plot showing the difference between a constant efficiency and the efficiency
 # depending on the ambient temperature for the same irradiance and hour of the
@@ -90,4 +90,4 @@
 ax.grid()
 ax.legend()
 plt.show()
-plt.savefig('compare_temp_dependency.png')
+plt.savefig('results/compare_temp_dependency_method2.png')
diff --git a/examples/concentrating_solar_power/csp_plant_example.py b/examples/concentrating_solar_power/csp_plant_example.py
@@ -142,4 +142,4 @@
 df = pd.DataFrame()
 df = df.append(collector['sequences'])
 df = df.join(thermal_bus['sequences'], lsuffix='_1')
-df.to_csv('CSP_results.csv')
+df.to_csv('results/csp_plant_results.csv')