Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NRCan-IETS-CE-O-HBC/HTAP
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: general-dev
Choose a base ref
...
head repository: StepWin/HTAP
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 12 commits
  • 2 files changed
  • 3 contributors

Commits on Oct 13, 2018

  1. Merge pull request #1 from NRCan-IETS-CE-O-HBC/general-dev

    Updating the fork
    please-wait authored Oct 13, 2018
    Configuration menu
    Copy the full SHA
    c0b27a9 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2018

  1. Merge pull request #2 from NRCan-IETS-CE-O-HBC/general-dev

    Merged origin's General-dev to master
    please-wait authored Nov 5, 2018
    Configuration menu
    Copy the full SHA
    ff839ee View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2018

  1. Merge pull request #3 from NRCan-IETS-CE-O-HBC/general-dev

    Sync with source
    please-wait authored Nov 6, 2018
    Configuration menu
    Copy the full SHA
    d4ca164 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2018

  1. Configuration menu
    Copy the full SHA
    9d51beb View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2018

  1. Consistency fixes in HTAP Options

    - In walls, the letter-case of `OPT-H2K-EffRValue` was not as same as other assemblies. This commit fixes that.
    
    - For roofs in `HTAP-options.json` some roofs are defined with `<Opt-Ceiling>` and some with `OPT-H2K-EffRValue`. This commit changes all to use the latter.
    please-wait committed Nov 14, 2018
    Configuration menu
    Copy the full SHA
    930116b View commit details
    Browse the repository at this point in the history
  2. Changed the values of $maxRunTime and $maxTries to 25 and 3 respectively

    The time-out set in `substitute-h2k.rb` does not appear to give HOT2000 sufficient time for large models or when many threads are being used. Meanwhile, 3 tries have been working well for us and speeds up the process of detecting errors.
    please-wait committed Nov 14, 2018
    Configuration menu
    Copy the full SHA
    72aee41 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2018

  1. Consistent cost units. Some units in HTAPUnitCosts.json are written…

    … in two different ways.
    
    - `LF` and `linear feet` to `linear feet`
    - `ea` and `each` to `each`
    - `cu. Ft ` and `cu.ft.` to `cubic feet`
    - `sf floor area` and `sq.ft. floor` to `sf floor area`
    please-wait committed Nov 19, 2018
    Configuration menu
    Copy the full SHA
    39f9edd View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2018

  1. Merge pull request #5 from NRCan-IETS-CE-O-HBC/general-dev

    Sync with upstream: Added ERS numbers
    please-wait authored Nov 20, 2018
    Configuration menu
    Copy the full SHA
    ee08951 View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2019

  1. Merge pull request #6 from NRCan-IETS-CE-O-HBC/general-dev

    Sync with upstream `general-dev`
    please-wait authored Jan 7, 2019
    Configuration menu
    Copy the full SHA
    ba1b8ab View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5da51e7 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2019

  1. Configuration menu
    Copy the full SHA
    ab4fbf8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    bb16702 View commit details
    Browse the repository at this point in the history
Loading