Merge branch 'develop-move-geodata-folder' into develop

arras-energy · Mar 8, 2022 · 79cc067 · 79cc067
2 parents 2667071 + 9297a31
commit 79cc067
Show file tree

Hide file tree

Showing 17 changed files with 12 additions and 12 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -62,6 +62,7 @@ include $(top_srcdir)/tools/Makefile.mk
 include $(top_srcdir)/cloud/Makefile.mk
 include $(top_srcdir)/utilities/Makefile.mk
 include $(top_srcdir)/python/Makefile.mk
+include $(top_srcdir)/geodata/Makefile.mk
 
 # approved modules
 include $(top_srcdir)/modules.mk

diff --git a/geodata/Makefile.mk b/geodata/Makefile.mk
@@ -0,0 +1,11 @@
+# geodata/Makefile.mk
+dist_pkgdata_DATA += geodata/geodata_address.py
+dist_pkgdata_DATA += geodata/geodata_census.py
+dist_pkgdata_DATA += geodata/geodata_distance.py
+dist_pkgdata_DATA += geodata/geodata_elevation.py
+dist_pkgdata_DATA += geodata/geodata_powerline.py
+dist_pkgdata_DATA += geodata/geodata_powerline_cabletypes.csv
+# dist_pkgdata_DATA += geodata/geodata_transportation.py
+dist_pkgdata_DATA += geodata/geodata_utility.py
+dist_pkgdata_DATA += geodata/geodata_vegetation.py
+dist_pkgdata_DATA += geodata/geodata_weather.py
diff --git a/gldcore/geodata/autotest/test_datasets.glm → geodata/autotest/test_datasets.glm b/gldcore/geodata/autotest/test_datasets.glm → geodata/autotest/test_datasets.glm
diff --git a/gldcore/geodata/autotest/unittest.sh → geodata/autotest/unittest.sh b/gldcore/geodata/autotest/unittest.sh → geodata/autotest/unittest.sh
diff --git a/gldcore/geodata/geodata_address.py → geodata/geodata_address.py b/gldcore/geodata/geodata_address.py → geodata/geodata_address.py
diff --git a/gldcore/geodata/geodata_census.py → geodata/geodata_census.py b/gldcore/geodata/geodata_census.py → geodata/geodata_census.py
diff --git a/gldcore/geodata/geodata_distance.py → geodata/geodata_distance.py b/gldcore/geodata/geodata_distance.py → geodata/geodata_distance.py
diff --git a/gldcore/geodata/geodata_elevation.py → geodata/geodata_elevation.py b/gldcore/geodata/geodata_elevation.py → geodata/geodata_elevation.py
diff --git a/gldcore/geodata/geodata_powerline.py → geodata/geodata_powerline.py b/gldcore/geodata/geodata_powerline.py → geodata/geodata_powerline.py
diff --git a/.../geodata/geodata_powerline_cabletypes.csv → geodata/geodata_powerline_cabletypes.csv b/.../geodata/geodata_powerline_cabletypes.csv → geodata/geodata_powerline_cabletypes.csv
diff --git a/gldcore/geodata/geodata_utility.py → geodata/geodata_utility.py b/gldcore/geodata/geodata_utility.py → geodata/geodata_utility.py
diff --git a/gldcore/geodata/geodata_vegetation.py → geodata/geodata_vegetation.py b/gldcore/geodata/geodata_vegetation.py → geodata/geodata_vegetation.py
diff --git a/gldcore/geodata/geodata_weather.py → geodata/geodata_weather.py b/gldcore/geodata/geodata_weather.py → geodata/geodata_weather.py
diff --git a/gldcore/geodata/requirements.txt → geodata/requirements.txt b/gldcore/geodata/requirements.txt → geodata/requirements.txt
diff --git a/gldcore/Makefile.mk b/gldcore/Makefile.mk
@@ -3,7 +3,6 @@ include gldcore/link/matlab/Makefile.mk
 include gldcore/rt/Makefile.mk
 include gldcore/solvers/Makefile.mk
 include gldcore/scripts/Makefile.mk
-include gldcore/geodata/Makefile.mk
 
 dist_pkgdata_DATA += gldcore/tzinfo.txt
 dist_pkgdata_DATA += gldcore/unitfile.txt

diff --git a/gldcore/geodata/Makefile.mk b/gldcore/geodata/Makefile.mk
diff --git a/gldcore/geodata/geodata.conf b/gldcore/geodata/geodata.conf