-
Notifications
You must be signed in to change notification settings - Fork 11
Comparing changes
Open a pull request
base repository: NRCan-IETS-CE-O-HBC/HTAP
base: general-dev
head repository: StepWin/HTAP
compare: master
- 12 commits
- 2 files changed
- 3 contributors
Commits on Oct 13, 2018
-
Merge pull request #1 from NRCan-IETS-CE-O-HBC/general-dev
Updating the fork
Configuration menu - View commit details
-
Copy full SHA for c0b27a9 - Browse repository at this point
Copy the full SHA c0b27a9View commit details
Commits on Nov 5, 2018
-
Merge pull request #2 from NRCan-IETS-CE-O-HBC/general-dev
Merged origin's General-dev to master
Configuration menu - View commit details
-
Copy full SHA for ff839ee - Browse repository at this point
Copy the full SHA ff839eeView commit details
Commits on Nov 6, 2018
-
Merge pull request #3 from NRCan-IETS-CE-O-HBC/general-dev
Sync with source
Configuration menu - View commit details
-
Copy full SHA for d4ca164 - Browse repository at this point
Copy the full SHA d4ca164View commit details
Commits on Nov 7, 2018
-
Merge pull request #4 from NRCan-IETS-CE-O-HBC/general-dev
Sync with main
Configuration menu - View commit details
-
Copy full SHA for 9d51beb - Browse repository at this point
Copy the full SHA 9d51bebView commit details
Commits on Nov 14, 2018
-
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.
Configuration menu - View commit details
-
Copy full SHA for 930116b - Browse repository at this point
Copy the full SHA 930116bView commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for 72aee41 - Browse repository at this point
Copy the full SHA 72aee41View commit details
Commits on Nov 19, 2018
-
Consistent cost units. Some units in
HTAPUnitCosts.jsonare 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`
Configuration menu - View commit details
-
Copy full SHA for 39f9edd - Browse repository at this point
Copy the full SHA 39f9eddView commit details
Commits on Nov 20, 2018
-
Merge pull request #5 from NRCan-IETS-CE-O-HBC/general-dev
Sync with upstream: Added ERS numbers
Configuration menu - View commit details
-
Copy full SHA for ee08951 - Browse repository at this point
Copy the full SHA ee08951View commit details
Commits on Jan 7, 2019
-
Merge pull request #6 from NRCan-IETS-CE-O-HBC/general-dev
Sync with upstream `general-dev`
Configuration menu - View commit details
-
Copy full SHA for ba1b8ab - Browse repository at this point
Copy the full SHA ba1b8abView commit details -
Configuration menu - View commit details
-
Copy full SHA for 5da51e7 - Browse repository at this point
Copy the full SHA 5da51e7View commit details
Commits on Jan 20, 2019
-
Configuration menu - View commit details
-
Copy full SHA for ab4fbf8 - Browse repository at this point
Copy the full SHA ab4fbf8View commit details -
Configuration menu - View commit details
-
Copy full SHA for bb16702 - Browse repository at this point
Copy the full SHA bb16702View commit details
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff general-dev...master