-
Notifications
You must be signed in to change notification settings - Fork 57
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Squashed 'resources/hpxml-measures/' changes from 9a9e161fe79..af5aa8…
…d0329 af5aa8d0329 Merge pull request #1729 from NREL/msgpack_num_decimal 3613b3a118e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into msgpack_num_decimal 0464d0f2a1b Merge pull request #1668 from NREL/tcm 92461e0dd85 Allow specifying the number of decimal places in the msgpack timeseries output file if desired. 885ca266360 Update Changelog.md [ci skip] 2aaeea43fe6 Merge branch 'tcm' of https://github.com/NREL/OpenStudio-HPXML into tcm 84b537c5b65 Address FIXME. cf34e930f47 Latest results. d69047cd470 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into tcm ff7edc61146 Increase cooling setpoint by 1F to avoid NREL/OpenStudio-HPXML#1728. 1c8fec2b53b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into tcm e33fd4ab605 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into tcm 3cf79029b58 Latest results. 40cf39be6f3 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into tcm 1fde6c94bc8 Latest results. 8a424ac348e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into tcm 4d683d214ef Skip test for now. 65e9873dd06 update measure.xml 1c8a6d382ab Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into tcm c5ccab5eb07 Make rubocop happy. 0d4064ecd40 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into tcm a4640da4cc8 Fix a CI test. c364d15971a Updates default temperature capacitance multiplier to 7. git-subtree-dir: resources/hpxml-measures git-subtree-split: af5aa8d03298b86af8f96317c5303647553a17d3
- Loading branch information
1 parent
0fd32de
commit 93967a8
Showing
19 changed files
with
1,930 additions
and
1,924 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,27 +1,27 @@ | ||
Test Case,Annual Heating Load [MMBtu],Annual Cooling Load [MMBtu] | ||
L100AC.xml,51.41,N/A | ||
L110AC.xml,77.05,N/A | ||
L120AC.xml,39.84,N/A | ||
L130AC.xml,43.86,N/A | ||
L140AC.xml,48.05,N/A | ||
L150AC.xml,40.85,N/A | ||
L155AC.xml,44.14,N/A | ||
L160AC.xml,52.19,N/A | ||
L170AC.xml,62.0,N/A | ||
L200AC.xml,124.27,N/A | ||
L202AC.xml,131.27,N/A | ||
L302XC.xml,46.87,N/A | ||
L304XC.xml,45.2,N/A | ||
L322XC.xml,66.93,N/A | ||
L324XC.xml,48.62,N/A | ||
L100AL.xml,N/A,51.47 | ||
L110AL.xml,N/A,55.25 | ||
L120AL.xml,N/A,47.69 | ||
L130AL.xml,N/A,36.35 | ||
L140AL.xml,N/A,24.32 | ||
L150AL.xml,N/A,64.56 | ||
L155AL.xml,N/A,48.79 | ||
L160AL.xml,N/A,62.49 | ||
L170AL.xml,N/A,42.11 | ||
L200AL.xml,N/A,64.53 | ||
L202AL.xml,N/A,54.83 | ||
L100AC.xml,51.28,N/A | ||
L110AC.xml,76.84,N/A | ||
L120AC.xml,39.74,N/A | ||
L130AC.xml,43.88,N/A | ||
L140AC.xml,48.15,N/A | ||
L150AC.xml,40.49,N/A | ||
L155AC.xml,43.88,N/A | ||
L160AC.xml,52.13,N/A | ||
L170AC.xml,61.89,N/A | ||
L200AC.xml,123.75,N/A | ||
L202AC.xml,130.8,N/A | ||
L302XC.xml,46.8,N/A | ||
L304XC.xml,45.13,N/A | ||
L322XC.xml,66.99,N/A | ||
L324XC.xml,48.68,N/A | ||
L100AL.xml,N/A,50.42 | ||
L110AL.xml,N/A,54.33 | ||
L120AL.xml,N/A,46.96 | ||
L130AL.xml,N/A,35.82 | ||
L140AL.xml,N/A,24.02 | ||
L150AL.xml,N/A,62.19 | ||
L155AL.xml,N/A,46.92 | ||
L160AL.xml,N/A,61.5 | ||
L170AL.xml,N/A,41.14 | ||
L200AL.xml,N/A,63.27 | ||
L202AL.xml,N/A,54.21 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,9 @@ | ||
Test Case,Heat/Cool (kWh or therm),HVAC Fan (kWh) | ||
HVAC3a.xml,560.83,453.09 | ||
HVAC3e.xml,6335.32,980.03 | ||
HVAC3b.xml,677.0,660.0 | ||
HVAC3c.xml,588.34,525.48 | ||
HVAC3d.xml,640.83,624.83 | ||
HVAC3f.xml,7992.34,1236.76 | ||
HVAC3g.xml,6754.41,1042.16 | ||
HVAC3h.xml,7519.91,1137.99 | ||
HVAC3a.xml,557.36,450.16 | ||
HVAC3e.xml,6217.5,957.76 | ||
HVAC3b.xml,673.73,656.77 | ||
HVAC3c.xml,585.15,522.55 | ||
HVAC3d.xml,637.48,621.6 | ||
HVAC3f.xml,7859.29,1211.56 | ||
HVAC3g.xml,6632.49,1019.3 | ||
HVAC3h.xml,7388.32,1113.67 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,8 @@ | ||
Test Case,HVAC (kWh or therm),HVAC Fan (kWh) | ||
HVAC1a.xml,6277.0,803.89 | ||
HVAC1b.xml,4660.12,803.89 | ||
HVAC2a.xml,639.46,623.66 | ||
HVAC2b.xml,554.19,623.66 | ||
HVAC2c.xml,7623.36,1192.21 | ||
HVAC2d.xml,4619.68,1192.21 | ||
HVAC2e.xml,14617.8,623.66 | ||
HVAC1a.xml,6160.06,785.72 | ||
HVAC1b.xml,4574.55,785.72 | ||
HVAC2a.xml,635.91,620.14 | ||
HVAC2b.xml,551.12,620.14 | ||
HVAC2c.xml,7589.08,1187.82 | ||
HVAC2d.xml,4600.92,1187.82 | ||
HVAC2e.xml,14536.62,620.14 |
Oops, something went wrong.