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

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

merged 66 commits into from
Mar 22, 2022

Conversation

dchassin
Copy link
Member

David P. Chassin and others added 30 commits July 30, 2021 16:57
Create mdb-ami2glm-load.py
2644d53
@dchassin
Merge branch 'develop' into develop-add-csvami2glmload-converter
61bee5f
Add sump pump to enduse loads
67d54c5
@dchassin
Add sump state implementation
c349668
@dchassin
Add sump enduse loadshape
404995f
@dchassin
Revert "Add sump enduse loadshape"
5ed76f0 
This reverts commit 404995f.
@dchassin
Create test_sump.glm
f29c85d
@dchassin
Add sump to enduse schedules
bc9ad8d
Add curtailable enduses global variable
02ef71a
Add curtailment control global
46187db
Add loadshape output command
dec180d
Add --loadshape command line option
b5ac2d5
Add test_sump.glm
1bf11a8
@dchassin
Fix python setup
3914c58
@dchassin
Fix curtailment
e31c6f9
@dchassin
Fix linux build warnings
828d1ba
@dchassin
Update cmdarg.cpp
04b2944
@dchassin
Disable dishwasher validation test because it doesn't work
a5cf749
@dchassin
Fix enduse loadshape validation tests
c6e384a
@dchassin
Update house model sump implementation
1d60483
@dchassin
Update billing.csv
c1e8be2
@dchassin
Update curtailment and sump docs and tests
054f6ba
@dchassin
Merge branch 'develop' into develop-add-mdbami2glmload-converter
d23d0fb
@dchassin
Create mdb-ami2glm-load.py
97303c8
@dchassin
Add general MDB converters
f4c3ccc
@dchassin
Merge branch 'develop' into develop-add-mdbami2gldload-converter
33dddee
@dchassin
Create mdb_info.py
e6a3a25
@dchassin
Update Makefile.mk
1ee82d6
@dchassin
Update mdb_info.py
6d3db02
@dchassin
Create rbsa_single_family_2011.mdb
6f0a53c
@dchassin
Update player.cpp
1259423
@dchassin
Update load.cpp
cdaab40
@dchassin
Update .gitignore
73c7510
@dchassin
Update load.cpp
44555aa
@dchassin
Update mdb-table2glm-player.py
950c9fc
@dchassin
Create IEEE-13-cyme.glm
fab68f6
@dchassin
Update test_mdbtable2glmobject.glm
d17d479
@dchassin
Create test_mdbtable2glmplayer.csv
904d332
@dchassin
Update test_mdbtable2glmplayer.glm
4cd1e80
@dchassin
Update .gitignore
81ff526
@dchassin
Delete ami_data.glm
3d0201a
@dchassin
Update IEEE-13-cyme.glm
55b065a
@dchassin
Update test_mdbtable2glmobject.glm
89594cf
@dchassin
Fix resolver
1d0bef7
@dchassin
Fix object name resolution
0d4a2cb
@dchassin
Update test_create_poles.glm
65650c0
@dchassin
Fix requirements
494c520
@dchassin
Update metrics.cpp
22be525
@dchassin
Fix mdbtools usage in converters
c6273d8
@dchassin
Update test_mdbtable2glmobject.glm
7cf048c
@dchassin
Merge remote-tracking branch 'origin/develop-add-covered-conductor' i…
4307929 
…nto develop-merge-updates
@dchassin
Merge branch 'develop-update-house-model' into develop-merge-updates
0800a99
@dchassin
Merge branch 'develop-add-mdbami2gldload-converter' into develop-merg…
62bfedb 
…e-updates
@dchassin dchassin changed the base branch from master to develop March 20, 2022 20:29
@aivanova5 aivanova5 self-requested a review March 21, 2022 20:56
@aivanova5 aivanova5 merged commit ceab8ce into develop Mar 22, 2022
@aivanova5 aivanova5 deleted the develop-merge-updates branch March 22, 2022 03:01
@dchassin dchassin changed the title Develop merge updates Consolidated merge of #1122, #1133, #1134, and #1135 Apr 12, 2022
@dchassin dchassin changed the title Consolidated merge of #1122, #1133, #1134, and #1135 Consolidate merge of #1122, #1133, #1134, and #1135 Apr 12, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@aivanova5 aivanova5 aivanova5 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@dchassin @aivanova5