Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

HPWH Equipment Sequence Number Error to Warning #5124

Merged
merged 18 commits into from Sep 9, 2015
Merged

HPWH Equipment Sequence Number Error to Warning #5124

merged 18 commits into from Sep 9, 2015

Commits on Aug 19, 2015

  1. changing error message to warning and rewording #4695

    @nmerket
    nmerket committed Aug 19, 2015
    4 Configuration menu
    Copy the full SHA
    9de9ed7 View commit details
    Browse the repository at this point in the history

  2. changing to warning error

    @nmerket
    nmerket committed Aug 19, 2015
    7 Configuration menu
    Copy the full SHA
    81ee427 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2015

  1. adding working unit test

    @nmerket
    nmerket committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    840f815 View commit details
    Browse the repository at this point in the history

  2. merging in develop, problems in water heater unit tests

    @nmerket
    nmerket committed Aug 21, 2015
    7 Configuration menu
    Copy the full SHA
    f77bdba View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2015

  1. adding WaterThermalTanksFixture and a bunch of clear_state functions.… 

    … work again.
    @nmerket
    nmerket committed Aug 28, 2015
    Configuration menu
    Copy the full SHA
    cdd7a79 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into 4695_hpwh_equip_seq_num

    @nmerket
    nmerket committed Aug 28, 2015
    7 Configuration menu
    Copy the full SHA
    93140a8 View commit details
    Browse the repository at this point in the history

  3. removing WaterThermalTankFixture

    @nmerket
    nmerket committed Aug 28, 2015
    3 Configuration menu
    Copy the full SHA
    1fbba86 View commit details
    Browse the repository at this point in the history

  4. Update WaterThermalTanks unit tests

    @mbadams5
    mbadams5 committed Aug 28, 2015
    Configuration menu
    Copy the full SHA
    1184fe5 View commit details
    Browse the repository at this point in the history

  5. Merge in changes

    @mbadams5
    mbadams5 committed Aug 28, 2015
    Configuration menu
    Copy the full SHA
    517ae8a View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/4695_hpwh_equip_seq_num' into 46… 

    …95_hpwh_equip_seq_num

Conflicts:
	tst/EnergyPlus/unit/WaterThermalTanks.unit.cc
    @mbadams5
    mbadams5 committed Aug 28, 2015
    Configuration menu
    Copy the full SHA
    9089846 View commit details
    Browse the repository at this point in the history

  7. Fix merge issues

    @mbadams5
    mbadams5 committed Aug 28, 2015
    Configuration menu
    Copy the full SHA
    5cb7d08 View commit details
    Browse the repository at this point in the history

  8. Fix another merge issue

    @mbadams5
    mbadams5 committed Aug 28, 2015
    7 Configuration menu
    Copy the full SHA
    7f502ff View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2015

  1. merging in develop and resolving conflicts

    @nmerket
    nmerket committed Sep 2, 2015
    Configuration menu
    Copy the full SHA
    a0cbfee View commit details
    Browse the repository at this point in the history

  2. removing redundant clear_states from HVACFixture

    @nmerket
    nmerket committed Sep 2, 2015
    Configuration menu
    Copy the full SHA
    e9232b6 View commit details
    Browse the repository at this point in the history

  3. removing extra clear_state from header

    @nmerket
    nmerket committed Sep 2, 2015
    11 Configuration menu
    Copy the full SHA
    cb971b5 View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2015

  1. Merge remote-tracking branch 'remotes/origin/develop' into 4695_hpwh_… 

    …equip_seq_num

Conflicts:
	tst/EnergyPlus/unit/Fixtures/EnergyPlusFixture.cc
	tst/EnergyPlus/unit/Fixtures/HVACFixture.hh
    @mjwitte
    mjwitte committed Sep 8, 2015
    Configuration menu
    Copy the full SHA
    054c657 View commit details
    Browse the repository at this point in the history

  2. HPWH Equipment sequence - fix bad merge conflict resolution

    @mjwitte
    mjwitte committed Sep 8, 2015
    3 Configuration menu
    Copy the full SHA
    eb809bd View commit details
    Browse the repository at this point in the history

  3. PWH Equipment sequence - fix bad merge conflict resolution - again

    @mjwitte
    mjwitte committed Sep 8, 2015
    7 Configuration menu
    Copy the full SHA
    adc9167 View commit details
    Browse the repository at this point in the history