Merge branch 'develop-create-tools-folder' into develop

arras-energy · Mar 8, 2022 · 2667071 · 2667071
2 parents 8da30ce + 5d3cb7c
commit 2667071
Show file tree

Hide file tree

Showing 42 changed files with 379,573 additions and 87 deletions.
diff --git a/.gitignore b/.gitignore
@@ -138,6 +138,9 @@ converters/autotest/IEEE-13-cyme.glm
 object_profile.txt
 fault_check.txt
 
+# files that should be ignored by git
+*_ignore.*
+
 # specific outputs that should be ignored
 python/example.png
 models/ieee123/config/local.glm

diff --git a/Makefile.am b/Makefile.am
@@ -58,6 +58,7 @@ include $(top_srcdir)/third_party/Makefile.mk
 include $(top_srcdir)/gldcore/Makefile.mk
 include $(top_srcdir)/python_extras/Makefile.mk
 include $(top_srcdir)/converters/Makefile.mk
+include $(top_srcdir)/tools/Makefile.mk
 include $(top_srcdir)/cloud/Makefile.mk
 include $(top_srcdir)/utilities/Makefile.mk
 include $(top_srcdir)/python/Makefile.mk

diff --git a/gldcore/link/python/README.md b/gldcore/link/python/README.md
@@ -0,0 +1 @@
+See https://docs.gridlabd.us/.
diff --git a/python_extras/Makefile.mk b/python_extras/Makefile.mk
diff --git a/python_extras/example/caiso_data.glm b/python_extras/example/caiso_data.glm
diff --git a/python_extras/example/create_player.glm b/python_extras/example/create_player.glm
diff --git a/python_extras/example/ieee13_mounts.csv b/python_extras/example/ieee13_mounts.csv
diff --git a/tools/Makefile.mk b/tools/Makefile.mk
@@ -0,0 +1,12 @@
+dist_pkgdata_DATA += tools/create_player.py
+dist_pkgdata_DATA += tools/create_poles.py
+dist_pkgdata_DATA += tools/eia_recs.py
+dist_pkgdata_DATA += tools/fit_filter.py
+dist_pkgdata_DATA += tools/gridlabd-editor.png
+dist_pkgdata_DATA += tools/gridlabd-editor.py
+dist_pkgdata_DATA += tools/insights.py
+dist_pkgdata_DATA += tools/market_data.py
+dist_pkgdata_DATA += tools/metar2glm.py
+dist_pkgdata_DATA += tools/noaa_forecast.py
+dist_pkgdata_DATA += tools/nsrdb_weather.py
+dist_pkgdata_DATA += tools/ucar_weather.py
diff --git a/python_extras/example/ieee13.glm → tools/autotest/ieee13.glm b/python_extras/example/ieee13.glm → tools/autotest/ieee13.glm
diff --git a/python_extras/example/power_panel.csv → tools/autotest/test_create_player.csv b/python_extras/example/power_panel.csv → tools/autotest/test_create_player.csv
diff --git a/tools/autotest/test_create_player.glm b/tools/autotest/test_create_player.glm
@@ -0,0 +1,43 @@
+// Example: create_player.glm
+//
+// Load a panel of hourly loads as a CSV player
+//
+
+#ifexist ../test_create_player.csv
+#define DIR=..
+#endif
+
+#python -m create_player -i=${DIR:-.}/test_create_player.csv --stack -o=test_create_player_power_opt_ignore.csv -p=test_create_player_power_opt_ignore.glm -t=test
+
+class test
+{
+    double value;
+}
+
+module tape
+{
+    csv_header_type NONE;
+}
+
+object test
+{
+    name test;
+    object recorder
+    {
+        property "value";
+        file "test_create_player_out.csv";
+    };
+}
+
+#include "test_create_player_power_opt_ignore.glm"
+
+clock
+{
+    timezone "PST+8PDT";
+    starttime ${test_create_player_startdate};
+    stoptime ${test_create_player_stopdate};
+}
+
+#ifexist ../test_create_player_out.csv
+#on_exit 0 diff ../test_create_player_out.csv test_create_player_out.csv > gridlabd.diff
+#endif