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

Commits on Jul 30, 2021

  1. Create mdb-ami2glm-load.py

    David P. Chassin committed Jul 30, 2021
    Configuration menu
    Copy the full SHA
    2644d53 View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2022

  1. Merge branch 'develop' into develop-add-csvami2glmload-converter

    @dchassin
    dchassin committed Jan 7, 2022
    Configuration menu
    Copy the full SHA
    61bee5f View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2022

  1. Add sump pump to enduse loads

    David P. Chassin committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    67d54c5 View commit details
    Browse the repository at this point in the history

  2. Add sump state implementation

    @dchassin
    dchassin committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    c349668 View commit details
    Browse the repository at this point in the history

  3. Add sump enduse loadshape

    @dchassin
    dchassin committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    404995f View commit details
    Browse the repository at this point in the history

  4. Revert "Add sump enduse loadshape" 

    This reverts commit 404995f.
    @dchassin
    dchassin committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    5ed76f0 View commit details
    Browse the repository at this point in the history

  5. Create test_sump.glm

    @dchassin
    dchassin committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    f29c85d View commit details
    Browse the repository at this point in the history

  6. Add sump to enduse schedules

    @dchassin
    dchassin committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    bc9ad8d View commit details
    Browse the repository at this point in the history

  7. Add curtailable enduses global variable

    David P. Chassin committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    02ef71a View commit details
    Browse the repository at this point in the history

  8. Add curtailment control global

    David P. Chassin committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    46187db View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2022

  1. Add loadshape output command

    David P. Chassin committed Mar 11, 2022
    Configuration menu
    Copy the full SHA
    dec180d View commit details
    Browse the repository at this point in the history

  2. Add --loadshape command line option

    David P. Chassin committed Mar 11, 2022
    Configuration menu
    Copy the full SHA
    b5ac2d5 View commit details
    Browse the repository at this point in the history

  3. Add test_sump.glm

    David P. Chassin committed Mar 11, 2022
    Configuration menu
    Copy the full SHA
    1bf11a8 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2022

  1. Fix python setup

    @dchassin
    dchassin committed Mar 12, 2022
    Configuration menu
    Copy the full SHA
    3914c58 View commit details
    Browse the repository at this point in the history

  2. Fix curtailment

    @dchassin
    dchassin committed Mar 12, 2022
    Configuration menu
    Copy the full SHA
    e31c6f9 View commit details
    Browse the repository at this point in the history

  3. Fix linux build warnings

    @dchassin
    dchassin committed Mar 12, 2022
    Configuration menu
    Copy the full SHA
    828d1ba View commit details
    Browse the repository at this point in the history

  4. Update cmdarg.cpp

    @dchassin
    dchassin committed Mar 12, 2022
    Configuration menu
    Copy the full SHA
    04b2944 View commit details
    Browse the repository at this point in the history

  5. Disable dishwasher validation test because it doesn't work

    @dchassin
    dchassin committed Mar 12, 2022
    Configuration menu
    Copy the full SHA
    a5cf749 View commit details
    Browse the repository at this point in the history

  6. Fix enduse loadshape validation tests

    @dchassin
    dchassin committed Mar 12, 2022
    Configuration menu
    Copy the full SHA
    c6e384a View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2022

  1. Update house model sump implementation

    @dchassin
    dchassin committed Mar 13, 2022
    Configuration menu
    Copy the full SHA
    1d60483 View commit details
    Browse the repository at this point in the history

  2. Update billing.csv

    @dchassin
    dchassin committed Mar 13, 2022
    Configuration menu
    Copy the full SHA
    c1e8be2 View commit details
    Browse the repository at this point in the history

  3. Update curtailment and sump docs and tests

    @dchassin
    dchassin committed Mar 13, 2022
    Configuration menu
    Copy the full SHA
    054f6ba View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2022

  1. Merge branch 'develop' into develop-add-mdbami2glmload-converter

    @dchassin
    dchassin committed Mar 14, 2022
    Configuration menu
    Copy the full SHA
    d23d0fb View commit details
    Browse the repository at this point in the history

  2. Create mdb-ami2glm-load.py

    @dchassin
    dchassin committed Mar 14, 2022
    Configuration menu
    Copy the full SHA
    97303c8 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2022

  1. Add general MDB converters

    @dchassin
    dchassin committed Mar 15, 2022
    Configuration menu
    Copy the full SHA
    f4c3ccc View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into develop-add-mdbami2gldload-converter

    @dchassin
    dchassin committed Mar 15, 2022
    Configuration menu
    Copy the full SHA
    33dddee View commit details
    Browse the repository at this point in the history

  3. Create mdb_info.py

    @dchassin
    dchassin committed Mar 15, 2022
    Configuration menu
    Copy the full SHA
    e6a3a25 View commit details
    Browse the repository at this point in the history

  4. Update Makefile.mk

    @dchassin
    dchassin committed Mar 15, 2022
    Configuration menu
    Copy the full SHA
    1ee82d6 View commit details
    Browse the repository at this point in the history

  5. Update mdb_info.py

    @dchassin
    dchassin committed Mar 15, 2022
    Configuration menu
    Copy the full SHA
    6d3db02 View commit details
    Browse the repository at this point in the history

  6. Create rbsa_single_family_2011.mdb

    @dchassin
    dchassin committed Mar 15, 2022
    Configuration menu
    Copy the full SHA
    6f0a53c View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2022

  1. Merge branch 'develop' into develop-add-mdbami2gldload-converter

    @dchassin
    dchassin committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    9d43fca View commit details
    Browse the repository at this point in the history

  2. Update Makefile.mk

    @dchassin
    dchassin committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    2de7d2a View commit details
    Browse the repository at this point in the history

  3. Update requirements.txt

    @dchassin
    dchassin committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    9b1698e View commit details
    Browse the repository at this point in the history

  4. Update requirements.txt

    @dchassin
    dchassin committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    0cbefa6 View commit details
    Browse the repository at this point in the history

  5. Update mdb_info.py

    @dchassin
    dchassin committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    6267b1f View commit details
    Browse the repository at this point in the history

  6. MDB2GLM work progress

    David P. Chassin committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    63103ba View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2022

  1. Finish mdb-table to glm-object converter

    David P. Chassin committed Mar 18, 2022
    Configuration menu
    Copy the full SHA
    e89bc49 View commit details
    Browse the repository at this point in the history

  2. Update mdb-table2csv-player.py

    David P. Chassin committed Mar 18, 2022
    Configuration menu
    Copy the full SHA
    513e918 View commit details
    Browse the repository at this point in the history

  3. Add covered conductor

    David P. Chassin committed Mar 18, 2022
    Configuration menu
    Copy the full SHA
    03a818c View commit details
    Browse the repository at this point in the history

  4. Update load.cpp

    @dchassin
    dchassin authored Mar 18, 2022
    Configuration menu
    Copy the full SHA
    bf6048c View commit details
    Browse the repository at this point in the history

  5. Work in progress

    David P. Chassin committed Mar 18, 2022
    Configuration menu
    Copy the full SHA
    aefe23a View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2022

  1. Delete ami_data.mdb.gz

    @dchassin
    dchassin committed Mar 19, 2022
    Configuration menu
    Copy the full SHA
    5c963ab View commit details
    Browse the repository at this point in the history

  2. Fix access to test data

    @dchassin
    dchassin committed Mar 19, 2022
    Configuration menu
    Copy the full SHA
    2b8ab4b View commit details
    Browse the repository at this point in the history

  3. Update player.cpp

    @dchassin
    dchassin committed Mar 19, 2022
    Configuration menu
    Copy the full SHA
    1259423 View commit details
    Browse the repository at this point in the history

  4. Update load.cpp

    @dchassin
    dchassin committed Mar 19, 2022
    Configuration menu
    Copy the full SHA
    cdaab40 View commit details
    Browse the repository at this point in the history

  5. Update .gitignore

    @dchassin
    dchassin committed Mar 19, 2022
    Configuration menu
    Copy the full SHA
    73c7510 View commit details
    Browse the repository at this point in the history

  6. Update load.cpp

    @dchassin
    dchassin committed Mar 19, 2022
    Configuration menu
    Copy the full SHA
    44555aa View commit details
    Browse the repository at this point in the history

  7. Update mdb-table2glm-player.py

    @dchassin
    dchassin committed Mar 19, 2022
    Configuration menu
    Copy the full SHA
    950c9fc View commit details
    Browse the repository at this point in the history

  8. Create IEEE-13-cyme.glm

    @dchassin
    dchassin committed Mar 19, 2022
    Configuration menu
    Copy the full SHA
    fab68f6 View commit details
    Browse the repository at this point in the history

  9. Update test_mdbtable2glmobject.glm

    @dchassin
    dchassin committed Mar 19, 2022
    Configuration menu
    Copy the full SHA
    d17d479 View commit details
    Browse the repository at this point in the history

  10. Create test_mdbtable2glmplayer.csv

    @dchassin
    dchassin committed Mar 19, 2022
    Configuration menu
    Copy the full SHA
    904d332 View commit details
    Browse the repository at this point in the history

  11. Update test_mdbtable2glmplayer.glm

    @dchassin
    dchassin committed Mar 19, 2022
    Configuration menu
    Copy the full SHA
    4cd1e80 View commit details
    Browse the repository at this point in the history

  12. Update .gitignore

    @dchassin
    dchassin committed Mar 19, 2022
    Configuration menu
    Copy the full SHA
    81ff526 View commit details
    Browse the repository at this point in the history

  13. Delete ami_data.glm

    @dchassin
    dchassin committed Mar 19, 2022
    Configuration menu
    Copy the full SHA
    3d0201a View commit details
    Browse the repository at this point in the history

  14. Update IEEE-13-cyme.glm

    @dchassin
    dchassin committed Mar 19, 2022
    Configuration menu
    Copy the full SHA
    55b065a View commit details
    Browse the repository at this point in the history

  15. Update test_mdbtable2glmobject.glm

    @dchassin
    dchassin committed Mar 19, 2022
    Configuration menu
    Copy the full SHA
    89594cf View commit details
    Browse the repository at this point in the history

  16. Fix resolver

    @dchassin
    dchassin committed Mar 19, 2022
    Configuration menu
    Copy the full SHA
    1d0bef7 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2022

  1. Fix object name resolution

    @dchassin
    dchassin committed Mar 20, 2022
    Configuration menu
    Copy the full SHA
    0d4a2cb View commit details
    Browse the repository at this point in the history

  2. Update test_create_poles.glm

    @dchassin
    dchassin committed Mar 20, 2022
    Configuration menu
    Copy the full SHA
    65650c0 View commit details
    Browse the repository at this point in the history

  3. Fix requirements

    @dchassin
    dchassin committed Mar 20, 2022
    Configuration menu
    Copy the full SHA
    494c520 View commit details
    Browse the repository at this point in the history

  4. Update metrics.cpp

    @dchassin
    dchassin committed Mar 20, 2022
    Configuration menu
    Copy the full SHA
    22be525 View commit details
    Browse the repository at this point in the history

  5. Fix mdbtools usage in converters

    @dchassin
    dchassin committed Mar 20, 2022
    Configuration menu
    Copy the full SHA
    c6273d8 View commit details
    Browse the repository at this point in the history

  6. Update test_mdbtable2glmobject.glm

    @dchassin
    dchassin committed Mar 20, 2022
    Configuration menu
    Copy the full SHA
    7cf048c View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/develop-add-covered-conductor' i… 

    …nto develop-merge-updates
    @dchassin
    dchassin committed Mar 20, 2022
    Configuration menu
    Copy the full SHA
    4307929 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'develop-update-house-model' into develop-merge-updates

    @dchassin
    dchassin committed Mar 20, 2022
    Configuration menu
    Copy the full SHA
    0800a99 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'develop-add-mdbami2gldload-converter' into develop-merg… 

    …e-updates
    @dchassin
    dchassin committed Mar 20, 2022
    Configuration menu
    Copy the full SHA
    62bfedb View commit details
    Browse the repository at this point in the history