arras-energy · dchassin · Mar 9, 2022 · Mar 8, 2022 · Mar 8, 2022 · Mar 8, 2022
diff --git a/.gitignore b/.gitignore
@@ -132,7 +132,7 @@ autotest/test_*/
 gldcore/autotest/ceus.glm
 gldcore/autotest/ica_test.glm
 gldcore/autotest/test_output_save.csv
-gldcore/converters/autotest/IEEE-13-cyme.glm
+converters/autotest/IEEE-13-cyme.glm
 
 # widely found generic output files
 object_profile.txt
@@ -141,21 +141,21 @@ fault_check.txt
 # specific outputs that should be ignored
 gldcore/link/python/example.png
 models/ieee123/config/local.glm
-gldcore/converters/autotest/IEEE-*-cyme/*
+converters/autotest/IEEE-*-cyme/*
 gridlabd.glm
 gldcore/autotest/config.glm
 gldcore/autotest/modify.glm
 validate.zip.gz
-gldcore/converters/autotest/*.png
+converters/autotest/*.png
 validate.tar.gz
-gldcore/converters/autotest/weather_recorder.csv
-gldcore/converters/onpoint_history_postal-code_hour_201801010000-201812312359.csv
-gldcore/converters/onpoint_history_postal-code_hour_201801010000-201812312359.glm
-gldcore/converters/test_data.csv
-gldcore/converters/test_data.glm
-gldcore/converters/autotest/weather_recorder.csv
-gldcore/converters/noaa.csv
-gldcore/converters/noaa.glm
+converters/autotest/weather_recorder.csv
+converters/onpoint_history_postal-code_hour_201801010000-201812312359.csv
+converters/onpoint_history_postal-code_hour_201801010000-201812312359.glm
+converters/test_data.csv
+converters/test_data.glm
+converters/autotest/weather_recorder.csv
+converters/noaa.csv
+converters/noaa.glm
 gldcore/link/python/examples/example_2/example.png
 gldcore/link/python/examples/example_3/example.png
 gldcore/link/python/examples/example_3/x.csv
@@ -168,11 +168,11 @@ documents/gridlabd.md
 documents/gridlabd.pdf
 openfido.err
 test_*.html
-gldcore/converters/autotest/IEEE-123.html
-gldcore/converters/autotest/solver_nr_profile.csv
-gldcore/converters/autotest/table2glm_input_noclass.glm
-gldcore/converters/autotest/table2glm_input_noname.glm
-gldcore/converters/autotest/table2glm_input.glm
+converters/autotest/IEEE-123.html
+converters/autotest/solver_nr_profile.csv
+converters/autotest/table2glm_input_noclass.glm
+converters/autotest/table2glm_input_noname.glm
+converters/autotest/table2glm_input.glm
 gldcore/geodata/docs/geodata.conf
 gldcore/gridlabd.in
 geodata.conf

diff --git a/Makefile.am b/Makefile.am
@@ -57,6 +57,7 @@ docs_targets =
 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)/cloud/Makefile.mk
 include $(top_srcdir)/utilities/Makefile.mk
 

diff --git a/converters/Makefile.mk b/converters/Makefile.mk
@@ -0,0 +1,82 @@
+#
+# INPUT CONVERTERS
+#
+
+python_requirements += converters/requirements.txt
+
+# csv -> glm
+dist_pkgdata_DATA += converters/csv-ami2glm-ceus.py
+dist_pkgdata_DATA += converters/csv-ami2glm-rbsa.py
+dist_pkgdata_DATA += converters/csv-ceus2glm-ceus.py
+dist_pkgdata_DATA += converters/csv-ica2glm-ica.py
+dist_pkgdata_DATA += converters/csv-noaa-weather2glm-weather.py
+dist_pkgdata_DATA += converters/csv-onpoint-weather2glm-weather.py
+dist_pkgdata_DATA += converters/csv-scada2glm-ceus.py
+dist_pkgdata_DATA += converters/csv-scada2glm-rbsa.py
+dist_pkgdata_DATA += converters/csv-schneider2glm-player.py
+dist_pkgdata_DATA += converters/csv-table2glm-library.py
+dist_pkgdata_DATA += converters/csv-table2glm-object.py
+dist_pkgdata_DATA += converters/csv-visualcrossing-weather2glm-weather.py
+dist_pkgdata_DATA += converters/csv2glm.py
+
+# gz -> glm
+dist_pkgdata_DATA += converters/gz2glm.py
+
+# mdb -> glm
+dist_pkgdata_DATA += converters/mdb2glm.py
+dist_pkgdata_DATA += converters/mdb-cyme2glm.py
+
+# omd -> glm
+dist_pkgdata_DATA += converters/omd2glm.py
+
+# tmy3 -> glm
+dist_pkgdata_DATA += converters/tmy32glm.py
+
+# txt -> glm
+dist_pkgdata_DATA += converters/txt2glm.py
+dist_pkgdata_DATA += converters/txt-cyme2glm.py
+
+# zip -> glm
+dist_pkgdata_DATA += converters/zip2glm.py
+
+#
+# OUTPUT CONVERTERS
+#
+
+# glm-> omd
+dist_pkgdata_DATA += converters/glm2omd.py
+
+# json -> csv
+dist_pkgdata_DATA += converters/json2csv.py
+dist_pkgdata_DATA += converters/json2csv-profile.py
+
+# json -> html
+dist_pkgdata_DATA += converters/json2html.py
+dist_pkgdata_DATA += converters/json2html_config.py
+
+# json -> glm
+dist_pkgdata_DATA += converters/json2glm.py
+
+# json -> md
+dist_pkgdata_DATA += converters/json2md.py
+
+# json -> png
+dist_pkgdata_DATA += converters/json2png.py
+dist_pkgdata_DATA += converters/json2png-oneline.py
+
+# json -> txt
+dist_pkgdata_DATA += converters/json2txt.py
+
+# json -> zip
+dist_pkgdata_DATA += converters/json2zip.py
+
+# xls -> csv
+dist_pkgdata_DATA += converters/xls2csv.py
+dist_pkgdata_DATA += converters/xls-spida2csv-geodata.py
+
+#
+# SUPPORT MODULES
+#
+dist_pkgdata_DATA += converters/cyme.py
+dist_pkgdata_DATA += converters/csv-modify2glm-modify.py
+dist_pkgdata_DATA += converters/csv-config2glm-config.py
diff --git a/...ore/converters/autotest/IEEE-123-cyme.mdb → converters/autotest/IEEE-123-cyme.mdb b/...ore/converters/autotest/IEEE-123-cyme.mdb → converters/autotest/IEEE-123-cyme.mdb
diff --git a/gldcore/converters/autotest/IEEE-123.glm → converters/autotest/IEEE-123.glm b/gldcore/converters/autotest/IEEE-123.glm → converters/autotest/IEEE-123.glm
diff --git a/gldcore/converters/autotest/IEEE-123.tmy3 → converters/autotest/IEEE-123.tmy3 b/gldcore/converters/autotest/IEEE-123.tmy3 → converters/autotest/IEEE-123.tmy3
diff --git a/...nverters/autotest/IEEE-13-cyme-modify.glm → converters/autotest/IEEE-13-cyme-modify.glm b/...nverters/autotest/IEEE-13-cyme-modify.glm → converters/autotest/IEEE-13-cyme-modify.glm
diff --git a/gldcore/converters/autotest/IEEE-13-cyme.mdb → converters/autotest/IEEE-13-cyme.mdb b/gldcore/converters/autotest/IEEE-13-cyme.mdb → converters/autotest/IEEE-13-cyme.mdb
diff --git a/gldcore/converters/autotest/IEEE-13.glm → converters/autotest/IEEE-13.glm b/gldcore/converters/autotest/IEEE-13.glm → converters/autotest/IEEE-13.glm
diff --git a/...e/converters/autotest/table2glm_input.csv → converters/autotest/table2glm_input.csv b/...e/converters/autotest/table2glm_input.csv → converters/autotest/table2glm_input.csv
diff --git a/...ters/autotest/table2glm_input_noclass.csv → ...ters/autotest/table2glm_input_noclass.csv b/...ters/autotest/table2glm_input_noclass.csv → ...ters/autotest/table2glm_input_noclass.csv
diff --git a/...rters/autotest/table2glm_input_noname.csv → ...rters/autotest/table2glm_input_noname.csv b/...rters/autotest/table2glm_input_noname.csv → ...rters/autotest/table2glm_input_noname.csv
diff --git a/...erters/autotest/test_json2csv_profile.glm → ...erters/autotest/test_json2csv_profile.glm b/...erters/autotest/test_json2csv_profile.glm → ...erters/autotest/test_json2csv_profile.glm
diff --git a/...re/converters/autotest/test_json2html.glm → converters/autotest/test_json2html.glm b/...re/converters/autotest/test_json2html.glm → converters/autotest/test_json2html.glm
diff --git a/...erters/autotest/test_json2png_profile.glm → ...erters/autotest/test_json2png_profile.glm b/...erters/autotest/test_json2png_profile.glm → ...erters/autotest/test_json2png_profile.glm
diff --git a/...ore/converters/autotest/test_markdown.glm → converters/autotest/test_markdown.glm b/...ore/converters/autotest/test_markdown.glm → converters/autotest/test_markdown.glm
diff --git a/...converters/autotest/test_noaa_weather.glm → converters/autotest/test_noaa_weather.glm b/...converters/autotest/test_noaa_weather.glm → converters/autotest/test_noaa_weather.glm
diff --git a/...verters/autotest/test_onpoint_weather.glm → converters/autotest/test_onpoint_weather.glm b/...verters/autotest/test_onpoint_weather.glm → converters/autotest/test_onpoint_weather.glm
diff --git a/...re/converters/autotest/test_table2glm.glm → converters/autotest/test_table2glm.glm b/...re/converters/autotest/test_table2glm.glm → converters/autotest/test_table2glm.glm
diff --git a/...onverters/autotest/test_table2glm_err.glm → converters/autotest/test_table2glm_err.glm b/...onverters/autotest/test_table2glm_err.glm → converters/autotest/test_table2glm_err.glm
diff --git a/...rters/autotest/test_table2glm_noclass.glm → ...rters/autotest/test_table2glm_noclass.glm b/...rters/autotest/test_table2glm_noclass.glm → ...rters/autotest/test_table2glm_noclass.glm
diff --git a/...erters/autotest/test_table2glm_noname.glm → ...erters/autotest/test_table2glm_noname.glm b/...erters/autotest/test_table2glm_noname.glm → ...erters/autotest/test_table2glm_noname.glm
diff --git a/.../autotest/test_visualcrossing_weather.glm → .../autotest/test_visualcrossing_weather.glm b/.../autotest/test_visualcrossing_weather.glm → .../autotest/test_visualcrossing_weather.glm
diff --git a/...s/autotest/test_xls-spida2csv-geodata.csv → ...s/autotest/test_xls-spida2csv-geodata.csv b/...s/autotest/test_xls-spida2csv-geodata.csv → ...s/autotest/test_xls-spida2csv-geodata.csv
diff --git a/...s/autotest/test_xls-spida2csv-geodata.glm → ...s/autotest/test_xls-spida2csv-geodata.glm b/...s/autotest/test_xls-spida2csv-geodata.glm → ...s/autotest/test_xls-spida2csv-geodata.glm
diff --git a/...s/autotest/test_xls-spida2csv-geodata.xls → ...s/autotest/test_xls-spida2csv-geodata.xls b/...s/autotest/test_xls-spida2csv-geodata.xls → ...s/autotest/test_xls-spida2csv-geodata.xls
diff --git a/.../converters/autotest/weather_recorder.csv → converters/autotest/weather_recorder.csv b/.../converters/autotest/weather_recorder.csv → converters/autotest/weather_recorder.csv
diff --git a/gldcore/converters/csv-ami2glm-ceus.py → converters/csv-ami2glm-ceus.py b/gldcore/converters/csv-ami2glm-ceus.py → converters/csv-ami2glm-ceus.py
diff --git a/gldcore/converters/csv-ami2glm-rbsa.py → converters/csv-ami2glm-rbsa.py b/gldcore/converters/csv-ami2glm-rbsa.py → converters/csv-ami2glm-rbsa.py
diff --git a/gldcore/converters/csv-ceus2glm-ceus.py → converters/csv-ceus2glm-ceus.py b/gldcore/converters/csv-ceus2glm-ceus.py → converters/csv-ceus2glm-ceus.py
diff --git a/gldcore/converters/csv-config2glm-config.py → converters/csv-config2glm-config.py b/gldcore/converters/csv-config2glm-config.py → converters/csv-config2glm-config.py
diff --git a/...re/converters/csv-dataframe2glm-modify.py → converters/csv-dataframe2glm-modify.py b/...re/converters/csv-dataframe2glm-modify.py → converters/csv-dataframe2glm-modify.py
diff --git a/gldcore/converters/csv-ica2glm-ica.py → converters/csv-ica2glm-ica.py b/gldcore/converters/csv-ica2glm-ica.py → converters/csv-ica2glm-ica.py
diff --git a/gldcore/converters/csv-modify2glm-modify.py → converters/csv-modify2glm-modify.py b/gldcore/converters/csv-modify2glm-modify.py → converters/csv-modify2glm-modify.py
diff --git a/...onverters/csv-noaa-weather2glm-weather.py → converters/csv-noaa-weather2glm-weather.py b/...onverters/csv-noaa-weather2glm-weather.py → converters/csv-noaa-weather2glm-weather.py
diff --git a/...erters/csv-onpoint-weather2glm-weather.py → ...erters/csv-onpoint-weather2glm-weather.py b/...erters/csv-onpoint-weather2glm-weather.py → ...erters/csv-onpoint-weather2glm-weather.py
diff --git a/gldcore/converters/csv-scada2glm-ceus.py → converters/csv-scada2glm-ceus.py b/gldcore/converters/csv-scada2glm-ceus.py → converters/csv-scada2glm-ceus.py
diff --git a/gldcore/converters/csv-scada2glm-rbsa.py → converters/csv-scada2glm-rbsa.py b/gldcore/converters/csv-scada2glm-rbsa.py → converters/csv-scada2glm-rbsa.py
diff --git a/...re/converters/csv-schneider2glm-player.py → converters/csv-schneider2glm-player.py b/...re/converters/csv-schneider2glm-player.py → converters/csv-schneider2glm-player.py
diff --git a/gldcore/converters/csv-table2glm-library.py → converters/csv-table2glm-library.py b/gldcore/converters/csv-table2glm-library.py → converters/csv-table2glm-library.py
diff --git a/gldcore/converters/csv-table2glm-object.py → converters/csv-table2glm-object.py b/gldcore/converters/csv-table2glm-object.py → converters/csv-table2glm-object.py
diff --git a/...csv-visualcrossing-weather2glm-weather.py → ...csv-visualcrossing-weather2glm-weather.py b/...csv-visualcrossing-weather2glm-weather.py → ...csv-visualcrossing-weather2glm-weather.py
diff --git a/gldcore/converters/csv2glm.py → converters/csv2glm.py b/gldcore/converters/csv2glm.py → converters/csv2glm.py
diff --git a/gldcore/converters/cyme.py → converters/cyme.py b/gldcore/converters/cyme.py → converters/cyme.py
diff --git a/gldcore/converters/glm2omd.py → converters/glm2omd.py b/gldcore/converters/glm2omd.py → converters/glm2omd.py
diff --git a/gldcore/converters/gz2glm.py → converters/gz2glm.py b/gldcore/converters/gz2glm.py → converters/gz2glm.py
diff --git a/gldcore/converters/json2csv-profile.py → converters/json2csv-profile.py b/gldcore/converters/json2csv-profile.py → converters/json2csv-profile.py
diff --git a/gldcore/converters/json2csv.py → converters/json2csv.py b/gldcore/converters/json2csv.py → converters/json2csv.py
diff --git a/gldcore/converters/json2glm.py → converters/json2glm.py b/gldcore/converters/json2glm.py → converters/json2glm.py
diff --git a/gldcore/converters/json2html.py → converters/json2html.py b/gldcore/converters/json2html.py → converters/json2html.py
diff --git a/gldcore/converters/json2html_config.py → converters/json2html_config.py b/gldcore/converters/json2html_config.py → converters/json2html_config.py
diff --git a/gldcore/converters/json2md.py → converters/json2md.py b/gldcore/converters/json2md.py → converters/json2md.py
diff --git a/gldcore/converters/json2png-oneline.py → converters/json2png-oneline.py b/gldcore/converters/json2png-oneline.py → converters/json2png-oneline.py
diff --git a/gldcore/converters/json2png.py → converters/json2png.py b/gldcore/converters/json2png.py → converters/json2png.py
diff --git a/gldcore/converters/json2txt.py → converters/json2txt.py b/gldcore/converters/json2txt.py → converters/json2txt.py
diff --git a/gldcore/converters/json2zip.py → converters/json2zip.py b/gldcore/converters/json2zip.py → converters/json2zip.py
diff --git a/gldcore/converters/mdb-cyme2glm.py → converters/mdb-cyme2glm.py b/gldcore/converters/mdb-cyme2glm.py → converters/mdb-cyme2glm.py
diff --git a/gldcore/converters/mdb-cyme2omd.py → converters/mdb-cyme2omd.py b/gldcore/converters/mdb-cyme2omd.py → converters/mdb-cyme2omd.py
diff --git a/gldcore/converters/mdb2glm.py → converters/mdb2glm.py b/gldcore/converters/mdb2glm.py → converters/mdb2glm.py
diff --git a/gldcore/converters/omd2glm.py → converters/omd2glm.py b/gldcore/converters/omd2glm.py → converters/omd2glm.py
diff --git a/gldcore/converters/requirements.txt → converters/requirements.txt b/gldcore/converters/requirements.txt → converters/requirements.txt
diff --git a/gldcore/converters/tmy32glm.py → converters/tmy32glm.py b/gldcore/converters/tmy32glm.py → converters/tmy32glm.py
diff --git a/gldcore/converters/txt-cyme2glm.py → converters/txt-cyme2glm.py b/gldcore/converters/txt-cyme2glm.py → converters/txt-cyme2glm.py
diff --git a/gldcore/converters/txt2glm.py → converters/txt2glm.py b/gldcore/converters/txt2glm.py → converters/txt2glm.py
diff --git a/gldcore/converters/xls-spida2csv-geodata.py → converters/xls-spida2csv-geodata.py b/gldcore/converters/xls-spida2csv-geodata.py → converters/xls-spida2csv-geodata.py
diff --git a/gldcore/converters/xls2csv.py → converters/xls2csv.py b/gldcore/converters/xls2csv.py → converters/xls2csv.py
diff --git a/gldcore/converters/zip2glm.py → converters/zip2glm.py b/gldcore/converters/zip2glm.py → converters/zip2glm.py
diff --git a/gldcore/Makefile.mk b/gldcore/Makefile.mk
@@ -2,7 +2,6 @@ include gldcore/link/engine/Makefile.mk
 include gldcore/link/matlab/Makefile.mk
 include gldcore/link/python/Makefile.mk
 include gldcore/rt/Makefile.mk
-include gldcore/converters/Makefile.mk
 include gldcore/solvers/Makefile.mk
 include gldcore/scripts/Makefile.mk
 include gldcore/geodata/Makefile.mk

diff --git a/gldcore/converters/Makefile.mk b/gldcore/converters/Makefile.mk