Skip to content
This repository has been archived by the owner on Sep 27, 2023. It is now read-only.

Commit

Permalink
Develop merge updates (#1137)
Browse files Browse the repository at this point in the history
* Create mdb-ami2glm-load.py

* Add sump pump to enduse loads

* Add sump state implementation

* Add sump enduse loadshape

* Revert "Add sump enduse loadshape"

This reverts commit 404995f.

* Create test_sump.glm

* Add sump to enduse schedules

* Add curtailable enduses global variable

* Add curtailment control global

* Add loadshape output command

* Add --loadshape command line option

* Add test_sump.glm

* Fix python setup

* Fix curtailment

* Fix linux build warnings

* Update cmdarg.cpp

* Disable dishwasher validation test because it doesn't work

* Fix enduse loadshape validation tests

* Update house model sump implementation

* Update billing.csv

* Update curtailment and sump docs and tests

* Create mdb-ami2glm-load.py

* Add general MDB converters

* Create mdb_info.py

* Update Makefile.mk

* Update mdb_info.py

* Create rbsa_single_family_2011.mdb

* Update Makefile.mk

* Update requirements.txt

* Update requirements.txt

* Update mdb_info.py

* MDB2GLM work progress

* Finish mdb-table to glm-object converter

* Update mdb-table2csv-player.py

* Add covered conductor

* Update load.cpp

* Work in progress

* Delete ami_data.mdb.gz

* Fix access to test data

* Update player.cpp

* Update load.cpp

* Update .gitignore

* Update load.cpp

* Update mdb-table2glm-player.py

* Create IEEE-13-cyme.glm

* Update test_mdbtable2glmobject.glm

* Create test_mdbtable2glmplayer.csv

* Update test_mdbtable2glmplayer.glm

* Update .gitignore

* Delete ami_data.glm

* Update IEEE-13-cyme.glm

* Update test_mdbtable2glmobject.glm

* Fix resolver

* Fix object name resolution

* Update test_create_poles.glm

* Fix requirements

* Update metrics.cpp

* Fix mdbtools usage in converters

* Update test_mdbtable2glmobject.glm
  • Loading branch information
dchassin authored Mar 22, 2022
1 parent 4e2855f commit ceab8ce
Showing 74 changed files with 24,844 additions and 803 deletions.
3 changes: 3 additions & 0 deletions build-aux/setup-Darwin-19.sh
Original file line number Diff line number Diff line change
@@ -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
3 changes: 3 additions & 0 deletions build-aux/setup-Darwin-20.sh
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions build-aux/setup-Linux-amzn-2.sh
Original file line number Diff line number Diff line change
@@ -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
15 changes: 10 additions & 5 deletions build-aux/setup-Linux-centos-8.sh
Original file line number Diff line number Diff line change
@@ -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
9 changes: 5 additions & 4 deletions build-aux/setup-Linux-debian-11.sh
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions build-aux/setup-Linux-ubuntu-18.sh
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions build-aux/setup-Linux-ubuntu-20.sh
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions converters/Makefile.mk
Original file line number Diff line number Diff line change
@@ -26,6 +26,8 @@ dist_pkgdata_DATA += converters/gz2glm.py
# mdb -> glm
dist_pkgdata_DATA += converters/mdb2glm.py
dist_pkgdata_DATA += converters/mdb-cyme2glm.py
dist_pkgdata_DATA += converters/mdb-table2glm-object.py
dist_pkgdata_DATA += converters/mdb-table2glm-player.py

# omd -> glm
dist_pkgdata_DATA += converters/omd2glm.py
2 changes: 2 additions & 0 deletions converters/autotest/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ami_data.*
AMI_*.csv
72 changes: 72 additions & 0 deletions converters/autotest/IEEE-13-cyme.glm
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
// generated by '/usr/local/opt/gridlabd/4.2.31-220317-develop_add_mdbami2gldload_converter/share/gridlabd/mdb2glm.py -i ./IEEE-13-cyme.mdb -o IEEE-13-cyme.glm -o IEEE-13-cyme.glm -t table -f object -p table=CYMLOAD -p class=test -p modules=powerflow,residential -p columns=DeviceNumber:name -p dtypes=NetworkId:int32'
module powerflow;
module residential;
class test {
int64 DeviceType;
int32 NetworkId;
int64 ConnectionConfiguration;
int64 SymbolSize;
}
object test {
name "L632_671-1";
DeviceType "21";
NetworkId "650";
ConnectionConfiguration "0";
SymbolSize "0";
}
object test {
name "LOAD611";
DeviceType "20";
NetworkId "650";
ConnectionConfiguration "0";
SymbolSize "0";
}
object test {
name "LOAD634";
DeviceType "20";
NetworkId "650";
ConnectionConfiguration "0";
SymbolSize "0";
}
object test {
name "LOAD645";
DeviceType "20";
NetworkId "650";
ConnectionConfiguration "0";
SymbolSize "0";
}
object test {
name "LOAD646";
DeviceType "20";
NetworkId "650";
ConnectionConfiguration "2";
SymbolSize "0";
}
object test {
name "LOAD652";
DeviceType "20";
NetworkId "650";
ConnectionConfiguration "0";
SymbolSize "0";
}
object test {
name "LOAD671";
DeviceType "20";
NetworkId "650";
ConnectionConfiguration "2";
SymbolSize "0";
}
object test {
name "LOAD675";
DeviceType "20";
NetworkId "650";
ConnectionConfiguration "0";
SymbolSize "0";
}
object test {
name "LOAD692";
DeviceType "20";
NetworkId "650";
ConnectionConfiguration "2";
SymbolSize "0";
}
17 changes: 17 additions & 0 deletions converters/autotest/test_mdbtable2glmobject.glm
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#ifmissing /usr/local/bin/mdb-schema

#warning mdbtools is not available

#else // found /usr/local/bin/mdb-schema

#ifexist ../IEEE-13-cyme.mdb
#define DIR=..
#endif // exist ../IEEE-13-cyme.mdb

#input "${DIR:-.}/IEEE-13-cyme.mdb" -o IEEE-13-cyme.glm -t table -f object -p table=CYMLOAD -p class=test -p modules=powerflow,residential -p columns=DeviceNumber:name -p dtypes=NetworkId:int32

#ifexist ../IEEE-13-cyme.glm
#on_exit 0 diff -I '^[#/]' ../IEEE-13-cyme.glm IEEE-13-cyme.glm > gridlabd.diff
#endif // exist ../IEEE-13-cyme.glm

#endif // missing /usr/local/bin/mdb-schema
Loading

0 comments on commit ceab8ce

Please sign in to comment.