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

Update Water Heater=Other Fuel to map to no water heater #375

Merged
merged 17 commits into from
Mar 25, 2020
Merged

Update Water Heater=Other Fuel to map to no water heater #375

merged 17 commits into from
Mar 25, 2020

Commits on Jan 28, 2020

  1. Update Water Heater=Other Fuel to map to no water heater.

    @joseph-robertson
    joseph-robertson committed Jan 28, 2020
    Configuration menu
    Copy the full SHA
    b035046 View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2020

  1. Merge branch 'master' into remove-fixme-other-fuel

    @joseph-robertson
    joseph-robertson committed Jan 29, 2020
    Configuration menu
    Copy the full SHA
    f205c88 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2020

  1. Update cw, cd, dw, fixtures, dist to skip when no water heater.

    @joseph-robertson
    joseph-robertson committed Feb 3, 2020
    Configuration menu
    Copy the full SHA
    c168b27 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2020

  1. Merge branch 'master' into remove-fixme-other-fuel

    @joseph-robertson
    joseph-robertson committed Feb 21, 2020
    Configuration menu
    Copy the full SHA
    8d63579 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into remove-fixme-other-fuel

    @joseph-robertson
    joseph-robertson committed Feb 21, 2020
    Configuration menu
    Copy the full SHA
    6ca3f84 View commit details
    Browse the repository at this point in the history

  3. Update the changelog.

    @joseph-robertson
    joseph-robertson committed Feb 21, 2020
    Configuration menu
    Copy the full SHA
    5ed40fc View commit details
    Browse the repository at this point in the history

  4. Fix merge conflict.

    @joseph-robertson
    joseph-robertson committed Feb 21, 2020
    Configuration menu
    Copy the full SHA
    2c8292f View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2020

  1. Fix bug in waterheater get plantloop method.

    @joseph-robertson
    joseph-robertson committed Mar 9, 2020
    Configuration menu
    Copy the full SHA
    f8360e1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into remove-fixme-other-fuel

    @joseph-robertson
    joseph-robertson committed Mar 9, 2020
    Configuration menu
    Copy the full SHA
    7e5a56f View commit details
    Browse the repository at this point in the history

  3. Update water heater tsv format.

    @joseph-robertson
    joseph-robertson committed Mar 9, 2020
    Configuration menu
    Copy the full SHA
    c9a46a8 View commit details
    Browse the repository at this point in the history

  4. Skip shw if no water heater.

    @joseph-robertson
    joseph-robertson committed Mar 9, 2020
    Configuration menu
    Copy the full SHA
    9b8d6bc View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2020

  1. Line endings issue.

    @joseph-robertson
    joseph-robertson committed Mar 12, 2020
    Configuration menu
    Copy the full SHA
    41d18f4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into remove-fixme-other-fuel

    @joseph-robertson
    joseph-robertson committed Mar 12, 2020
    Configuration menu
    Copy the full SHA
    e0053c4 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'remove-fixme-other-fuel' of github.com:NREL/OpenStudio-… 

    …BuildStock into remove-fixme-other-fuel
    @joseph-robertson
    joseph-robertson committed Mar 12, 2020
    Configuration menu
    Copy the full SHA
    195d747 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2020

  1. Merge branch 'master' into remove-fixme-other-fuel

    @joseph-robertson
    joseph-robertson committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    f12e1d9 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2020

  1. Merge branch 'master' into remove-fixme-other-fuel

    @joseph-robertson
    joseph-robertson committed Mar 25, 2020
    Configuration menu
    Copy the full SHA
    0c2aec8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into remove-fixme-other-fuel

    @joseph-robertson
    joseph-robertson committed Mar 25, 2020
    Configuration menu
    Copy the full SHA
    6afb932 View commit details
    Browse the repository at this point in the history