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

Consolidate merge of #1122, #1133, #1134, and #1135 #1137

Merged
merged 66 commits into from
Mar 22, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
2644d53
Create mdb-ami2glm-load.py
Jul 30, 2021
61bee5f
Merge branch 'develop' into develop-add-csvami2glmload-converter
dchassin Jan 7, 2022
67d54c5
Add sump pump to enduse loads
Mar 10, 2022
c349668
Add sump state implementation
dchassin Mar 10, 2022
404995f
Add sump enduse loadshape
dchassin Mar 10, 2022
5ed76f0
Revert "Add sump enduse loadshape"
dchassin Mar 10, 2022
f29c85d
Create test_sump.glm
dchassin Mar 10, 2022
bc9ad8d
Add sump to enduse schedules
dchassin Mar 10, 2022
02ef71a
Add curtailable enduses global variable
Mar 10, 2022
46187db
Add curtailment control global
Mar 10, 2022
dec180d
Add loadshape output command
Mar 11, 2022
b5ac2d5
Add --loadshape command line option
Mar 11, 2022
1bf11a8
Add test_sump.glm
Mar 11, 2022
3914c58
Fix python setup
dchassin Mar 12, 2022
e31c6f9
Fix curtailment
dchassin Mar 12, 2022
828d1ba
Fix linux build warnings
dchassin Mar 12, 2022
04b2944
Update cmdarg.cpp
dchassin Mar 12, 2022
a5cf749
Disable dishwasher validation test because it doesn't work
dchassin Mar 12, 2022
c6e384a
Fix enduse loadshape validation tests
dchassin Mar 12, 2022
1d60483
Update house model sump implementation
dchassin Mar 13, 2022
c1e8be2
Update billing.csv
dchassin Mar 13, 2022
054f6ba
Update curtailment and sump docs and tests
dchassin Mar 13, 2022
d23d0fb
Merge branch 'develop' into develop-add-mdbami2glmload-converter
dchassin Mar 14, 2022
97303c8
Create mdb-ami2glm-load.py
dchassin Mar 14, 2022
f4c3ccc
Add general MDB converters
dchassin Mar 15, 2022
33dddee
Merge branch 'develop' into develop-add-mdbami2gldload-converter
dchassin Mar 15, 2022
e6a3a25
Create mdb_info.py
dchassin Mar 15, 2022
1ee82d6
Update Makefile.mk
dchassin Mar 15, 2022
6d3db02
Update mdb_info.py
dchassin Mar 15, 2022
6f0a53c
Create rbsa_single_family_2011.mdb
dchassin Mar 15, 2022
9d43fca
Merge branch 'develop' into develop-add-mdbami2gldload-converter
dchassin Mar 17, 2022
2de7d2a
Update Makefile.mk
dchassin Mar 17, 2022
9b1698e
Update requirements.txt
dchassin Mar 17, 2022
0cbefa6
Update requirements.txt
dchassin Mar 17, 2022
6267b1f
Update mdb_info.py
dchassin Mar 17, 2022
63103ba
MDB2GLM work progress
Mar 17, 2022
e89bc49
Finish mdb-table to glm-object converter
Mar 18, 2022
513e918
Update mdb-table2csv-player.py
Mar 18, 2022
03a818c
Add covered conductor
Mar 18, 2022
bf6048c
Update load.cpp
dchassin Mar 18, 2022
aefe23a
Work in progress
Mar 18, 2022
5c963ab
Delete ami_data.mdb.gz
dchassin Mar 19, 2022
2b8ab4b
Fix access to test data
dchassin Mar 19, 2022
1259423
Update player.cpp
dchassin Mar 19, 2022
cdaab40
Update load.cpp
dchassin Mar 19, 2022
73c7510
Update .gitignore
dchassin Mar 19, 2022
44555aa
Update load.cpp
dchassin Mar 19, 2022
950c9fc
Update mdb-table2glm-player.py
dchassin Mar 19, 2022
fab68f6
Create IEEE-13-cyme.glm
dchassin Mar 19, 2022
d17d479
Update test_mdbtable2glmobject.glm
dchassin Mar 19, 2022
904d332
Create test_mdbtable2glmplayer.csv
dchassin Mar 19, 2022
4cd1e80
Update test_mdbtable2glmplayer.glm
dchassin Mar 19, 2022
81ff526
Update .gitignore
dchassin Mar 19, 2022
3d0201a
Delete ami_data.glm
dchassin Mar 19, 2022
55b065a
Update IEEE-13-cyme.glm
dchassin Mar 19, 2022
89594cf
Update test_mdbtable2glmobject.glm
dchassin Mar 19, 2022
1d0bef7
Fix resolver
dchassin Mar 19, 2022
0d4a2cb
Fix object name resolution
dchassin Mar 20, 2022
65650c0
Update test_create_poles.glm
dchassin Mar 20, 2022
494c520
Fix requirements
dchassin Mar 20, 2022
22be525
Update metrics.cpp
dchassin Mar 20, 2022
c6273d8
Fix mdbtools usage in converters
dchassin Mar 20, 2022
7cf048c
Update test_mdbtable2glmobject.glm
dchassin Mar 20, 2022
4307929
Merge remote-tracking branch 'origin/develop-add-covered-conductor' i…
dchassin Mar 20, 2022
0800a99
Merge branch 'develop-update-house-model' into develop-merge-updates
dchassin Mar 20, 2022
62bfedb
Merge branch 'develop-add-mdbami2gldload-converter' into develop-merg…
dchassin Mar 20, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add test_sump.glm
  • Loading branch information
David P. Chassin committed Mar 11, 2022
commit 1bf11a89932a340ed973bf7b1889fec86a6c4b07
2 changes: 2 additions & 0 deletions module/residential/autotest/test_sump.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
timestamp,panel.power
2020-01-01 00:00:00 PST,+0+0j
20 changes: 17 additions & 3 deletions module/residential/autotest/test_sump.glm
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,27 @@ clock
{
timezone "PST+8PDT";
starttime "2020-01-01 00:00:00 PST";
stoptime "2020-01-01 00:00:00 PST";
stoptime "2020-02-01 00:00:00 PST";
}
module residential
{
implicit_enduses SUMP;
implicit_enduses SUMP|LIGHTS|PLUGS;
}
module tape
{
csv_header_type NAME;
}
object house
{
sump_status "OFF";
}
object recorder
{
file "test_sump.csv";
property "panel.power";
interval -1;
};
}

#ifdef ../test_sump.csv
#on_exit 0 diff ../test_sump.csv test_sump.csv > gridlabd.diff
#endif