diff --git a/.gitignore b/.gitignore index a520ac4b1..17d707aa0 100644 --- 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 index 8aa566edd..255fdc857 100644 --- 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 new file mode 100644 index 000000000..49a7d4483 --- /dev/null +++ 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/gldcore/converters/autotest/IEEE-123-cyme.mdb b/converters/autotest/IEEE-123-cyme.mdb similarity index 100% rename from gldcore/converters/autotest/IEEE-123-cyme.mdb rename to converters/autotest/IEEE-123-cyme.mdb diff --git a/gldcore/converters/autotest/IEEE-123.glm b/converters/autotest/IEEE-123.glm similarity index 100% rename from gldcore/converters/autotest/IEEE-123.glm rename to converters/autotest/IEEE-123.glm diff --git a/gldcore/converters/autotest/IEEE-123.tmy3 b/converters/autotest/IEEE-123.tmy3 similarity index 100% rename from gldcore/converters/autotest/IEEE-123.tmy3 rename to converters/autotest/IEEE-123.tmy3 diff --git a/gldcore/converters/autotest/IEEE-13-cyme-modify.glm b/converters/autotest/IEEE-13-cyme-modify.glm similarity index 100% rename from gldcore/converters/autotest/IEEE-13-cyme-modify.glm rename to converters/autotest/IEEE-13-cyme-modify.glm diff --git a/gldcore/converters/autotest/IEEE-13-cyme.mdb b/converters/autotest/IEEE-13-cyme.mdb similarity index 100% rename from gldcore/converters/autotest/IEEE-13-cyme.mdb rename to converters/autotest/IEEE-13-cyme.mdb diff --git a/gldcore/converters/autotest/IEEE-13.glm b/converters/autotest/IEEE-13.glm similarity index 100% rename from gldcore/converters/autotest/IEEE-13.glm rename to converters/autotest/IEEE-13.glm diff --git a/gldcore/converters/autotest/table2glm_input.csv b/converters/autotest/table2glm_input.csv similarity index 100% rename from gldcore/converters/autotest/table2glm_input.csv rename to converters/autotest/table2glm_input.csv diff --git a/gldcore/converters/autotest/table2glm_input_noclass.csv b/converters/autotest/table2glm_input_noclass.csv similarity index 100% rename from gldcore/converters/autotest/table2glm_input_noclass.csv rename to converters/autotest/table2glm_input_noclass.csv diff --git a/gldcore/converters/autotest/table2glm_input_noname.csv b/converters/autotest/table2glm_input_noname.csv similarity index 100% rename from gldcore/converters/autotest/table2glm_input_noname.csv rename to converters/autotest/table2glm_input_noname.csv diff --git a/gldcore/converters/autotest/test_json2csv_profile.glm b/converters/autotest/test_json2csv_profile.glm similarity index 100% rename from gldcore/converters/autotest/test_json2csv_profile.glm rename to converters/autotest/test_json2csv_profile.glm diff --git a/gldcore/converters/autotest/test_json2html.glm b/converters/autotest/test_json2html.glm similarity index 100% rename from gldcore/converters/autotest/test_json2html.glm rename to converters/autotest/test_json2html.glm diff --git a/gldcore/converters/autotest/test_json2png_profile.glm b/converters/autotest/test_json2png_profile.glm similarity index 100% rename from gldcore/converters/autotest/test_json2png_profile.glm rename to converters/autotest/test_json2png_profile.glm diff --git a/gldcore/converters/autotest/test_markdown.glm b/converters/autotest/test_markdown.glm similarity index 100% rename from gldcore/converters/autotest/test_markdown.glm rename to converters/autotest/test_markdown.glm diff --git a/gldcore/converters/autotest/test_noaa_weather.glm b/converters/autotest/test_noaa_weather.glm similarity index 100% rename from gldcore/converters/autotest/test_noaa_weather.glm rename to converters/autotest/test_noaa_weather.glm diff --git a/gldcore/converters/autotest/test_onpoint_weather.glm b/converters/autotest/test_onpoint_weather.glm similarity index 100% rename from gldcore/converters/autotest/test_onpoint_weather.glm rename to converters/autotest/test_onpoint_weather.glm diff --git a/gldcore/converters/autotest/test_table2glm.glm b/converters/autotest/test_table2glm.glm similarity index 100% rename from gldcore/converters/autotest/test_table2glm.glm rename to converters/autotest/test_table2glm.glm diff --git a/gldcore/converters/autotest/test_table2glm_err.glm b/converters/autotest/test_table2glm_err.glm similarity index 100% rename from gldcore/converters/autotest/test_table2glm_err.glm rename to converters/autotest/test_table2glm_err.glm diff --git a/gldcore/converters/autotest/test_table2glm_noclass.glm b/converters/autotest/test_table2glm_noclass.glm similarity index 100% rename from gldcore/converters/autotest/test_table2glm_noclass.glm rename to converters/autotest/test_table2glm_noclass.glm diff --git a/gldcore/converters/autotest/test_table2glm_noname.glm b/converters/autotest/test_table2glm_noname.glm similarity index 100% rename from gldcore/converters/autotest/test_table2glm_noname.glm rename to converters/autotest/test_table2glm_noname.glm diff --git a/gldcore/converters/autotest/test_visualcrossing_weather.glm b/converters/autotest/test_visualcrossing_weather.glm similarity index 100% rename from gldcore/converters/autotest/test_visualcrossing_weather.glm rename to converters/autotest/test_visualcrossing_weather.glm diff --git a/gldcore/converters/autotest/test_xls-spida2csv-geodata.csv b/converters/autotest/test_xls-spida2csv-geodata.csv similarity index 100% rename from gldcore/converters/autotest/test_xls-spida2csv-geodata.csv rename to converters/autotest/test_xls-spida2csv-geodata.csv diff --git a/gldcore/converters/autotest/test_xls-spida2csv-geodata.glm b/converters/autotest/test_xls-spida2csv-geodata.glm similarity index 100% rename from gldcore/converters/autotest/test_xls-spida2csv-geodata.glm rename to converters/autotest/test_xls-spida2csv-geodata.glm diff --git a/gldcore/converters/autotest/test_xls-spida2csv-geodata.xls b/converters/autotest/test_xls-spida2csv-geodata.xls similarity index 100% rename from gldcore/converters/autotest/test_xls-spida2csv-geodata.xls rename to converters/autotest/test_xls-spida2csv-geodata.xls diff --git a/gldcore/converters/autotest/weather_recorder.csv b/converters/autotest/weather_recorder.csv similarity index 100% rename from gldcore/converters/autotest/weather_recorder.csv rename to converters/autotest/weather_recorder.csv diff --git a/gldcore/converters/csv-ami2glm-ceus.py b/converters/csv-ami2glm-ceus.py similarity index 100% rename from gldcore/converters/csv-ami2glm-ceus.py rename to converters/csv-ami2glm-ceus.py diff --git a/gldcore/converters/csv-ami2glm-rbsa.py b/converters/csv-ami2glm-rbsa.py similarity index 100% rename from gldcore/converters/csv-ami2glm-rbsa.py rename to converters/csv-ami2glm-rbsa.py diff --git a/gldcore/converters/csv-ceus2glm-ceus.py b/converters/csv-ceus2glm-ceus.py similarity index 100% rename from gldcore/converters/csv-ceus2glm-ceus.py rename to converters/csv-ceus2glm-ceus.py diff --git a/gldcore/converters/csv-config2glm-config.py b/converters/csv-config2glm-config.py similarity index 100% rename from gldcore/converters/csv-config2glm-config.py rename to converters/csv-config2glm-config.py diff --git a/gldcore/converters/csv-dataframe2glm-modify.py b/converters/csv-dataframe2glm-modify.py similarity index 100% rename from gldcore/converters/csv-dataframe2glm-modify.py rename to converters/csv-dataframe2glm-modify.py diff --git a/gldcore/converters/csv-ica2glm-ica.py b/converters/csv-ica2glm-ica.py similarity index 100% rename from gldcore/converters/csv-ica2glm-ica.py rename to converters/csv-ica2glm-ica.py diff --git a/gldcore/converters/csv-modify2glm-modify.py b/converters/csv-modify2glm-modify.py similarity index 100% rename from gldcore/converters/csv-modify2glm-modify.py rename to converters/csv-modify2glm-modify.py diff --git a/gldcore/converters/csv-noaa-weather2glm-weather.py b/converters/csv-noaa-weather2glm-weather.py similarity index 100% rename from gldcore/converters/csv-noaa-weather2glm-weather.py rename to converters/csv-noaa-weather2glm-weather.py diff --git a/gldcore/converters/csv-onpoint-weather2glm-weather.py b/converters/csv-onpoint-weather2glm-weather.py similarity index 100% rename from gldcore/converters/csv-onpoint-weather2glm-weather.py rename to converters/csv-onpoint-weather2glm-weather.py diff --git a/gldcore/converters/csv-scada2glm-ceus.py b/converters/csv-scada2glm-ceus.py similarity index 100% rename from gldcore/converters/csv-scada2glm-ceus.py rename to converters/csv-scada2glm-ceus.py diff --git a/gldcore/converters/csv-scada2glm-rbsa.py b/converters/csv-scada2glm-rbsa.py similarity index 100% rename from gldcore/converters/csv-scada2glm-rbsa.py rename to converters/csv-scada2glm-rbsa.py diff --git a/gldcore/converters/csv-schneider2glm-player.py b/converters/csv-schneider2glm-player.py similarity index 100% rename from gldcore/converters/csv-schneider2glm-player.py rename to converters/csv-schneider2glm-player.py diff --git a/gldcore/converters/csv-table2glm-library.py b/converters/csv-table2glm-library.py similarity index 100% rename from gldcore/converters/csv-table2glm-library.py rename to converters/csv-table2glm-library.py diff --git a/gldcore/converters/csv-table2glm-object.py b/converters/csv-table2glm-object.py similarity index 100% rename from gldcore/converters/csv-table2glm-object.py rename to converters/csv-table2glm-object.py diff --git a/gldcore/converters/csv-visualcrossing-weather2glm-weather.py b/converters/csv-visualcrossing-weather2glm-weather.py similarity index 100% rename from gldcore/converters/csv-visualcrossing-weather2glm-weather.py rename to converters/csv-visualcrossing-weather2glm-weather.py diff --git a/gldcore/converters/csv2glm.py b/converters/csv2glm.py similarity index 100% rename from gldcore/converters/csv2glm.py rename to converters/csv2glm.py diff --git a/gldcore/converters/cyme.py b/converters/cyme.py similarity index 100% rename from gldcore/converters/cyme.py rename to converters/cyme.py diff --git a/gldcore/converters/glm2omd.py b/converters/glm2omd.py similarity index 100% rename from gldcore/converters/glm2omd.py rename to converters/glm2omd.py diff --git a/gldcore/converters/gz2glm.py b/converters/gz2glm.py similarity index 100% rename from gldcore/converters/gz2glm.py rename to converters/gz2glm.py diff --git a/gldcore/converters/json2csv-profile.py b/converters/json2csv-profile.py similarity index 100% rename from gldcore/converters/json2csv-profile.py rename to converters/json2csv-profile.py diff --git a/gldcore/converters/json2csv.py b/converters/json2csv.py similarity index 100% rename from gldcore/converters/json2csv.py rename to converters/json2csv.py diff --git a/gldcore/converters/json2glm.py b/converters/json2glm.py similarity index 100% rename from gldcore/converters/json2glm.py rename to converters/json2glm.py diff --git a/gldcore/converters/json2html.py b/converters/json2html.py similarity index 100% rename from gldcore/converters/json2html.py rename to converters/json2html.py diff --git a/gldcore/converters/json2html_config.py b/converters/json2html_config.py similarity index 100% rename from gldcore/converters/json2html_config.py rename to converters/json2html_config.py diff --git a/gldcore/converters/json2md.py b/converters/json2md.py similarity index 100% rename from gldcore/converters/json2md.py rename to converters/json2md.py diff --git a/gldcore/converters/json2png-oneline.py b/converters/json2png-oneline.py similarity index 100% rename from gldcore/converters/json2png-oneline.py rename to converters/json2png-oneline.py diff --git a/gldcore/converters/json2png.py b/converters/json2png.py similarity index 100% rename from gldcore/converters/json2png.py rename to converters/json2png.py diff --git a/gldcore/converters/json2txt.py b/converters/json2txt.py similarity index 100% rename from gldcore/converters/json2txt.py rename to converters/json2txt.py diff --git a/gldcore/converters/json2zip.py b/converters/json2zip.py similarity index 100% rename from gldcore/converters/json2zip.py rename to converters/json2zip.py diff --git a/gldcore/converters/mdb-cyme2glm.py b/converters/mdb-cyme2glm.py similarity index 100% rename from gldcore/converters/mdb-cyme2glm.py rename to converters/mdb-cyme2glm.py diff --git a/gldcore/converters/mdb-cyme2omd.py b/converters/mdb-cyme2omd.py similarity index 100% rename from gldcore/converters/mdb-cyme2omd.py rename to converters/mdb-cyme2omd.py diff --git a/gldcore/converters/mdb2glm.py b/converters/mdb2glm.py similarity index 100% rename from gldcore/converters/mdb2glm.py rename to converters/mdb2glm.py diff --git a/gldcore/converters/omd2glm.py b/converters/omd2glm.py similarity index 100% rename from gldcore/converters/omd2glm.py rename to converters/omd2glm.py diff --git a/gldcore/converters/requirements.txt b/converters/requirements.txt similarity index 100% rename from gldcore/converters/requirements.txt rename to converters/requirements.txt diff --git a/gldcore/converters/tmy32glm.py b/converters/tmy32glm.py similarity index 100% rename from gldcore/converters/tmy32glm.py rename to converters/tmy32glm.py diff --git a/gldcore/converters/txt-cyme2glm.py b/converters/txt-cyme2glm.py similarity index 100% rename from gldcore/converters/txt-cyme2glm.py rename to converters/txt-cyme2glm.py diff --git a/gldcore/converters/txt2glm.py b/converters/txt2glm.py similarity index 100% rename from gldcore/converters/txt2glm.py rename to converters/txt2glm.py diff --git a/gldcore/converters/xls-spida2csv-geodata.py b/converters/xls-spida2csv-geodata.py similarity index 100% rename from gldcore/converters/xls-spida2csv-geodata.py rename to converters/xls-spida2csv-geodata.py diff --git a/gldcore/converters/xls2csv.py b/converters/xls2csv.py similarity index 100% rename from gldcore/converters/xls2csv.py rename to converters/xls2csv.py diff --git a/gldcore/converters/zip2glm.py b/converters/zip2glm.py similarity index 100% rename from gldcore/converters/zip2glm.py rename to converters/zip2glm.py diff --git a/gldcore/Makefile.mk b/gldcore/Makefile.mk index f3fb69a9a..7e9db0f51 100644 --- 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 deleted file mode 100644 index 6b675ec91..000000000 --- a/gldcore/converters/Makefile.mk +++ /dev/null @@ -1,82 +0,0 @@ -# -# INPUT CONVERTERS -# - -python_requirements += gldcore/converters/requirements.txt - -# csv -> glm -dist_pkgdata_DATA += gldcore/converters/csv-ami2glm-ceus.py -dist_pkgdata_DATA += gldcore/converters/csv-ami2glm-rbsa.py -dist_pkgdata_DATA += gldcore/converters/csv-ceus2glm-ceus.py -dist_pkgdata_DATA += gldcore/converters/csv-ica2glm-ica.py -dist_pkgdata_DATA += gldcore/converters/csv-noaa-weather2glm-weather.py -dist_pkgdata_DATA += gldcore/converters/csv-onpoint-weather2glm-weather.py -dist_pkgdata_DATA += gldcore/converters/csv-scada2glm-ceus.py -dist_pkgdata_DATA += gldcore/converters/csv-scada2glm-rbsa.py -dist_pkgdata_DATA += gldcore/converters/csv-schneider2glm-player.py -dist_pkgdata_DATA += gldcore/converters/csv-table2glm-library.py -dist_pkgdata_DATA += gldcore/converters/csv-table2glm-object.py -dist_pkgdata_DATA += gldcore/converters/csv-visualcrossing-weather2glm-weather.py -dist_pkgdata_DATA += gldcore/converters/csv2glm.py - -# gz -> glm -dist_pkgdata_DATA += gldcore/converters/gz2glm.py - -# mdb -> glm -dist_pkgdata_DATA += gldcore/converters/mdb2glm.py -dist_pkgdata_DATA += gldcore/converters/mdb-cyme2glm.py - -# omd -> glm -dist_pkgdata_DATA += gldcore/converters/omd2glm.py - -# tmy3 -> glm -dist_pkgdata_DATA += gldcore/converters/tmy32glm.py - -# txt -> glm -dist_pkgdata_DATA += gldcore/converters/txt2glm.py -dist_pkgdata_DATA += gldcore/converters/txt-cyme2glm.py - -# zip -> glm -dist_pkgdata_DATA += gldcore/converters/zip2glm.py - -# -# OUTPUT CONVERTERS -# - -# glm-> omd -dist_pkgdata_DATA += gldcore/converters/glm2omd.py - -# json -> csv -dist_pkgdata_DATA += gldcore/converters/json2csv.py -dist_pkgdata_DATA += gldcore/converters/json2csv-profile.py - -# json -> html -dist_pkgdata_DATA += gldcore/converters/json2html.py -dist_pkgdata_DATA += gldcore/converters/json2html_config.py - -# json -> glm -dist_pkgdata_DATA += gldcore/converters/json2glm.py - -# json -> md -dist_pkgdata_DATA += gldcore/converters/json2md.py - -# json -> png -dist_pkgdata_DATA += gldcore/converters/json2png.py -dist_pkgdata_DATA += gldcore/converters/json2png-oneline.py - -# json -> txt -dist_pkgdata_DATA += gldcore/converters/json2txt.py - -# json -> zip -dist_pkgdata_DATA += gldcore/converters/json2zip.py - -# xls -> csv -dist_pkgdata_DATA += gldcore/converters/xls2csv.py -dist_pkgdata_DATA += gldcore/converters/xls-spida2csv-geodata.py - -# -# SUPPORT MODULES -# -dist_pkgdata_DATA += gldcore/converters/cyme.py -dist_pkgdata_DATA += gldcore/converters/csv-modify2glm-modify.py -dist_pkgdata_DATA += gldcore/converters/csv-config2glm-config.py