Merge pull request #1101 from slacgismo/develop

Release beauharnois-31

.github/workflows/develop.yml

@@ -10,7 +10,7 @@ jobs:
  build:
 
  runs-on: ubuntu-latest
- container: slacgismo/gridlabd_dockerhub_base:220223
+ container: slacgismo/gridlabd_dockerhub_base:220322
 
  steps:
  - uses: actions/checkout@v2

.github/workflows/master.yml

@@ -10,7 +10,7 @@ jobs:
  build:
 
  runs-on: ubuntu-latest
- container: slacgismo/gridlabd_dockerhub_base:220223
+ container: slacgismo/gridlabd_dockerhub_base:220322
 
  steps:
  - uses: actions/checkout@v2

.gitignore

@@ -17,13 +17,13 @@ build-aux/compile
 build-aux/config.guess
 build-aux/config.sub
 build-aux/depcomp
-gldcore/config.h.in
-gldcore/config.h
+source/config.h.in
+source/config.h
 /configure.scan
 build-aux/install-sh
 build-aux/ltmain.sh
 build-aux/missing
-gldcore/stamp-h1
+source/stamp-h1
 
 # Prerequisites
 *.d
@@ -84,7 +84,7 @@ config.log
 config.status
 configure
 configure~
-gldcore/gridlabd
+source/gridlabd
 gridlabd.spec
 libtool
 m4/libtool.m4
@@ -93,8 +93,8 @@ m4/ltsugar.m4
 m4/ltversion.m4
 m4/lt~obsolete.m4
 m4/lt-obsolete.m4
-gldcore/build.h
-gldcore/config.h.in~
+source/build.h
+source/config.h.in~
 gridlabd.bin
 install/
 third_party/xerces*/*
@@ -129,57 +129,62 @@ autotest/test_*/
 */autotest/test_*/
 */*/autotest/test_*/
 */*/*/autotest/test_*/
-gldcore/autotest/ceus.glm
-gldcore/autotest/ica_test.glm
-gldcore/autotest/test_output_save.csv
-gldcore/converters/autotest/IEEE-13-cyme.glm
+source/autotest/ceus.glm
+source/autotest/ica_test.glm
+source/autotest/test_output_save.csv
+converters/autotest/IEEE-13-cyme.glm
 
 # widely found generic output files
 object_profile.txt
 fault_check.txt
 
+# files that should be ignored by git
+*_ignore.*
+
 # specific outputs that should be ignored
-gldcore/link/python/example.png
+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
+source/autotest/config.glm
+source/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
-gldcore/link/python/examples/example_2/example.png
-gldcore/link/python/examples/example_3/example.png
-gldcore/link/python/examples/example_3/x.csv
-gldcore/link/python/examples/example_1/example.png
-gldcore/link/python/examples/example_1/x.csv
-gldcore/autotest/test.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
+source/link/python/examples/example_2/example.png
+source/link/python/examples/example_3/example.png
+source/link/python/examples/example_3/x.csv
+source/link/python/examples/example_1/example.png
+source/link/python/examples/example_1/x.csv
+source/autotest/test.glm
 powerflow/autotest/test_IEEE13_pole_output.csv
 gridlabd-core.*
 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
-gldcore/geodata/docs/geodata.conf
-gldcore/gridlabd.in
+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
+source/geodata/docs/geodata.conf
+source/gridlabd.in
 geodata.conf
-gldcore/autotest/output.csv
+source/autotest/output.csv
 python_extras/example/output.csv
 *.egg
 gridlabd.egg-info/
-gldcore/link/python/dist/
-gldcore/link/python/gridlabd.egg-info/
+python/dist/*.whl
+python/dist/*.tar.gz
+python/gridlabd.egg-info/
 gridlabd.egg-*
+module/resilience/docs/output.csv

Makefile.am

@@ -18,17 +18,17 @@ CC = $(PTHREAD_CC)
 CXX = $(PTHREAD_CXX)
 
 AM_CPPFLAGS = -Wall -fPIC
-AM_CPPFLAGS += -I$(top_srcdir)/gldcore -I$(top_srcdir)/build-dir/gldcore
+AM_CPPFLAGS += -I$(top_srcdir)/source -I$(top_srcdir)/build-dir/source
 AM_CPPFLAGS += $(GLD_CPPFLAGS)
 
 AM_CFLAGS = -Wall
-AM_CFLAGS += -I$(top_srcdir)/gldcore -I$(top_srcdir)/build-dir/gldcore
+AM_CFLAGS += -I$(top_srcdir)/source -I$(top_srcdir)/build-dir/source
 AM_CFLAGS += $(PTHREAD_CFLAGS)
-AM_CFLAGS += $(GLD_CFLAGS) -I$(top_srcdir)/build-dir/gldcore
+AM_CFLAGS += $(GLD_CFLAGS) -I$(top_srcdir)/build-dir/source
 
 AM_CXXFLAGS = -Wall -fPIC
 AM_CXXFLAGS += $(PTHREAD_CFLAGS)
-AM_CXXFLAGS += $(GLD_CXXFLAGS) -I$(top_srcdir)/build-dir/gldcore
+AM_CXXFLAGS += $(GLD_CXXFLAGS) -I$(top_srcdir)/build-dir/source
 
 AM_LDFLAGS =
 AM_LDFLAGS += -no-undefined
@@ -55,10 +55,15 @@ docs_targets =
 
 # required modules
 include $(top_srcdir)/third_party/Makefile.mk
-include $(top_srcdir)/gldcore/Makefile.mk
-include $(top_srcdir)/python_extras/Makefile.mk
+include $(top_srcdir)/source/Makefile.mk
+include $(top_srcdir)/runtime/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
+include $(top_srcdir)/geodata/Makefile.mk
+include $(top_srcdir)/subcommands/Makefile.mk
 
 # approved modules
 include $(top_srcdir)/modules.mk
@@ -167,11 +172,11 @@ $(scratchdir)/.xerces.stamp: third_party/$(XERCES_TARNAME).tar.gz
 
 $(scratchdir)/pkg: distdir # $(scratchdir)/.xerces.stamp
  test ! -e $@ || rm -rf $@
- test -d $@/gldcore || mkdir -p $@/gldcore
- cd $(distdir) && $(PWD)/configure && make install DESTDIR=$(CURDIR)/$@/gldcore
+ test -d $@/source || mkdir -p $@/source
+ cd $(distdir) && $(PWD)/configure && make install DESTDIR=$(CURDIR)/$@/source
  cd $@ && mkdir -p climate-data/usr/local/lib/gridlabd devel/usr/local/lib/gridlabd # libxerces-c/usr/lib
- mv $@/gldcore/usr/local/include $@/devel/usr/local/include
- mv $@/gldcore/usr/local/lib/gridlabd/*.la $@/devel/usr/local/lib/gridlabd/
+ mv $@/source/usr/local/include $@/devel/usr/local/include
+ mv $@/source/usr/local/lib/gridlabd/*.la $@/devel/usr/local/lib/gridlabd/
  $(am__remove_distdir)
 
 $(scratchdir)/$(PACKAGE_TARNAME).mpkg: $(scratchdir)/pkg
@@ -319,6 +324,7 @@ $(PREFIX)/docker.img: docker/Dockerfile Makefile
 
 system: python-install install
  @echo "Setting $$($(top_srcdir)/build-aux/version.sh --install) to the current system version"
+# @$(DESTDIR)$(bindir)/gridlabd docker disable > /dev/null
  @$(DESTDIR)$(bindir)/gridlabd version set
  @if [ ! "$$(gridlabd --version=install)" == "$$($(top_srcdir)/build-aux/version.sh --install)" ]; then \
  echo 'WARNING : build and install versions differ; run `make reconfigure` to fix this problem'; \
@@ -330,14 +336,14 @@ html-local: module-html developer-html troubleshooting-html
  @mkdir -p $(prefix)/share/doc/developer
  @cp $(top_srcdir)/documents/index.html $(prefix)/share/doc/index.html
  @cp -R $(top_srcdir)/documents/html/* $(prefix)/share/doc/
- @cp -R $(top_srcdir)/gldcore/html/* $(prefix)/share/doc/developer/
+ @cp -R $(top_srcdir)/source/html/* $(prefix)/share/doc/developer/
 
 module-html:
  @mkdir -p $(top_srcdir)/documents/html/modules
  @doxygen $(top_srcdir)/doxygen/gridlabd.conf
 
 developer-html: # TODO
- @(cd $(top_srcdir)/gldcore/html ; natural_docs . ; cd - > /dev/null )
+ @(cd $(top_srcdir)/source/html ; natural_docs . ; cd - > /dev/null )
 
 troubleshooting-html:
  @mkdir -p $(top_srcdir)/documents/html/troubleshooting/

build-aux/setup-Darwin-19.sh

@@ -13,6 +13,9 @@ brew install autoconf automake libtool gnu-sed gawk
 # install python3
 brew install python3
 
+# mdbtools
+brew install mdbtools
+
 # docs generators
 brew install mono
 brew install naturaldocs

build-aux/setup-Darwin-20.sh

@@ -13,6 +13,9 @@ brew install autoconf automake libtool gnu-sed gawk
 # install python3
 brew install python3
 
+# mdbtools
+brew install mdbtools
+
 # docs generators
 brew install mono
 brew install naturaldocs

build-aux/setup-Linux-amzn-2.sh

@@ -22,6 +22,7 @@ yum -q install cmake -y
 yum -q install ncurses-devel -y
 #yum -q install epel-release -y
 yum -q install libcurl-devel -y
+yum -q install mdbtools -y
 
 # python3.9.x support needed as of 4.2
 if [ ! -x /usr/local/bin/python3 -o "$(/usr/local/bin/python3 --version | cut -f2 -d.)" != "Python 3.9" ]; then

build-aux/setup-Linux-centos-8.sh

@@ -30,14 +30,19 @@ if [ ! -x /usr/local/bin/python3 -o "$(/usr/local/bin/python3 --version)" != "Py
  ln -sf /usr/local/bin/pip3.9 /usr/local/bin/pip3
  # install python packages
  /usr/local/bin/python3 -m pip install --upgrade pip
-<<<<<<< HEAD
- /usr/local/bin/python3 -m pip install matplotlib Pillow pandas numpy networkx pytz pysolar PyGithub scikit-learn xlrd 
-=======
  /usr/local/bin/python3 -m pip install mysql-connector matplotlib Pillow pandas numpy networkx pytz pysolar PyGithub scikit-learn xlrd 
->>>>>>> 13db67f9f90774b9ca73620eb394a1d9c37e5c08
  /usr/local/bin/python3 -m pip install IPython censusdata
 
-
+# mdbtools
+if [ ! -x /usr/local/bin/mdb-schema ]; then
+ echo "install mdbtools"
+
+ cd /usr/local/src
+ git clone https://github.com/brianb/mdbtools.git mdbtools
+ cd mdbtools
+ autoreconf -isf
+ ./configure
+ make install
 fi
 
 # latex

build-aux/setup-Linux-debian-11.sh

@@ -45,10 +45,11 @@ apt-get -q install bison -y
 apt-get -q install libcurl4-gnutls-dev -y
 apt-get -q install subversion -y
 apt-get -q install util-linux -y
-apt-get install liblzma-dev -y
-apt-get install libbz2-dev -y
-apt-get install libncursesw5-dev -y
-apt-get install xz-utils -y
+apt-get -q install liblzma-dev -y
+apt-get -q install libbz2-dev -y
+apt-get -q install libncursesw5-dev -y
+apt-get -q install xz-utils -y
+apt-get -q install mdbtools -y
 
 # Install python 3.9.6
 # python3 support needed as of 4.2

build-aux/setup-Linux-ubuntu-18.sh

@@ -34,6 +34,7 @@ apt-get -q install bison -y
 apt-get -q install libcurl4-gnutls-dev -y
 apt-get -q install libncurses5-dev -y
 apt-get -q install subversion -y
+apt-get -q install mdbtools -y
 
 # doxgygen
 apt-get -q install gawk -y

build-aux/setup-Linux-ubuntu-20.sh

@@ -21,6 +21,7 @@ apt-get -q install libssl-dev -y
 apt-get -q install libbz2-dev -y
 apt-get -q install libffi-dev -y
 apt-get -q install zlib1g-dev -y
+apt-get -q install mdbtools -y
 
 # install python 3.9
 if [ ! -x /usr/local/bin/python3 -o $(/usr/local/bin/python3 --version | cut -f-2 -d.) != "Python 3.9" ]; then

build-aux/version.sh

@@ -3,7 +3,7 @@
 # It is assumed that this script is run from the top-level srcdir.
 EXE=$0
 TOP=$(cd ${EXE/version.sh/..}; pwd)
-FIL="${TOP}/gldcore/version.h"
+FIL="${TOP}/source/version.h"
 MAJ=`sed -En 's/#define REV_MAJOR ([0-9]+).*/\1/p' $FIL | tr -d '\n'`
 MIN=`sed -En 's/#define REV_MINOR ([0-9]+).*/\1/p' $FIL | tr -d '\n'`
 PAT=`sed -En 's/#define REV_PATCH ([0-9]+).*/\1/p' $FIL | tr -d '\n'`

checkpkgs

@@ -53,12 +53,12 @@ if [ -f VERSION ]; then
  echo "ERROR: VERSION doesn't specified release version info"
  elif [ ! -f REV ]; then
  echo "ERROR: REV file not found; this release is faulty"
- elif [ -f gldcore/version.h ]; then
+ elif [ -f source/version.h ]; then
  . ./REV
  if [ -z "$BUILD" ]; then
  echo "ERROR: REV file does not specify BUILD"
  else
- echo -n "Updating gldcore/version.h with VERSION info... "
+ echo -n "Updating source/version.h with VERSION info... "
  echo "/* automatically created by $0 */" >.tmp.$$
  echo "" >>.tmp.$$
  echo "#ifndef _GRIDLABD_VERSION_H" >>.tmp.$$
@@ -77,12 +77,12 @@ if [ -f VERSION ]; then
  echo "#define BRANCH \"$NAME\"" >>.tmp.$$
  echo "" >>.tmp.$$
  echo "#endif" >>.tmp.$$
-# grep BRANCH gldcore/version.h >>.tmp.$$
- mv .tmp.$$ gldcore/version.h
+# grep BRANCH source/version.h >>.tmp.$$
+ mv .tmp.$$ source/version.h
  echo "done"
  fi
  else
- echo "ERROR: gldcore/version.h not found and couldn't be updated"
+ echo "ERROR: source/version.h not found and couldn't be updated"
  fi 
 fi
 

configure.ac

@@ -44,8 +44,8 @@ m4_define([pkgorigin],sbuild_m4_esyscmd_s([git rev-parse --abbrev-ref HEAD]))
 
 AC_PREREQ([2.63])
 AC_INIT(pkgname, pkgversion, [[email protected]], pkg)
-AC_CONFIG_SRCDIR([gldcore/gridlabd.h])
-AC_CONFIG_HEADER([gldcore/config.h])
+AC_CONFIG_SRCDIR([source/gridlabd.h])
+AC_CONFIG_HEADER([source/config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
 
@@ -644,5 +644,5 @@ LDFLAGS="$(python3-config --ldflags) $PYTHON_LIB $LDFLAGS "
 
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([gridlabd.spec])
-AC_CONFIG_FILES([gldcore/gridlabd], [chmod +x gldcore/gridlabd])
+AC_CONFIG_FILES([source/gridlabd], [chmod +x source/gridlabd])
 AC_OUTPUT