diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index 370684824b..68ef8bea71 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -161,6 +161,12 @@ jobs:
path: workflow/tests/test_results
name: test_results_other
+ - name: Store release package
+ uses: actions/upload-artifact@v7
+ with:
+ path: OpenStudio-ERI-*.zip
+ archive: false
+
run-windows-tests:
runs-on: windows-latest
steps:
diff --git a/Changelog.md b/Changelog.md
index 309f335031..ae1f50a172 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,7 +8,8 @@ __New Features__
- Compressor lockout temperatures for Rated Home defaults and Reference Home updated from 0F (single/two stage) and -20F (variable speed) to 5F and -10F, respectively.
- Dual-fuel heat pumps now have the HP sized using the greater of the heating design temperature and 25F.
- Pan heaters no longer operate when the outdoor temperature is below the compressor lockout temperature.
-- Adds a warning if there are more than 300 unmet hours for heating or cooling.
+- Adds a warning if there are more than 300 unmet hours for heating or cooling; setpoint tolerance increased from 0.36 deg-F (0.2 deg-C) to 0.5 deg-F.
+- Runtime speed improvements for homes with multiple ground source heat pumps.
- Utility bill scenarios can now be defined for the Rated/Reference Homes; see [the documentation](https://openstudio-eri.readthedocs.io/en/latest/workflow_inputs.html#hpxml-utility-bill-scenarios) for more information.
- The `Battery/NominalCapacity` input is no longer used.
- Output updates:
diff --git a/docs/source/workflow_outputs.rst b/docs/source/workflow_outputs.rst
index 65cb3b52f6..b1c09d5786 100644
--- a/docs/source/workflow_outputs.rst
+++ b/docs/source/workflow_outputs.rst
@@ -459,7 +459,7 @@ Annual unmet hours are listed below.
Unmet Hours: EV Driving (hr) Not used by OS-ERI
============================ =====
- .. [#] The unmet heating and cooling numbers reflect the number of hours during the heating/cooling season when the conditioned space temperature deviates more than 0.2 deg-C (0.36 deg-F) from the heating/cooling setpoint.
+ .. [#] The unmet heating and cooling numbers reflect the number of hours during the heating/cooling season when the conditioned space temperature deviates more than 0.5 deg-F from the heating/cooling setpoint.
OpenStudio-ERI will issue a warning if there are more than 300 unmet hours for heating or cooling.
Peak Building Electricity
diff --git a/hpxml-measures/BuildResidentialHPXML/README.md b/hpxml-measures/BuildResidentialHPXML/README.md
index e3385784f5..9a02084f0c 100644
--- a/hpxml-measures/BuildResidentialHPXML/README.md
+++ b/hpxml-measures/BuildResidentialHPXML/README.md
@@ -947,7 +947,7 @@ The geothermal loop configuration if there's a ground-to-air heat pump.
- **Required:** ``false``
-- **Choices:**
- `Default`
- `Vertical Loop, Enhanced Grout`
- `Vertical Loop, Enhanced Pipe`
- `Vertical Loop, Enhanced Grout & Pipe`
- `Detailed Example: Lopsided U Configuration, 10 Boreholes`
+- **Choices:**
- `Default`
- `Vertical Loop, Enhanced Grout`
- `Vertical Loop, Enhanced Pipe`
- `Vertical Loop, Enhanced Grout & Pipe`
- `Detailed Example: Vertical Loop, L Configuration, 4 Boreholes`
- **Default:** `Default`
diff --git a/hpxml-measures/BuildResidentialHPXML/measure.rb b/hpxml-measures/BuildResidentialHPXML/measure.rb
index 53a9ae12a5..eeba5103bb 100644
--- a/hpxml-measures/BuildResidentialHPXML/measure.rb
+++ b/hpxml-measures/BuildResidentialHPXML/measure.rb
@@ -2698,7 +2698,7 @@ def set_geothermal_loop(hpxml_bldg, args)
'1-1/4" pipe' => 1.25 }[args[:hvac_geothermal_loop_pipe_diameter]]
hpxml_bldg.geothermal_loops.add(id: "GeothermalLoop#{hpxml_bldg.geothermal_loops.size + 1}",
- loop_configuration: args[:hvac_geothermal_loop_configuration],
+ loop_config: args[:hvac_geothermal_loop_configuration],
loop_flow: args[:hvac_geothermal_loop_loop_flow],
bore_config: args[:hvac_geothermal_loop_borefield_configuration],
num_bore_holes: args[:hvac_geothermal_loop_boreholes_count],
diff --git a/hpxml-measures/BuildResidentialHPXML/measure.xml b/hpxml-measures/BuildResidentialHPXML/measure.xml
index cb7e583e85..34dec045c3 100644
--- a/hpxml-measures/BuildResidentialHPXML/measure.xml
+++ b/hpxml-measures/BuildResidentialHPXML/measure.xml
@@ -3,8 +3,8 @@
3.1
build_residential_hpxml
a13a8983-2b01-4930-8af2-42030b6e4233
- a5100732-58ee-47a2-8655-cbd3b2e4a4bd
- 2026-04-13T14:50:45Z
+ 05cfb040-cc69-41f0-86c1-58563d5f3800
+ 2026-05-13T03:01:47Z
2C38F48B
BuildResidentialHPXML
HPXML Builder
@@ -5494,8 +5494,8 @@
Vertical Loop, Enhanced Grout & Pipe
- Detailed Example: Lopsided U Configuration, 10 Boreholes
- Detailed Example: Lopsided U Configuration, 10 Boreholes
+ Detailed Example: Vertical Loop, L Configuration, 4 Boreholes
+ Detailed Example: Vertical Loop, L Configuration, 4 Boreholes
@@ -11437,7 +11437,7 @@
README.md
md
readme
- B9841315
+ 01D52363
README.md.erb
@@ -11454,7 +11454,7 @@
measure.rb
rb
script
- 4F3E18D4
+ FE0CEC87
constants.rb
@@ -11850,7 +11850,7 @@
options/hvac_geothermal_loop.tsv
tsv
resource
- 01874F99
+ 0B427696
options/hvac_heat_pump.tsv
diff --git a/hpxml-measures/BuildResidentialHPXML/resources/options/hvac_geothermal_loop.tsv b/hpxml-measures/BuildResidentialHPXML/resources/options/hvac_geothermal_loop.tsv
index 348bc2fa69..5a38355951 100644
--- a/hpxml-measures/BuildResidentialHPXML/resources/options/hvac_geothermal_loop.tsv
+++ b/hpxml-measures/BuildResidentialHPXML/resources/options/hvac_geothermal_loop.tsv
@@ -3,7 +3,7 @@ Default
"Vertical Loop, Enhanced Grout" vertical thermally enhanced
"Vertical Loop, Enhanced Pipe" vertical thermally enhanced
"Vertical Loop, Enhanced Grout & Pipe" vertical thermally enhanced thermally enhanced
-"Detailed Example: Lopsided U Configuration, 10 Boreholes" vertical Lopsided U 10 9 315 16.4 5.9 standard standard "1"" pipe" 2.5
+"Detailed Example: Vertical Loop, L Configuration, 4 Boreholes" vertical L 10 4 150 16.4 5.9 standard standard "1"" pipe" 2.5
# Configuration: Configuration of the geothermal loop for ground-to-air heat pumps.
# Borefield Configuration: Borefield configuration of the geothermal loop.
diff --git a/hpxml-measures/Changelog.md b/hpxml-measures/Changelog.md
index 5db6151265..1717fdbfae 100644
--- a/hpxml-measures/Changelog.md
+++ b/hpxml-measures/Changelog.md
@@ -2,9 +2,10 @@
__New Features__
- HVAC updates:
- - Adds a warning if there are more than 300 unmet hours for heating or cooling.
+ - Adds a warning if there are more than 300 unmet hours for heating or cooling; setpoint tolerance increased from 0.36 deg-F (0.2 deg-C) to 0.5 deg-F.
- Dual-fuel heat pumps with switchover temperatures > 25F are now autosized based on 25F to allow some additional heating capacity buffer.
- Improves handling of duct leakage specified using cfm25/cfm50.
+ - Allows multiple ground-source heat pumps attached to a single geothermal loop; yields runtime speed improvements.
- Crankcase heating energy is now disabled during unavailable periods, e.g., power outages.
- Adds advanced research feature to model latent degradation for cooling systems, including an input to specify an HVAC blower-off delay.
- Output updates:
@@ -38,6 +39,7 @@ __Bugfixes__
- Fixes logic in HP multi-stage backup advanced research feature.
- Fixes PV grid connection fee applying in utility bill calculation even if the home has no PV.
- Fixes possible "Failed to process String" EnergyPlus error when requesting component loads.
+- Fixes ducts in manufactured home belly from being incorrectly modeled as if they were outside.
## OpenStudio-HPXML v1.11.1
diff --git a/hpxml-measures/HPXMLtoOpenStudio/measure.xml b/hpxml-measures/HPXMLtoOpenStudio/measure.xml
index 3e4e3af30f..47fb0a2ed7 100644
--- a/hpxml-measures/HPXMLtoOpenStudio/measure.xml
+++ b/hpxml-measures/HPXMLtoOpenStudio/measure.xml
@@ -3,8 +3,8 @@
3.1
hpxml_to_openstudio
b1543b30-9465-45ff-ba04-1d1f85e763bc
- c16a00c3-3068-4f6f-9540-1a1ce0a93fa9
- 2026-05-07T00:20:32Z
+ bb198cff-d193-4387-800c-39b35e16ff89
+ 2026-05-13T03:01:59Z
D8922A73
HPXMLToOpenStudio
HPXML to OpenStudio Translator
@@ -307,25 +307,25 @@
data/g_functions/C_configurations_5m_v1.0.json
json
resource
- E97DCCDD
+ 3607104A
data/g_functions/L_configurations_5m_v1.0.json
json
resource
- 6B2B3787
+ B7C8ACB4
data/g_functions/LopU_configurations_5m_v1.0.json
json
resource
- B13FA813
+ 65665495
data/g_functions/Open_configurations_5m_v1.0.json
json
resource
- FF25A024
+ 0446DBC3
data/g_functions/README.md
@@ -337,19 +337,19 @@
data/g_functions/U_configurations_5m_v1.0.json
json
resource
- B5BEF270
+ B1AC362A
data/g_functions/rectangle_5m_v1.0.json
json
resource
- 25FFB6A8
+ 90F45213
data/g_functions/util.rb
rb
resource
- D00579DD
+ DA595BFC
data/unavailable_periods.csv
@@ -367,7 +367,7 @@
defaults.rb
rb
resource
- 7C57F239
+ 4044148D
electric_panel.rb
@@ -391,7 +391,7 @@
geometry.rb
rb
resource
- 548BF981
+ 7F402CF9
hotwater_appliances.rb
@@ -403,7 +403,7 @@
hpxml.rb
rb
resource
- A8A9DC80
+ 4741A9D8
hpxml_schema/HPXML.xsd
@@ -421,7 +421,7 @@
hpxml_schematron/EPvalidator.sch
sch
resource
- 43C0728B
+ 0D042BF0
hpxml_schematron/iso-schematron.xsd
@@ -433,13 +433,13 @@
hvac.rb
rb
resource
- D88E051C
+ DF5A0B42
hvac_sizing.rb
rb
resource
- 9A5B62E2
+ A450945A
internal_gains.rb
@@ -499,7 +499,7 @@
output.rb
rb
resource
- F5CABDA5
+ 855DE50B
psychrometrics.rb
@@ -751,7 +751,7 @@
test_defaults.rb
rb
test
- 4E7A6CA0
+ 396FC7B6
test_electric_panel.rb
@@ -781,13 +781,13 @@
test_hvac.rb
rb
test
- 1F777044
+ 8D9CC019
test_hvac_sizing.rb
rb
test
- 79B33360
+ DD3D9866
test_lighting.rb
@@ -829,7 +829,7 @@
test_validation.rb
rb
test
- 24E06C3D
+ 08D1113A
test_vehicle.rb
diff --git a/hpxml-measures/HPXMLtoOpenStudio/resources/data/g_functions/C_configurations_5m_v1.0.json b/hpxml-measures/HPXMLtoOpenStudio/resources/data/g_functions/C_configurations_5m_v1.0.json
index a97965ca65..1086e27ec7 100644
--- a/hpxml-measures/HPXMLtoOpenStudio/resources/data/g_functions/C_configurations_5m_v1.0.json
+++ b/hpxml-measures/HPXMLtoOpenStudio/resources/data/g_functions/C_configurations_5m_v1.0.json
@@ -426,5 +426,943 @@
3.003
]
}
+ },
+ "4_4": {
+ "1": {
+ "bore_locations": [
+ [
+ 0.0,
+ 0.0
+ ],
+ [
+ 5.0,
+ 0.0
+ ],
+ [
+ 10.0,
+ 0.0
+ ],
+ [
+ 15.0,
+ 0.0
+ ],
+ [
+ 15.0,
+ 5.0
+ ],
+ [
+ 15.0,
+ 10.0
+ ],
+ [
+ 0.0,
+ 15.0
+ ],
+ [
+ 10.0,
+ 15.0
+ ],
+ [
+ 15.0,
+ 15.0
+ ],
+ [
+ 0.0,
+ 5.0
+ ],
+ [
+ 0.0,
+ 10.0
+ ]
+ ],
+ "g": {
+ "5._192._0.08": [
+ 2.8351669612369923,
+ 3.187131809821055,
+ 3.5217574552296442,
+ 4.031860000556221,
+ 4.642789924984922,
+ 5.664050926695616,
+ 7.177536839227692,
+ 8.73205712185217,
+ 11.14645622530254,
+ 12.68750861068738,
+ 13.794921102061611,
+ 15.339985850260671,
+ 16.399605548253966,
+ 18.73422495054544,
+ 20.675477814061185,
+ 21.20270161298177,
+ 21.673507036497224,
+ 22.130117723325338,
+ 22.48254787979569,
+ 22.783313445882108,
+ 23.041506933773235,
+ 23.25700176539784,
+ 23.417612525329186,
+ 23.600819999746907,
+ 23.725907494602644,
+ 23.78730535626037,
+ 23.886809623125316
+ ],
+ "5._24._0.075": [
+ 0.8740059532267964,
+ 1.1958031759615428,
+ 1.4813847491413066,
+ 1.819821321700434,
+ 2.1114679242247285,
+ 2.4511928331436965,
+ 2.7884196223805504,
+ 3.044992027085384,
+ 3.38791749451322,
+ 3.6173418260566677,
+ 3.803349868661866,
+ 4.110060121199708,
+ 4.362469622374145,
+ 5.11332117909886,
+ 6.085104560190628,
+ 6.434924828625525,
+ 6.7899634813382646,
+ 7.177169255216708,
+ 7.509350469809416,
+ 7.815605489491669,
+ 8.097485888963899,
+ 8.346592396306441,
+ 8.539609729993684,
+ 8.766974322953123,
+ 8.926316375019143,
+ 9.005943772244606,
+ 9.13667321203526
+ ],
+ "5._384._0.0875": [
+ 3.4917854785249274,
+ 4.027892682863467,
+ 4.674512332290674,
+ 5.76433018715352,
+ 7.118823424030785,
+ 9.27496727848396,
+ 11.950748739554333,
+ 14.215514760326917,
+ 17.213590667732912,
+ 18.94650290689656,
+ 20.1401514543864,
+ 21.755871343338576,
+ 22.842316077409556,
+ 25.203207795314178,
+ 27.15383368215816,
+ 27.68261441976035,
+ 28.155994660819886,
+ 28.615633613620084,
+ 28.971159712344004,
+ 29.274716510103367,
+ 29.535753696189534,
+ 29.753984531395947,
+ 29.91669228327421,
+ 30.102527311648508,
+ 30.229375158748294,
+ 30.29158608804928,
+ 30.39228523455161
+ ],
+ "5._48._0.075": [
+ 1.5268463243731416,
+ 1.867903705312546,
+ 2.1622431316564774,
+ 2.5060808689637457,
+ 2.800134562232989,
+ 3.14327916441727,
+ 3.5123102532597708,
+ 3.861332630541545,
+ 4.46625801003282,
+ 4.930366410124289,
+ 5.320873222479279,
+ 5.977986165022717,
+ 6.523082498661355,
+ 8.070512526217932,
+ 9.74033387825479,
+ 10.249977839170032,
+ 10.72380344038845,
+ 11.198839359120816,
+ 11.575308318512594,
+ 11.901326389413148,
+ 12.18463074954121,
+ 12.42294215151655,
+ 12.601109309351095,
+ 12.804250491457228,
+ 12.943133129933976,
+ 13.011482757605545,
+ 13.122456061328451
+ ],
+ "5._96._0.075": [
+ 2.209271810327405,
+ 2.5553235630354036,
+ 2.85191445085216,
+ 3.2002236321495934,
+ 3.5241752721853348,
+ 4.0072483561728,
+ 4.693830270584265,
+ 5.424314266196199,
+ 6.744298970435425,
+ 7.750465107474564,
+ 8.557800527938326,
+ 9.799245263410551,
+ 10.719250086160097,
+ 12.912412337145456,
+ 14.85221260258157,
+ 15.391211680617198,
+ 15.87463723683865,
+ 16.34552964897247,
+ 16.709868891192656,
+ 17.02099235650318,
+ 17.288039892312778,
+ 17.51073252615451,
+ 17.67656252866379,
+ 17.865298415493864,
+ 17.99408591656644,
+ 18.057328074885103,
+ 18.159887791902026
+ ]
+ },
+ "logtime": [
+ -8.5,
+ -7.8,
+ -7.2,
+ -6.5,
+ -5.9,
+ -5.2,
+ -4.5,
+ -3.963,
+ -3.27,
+ -2.864,
+ -2.577,
+ -2.171,
+ -1.884,
+ -1.191,
+ -0.497,
+ -0.274,
+ -0.051,
+ 0.196,
+ 0.419,
+ 0.642,
+ 0.873,
+ 1.112,
+ 1.335,
+ 1.679,
+ 2.028,
+ 2.275,
+ 3.003
+ ]
+ }
+ },
+ "4_5": {
+ "1": {
+ "bore_locations": [
+ [
+ 0.0,
+ 0.0
+ ],
+ [
+ 5.0,
+ 0.0
+ ],
+ [
+ 10.0,
+ 0.0
+ ],
+ [
+ 15.0,
+ 0.0
+ ],
+ [
+ 15.0,
+ 5.0
+ ],
+ [
+ 15.0,
+ 10.0
+ ],
+ [
+ 15.0,
+ 15.0
+ ],
+ [
+ 0.0,
+ 20.0
+ ],
+ [
+ 10.0,
+ 20.0
+ ],
+ [
+ 15.0,
+ 20.0
+ ],
+ [
+ 0.0,
+ 5.0
+ ],
+ [
+ 0.0,
+ 10.0
+ ],
+ [
+ 0.0,
+ 15.0
+ ]
+ ],
+ "g": {
+ "5._192._0.08": [
+ 2.8351678770733755,
+ 3.187202360842244,
+ 3.5222558951808356,
+ 4.033001480958287,
+ 4.64282847825528,
+ 5.658749749401029,
+ 7.180451156340128,
+ 8.792647613304357,
+ 11.396386191115555,
+ 13.108044712131049,
+ 14.35553574266794,
+ 16.113330138517803,
+ 17.32739253678775,
+ 20.01267682522805,
+ 22.247947491528564,
+ 22.854879473699143,
+ 23.396018982536418,
+ 23.920222244172166,
+ 24.324104590001333,
+ 24.66861275115878,
+ 24.96397783422694,
+ 25.21020822306621,
+ 25.393677703397284,
+ 25.60281885520403,
+ 25.745626917382793,
+ 25.815750974401922,
+ 25.929501898575484
+ ],
+ "5._24._0.075": [
+ 0.8740059532267966,
+ 1.1958031759615426,
+ 1.4813847491413075,
+ 1.8198213217004346,
+ 2.1114679242247294,
+ 2.4511928331586543,
+ 2.7884198332326826,
+ 3.045004897367837,
+ 3.3881764117636184,
+ 3.617997972654443,
+ 3.804287760326047,
+ 4.111048434608664,
+ 4.362992513447313,
+ 5.11016852521276,
+ 6.0823655856408045,
+ 6.438280156515094,
+ 6.804360914987624,
+ 7.209761383441146,
+ 7.563068641706794,
+ 7.893389830525229,
+ 8.201390950021436,
+ 8.476747535956298,
+ 8.69210657983334,
+ 8.947878709814887,
+ 9.128428140011792,
+ 9.21909198419426,
+ 9.368561189426797
+ ],
+ "5._384._0.0875": [
+ 3.4923899597134294,
+ 4.029040072276986,
+ 4.6741343169428085,
+ 5.758331223450796,
+ 7.121224431188424,
+ 9.36822059802616,
+ 12.27988789238486,
+ 14.820180426978071,
+ 18.247407763100583,
+ 20.24848504178485,
+ 21.631563003465224,
+ 23.505756990273504,
+ 24.766687298672714,
+ 27.50173694297232,
+ 29.755679052510942,
+ 30.365871703720572,
+ 30.911469168650672,
+ 31.440685174920556,
+ 31.849473536539573,
+ 32.19840747924487,
+ 32.498207264933384,
+ 32.74865418987794,
+ 32.935365356564304,
+ 33.14854266213893,
+ 33.294079625377435,
+ 33.36548101987627,
+ 33.48113930887647
+ ],
+ "5._48._0.075": [
+ 1.526846324373142,
+ 1.8679037053125447,
+ 2.1622431316564743,
+ 2.506080869034838,
+ 2.800134750364696,
+ 3.1433094260752195,
+ 3.512719450033114,
+ 3.8623170774725897,
+ 4.4668128760826,
+ 4.928967502931451,
+ 5.317180793432326,
+ 5.971980540499062,
+ 6.5200866085609634,
+ 8.117954025217072,
+ 9.917694334766331,
+ 10.481136526359018,
+ 11.009779202169527,
+ 11.543864331667741,
+ 11.969543704904865,
+ 12.339609533251991,
+ 12.661968911851094,
+ 12.933481519286822,
+ 13.136605430208776,
+ 13.368095393353892,
+ 13.526402212564701,
+ 13.60437395778915,
+ 13.731107324489717
+ ],
+ "5._96._0.075": [
+ 2.209271810327405,
+ 2.5553235633328057,
+ 2.851914879893103,
+ 3.2002707743981924,
+ 3.524578082112754,
+ 4.008353700802753,
+ 4.693820220569501,
+ 5.420426385271752,
+ 6.741261908314919,
+ 7.770553372372415,
+ 8.614352087103972,
+ 9.94155380015661,
+ 10.945645852155918,
+ 13.392310279714764,
+ 15.597831649139092,
+ 16.215002367149157,
+ 16.768829694968566,
+ 17.30849014135084,
+ 17.725699027950938,
+ 18.081873254990406,
+ 18.387222587582094,
+ 18.641521896006108,
+ 18.830786411387095,
+ 19.04593977463032,
+ 19.192736721945092,
+ 19.26485238297267,
+ 19.381916346387253
+ ]
+ },
+ "logtime": [
+ -8.5,
+ -7.8,
+ -7.2,
+ -6.5,
+ -5.9,
+ -5.2,
+ -4.5,
+ -3.963,
+ -3.27,
+ -2.864,
+ -2.577,
+ -2.171,
+ -1.884,
+ -1.191,
+ -0.497,
+ -0.274,
+ -0.051,
+ 0.196,
+ 0.419,
+ 0.642,
+ 0.873,
+ 1.112,
+ 1.335,
+ 1.679,
+ 2.028,
+ 2.275,
+ 3.003
+ ]
+ }
+ },
+ "5_5": {
+ "2": {
+ "bore_locations": [
+ [
+ 0.0,
+ 0.0
+ ],
+ [
+ 5.0,
+ 0.0
+ ],
+ [
+ 10.0,
+ 0.0
+ ],
+ [
+ 15.0,
+ 0.0
+ ],
+ [
+ 20.0,
+ 0.0
+ ],
+ [
+ 20.0,
+ 5.0
+ ],
+ [
+ 20.0,
+ 10.0
+ ],
+ [
+ 20.0,
+ 15.0
+ ],
+ [
+ 0.0,
+ 20.0
+ ],
+ [
+ 15.0,
+ 20.0
+ ],
+ [
+ 20.0,
+ 20.0
+ ],
+ [
+ 0.0,
+ 5.0
+ ],
+ [
+ 0.0,
+ 10.0
+ ],
+ [
+ 0.0,
+ 15.0
+ ]
+ ],
+ "g": {
+ "5._192._0.08": [
+ 2.8351682368664046,
+ 3.187230075803818,
+ 3.5224492924972486,
+ 4.033119936823576,
+ 4.638396480759823,
+ 5.618987960858868,
+ 7.030026221999871,
+ 8.527839211273466,
+ 11.040326281134176,
+ 12.753084676806015,
+ 14.025120380850506,
+ 15.843214146708608,
+ 17.11195497122992,
+ 19.940401971075286,
+ 22.305981963908003,
+ 22.94907768350858,
+ 23.5219570494117,
+ 24.07656707380614,
+ 24.5033881875782,
+ 24.8673301405763,
+ 25.179061947213125,
+ 25.438701828274404,
+ 25.632108194735537,
+ 25.852441932874385,
+ 26.002888421341073,
+ 26.07678067912425,
+ 26.19671636902343
+ ],
+ "5._24._0.075": [
+ 0.8740059532267968,
+ 1.1958031759615424,
+ 1.481384749141307,
+ 1.8198213217004346,
+ 2.1114679242247285,
+ 2.4511928331645287,
+ 2.7884199160674505,
+ 3.045009953546903,
+ 3.38827791404913,
+ 3.6182455112077183,
+ 3.8045791292004805,
+ 4.110763196512884,
+ 4.36096455515036,
+ 5.088523341352613,
+ 5.996594731204861,
+ 6.324664302256742,
+ 6.66356948175994,
+ 7.043146251752328,
+ 7.379150274840224,
+ 7.698625225718219,
+ 8.00168389858422,
+ 8.27718079562981,
+ 8.495778161296176,
+ 8.759105313710558,
+ 8.94734091149286,
+ 9.042617955855821,
+ 9.200804830324877
+ ],
+ "5._384._0.0875": [
+ 3.492622151923022,
+ 4.028973564321868,
+ 4.6678688276745985,
+ 5.7086726490240105,
+ 6.970317380705004,
+ 9.065928706832562,
+ 11.90374824135082,
+ 14.474873600859345,
+ 18.032665981551915,
+ 20.138958066582124,
+ 21.602246611922695,
+ 23.5905838265759,
+ 24.930556453107524,
+ 27.83627994287034,
+ 30.228020615878005,
+ 30.87501041635176,
+ 31.452962934584594,
+ 32.013127460088626,
+ 32.44536358196687,
+ 32.81421549766889,
+ 33.13090295282149,
+ 33.39528824036076,
+ 33.59236582386283,
+ 33.81730334935146,
+ 33.97087939941161,
+ 34.046241503080196,
+ 34.16837716052527
+ ],
+ "5._48._0.075": [
+ 1.5268463243731418,
+ 1.8679037053125451,
+ 2.1622431316564747,
+ 2.506080869062769,
+ 2.8001348242735835,
+ 3.14332131451069,
+ 3.5128790354734982,
+ 3.862621957198177,
+ 4.464580392139133,
+ 4.918351090861684,
+ 5.292537742558518,
+ 5.90888858522505,
+ 6.41571666369946,
+ 7.898404905596242,
+ 9.638977655419469,
+ 10.20171680581911,
+ 10.73726058382615,
+ 11.284789288957224,
+ 11.725538212714785,
+ 12.111321620329223,
+ 12.449201935558799,
+ 12.734899089589739,
+ 12.94912980290307,
+ 13.19363236320802,
+ 13.361070496901409,
+ 13.443643755892115,
+ 13.578008549726166
+ ],
+ "5._96._0.075": [
+ 2.2092718103274054,
+ 2.55532356344964,
+ 2.8519150484449027,
+ 3.2002892942107675,
+ 3.5247352870633146,
+ 4.008584140887022,
+ 4.689236056197689,
+ 5.3941771300509735,
+ 6.627034602629627,
+ 7.57648313447077,
+ 8.364515942477567,
+ 9.632381153397771,
+ 10.615797361602414,
+ 13.086469576251346,
+ 15.377994804985304,
+ 16.026577406312093,
+ 16.610123141820804,
+ 17.179829031762406,
+ 17.62061768431994,
+ 17.997069004818776,
+ 18.319727012335672,
+ 18.58829979027774,
+ 18.788126998395434,
+ 19.015108735089672,
+ 19.169964336265924,
+ 19.246061934087628,
+ 19.369665726571647
+ ]
+ },
+ "logtime": [
+ -8.5,
+ -7.8,
+ -7.2,
+ -6.5,
+ -5.9,
+ -5.2,
+ -4.5,
+ -3.963,
+ -3.27,
+ -2.864,
+ -2.577,
+ -2.171,
+ -1.884,
+ -1.191,
+ -0.497,
+ -0.274,
+ -0.051,
+ 0.196,
+ 0.419,
+ 0.642,
+ 0.873,
+ 1.112,
+ 1.335,
+ 1.679,
+ 2.028,
+ 2.275,
+ 3.003
+ ]
+ },
+ "1": {
+ "bore_locations": [
+ [
+ 0.0,
+ 0.0
+ ],
+ [
+ 5.0,
+ 0.0
+ ],
+ [
+ 10.0,
+ 0.0
+ ],
+ [
+ 15.0,
+ 0.0
+ ],
+ [
+ 20.0,
+ 0.0
+ ],
+ [
+ 20.0,
+ 5.0
+ ],
+ [
+ 20.0,
+ 10.0
+ ],
+ [
+ 20.0,
+ 15.0
+ ],
+ [
+ 0.0,
+ 20.0
+ ],
+ [
+ 5.0,
+ 20.0
+ ],
+ [
+ 15.0,
+ 20.0
+ ],
+ [
+ 20.0,
+ 20.0
+ ],
+ [
+ 0.0,
+ 5.0
+ ],
+ [
+ 0.0,
+ 10.0
+ ],
+ [
+ 0.0,
+ 15.0
+ ]
+ ],
+ "g": {
+ "5._192._0.08": [
+ 2.8351685499612094,
+ 3.187258714136909,
+ 3.5228438727636755,
+ 4.036702022581875,
+ 4.652059663761198,
+ 5.66411335621385,
+ 7.149292259685648,
+ 8.747180084177202,
+ 11.441557145639967,
+ 13.278222887702963,
+ 14.640658498670904,
+ 16.58507056218041,
+ 17.940128138358585,
+ 20.95407158070511,
+ 23.468607430135222,
+ 24.151436597808804,
+ 24.75927850790786,
+ 25.347407047104415,
+ 25.799718108222166,
+ 26.18532888248482,
+ 26.515487387423388,
+ 26.79038286537399,
+ 26.995146993776675,
+ 27.228392392963908,
+ 27.387669175775645,
+ 27.465910417983835,
+ 27.592946987306984
+ ],
+ "5._24._0.075": [
+ 0.8740059532267966,
+ 1.1958031759615428,
+ 1.4813847491413066,
+ 1.8198213217004349,
+ 2.1114679242247285,
+ 2.4511928331696193,
+ 2.788419987937593,
+ 3.045014530241798,
+ 3.388426593393468,
+ 3.61893807115428,
+ 3.806285595638799,
+ 4.115630706207777,
+ 4.369938264699354,
+ 5.117784882055297,
+ 6.068516108590718,
+ 6.415824265478349,
+ 6.7763490198953225,
+ 7.181463551853645,
+ 7.540804641937169,
+ 7.882593658940476,
+ 8.206696609025872,
+ 8.500984182470376,
+ 8.734109053504245,
+ 9.014252932699334,
+ 9.214013449669416,
+ 9.31497291728689,
+ 9.482329836951564
+ ],
+ "5._384._0.0875": [
+ 3.4931710412388215,
+ 4.03347251947572,
+ 4.684150740084604,
+ 5.760930194323468,
+ 7.090110508325212,
+ 9.328967663103754,
+ 12.374459317749082,
+ 15.132200949349306,
+ 18.94147943586183,
+ 21.193415745962525,
+ 22.75649244448317,
+ 24.878240121776997,
+ 26.307037385519987,
+ 29.4013192647034,
+ 31.945044535233112,
+ 32.63276603259177,
+ 33.246905991035234,
+ 33.84197016373688,
+ 34.300968352075536,
+ 34.692638262582015,
+ 35.02884877405768,
+ 35.309486643079566,
+ 35.518683155067215,
+ 35.757445205723954,
+ 35.92047495679091,
+ 36.00048555072574,
+ 36.130183979125476
+ ],
+ "5._48._0.075": [
+ 1.526846324373142,
+ 1.8679037053125458,
+ 2.1622431316564743,
+ 2.5060808690869742,
+ 2.8001348883911774,
+ 3.14333256922029,
+ 3.5131692540568866,
+ 3.8644226946337272,
+ 4.474322861170921,
+ 4.938971065653816,
+ 5.325272456016258,
+ 5.96788111532566,
+ 6.501451766531553,
+ 8.080177454803994,
+ 9.942824398411016,
+ 10.544808651419324,
+ 11.116738437046614,
+ 11.700560773248478,
+ 12.169709819590091,
+ 12.579725893004984,
+ 12.93823569584624,
+ 13.240886724751643,
+ 13.467560161762616,
+ 13.725883296223618,
+ 13.902624815028982,
+ 13.98975730048277,
+ 14.131537721476786
+ ],
+ "5._96._0.075": [
+ 2.2092718103274027,
+ 2.555323563550897,
+ 2.8519151948255264,
+ 3.20030751279389,
+ 3.525015554640949,
+ 4.011396620649195,
+ 4.7030073729175825,
+ 5.428916711004246,
+ 6.720751192378307,
+ 7.729269255027415,
+ 8.571205844819746,
+ 9.929797544753724,
+ 10.98410396020036,
+ 13.627750385893856,
+ 16.07079560559501,
+ 16.76085096931969,
+ 17.380782833865567,
+ 17.985358028870824,
+ 18.452550200881838,
+ 18.851304164785265,
+ 19.192781169216094,
+ 19.476804803060265,
+ 19.68806369742662,
+ 19.927921271083143,
+ 20.09154574556812,
+ 20.171960076680513,
+ 20.302621620008832
+ ]
+ },
+ "logtime": [
+ -8.5,
+ -7.8,
+ -7.2,
+ -6.5,
+ -5.9,
+ -5.2,
+ -4.5,
+ -3.963,
+ -3.27,
+ -2.864,
+ -2.577,
+ -2.171,
+ -1.884,
+ -1.191,
+ -0.497,
+ -0.274,
+ -0.051,
+ 0.196,
+ 0.419,
+ 0.642,
+ 0.873,
+ 1.112,
+ 1.335,
+ 1.679,
+ 2.028,
+ 2.275,
+ 3.003
+ ]
+ }
}
}
\ No newline at end of file
diff --git a/hpxml-measures/HPXMLtoOpenStudio/resources/data/g_functions/L_configurations_5m_v1.0.json b/hpxml-measures/HPXMLtoOpenStudio/resources/data/g_functions/L_configurations_5m_v1.0.json
index 44a1e145dc..236c33483f 100644
--- a/hpxml-measures/HPXMLtoOpenStudio/resources/data/g_functions/L_configurations_5m_v1.0.json
+++ b/hpxml-measures/HPXMLtoOpenStudio/resources/data/g_functions/L_configurations_5m_v1.0.json
@@ -1454,5 +1454,1165 @@
2.275,
3.003
]
+ },
+ "6_6": {
+ "bore_locations": [
+ [
+ 0.0,
+ 0.0
+ ],
+ [
+ 5.0,
+ 0.0
+ ],
+ [
+ 10.0,
+ 0.0
+ ],
+ [
+ 15.0,
+ 0.0
+ ],
+ [
+ 20.0,
+ 0.0
+ ],
+ [
+ 25.0,
+ 0.0
+ ],
+ [
+ 0.0,
+ 25.0
+ ],
+ [
+ 0.0,
+ 5.0
+ ],
+ [
+ 0.0,
+ 10.0
+ ],
+ [
+ 0.0,
+ 15.0
+ ],
+ [
+ 0.0,
+ 20.0
+ ]
+ ],
+ "g": {
+ "5._192._0.08": [
+ 2.8351669577621674,
+ 3.1871192193948676,
+ 3.521147030588981,
+ 4.023365855809394,
+ 4.606310532051615,
+ 5.525154590156437,
+ 6.772940468158832,
+ 7.999806022714185,
+ 9.941598757751711,
+ 11.242662884163058,
+ 12.211544315706782,
+ 13.607906136045528,
+ 14.59263935206886,
+ 16.824091879097892,
+ 18.72312660757386,
+ 19.24335397415481,
+ 19.708619004058914,
+ 20.160401851536292,
+ 20.509208190057848,
+ 20.806947482446287,
+ 21.06245207261176,
+ 21.27558489730093,
+ 21.434393969024875,
+ 21.61542069542917,
+ 21.739005847415658,
+ 21.799676794051173,
+ 21.898040686672307
+ ],
+ "5._24._0.075": [
+ 0.8740059532267964,
+ 1.1958031759615428,
+ 1.4813847491413066,
+ 1.819821321700434,
+ 2.1114679242247285,
+ 2.4511928331436965,
+ 2.7884196221623285,
+ 3.044991496174073,
+ 3.3877527097132196,
+ 3.6160726391301234,
+ 3.7996273738513993,
+ 4.098019465268857,
+ 4.339022209371263,
+ 5.026107217697417,
+ 5.8440414428390755,
+ 6.12496204455322,
+ 6.406693192418688,
+ 6.7134419933778755,
+ 6.978744364157664,
+ 7.2272648406681945,
+ 7.460965845398456,
+ 7.672921351394197,
+ 7.841682627848078,
+ 8.046915876111084,
+ 8.195645774770457,
+ 8.271694307563981,
+ 8.399463961773895
+ ],
+ "5._384._0.0875": [
+ 3.4908602709826084,
+ 4.0170070627462415,
+ 4.630417814857196,
+ 5.600826537631196,
+ 6.712894335293744,
+ 8.412784240039514,
+ 10.585898349981383,
+ 12.534925378833286,
+ 15.261716518050669,
+ 16.89842738522324,
+ 18.045140324557863,
+ 19.615586697432747,
+ 20.680204821488207,
+ 23.00696807464605,
+ 24.93573195105683,
+ 25.459015695729356,
+ 25.927119645774955,
+ 26.381384192582434,
+ 26.732414022325983,
+ 27.032040016138804,
+ 27.289490757228663,
+ 27.50455465452447,
+ 27.66485590067734,
+ 27.847836732142586,
+ 27.972723477401907,
+ 28.033980567026,
+ 28.133174527050837
+ ],
+ "5._48._0.075": [
+ 1.5268463243731416,
+ 1.867903705312546,
+ 2.1622431316564774,
+ 2.5060808689637466,
+ 2.8001345620605465,
+ 3.1432765700009027,
+ 3.511900157579732,
+ 3.8574036564334957,
+ 4.440887644389008,
+ 4.872355267997838,
+ 5.222739998030375,
+ 5.786151397567435,
+ 6.23375454128204,
+ 7.461544063755105,
+ 8.815056482358655,
+ 9.246689656701514,
+ 9.658149990958638,
+ 10.081305862476338,
+ 10.42477198168299,
+ 10.72821721038496,
+ 10.996609470756361,
+ 11.22581700371914,
+ 11.399115925681143,
+ 11.598748708885626,
+ 11.736397212995387,
+ 11.80451587427758,
+ 11.915623087673218
+ ],
+ "5._96._0.075": [
+ 2.2092718103274045,
+ 2.5553235630354045,
+ 2.8519144500274347,
+ 3.2002177206514753,
+ 3.5237862369213295,
+ 4.000750567092088,
+ 4.656992371761951,
+ 5.320529068038654,
+ 6.429256420354291,
+ 7.230505847415193,
+ 7.867261249100356,
+ 8.857381709996897,
+ 9.610988894823729,
+ 11.499131461832192,
+ 13.284176057911953,
+ 13.79691991061618,
+ 14.262664615342693,
+ 14.720695672941652,
+ 15.077691859446688,
+ 15.383946316603518,
+ 15.647759380058123,
+ 15.86829371610848,
+ 16.032740186622522,
+ 16.220041339883917,
+ 16.347981997621094,
+ 16.41086759714324,
+ 16.512931200571227
+ ]
+ },
+ "logtime": [
+ -8.5,
+ -7.8,
+ -7.2,
+ -6.5,
+ -5.9,
+ -5.2,
+ -4.5,
+ -3.963,
+ -3.27,
+ -2.864,
+ -2.577,
+ -2.171,
+ -1.884,
+ -1.191,
+ -0.497,
+ -0.274,
+ -0.051,
+ 0.196,
+ 0.419,
+ 0.642,
+ 0.873,
+ 1.112,
+ 1.335,
+ 1.679,
+ 2.028,
+ 2.275,
+ 3.003
+ ]
+ },
+ "6_7": {
+ "bore_locations": [
+ [
+ 0.0,
+ 0.0
+ ],
+ [
+ 5.0,
+ 0.0
+ ],
+ [
+ 10.0,
+ 0.0
+ ],
+ [
+ 15.0,
+ 0.0
+ ],
+ [
+ 20.0,
+ 0.0
+ ],
+ [
+ 25.0,
+ 0.0
+ ],
+ [
+ 0.0,
+ 30.0
+ ],
+ [
+ 0.0,
+ 5.0
+ ],
+ [
+ 0.0,
+ 10.0
+ ],
+ [
+ 0.0,
+ 15.0
+ ],
+ [
+ 0.0,
+ 20.0
+ ],
+ [
+ 0.0,
+ 25.0
+ ]
+ ],
+ "g": {
+ "5._192._0.08": [
+ 2.8351674541297007,
+ 3.1871584837082296,
+ 3.521467875714243,
+ 4.024690528246597,
+ 4.60932106086417,
+ 5.53199678907741,
+ 6.7877876555928,
+ 8.026984463724029,
+ 10.005498181845848,
+ 11.347613660729422,
+ 12.356049524408961,
+ 13.821789488916195,
+ 14.86341765943353,
+ 17.241219584206274,
+ 19.2768696905655,
+ 19.835703865895972,
+ 20.335423205728716,
+ 20.820603769785155,
+ 21.194972439033418,
+ 21.514498434806388,
+ 21.788543739923107,
+ 22.01701194822389,
+ 22.187224575201558,
+ 22.3811725906848,
+ 22.51358757790876,
+ 22.578609361876232,
+ 22.684081830743065
+ ],
+ "5._24._0.075": [
+ 0.8740059532267963,
+ 1.1958031759615422,
+ 1.4813847491413066,
+ 1.8198213217004344,
+ 2.111467924224729,
+ 2.4511928331517985,
+ 2.788419736392089,
+ 3.044998511819466,
+ 3.387906687674658,
+ 3.616533793064507,
+ 3.800445433117961,
+ 4.099555699995611,
+ 4.341243678574233,
+ 5.030919447830196,
+ 5.853470286447782,
+ 6.136460861033366,
+ 6.420707940532027,
+ 6.730883619349902,
+ 7.00001584261999,
+ 7.253100434888668,
+ 7.492251961941022,
+ 7.710392550192761,
+ 7.885124647393239,
+ 8.09914526804845,
+ 8.255543892109015,
+ 8.336028955287762,
+ 8.472178479748992
+ ],
+ "5._384._0.0875": [
+ 3.4912645960454176,
+ 4.0185326914089385,
+ 4.6338018092406505,
+ 5.608489557785468,
+ 6.727825678096589,
+ 8.446379514094914,
+ 10.667443918550392,
+ 12.689510898055952,
+ 15.56167735597107,
+ 17.304928189905837,
+ 18.532529977255134,
+ 20.219187289391847,
+ 21.365180001445644,
+ 23.871799177779547,
+ 25.94945604760798,
+ 26.512982999180746,
+ 27.016756795847673,
+ 27.50537749907307,
+ 27.88266517174836,
+ 28.204648446084516,
+ 28.481163372136898,
+ 28.7120419515303,
+ 28.884116784656698,
+ 29.08048720880175,
+ 29.214522429809332,
+ 29.280279400657758,
+ 29.386803854240252
+ ],
+ "5._48._0.075": [
+ 1.5268463243731443,
+ 1.8679037053125465,
+ 2.1622431316564765,
+ 2.506080869002254,
+ 2.800134663979592,
+ 3.143293177931288,
+ 3.5121559747492137,
+ 3.858263995568316,
+ 4.4432824804795334,
+ 4.8762288820322635,
+ 5.228059505465403,
+ 5.79436056674996,
+ 6.2447972268361465,
+ 7.4841819102786795,
+ 8.862916861363173,
+ 9.30723519646787,
+ 9.733134448726311,
+ 10.173763060407977,
+ 10.533468185065612,
+ 10.852846514046604,
+ 11.136561563800761,
+ 11.379753751768554,
+ 11.564166191712337,
+ 11.777102103868563,
+ 11.924262686939475,
+ 11.997218030098983,
+ 12.11641933439241
+ ],
+ "5._96._0.075": [
+ 2.209271810327406,
+ 2.555323563196496,
+ 2.85191468249334,
+ 3.2002437486537096,
+ 3.524036839944555,
+ 4.001889919811996,
+ 4.660003088469863,
+ 5.326148539176631,
+ 6.441287410948285,
+ 7.2491339259521395,
+ 7.892985951806132,
+ 8.899024531216696,
+ 9.669952194169028,
+ 11.624145610431226,
+ 13.50242437173609,
+ 14.046906563553259,
+ 14.542925050440227,
+ 15.031898156994867,
+ 15.413581140699698,
+ 15.741384487181833,
+ 16.023898902601484,
+ 16.26010630015639,
+ 16.436275607162695,
+ 16.636887608642944,
+ 16.773959867479213,
+ 16.84136544824774,
+ 16.950839131218785
+ ]
+ },
+ "logtime": [
+ -8.5,
+ -7.8,
+ -7.2,
+ -6.5,
+ -5.9,
+ -5.2,
+ -4.5,
+ -3.963,
+ -3.27,
+ -2.864,
+ -2.577,
+ -2.171,
+ -1.884,
+ -1.191,
+ -0.497,
+ -0.274,
+ -0.051,
+ 0.196,
+ 0.419,
+ 0.642,
+ 0.873,
+ 1.112,
+ 1.335,
+ 1.679,
+ 2.028,
+ 2.275,
+ 3.003
+ ]
+ },
+ "7_7": {
+ "bore_locations": [
+ [
+ 0.0,
+ 0.0
+ ],
+ [
+ 5.0,
+ 0.0
+ ],
+ [
+ 10.0,
+ 0.0
+ ],
+ [
+ 15.0,
+ 0.0
+ ],
+ [
+ 20.0,
+ 0.0
+ ],
+ [
+ 25.0,
+ 0.0
+ ],
+ [
+ 30.0,
+ 0.0
+ ],
+ [
+ 0.0,
+ 30.0
+ ],
+ [
+ 0.0,
+ 5.0
+ ],
+ [
+ 0.0,
+ 10.0
+ ],
+ [
+ 0.0,
+ 15.0
+ ],
+ [
+ 0.0,
+ 20.0
+ ],
+ [
+ 0.0,
+ 25.0
+ ]
+ ],
+ "g": {
+ "5._192._0.08": [
+ 2.8351678741331408,
+ 3.187191707390499,
+ 3.5217393669350403,
+ 4.025811676169003,
+ 4.611870227751412,
+ 5.537795800759848,
+ 6.800389806904333,
+ 8.050103893727178,
+ 10.060518681995276,
+ 11.439331700310404,
+ 12.483833908945316,
+ 14.014003956157548,
+ 15.10930713116249,
+ 17.627377615910415,
+ 19.795674228689204,
+ 20.39216640709663,
+ 20.925495749111512,
+ 21.44325179789237,
+ 21.84252487835766,
+ 22.18326864249084,
+ 22.475348452119107,
+ 22.71871495714622,
+ 22.900001535713283,
+ 23.106486431447557,
+ 23.247468918081278,
+ 23.3167142037632,
+ 23.429094647958564
+ ],
+ "5._24._0.075": [
+ 0.8740059532267966,
+ 1.1958031759615426,
+ 1.4813847491413075,
+ 1.8198213217004346,
+ 2.1114679242247294,
+ 2.4511928331586534,
+ 2.788419833048036,
+ 3.04500444813516,
+ 3.3880369775318377,
+ 3.6169240140272114,
+ 3.801137698038686,
+ 4.100855923503154,
+ 4.343124215308052,
+ 5.034996335647229,
+ 5.861467073224896,
+ 6.146216583619697,
+ 6.432604703023703,
+ 6.745705834033391,
+ 7.018127675806529,
+ 7.2751681070976195,
+ 7.519100808921399,
+ 7.742743770569414,
+ 7.92286379238192,
+ 8.144945847441775,
+ 8.30850930604894,
+ 8.393195751397345,
+ 8.537396571116023
+ ],
+ "5._384._0.0875": [
+ 3.4916067904149446,
+ 4.0198240827369105,
+ 4.636667597094648,
+ 5.614985561635049,
+ 6.740499153589884,
+ 8.47500066083408,
+ 10.738027548238248,
+ 12.826219249426686,
+ 15.834315054525572,
+ 17.679396178855754,
+ 18.985112639474284,
+ 20.7847797915105,
+ 22.010294964509136,
+ 24.693092419105408,
+ 26.916657795485126,
+ 27.519604546628347,
+ 28.058275456033517,
+ 28.58047328972315,
+ 28.98338339028888,
+ 29.3271743610351,
+ 29.62226449967323,
+ 29.86853700773221,
+ 30.052070056871234,
+ 30.261465122893284,
+ 30.404400514360496,
+ 30.474536758089577,
+ 30.588201152456218
+ ],
+ "5._48._0.075": [
+ 1.526846324373142,
+ 1.8679037053125447,
+ 2.1622431316564743,
+ 2.5060808690348386,
+ 2.800134750218784,
+ 3.143307230798961,
+ 3.5123724390424402,
+ 3.8589920639929276,
+ 4.445310004625549,
+ 4.879509520419286,
+ 5.232566043481965,
+ 5.8013193407345,
+ 6.254162521274261,
+ 7.5034304938862295,
+ 8.904070051204977,
+ 9.359672930154753,
+ 9.798590671706775,
+ 10.255184720943424,
+ 10.629921455860037,
+ 10.96420757552041,
+ 11.262396807508665,
+ 11.518907769309955,
+ 11.713972451944851,
+ 11.939728327815141,
+ 12.096098583996236,
+ 12.173752831431834,
+ 12.300842914556565
+ ],
+ "5._96._0.075": [
+ 2.2092718103274045,
+ 2.555323563332807,
+ 2.8519148791952587,
+ 3.2002657723579087,
+ 3.524248892192482,
+ 4.002854171379256,
+ 4.662552459852595,
+ 5.3309097455331615,
+ 6.451494118386653,
+ 7.264953503884768,
+ 7.914864471522974,
+ 8.934629531834318,
+ 9.720735758857101,
+ 11.734503885932972,
+ 13.69993518949301,
+ 14.274643255647991,
+ 14.799685476755629,
+ 15.31848007096448,
+ 15.724041144730029,
+ 16.072737335057095,
+ 16.37340624543421,
+ 16.624835721334396,
+ 16.812392922711286,
+ 17.02592878358431,
+ 17.17186969029452,
+ 17.243668646431907,
+ 17.360353967402094
+ ]
+ },
+ "logtime": [
+ -8.5,
+ -7.8,
+ -7.2,
+ -6.5,
+ -5.9,
+ -5.2,
+ -4.5,
+ -3.963,
+ -3.27,
+ -2.864,
+ -2.577,
+ -2.171,
+ -1.884,
+ -1.191,
+ -0.497,
+ -0.274,
+ -0.051,
+ 0.196,
+ 0.419,
+ 0.642,
+ 0.873,
+ 1.112,
+ 1.335,
+ 1.679,
+ 2.028,
+ 2.275,
+ 3.003
+ ]
+ },
+ "7_8": {
+ "bore_locations": [
+ [
+ 0.0,
+ 0.0
+ ],
+ [
+ 5.0,
+ 0.0
+ ],
+ [
+ 10.0,
+ 0.0
+ ],
+ [
+ 15.0,
+ 0.0
+ ],
+ [
+ 20.0,
+ 0.0
+ ],
+ [
+ 25.0,
+ 0.0
+ ],
+ [
+ 30.0,
+ 0.0
+ ],
+ [
+ 0.0,
+ 35.0
+ ],
+ [
+ 0.0,
+ 5.0
+ ],
+ [
+ 0.0,
+ 10.0
+ ],
+ [
+ 0.0,
+ 15.0
+ ],
+ [
+ 0.0,
+ 20.0
+ ],
+ [
+ 0.0,
+ 25.0
+ ],
+ [
+ 0.0,
+ 30.0
+ ]
+ ],
+ "g": {
+ "5._192._0.08": [
+ 2.8351682341361855,
+ 3.187220184856156,
+ 3.5219720787183877,
+ 4.026772858050683,
+ 4.614056539485514,
+ 5.542773521440582,
+ 6.811203287457257,
+ 8.069414727921231,
+ 10.103576179679171,
+ 11.510295415355422,
+ 12.583437540144077,
+ 14.167247878710658,
+ 15.309198251117595,
+ 17.95492144962361,
+ 20.249112015064615,
+ 20.881939794493764,
+ 21.44783409647677,
+ 21.99724844059008,
+ 22.420756948448904,
+ 22.7821686334302,
+ 23.091815859906024,
+ 23.349689816981904,
+ 23.541760100580202,
+ 23.760446616906343,
+ 23.909770955100438,
+ 23.98313157743104,
+ 24.102251513683864
+ ],
+ "5._24._0.075": [
+ 0.8740059532267968,
+ 1.1958031759615424,
+ 1.481384749141307,
+ 1.8198213217004346,
+ 2.1114679242247285,
+ 2.451192833164529,
+ 2.7884199158959913,
+ 3.0450095364060186,
+ 3.388148655145353,
+ 3.6172584991974457,
+ 3.801731112423456,
+ 4.101970643489091,
+ 4.344736711178724,
+ 5.038494495104595,
+ 5.868332109952828,
+ 6.154558103237766,
+ 6.442682539800378,
+ 6.7580519672796315,
+ 7.032921135333978,
+ 7.292843671742878,
+ 7.540269390565717,
+ 7.768019362025459,
+ 7.952286907185381,
+ 8.180847089088838,
+ 8.350476236087774,
+ 8.438862993751396,
+ 8.59046257974105
+ ],
+ "5._384._0.0875": [
+ 3.4919001532692104,
+ 4.020931336123524,
+ 4.639125744997634,
+ 5.6205627367161295,
+ 6.751374739521936,
+ 8.4986297024,
+ 10.792866047486049,
+ 12.932736288395224,
+ 16.056040110321923,
+ 17.992653827204652,
+ 19.370580645048655,
+ 21.276872326409098,
+ 22.578562184165012,
+ 25.4321049958891,
+ 27.798185927943283,
+ 28.43972669421086,
+ 29.01253937318256,
+ 29.567569480904933,
+ 29.99550056590794,
+ 30.360581401828597,
+ 30.6737858240776,
+ 30.935054490568703,
+ 31.129747101096562,
+ 31.351819316385402,
+ 31.50341826993212,
+ 31.577819009734828,
+ 31.698442453194886
+ ],
+ "5._48._0.075": [
+ 1.5268463243731418,
+ 1.8679037053125451,
+ 2.162243131656475,
+ 2.5060808690627714,
+ 2.800134824138092,
+ 3.1433192761166664,
+ 3.5125579825000632,
+ 3.8596161876972586,
+ 4.4470487033089485,
+ 4.882323661596086,
+ 5.236432740978537,
+ 5.807292388657001,
+ 6.26219163003932,
+ 7.519507205269493,
+ 8.936312198781886,
+ 9.400361408283022,
+ 9.8493153932292,
+ 10.31863216725119,
+ 10.7057834014931,
+ 11.052758205217117,
+ 11.36362061560754,
+ 11.632093040606524,
+ 11.836927553400882,
+ 12.074676083954314,
+ 12.23981468602377,
+ 12.321993142409417,
+ 12.45675675014932
+ ],
+ "5._96._0.075": [
+ 2.2092718103274054,
+ 2.5553235634496403,
+ 2.851915047796906,
+ 3.200284649825947,
+ 3.5244306538419785,
+ 4.003680806907409,
+ 4.664738980199499,
+ 5.334995417159499,
+ 6.460259492544648,
+ 7.278392344131289,
+ 7.933061265980362,
+ 8.963082797216538,
+ 9.760389799467758,
+ 11.820334565618644,
+ 13.859810303508882,
+ 14.46161354105922,
+ 15.013175369543214,
+ 15.559691648473956,
+ 15.987758812412714,
+ 16.356344092969824,
+ 16.674428418523213,
+ 16.940543915687222,
+ 17.139129278825152,
+ 17.365215120362112,
+ 17.519793092048044,
+ 17.595881410378173,
+ 17.719625403285182
+ ]
+ },
+ "logtime": [
+ -8.5,
+ -7.8,
+ -7.2,
+ -6.5,
+ -5.9,
+ -5.2,
+ -4.5,
+ -3.963,
+ -3.27,
+ -2.864,
+ -2.577,
+ -2.171,
+ -1.884,
+ -1.191,
+ -0.497,
+ -0.274,
+ -0.051,
+ 0.196,
+ 0.419,
+ 0.642,
+ 0.873,
+ 1.112,
+ 1.335,
+ 1.679,
+ 2.028,
+ 2.275,
+ 3.003
+ ]
+ },
+ "8_8": {
+ "bore_locations": [
+ [
+ 0.0,
+ 0.0
+ ],
+ [
+ 5.0,
+ 0.0
+ ],
+ [
+ 10.0,
+ 0.0
+ ],
+ [
+ 15.0,
+ 0.0
+ ],
+ [
+ 20.0,
+ 0.0
+ ],
+ [
+ 25.0,
+ 0.0
+ ],
+ [
+ 30.0,
+ 0.0
+ ],
+ [
+ 35.0,
+ 0.0
+ ],
+ [
+ 0.0,
+ 35.0
+ ],
+ [
+ 0.0,
+ 5.0
+ ],
+ [
+ 0.0,
+ 10.0
+ ],
+ [
+ 0.0,
+ 15.0
+ ],
+ [
+ 0.0,
+ 20.0
+ ],
+ [
+ 0.0,
+ 25.0
+ ],
+ [
+ 0.0,
+ 30.0
+ ]
+ ],
+ "g": {
+ "5._192._0.08": [
+ 2.8351685461388922,
+ 3.1872448653441046,
+ 3.5221737660142614,
+ 4.027606030181595,
+ 4.615952322949999,
+ 5.5470927177823715,
+ 6.820596361079991,
+ 8.086209354909053,
+ 10.141220151073613,
+ 11.572903974323399,
+ 12.672099968778154,
+ 14.305545778810774,
+ 15.491334887906024,
+ 18.259064305109362,
+ 20.675401687937203,
+ 21.34368796711487,
+ 21.941384425965765,
+ 22.521725455882947,
+ 22.96889146692319,
+ 23.350472787641145,
+ 23.677246025133087,
+ 23.9492472349288,
+ 24.151814214535577,
+ 24.382367588447913,
+ 24.539805190571496,
+ 24.61717021371193,
+ 24.74285498007454
+ ],
+ "5._24._0.075": [
+ 0.8740059532267966,
+ 1.1958031759615428,
+ 1.4813847491413066,
+ 1.8198213217004349,
+ 2.1114679242247285,
+ 2.4511928331696193,
+ 2.7884199876975537,
+ 3.0450139462409593,
+ 3.388245442853238,
+ 3.6175483938560546,
+ 3.802245438082671,
+ 4.102936915382072,
+ 4.346134661137425,
+ 5.04152896491717,
+ 5.8742919477567535,
+ 6.161801465573428,
+ 6.451436361901954,
+ 6.768781042726465,
+ 7.0457856869241775,
+ 7.308232922537122,
+ 7.55873945745347,
+ 7.790147684034378,
+ 7.978152254300947,
+ 8.212636122581966,
+ 8.38791058880643,
+ 8.47978899162525,
+ 8.638481366102813
+ ],
+ "5._384._0.0875": [
+ 3.4921544409544243,
+ 4.021891214565334,
+ 4.6412574538933455,
+ 5.625402803736955,
+ 6.760821707361557,
+ 8.519195032993032,
+ 10.8409495709237,
+ 13.027540272557085,
+ 16.25816634735268,
+ 18.281938878297797,
+ 19.72938030850207,
+ 21.739136759891217,
+ 23.115176668272447,
+ 26.135970237454863,
+ 28.64185049006609,
+ 29.321247835138585,
+ 29.927512569546746,
+ 30.51468131163631,
+ 30.967067882794463,
+ 31.352949169702576,
+ 31.683832245261772,
+ 31.959722084226694,
+ 32.165293011697415,
+ 32.39971681646143,
+ 32.559757699614444,
+ 32.63831524896758,
+ 32.76572762947959
+ ],
+ "5._48._0.075": [
+ 1.526846324373142,
+ 1.8679037053125458,
+ 2.1622431316564743,
+ 2.506080869086975,
+ 2.8001348882014896,
+ 3.143329715393923,
+ 3.5127187887973923,
+ 3.860157143486089,
+ 4.448556188720182,
+ 4.884764201999348,
+ 5.239786836323668,
+ 5.812475893417731,
+ 6.269161919760104,
+ 7.533484988795871,
+ 8.964476388352217,
+ 9.436049715136697,
+ 9.894041905844931,
+ 10.374951717197131,
+ 10.773554270443514,
+ 11.132357607293374,
+ 11.455151149100365,
+ 11.734984980991626,
+ 11.94916702245452,
+ 12.19846625232726,
+ 12.372100127776749,
+ 12.458679876360874,
+ 12.600937288947105
+ ],
+ "5._96._0.075": [
+ 2.209271810327403,
+ 2.555323563550898,
+ 2.8519151939183285,
+ 3.200301010303689,
+ 3.524588182531192,
+ 4.0043973245734135,
+ 4.666634969400773,
+ 5.33853975735726,
+ 6.46787073394971,
+ 7.2900695834709275,
+ 7.948883099273448,
+ 8.987873434146048,
+ 9.79505757461392,
+ 11.896628376351398,
+ 14.005086244566991,
+ 14.632615246019379,
+ 15.209540448563363,
+ 15.782731889543017,
+ 16.23255543583157,
+ 16.620428443115866,
+ 16.955436147743722,
+ 17.23583941267996,
+ 17.445160421228646,
+ 17.68346208881406,
+ 17.84645101445486,
+ 17.92672019451066,
+ 18.05735326954899
+ ]
+ },
+ "logtime": [
+ -8.5,
+ -7.8,
+ -7.2,
+ -6.5,
+ -5.9,
+ -5.2,
+ -4.5,
+ -3.963,
+ -3.27,
+ -2.864,
+ -2.577,
+ -2.171,
+ -1.884,
+ -1.191,
+ -0.497,
+ -0.274,
+ -0.051,
+ 0.196,
+ 0.419,
+ 0.642,
+ 0.873,
+ 1.112,
+ 1.335,
+ 1.679,
+ 2.028,
+ 2.275,
+ 3.003
+ ]
}
}
\ No newline at end of file
diff --git a/hpxml-measures/HPXMLtoOpenStudio/resources/data/g_functions/LopU_configurations_5m_v1.0.json b/hpxml-measures/HPXMLtoOpenStudio/resources/data/g_functions/LopU_configurations_5m_v1.0.json
index 569b31f812..fe8e1d3fc1 100644
--- a/hpxml-measures/HPXMLtoOpenStudio/resources/data/g_functions/LopU_configurations_5m_v1.0.json
+++ b/hpxml-measures/HPXMLtoOpenStudio/resources/data/g_functions/LopU_configurations_5m_v1.0.json
@@ -1066,5 +1066,1173 @@
3.003
]
}
+ },
+ "4_5": {
+ "1": {
+ "bore_locations": [
+ [
+ 0.0,
+ 0.0
+ ],
+ [
+ 5.0,
+ 0.0
+ ],
+ [
+ 10.0,
+ 0.0
+ ],
+ [
+ 15.0,
+ 0.0
+ ],
+ [
+ 15.0,
+ 5.0
+ ],
+ [
+ 15.0,
+ 10.0
+ ],
+ [
+ 15.0,
+ 15.0
+ ],
+ [
+ 0.0,
+ 20.0
+ ],
+ [
+ 0.0,
+ 5.0
+ ],
+ [
+ 0.0,
+ 10.0
+ ],
+ [
+ 0.0,
+ 15.0
+ ]
+ ],
+ "g": {
+ "5._192._0.08": [
+ 2.8351669594995696,
+ 3.1871255135651895,
+ 3.521450763630739,
+ 4.027440927131935,
+ 4.622901064505621,
+ 5.590842323594143,
+ 6.994013251503387,
+ 8.440417815809157,
+ 10.728184854157313,
+ 12.214306632006716,
+ 13.292549745887117,
+ 14.80816776521213,
+ 15.853513199927047,
+ 18.168200857384697,
+ 20.099784066308047,
+ 20.625001327106478,
+ 21.09399959055764,
+ 21.548853866921366,
+ 21.899853567786867,
+ 22.199376563300056,
+ 22.456438843198356,
+ 22.670932167342954,
+ 22.83077815451506,
+ 23.0130704568225,
+ 23.137526387217555,
+ 23.19861671795847,
+ 23.297635289834563
+ ],
+ "5._24._0.075": [
+ 0.8740059532267964,
+ 1.1958031759615428,
+ 1.4813847491413066,
+ 1.819821321700434,
+ 2.1114679242247285,
+ 2.451192833143696,
+ 2.78841962227144,
+ 3.0449917616272018,
+ 3.3878349676301713,
+ 3.616701375947365,
+ 3.801447409704434,
+ 4.103722699832003,
+ 4.349851754894547,
+ 5.066561474113735,
+ 5.971024315259826,
+ 6.2955218819689645,
+ 6.62582828289826,
+ 6.9882906596436865,
+ 7.30163597242899,
+ 7.592950879193618,
+ 7.863343356618984,
+ 8.104295595873035,
+ 8.292390753883636,
+ 8.515662382368468,
+ 8.673235627317126,
+ 8.752330139054957,
+ 8.882718003075793
+ ],
+ "5._384._0.0875": [
+ 3.4913178637505475,
+ 4.022181073829324,
+ 4.650368377493574,
+ 5.679273898695907,
+ 6.934048801514182,
+ 8.942879221488022,
+ 11.489485114208524,
+ 13.684995808311337,
+ 16.62944860524694,
+ 18.344229320003887,
+ 19.52898140146531,
+ 21.13567017703279,
+ 22.217371498825415,
+ 24.569254502705515,
+ 26.51258654834882,
+ 27.039341438027172,
+ 27.510770170273112,
+ 27.968408466397904,
+ 28.322269114374457,
+ 28.624373254589987,
+ 28.884097145454795,
+ 29.10117967968234,
+ 29.263019527746835,
+ 29.447835148184783,
+ 29.5739852640785,
+ 29.635856995184252,
+ 29.73602027391017
+ ],
+ "5._48._0.075": [
+ 1.5268463243731416,
+ 1.867903705312546,
+ 2.1622431316564774,
+ 2.5060808689637466,
+ 2.800134562146767,
+ 3.143277867155833,
+ 3.5121044816704936,
+ 3.8593228688016947,
+ 4.4525539637029485,
+ 4.898703068591462,
+ 5.26838558887342,
+ 5.881864911229149,
+ 6.3870005881946526,
+ 7.8263540122829225,
+ 9.412926489035238,
+ 9.9048563976805,
+ 10.36562493821697,
+ 10.83047667908275,
+ 11.20084087218063,
+ 11.522844256185813,
+ 11.80358597118042,
+ 12.040355409554644,
+ 12.217672829146709,
+ 12.42013260243858,
+ 12.558710792834725,
+ 12.626965836083905,
+ 12.73785532838156
+ ],
+ "5._96._0.075": [
+ 2.2092718103274045,
+ 2.5553235630354045,
+ 2.8519144504397986,
+ 3.200220676151204,
+ 3.523980108850833,
+ 4.003890726776593,
+ 4.6737315111805815,
+ 5.368629519144982,
+ 6.595906981770949,
+ 7.528573477316917,
+ 8.282223236150426,
+ 9.45367860913557,
+ 10.332264553318971,
+ 12.458704367017562,
+ 14.368556747552583,
+ 14.902671587749616,
+ 15.382706738935145,
+ 15.850985855448844,
+ 16.213657057920507,
+ 16.523527691355074,
+ 16.7895865650334,
+ 17.01148425955976,
+ 17.176729811423197,
+ 17.364776703032707,
+ 17.4930992608774,
+ 17.556120493846507,
+ 17.6583368081961
+ ]
+ },
+ "logtime": [
+ -8.5,
+ -7.8,
+ -7.2,
+ -6.5,
+ -5.9,
+ -5.2,
+ -4.5,
+ -3.963,
+ -3.27,
+ -2.864,
+ -2.577,
+ -2.171,
+ -1.884,
+ -1.191,
+ -0.497,
+ -0.274,
+ -0.051,
+ 0.196,
+ 0.419,
+ 0.642,
+ 0.873,
+ 1.112,
+ 1.335,
+ 1.679,
+ 2.028,
+ 2.275,
+ 3.003
+ ]
+ }
+ },
+ "5_5": {
+ "1": {
+ "bore_locations": [
+ [
+ 0.0,
+ 0.0
+ ],
+ [
+ 5.0,
+ 0.0
+ ],
+ [
+ 10.0,
+ 0.0
+ ],
+ [
+ 15.0,
+ 0.0
+ ],
+ [
+ 20.0,
+ 0.0
+ ],
+ [
+ 20.0,
+ 5.0
+ ],
+ [
+ 20.0,
+ 10.0
+ ],
+ [
+ 20.0,
+ 15.0
+ ],
+ [
+ 0.0,
+ 20.0
+ ],
+ [
+ 0.0,
+ 5.0
+ ],
+ [
+ 0.0,
+ 10.0
+ ],
+ [
+ 0.0,
+ 15.0
+ ]
+ ],
+ "g": {
+ "5._192._0.08": [
+ 2.835167455722319,
+ 3.187164253368534,
+ 3.521746301971919,
+ 4.02842259309182,
+ 4.624013567123641,
+ 5.579319157812532,
+ 6.922783553411615,
+ 8.30414112276388,
+ 10.554443202049557,
+ 12.06361508854351,
+ 13.177921176937739,
+ 14.765632203836812,
+ 15.871826450723033,
+ 18.340824841472102,
+ 20.411603551648323,
+ 20.975486018186274,
+ 21.478663014973144,
+ 21.96643372840536,
+ 22.3424675968339,
+ 22.66326344442359,
+ 22.938356315678803,
+ 23.167711416791423,
+ 23.338592472919593,
+ 23.533362283094895,
+ 23.666336688660117,
+ 23.731623767556734,
+ 23.837504151333466
+ ],
+ "5._24._0.075": [
+ 0.8740059532267963,
+ 1.1958031759615422,
+ 1.4813847491413066,
+ 1.8198213217004344,
+ 2.111467924224729,
+ 2.451192833151798,
+ 2.788419736492105,
+ 3.044998755151511,
+ 3.38798209104026,
+ 3.6171101408252784,
+ 3.8021136320949265,
+ 4.104765706456737,
+ 4.350995421159938,
+ 5.061942067728306,
+ 5.933232821892606,
+ 6.241751214747318,
+ 6.556412784504264,
+ 6.904378380097925,
+ 7.208806222027389,
+ 7.4957016563551795,
+ 7.765888175193149,
+ 8.010191791482212,
+ 8.203403906169012,
+ 8.435769851711482,
+ 8.60175359267224,
+ 8.685723191597464,
+ 8.825143413862401
+ ],
+ "5._384._0.0875": [
+ 3.491684146271643,
+ 4.023267111208729,
+ 4.651218691924928,
+ 5.663199686840241,
+ 6.862873689564256,
+ 8.786686976394648,
+ 11.313314244573547,
+ 13.567098650887633,
+ 16.663586156894397,
+ 18.491668382321397,
+ 19.761273935281313,
+ 21.487952651753982,
+ 22.652525290823707,
+ 25.184527304797125,
+ 27.27476150099981,
+ 27.840973062010548,
+ 28.34727754587184,
+ 28.838427228024507,
+ 29.217834027103176,
+ 29.541672065568456,
+ 29.81989947502766,
+ 30.05231053947457,
+ 30.225558308779714,
+ 30.42333879464964,
+ 30.558347490002983,
+ 30.624578008020414,
+ 30.73184808075906
+ ],
+ "5._48._0.075": [
+ 1.5268463243731443,
+ 1.8679037053125465,
+ 2.1622431316564765,
+ 2.506080869002253,
+ 2.800134664058629,
+ 3.143294366990227,
+ 3.51234327385534,
+ 3.8600231658561306,
+ 4.453787470096188,
+ 4.898329994233693,
+ 5.262935242511851,
+ 5.857856131234189,
+ 6.340376143296084,
+ 7.714029489979712,
+ 9.276829700482844,
+ 9.775169208853415,
+ 10.247833630544632,
+ 10.730011223466859,
+ 11.117786051483273,
+ 11.457205304493733,
+ 11.754722085272638,
+ 12.00663999068362,
+ 12.19578675949656,
+ 12.412130414090651,
+ 12.560463886665968,
+ 12.633629076525532,
+ 12.752653332461575
+ ],
+ "5._96._0.075": [
+ 2.2092718103274054,
+ 2.555323563196496,
+ 2.8519146828713384,
+ 3.200246457862802,
+ 3.5242145576928374,
+ 4.0047672157277745,
+ 4.674798660925404,
+ 5.362837203747391,
+ 6.544736994292002,
+ 7.431727436375156,
+ 8.154078096982458,
+ 9.29660560124912,
+ 10.171668113181864,
+ 12.348366540431808,
+ 14.357056679222422,
+ 14.925150810738675,
+ 15.437160406302576,
+ 15.937663402796083,
+ 16.325676492284472,
+ 16.657399888535174,
+ 16.94221489033507,
+ 17.17967887180835,
+ 17.356491786631466,
+ 17.55757963988236,
+ 17.694807483887693,
+ 17.762225945191844,
+ 17.871641922257645
+ ]
+ },
+ "logtime": [
+ -8.5,
+ -7.8,
+ -7.2,
+ -6.5,
+ -5.9,
+ -5.2,
+ -4.5,
+ -3.963,
+ -3.27,
+ -2.864,
+ -2.577,
+ -2.171,
+ -1.884,
+ -1.191,
+ -0.497,
+ -0.274,
+ -0.051,
+ 0.196,
+ 0.419,
+ 0.642,
+ 0.873,
+ 1.112,
+ 1.335,
+ 1.679,
+ 2.028,
+ 2.275,
+ 3.003
+ ]
+ }
+ },
+ "5_6": {
+ "2": {
+ "bore_locations": [
+ [
+ 0.0,
+ 0.0
+ ],
+ [
+ 5.0,
+ 0.0
+ ],
+ [
+ 10.0,
+ 0.0
+ ],
+ [
+ 15.0,
+ 0.0
+ ],
+ [
+ 20.0,
+ 0.0
+ ],
+ [
+ 20.0,
+ 5.0
+ ],
+ [
+ 20.0,
+ 10.0
+ ],
+ [
+ 20.0,
+ 15.0
+ ],
+ [
+ 0.0,
+ 25.0
+ ],
+ [
+ 0.0,
+ 5.0
+ ],
+ [
+ 0.0,
+ 10.0
+ ],
+ [
+ 0.0,
+ 15.0
+ ],
+ [
+ 0.0,
+ 20.0
+ ]
+ ],
+ "g": {
+ "5._192._0.08": [
+ 2.8351678756032506,
+ 3.1871970332340482,
+ 3.5219963792700835,
+ 4.029257160982754,
+ 4.625438548537246,
+ 5.581571347639799,
+ 6.927350925287799,
+ 8.318967004935404,
+ 10.61726074208108,
+ 12.181584444884853,
+ 13.346896336145143,
+ 15.019364851073014,
+ 16.191463662557055,
+ 18.81976961997921,
+ 21.030718679525684,
+ 21.63325729910961,
+ 22.170631839438595,
+ 22.691331843073993,
+ 23.092428564754517,
+ 23.434532893673673,
+ 23.727710015211958,
+ 23.971994134396812,
+ 24.153970486307404,
+ 24.36130746963971,
+ 24.502867655031217,
+ 24.572384940428588,
+ 24.685180403460368
+ ],
+ "5._24._0.075": [
+ 0.8740059532267966,
+ 1.1958031759615426,
+ 1.4813847491413075,
+ 1.8198213217004346,
+ 2.1114679242247294,
+ 2.451192833158654,
+ 2.788419833140358,
+ 3.0450046727493625,
+ 3.388106580854145,
+ 3.6174560345834403,
+ 3.802677631579794,
+ 4.105665799985949,
+ 4.352128060885872,
+ 5.063667703036873,
+ 5.935960480877939,
+ 6.245434944168357,
+ 6.561932881433218,
+ 6.913361290614929,
+ 7.222473823664502,
+ 7.5154686757359785,
+ 7.7931419029978155,
+ 8.0458580018569,
+ 8.24694675099684,
+ 8.490335096308083,
+ 8.665321716612308,
+ 8.75424595386709,
+ 8.902527837573007
+ ],
+ "5._384._0.0875": [
+ 3.491994139892584,
+ 4.024195318040663,
+ 4.652753355922339,
+ 5.665633535025146,
+ 6.867449322109124,
+ 8.808383682344262,
+ 11.399292790333975,
+ 13.748942584532955,
+ 17.02003258036753,
+ 18.967253869639176,
+ 20.324139160359515,
+ 22.172782525519168,
+ 23.421026528956038,
+ 26.134372899160592,
+ 28.37244494134407,
+ 28.978381020843116,
+ 29.51985682418446,
+ 30.044842973641273,
+ 30.450089091603385,
+ 30.79592537366868,
+ 31.09290839015706,
+ 31.340879115251134,
+ 31.525713628546903,
+ 31.73667702900685,
+ 31.880695756693797,
+ 31.95135882186754,
+ 32.06585183732913
+ ],
+ "5._48._0.075": [
+ 1.526846324373142,
+ 1.8679037053125447,
+ 2.1622431316564743,
+ 2.5060808690348377,
+ 2.8001347502917406,
+ 3.143308328392027,
+ 3.512545332131492,
+ 3.8606160269006207,
+ 4.4550102671411045,
+ 4.89992311959612,
+ 5.264799716741715,
+ 5.860236970238653,
+ 6.343524048263206,
+ 7.7260674458265655,
+ 9.322110356265519,
+ 9.8376006411807,
+ 10.32934942169722,
+ 10.83377786672947,
+ 11.24135804369911,
+ 11.599439755208454,
+ 11.914222918480158,
+ 12.181338827225302,
+ 12.382199717087675,
+ 12.612145127316209,
+ 12.769960121166498,
+ 12.84787473255296,
+ 12.974747598901702
+ ],
+ "5._96._0.075": [
+ 2.2092718103274045,
+ 2.5553235633328066,
+ 2.8519148795441804,
+ 3.200268273167085,
+ 3.5244129407812252,
+ 4.005510438641588,
+ 4.676216177419605,
+ 5.364819980203309,
+ 6.5481814668384875,
+ 7.438958720784601,
+ 8.168170746921275,
+ 9.330656267082633,
+ 10.229230582041316,
+ 12.492940115095385,
+ 14.611783654253092,
+ 15.214921521950753,
+ 15.759391351776683,
+ 16.292252171150597,
+ 16.705520421007435,
+ 17.058959524649378,
+ 17.362365077340574,
+ 17.6152387529061,
+ 17.803501656388374,
+ 18.017508102460514,
+ 18.163558262044976,
+ 18.235332053681265,
+ 18.351880443348918
+ ]
+ },
+ "logtime": [
+ -8.5,
+ -7.8,
+ -7.2,
+ -6.5,
+ -5.9,
+ -5.2,
+ -4.5,
+ -3.963,
+ -3.27,
+ -2.864,
+ -2.577,
+ -2.171,
+ -1.884,
+ -1.191,
+ -0.497,
+ -0.274,
+ -0.051,
+ 0.196,
+ 0.419,
+ 0.642,
+ 0.873,
+ 1.112,
+ 1.335,
+ 1.679,
+ 2.028,
+ 2.275,
+ 3.003
+ ]
+ },
+ "1": {
+ "bore_locations": [
+ [
+ 0.0,
+ 0.0
+ ],
+ [
+ 5.0,
+ 0.0
+ ],
+ [
+ 10.0,
+ 0.0
+ ],
+ [
+ 15.0,
+ 0.0
+ ],
+ [
+ 20.0,
+ 0.0
+ ],
+ [
+ 20.0,
+ 5.0
+ ],
+ [
+ 20.0,
+ 10.0
+ ],
+ [
+ 20.0,
+ 15.0
+ ],
+ [
+ 20.0,
+ 20.0
+ ],
+ [
+ 0.0,
+ 25.0
+ ],
+ [
+ 0.0,
+ 5.0
+ ],
+ [
+ 0.0,
+ 10.0
+ ],
+ [
+ 0.0,
+ 15.0
+ ],
+ [
+ 0.0,
+ 20.0
+ ]
+ ],
+ "g": {
+ "5._192._0.08": [
+ 2.8351682355012886,
+ 3.187225130284913,
+ 3.522210735800777,
+ 4.029972636980602,
+ 4.626662181505097,
+ 5.583938756400645,
+ 6.939599135952784,
+ 8.362927810062262,
+ 10.758073687209887,
+ 12.40906930548783,
+ 13.645385331866027,
+ 15.425359374352006,
+ 16.67503327359461,
+ 19.47757311113583,
+ 21.832417948857323,
+ 22.473654392401116,
+ 23.044990856063357,
+ 23.598193970660724,
+ 24.02391100504954,
+ 24.38690373531101,
+ 24.697773197057018,
+ 24.956645591000978,
+ 25.149462107675248,
+ 25.369080906196686,
+ 25.519032398946276,
+ 25.592683998771186,
+ 25.712240863873955
+ ],
+ "5._24._0.075": [
+ 0.8740059532267968,
+ 1.1958031759615424,
+ 1.481384749141307,
+ 1.8198213217004346,
+ 2.1114679242247285,
+ 2.4511928331645287,
+ 2.7884199159817205,
+ 3.0450097449763542,
+ 3.3882132869733823,
+ 3.6177525240467596,
+ 3.803161096532597,
+ 4.106437474415144,
+ 4.3530996087156115,
+ 5.065290017489952,
+ 5.941790316464481,
+ 6.255352380129186,
+ 6.578083679703817,
+ 6.939081952639077,
+ 7.258992269782869,
+ 7.5642001311671585,
+ 7.855117453414467,
+ 8.12115992406773,
+ 8.333594647719876,
+ 8.591382265116815,
+ 8.777038368586869,
+ 8.871476028183224,
+ 9.029031542834336
+ ],
+ "5._384._0.0875": [
+ 3.492259892399763,
+ 4.02499114238111,
+ 4.654073599607541,
+ 5.668427031660625,
+ 6.8795594026155,
+ 8.869538628731533,
+ 11.580777218678778,
+ 14.0701885150277,
+ 17.55785178140429,
+ 19.639423609202826,
+ 21.090713535502868,
+ 23.067461220629113,
+ 24.401770536160623,
+ 27.298194663854584,
+ 29.683434626835076,
+ 30.328710420960675,
+ 30.905002703715166,
+ 31.463463788617563,
+ 31.894270677811072,
+ 32.26187123771363,
+ 32.57741835116797,
+ 32.840799184390114,
+ 33.03711457494162,
+ 33.261151468659136,
+ 33.414109246006305,
+ 33.48917052927063,
+ 33.61083135726327
+ ],
+ "5._48._0.075": [
+ 1.5268463243731418,
+ 1.8679037053125451,
+ 2.1622431316564747,
+ 2.5060808690627696,
+ 2.8001348242058373,
+ 3.14332029531039,
+ 3.512718527361398,
+ 3.8611242435521054,
+ 4.456059086160568,
+ 4.901311338151137,
+ 5.266573469928468,
+ 5.863738640325235,
+ 6.35063272743358,
+ 7.761563957952724,
+ 9.424027415281046,
+ 9.966779803933857,
+ 10.486414658866888,
+ 11.02081738279616,
+ 11.4533185323382,
+ 11.833574025391664,
+ 12.167895891947806,
+ 12.451494190703572,
+ 12.664638979784629,
+ 12.908396034003182,
+ 13.07558835536145,
+ 13.158125949299045,
+ 13.292541306388305
+ ],
+ "5._96._0.075": [
+ 2.2092718103274054,
+ 2.55532356344964,
+ 2.8519150481209032,
+ 3.2002869720065177,
+ 3.5245829858177253,
+ 4.006147581255396,
+ 4.677433646055923,
+ 5.366695022382107,
+ 6.555920264613102,
+ 7.460858869781202,
+ 8.209416593362795,
+ 9.415795314702303,
+ 10.35712627269337,
+ 12.74977455371266,
+ 15.002232798746181,
+ 15.644308587814747,
+ 16.223586593425996,
+ 16.790218753086712,
+ 17.229257768377447,
+ 17.604525135982243,
+ 17.926368927728767,
+ 18.19436539796486,
+ 18.393796232330292,
+ 18.620332489480738,
+ 18.774902531683512,
+ 18.850871361394987,
+ 18.974283136961482
+ ]
+ },
+ "logtime": [
+ -8.5,
+ -7.8,
+ -7.2,
+ -6.5,
+ -5.9,
+ -5.2,
+ -4.5,
+ -3.963,
+ -3.27,
+ -2.864,
+ -2.577,
+ -2.171,
+ -1.884,
+ -1.191,
+ -0.497,
+ -0.274,
+ -0.051,
+ 0.196,
+ 0.419,
+ 0.642,
+ 0.873,
+ 1.112,
+ 1.335,
+ 1.679,
+ 2.028,
+ 2.275,
+ 3.003
+ ]
+ }
+ },
+ "6_6": {
+ "1": {
+ "bore_locations": [
+ [
+ 0.0,
+ 0.0
+ ],
+ [
+ 5.0,
+ 0.0
+ ],
+ [
+ 10.0,
+ 0.0
+ ],
+ [
+ 15.0,
+ 0.0
+ ],
+ [
+ 20.0,
+ 0.0
+ ],
+ [
+ 25.0,
+ 0.0
+ ],
+ [
+ 25.0,
+ 5.0
+ ],
+ [
+ 25.0,
+ 10.0
+ ],
+ [
+ 25.0,
+ 15.0
+ ],
+ [
+ 25.0,
+ 20.0
+ ],
+ [
+ 0.0,
+ 25.0
+ ],
+ [
+ 0.0,
+ 5.0
+ ],
+ [
+ 0.0,
+ 10.0
+ ],
+ [
+ 0.0,
+ 15.0
+ ],
+ [
+ 0.0,
+ 20.0
+ ]
+ ],
+ "g": {
+ "5._192._0.08": [
+ 2.8351685474129877,
+ 3.1872494810797085,
+ 3.5223965148661844,
+ 4.030592811656449,
+ 4.627714361246171,
+ 5.584140222750663,
+ 6.918061687061552,
+ 8.290355577090926,
+ 10.610082119673034,
+ 12.244628402545722,
+ 13.48905336568867,
+ 15.3074520795651,
+ 16.599550563347986,
+ 19.52876103898667,
+ 22.009314786854148,
+ 22.6865092018802,
+ 23.289702737651364,
+ 23.873648515838408,
+ 24.32269866914527,
+ 24.705502830772286,
+ 25.033105894680233,
+ 25.305718454120736,
+ 25.50872247747098,
+ 25.739823951944064,
+ 25.89761460786285,
+ 25.975133842399586,
+ 26.1010358549801
+ ],
+ "5._24._0.075": [
+ 0.8740059532267966,
+ 1.1958031759615428,
+ 1.4813847491413066,
+ 1.8198213217004349,
+ 2.1114679242247285,
+ 2.4511928331696184,
+ 2.788419987777567,
+ 3.045014140906611,
+ 3.388305766031536,
+ 3.618009488375746,
+ 3.803580126959415,
+ 4.107106339047922,
+ 4.353940144973575,
+ 5.066087886458091,
+ 5.933132928810665,
+ 6.238207730715223,
+ 6.549862486975425,
+ 6.89708184384569,
+ 7.205092455007118,
+ 7.500540049255561,
+ 7.784673334424664,
+ 8.047494575048605,
+ 8.259906500253773,
+ 8.521280437622925,
+ 8.712254948445805,
+ 8.810346000761752,
+ 8.975546005165267
+ ],
+ "5._384._0.0875": [
+ 3.4924902440842334,
+ 4.025681002944053,
+ 4.65519760000662,
+ 5.667878936320498,
+ 6.8584047491212345,
+ 8.77585092097882,
+ 11.414550125624526,
+ 13.904004108851833,
+ 17.481960817629123,
+ 19.652415109417635,
+ 21.175935155401216,
+ 23.259810231923577,
+ 24.670308023726395,
+ 27.735125331270456,
+ 30.25869190995757,
+ 30.941138655171642,
+ 31.550146803945236,
+ 32.13993959408101,
+ 32.594503538059826,
+ 32.98228706724444,
+ 33.31494900309519,
+ 33.59245597228586,
+ 33.79927514282707,
+ 34.03522489602005,
+ 34.19632350028283,
+ 34.27539467752157,
+ 34.40361145943094
+ ],
+ "5._48._0.075": [
+ 1.526846324373142,
+ 1.8679037053125458,
+ 2.1622431316564743,
+ 2.506080869086975,
+ 2.800134888264721,
+ 3.1433306666415235,
+ 3.5128686317022493,
+ 3.861564735288435,
+ 4.4569666138242,
+ 4.90242107152987,
+ 5.267391343048841,
+ 5.86090294040104,
+ 6.339557581151294,
+ 7.7029822520230935,
+ 9.314357337639127,
+ 9.850480698544585,
+ 10.36952295025419,
+ 10.909483040664316,
+ 11.351169515513913,
+ 11.742796132124422,
+ 12.089583885487999,
+ 12.385446224483859,
+ 12.608696691195538,
+ 12.864817634520552,
+ 13.04095751355361,
+ 13.128084114846052,
+ 13.27021845572316
+ ],
+ "5._96._0.075": [
+ 2.209271810327403,
+ 2.5553235635508984,
+ 2.8519151942207284,
+ 3.2003031776727306,
+ 3.5247303599667292,
+ 4.006699841231027,
+ 4.6784793790260215,
+ 5.367571004857667,
+ 6.543782826656962,
+ 7.421467633844777,
+ 8.141580510969167,
+ 9.304802974817639,
+ 10.222525602077718,
+ 12.609709440561087,
+ 14.92379254624852,
+ 15.592660291861653,
+ 16.19877951181794,
+ 16.793582046994793,
+ 17.25540770111174,
+ 17.650615126381812,
+ 17.98975875069552,
+ 18.272201559087815,
+ 18.482392727366864,
+ 18.721061577717897,
+ 18.883937536313518,
+ 18.964022464863927,
+ 19.09420277513519
+ ]
+ },
+ "logtime": [
+ -8.5,
+ -7.8,
+ -7.2,
+ -6.5,
+ -5.9,
+ -5.2,
+ -4.5,
+ -3.963,
+ -3.27,
+ -2.864,
+ -2.577,
+ -2.171,
+ -1.884,
+ -1.191,
+ -0.497,
+ -0.274,
+ -0.051,
+ 0.196,
+ 0.419,
+ 0.642,
+ 0.873,
+ 1.112,
+ 1.335,
+ 1.679,
+ 2.028,
+ 2.275,
+ 3.003
+ ]
+ }
}
}
\ No newline at end of file
diff --git a/hpxml-measures/HPXMLtoOpenStudio/resources/data/g_functions/Open_configurations_5m_v1.0.json b/hpxml-measures/HPXMLtoOpenStudio/resources/data/g_functions/Open_configurations_5m_v1.0.json
index ad43563aa4..666c5c683d 100644
--- a/hpxml-measures/HPXMLtoOpenStudio/resources/data/g_functions/Open_configurations_5m_v1.0.json
+++ b/hpxml-measures/HPXMLtoOpenStudio/resources/data/g_functions/Open_configurations_5m_v1.0.json
@@ -434,5 +434,473 @@
3.003
]
}
+ },
+ "4_4": {
+ "1": {
+ "bore_locations": [
+ [
+ 0.0,
+ 0.0
+ ],
+ [
+ 0.0,
+ 15.0
+ ],
+ [
+ 5.0,
+ 0.0
+ ],
+ [
+ 5.0,
+ 15.0
+ ],
+ [
+ 10.0,
+ 0.0
+ ],
+ [
+ 10.0,
+ 15.0
+ ],
+ [
+ 15.0,
+ 0.0
+ ],
+ [
+ 15.0,
+ 15.0
+ ],
+ [
+ 0.0,
+ 5.0
+ ],
+ [
+ 15.0,
+ 5.0
+ ],
+ [
+ 0.0,
+ 10.0
+ ],
+ [
+ 15.0,
+ 10.0
+ ]
+ ],
+ "g": {
+ "5._192._0.08": [
+ 2.8351729205545935,
+ 3.187613472729638,
+ 3.5261116642188135,
+ 4.054253597390166,
+ 4.70242914864568,
+ 5.8086030113135525,
+ 7.467549516284039,
+ 9.173910326217955,
+ 11.817549620297518,
+ 13.50063752774223,
+ 14.708245124966707,
+ 16.390506424244155,
+ 17.542754332347926,
+ 20.076562667192977,
+ 22.17930066733775,
+ 22.74990326709019,
+ 23.259177076033392,
+ 23.752891128976884,
+ 24.133769674524423,
+ 24.458778473467625,
+ 24.737703371030964,
+ 24.9704461779962,
+ 25.14391178539724,
+ 25.341768285828188,
+ 25.47687046952432,
+ 25.543193094793875,
+ 25.650707779981367
+ ],
+ "5._24._0.075": [
+ 0.8740059532267963,
+ 1.1958031759615426,
+ 1.4813847491413068,
+ 1.8198213217004353,
+ 2.1114679242247276,
+ 2.451192833240911,
+ 2.7884209933194914,
+ 3.0450766572778396,
+ 3.389902139693359,
+ 3.623913486030334,
+ 3.8161259791525683,
+ 4.137388995029404,
+ 4.4051267851223574,
+ 5.214701703132842,
+ 6.276949476181331,
+ 6.660407431446878,
+ 7.049422589341101,
+ 7.473153414434007,
+ 7.836070348060081,
+ 8.170029988786352,
+ 8.476777753348607,
+ 8.747261338461222,
+ 8.956411097426855,
+ 9.202137045330364,
+ 9.37395002483599,
+ 9.459699491909076,
+ 9.600312664462594
+ ],
+ "5._384._0.0875": [
+ 3.4974014612635833,
+ 4.0543778177746645,
+ 4.742542311205488,
+ 5.925653912078285,
+ 7.411046933317475,
+ 9.777945928796772,
+ 12.707582672564504,
+ 15.18137338890359,
+ 18.44968333281755,
+ 20.336262258422025,
+ 21.634806948968798,
+ 23.391045748332242,
+ 24.57126459982887,
+ 27.13330643048112,
+ 29.248061666688077,
+ 29.821100755788592,
+ 30.333976575384245,
+ 30.83185682051092,
+ 31.216858652123662,
+ 31.545573045197322,
+ 31.828203059721602,
+ 32.064458178976366,
+ 32.24060869933254,
+ 32.4417938093029,
+ 32.57913099533268,
+ 32.646493139072525,
+ 32.75555033459801
+ ],
+ "5._48._0.075": [
+ 1.5268463243731443,
+ 1.8679037053125467,
+ 2.1622431316564783,
+ 2.506080869425859,
+ 2.8001357854052342,
+ 3.143480621708681,
+ 3.5157195599231095,
+ 3.8747798570388277,
+ 4.512229192124728,
+ 5.010413764679055,
+ 5.4337256554705515,
+ 6.151298086195742,
+ 6.7488452499404605,
+ 8.445309591581669,
+ 10.268274360411876,
+ 10.822950270217252,
+ 11.337592629263623,
+ 11.85269991856157,
+ 12.260211639281591,
+ 12.612677176675874,
+ 12.918533381258486,
+ 13.17548225828373,
+ 13.367423393448528,
+ 13.586035310552214,
+ 13.735408064577877,
+ 13.808908278883589,
+ 13.928255410057844
+ ],
+ "5._96._0.075": [
+ 2.209271810327404,
+ 2.5553235649685027,
+ 2.85191724113029,
+ 3.200540894404338,
+ 3.5275047266417947,
+ 4.025970191286226,
+ 4.753579891339415,
+ 5.543082335133833,
+ 6.987551562749769,
+ 8.092101425207474,
+ 8.9776988236641,
+ 10.337085958191386,
+ 11.342491130110483,
+ 13.731702648068135,
+ 15.836916503083607,
+ 16.420819154043382,
+ 16.943922157361797,
+ 17.453033126848272,
+ 17.846569813436922,
+ 18.1824859274211,
+ 18.470631174105463,
+ 18.71078748729027,
+ 18.889590015481595,
+ 19.093028010450833,
+ 19.231845509633082,
+ 19.30002062517405,
+ 19.41061394306638
+ ]
+ },
+ "logtime": [
+ -8.5,
+ -7.8,
+ -7.2,
+ -6.5,
+ -5.9,
+ -5.2,
+ -4.5,
+ -3.963,
+ -3.27,
+ -2.864,
+ -2.577,
+ -2.171,
+ -1.884,
+ -1.191,
+ -0.497,
+ -0.274,
+ -0.051,
+ 0.196,
+ 0.419,
+ 0.642,
+ 0.873,
+ 1.112,
+ 1.335,
+ 1.679,
+ 2.028,
+ 2.275,
+ 3.003
+ ]
+ }
+ },
+ "4_5": {
+ "1": {
+ "bore_locations": [
+ [
+ 0.0,
+ 0.0
+ ],
+ [
+ 0.0,
+ 20.0
+ ],
+ [
+ 5.0,
+ 0.0
+ ],
+ [
+ 5.0,
+ 20.0
+ ],
+ [
+ 10.0,
+ 0.0
+ ],
+ [
+ 10.0,
+ 20.0
+ ],
+ [
+ 15.0,
+ 0.0
+ ],
+ [
+ 15.0,
+ 20.0
+ ],
+ [
+ 0.0,
+ 5.0
+ ],
+ [
+ 15.0,
+ 5.0
+ ],
+ [
+ 0.0,
+ 10.0
+ ],
+ [
+ 15.0,
+ 10.0
+ ],
+ [
+ 0.0,
+ 15.0
+ ],
+ [
+ 15.0,
+ 15.0
+ ]
+ ],
+ "g": {
+ "5._192._0.08": [
+ 2.83517291964452,
+ 3.1876101757539033,
+ 3.525952533029806,
+ 4.05211363467208,
+ 4.6938069440163,
+ 5.78058550436625,
+ 7.420593520479523,
+ 9.159622018026033,
+ 11.965509667083033,
+ 13.807711943883904,
+ 15.149082048919817,
+ 17.037210672860628,
+ 18.340130310898758,
+ 21.217473513072264,
+ 23.60864229366581,
+ 24.257427338066265,
+ 24.835595044653477,
+ 25.39544939590001,
+ 25.826593778720277,
+ 26.19431780813388,
+ 26.50949834289068,
+ 26.77218691852415,
+ 26.967918531277338,
+ 27.19102130267829,
+ 27.34337585972222,
+ 27.4181972247516,
+ 27.539599393683137
+ ],
+ "5._24._0.075": [
+ 0.8740059532267965,
+ 1.195803175961542,
+ 1.4813847491413066,
+ 1.8198213217004344,
+ 2.1114679242247285,
+ 2.4511928332409116,
+ 2.7884209932623367,
+ 3.045076518230904,
+ 3.38985905028238,
+ 3.6235840764481617,
+ 3.8151720590575846,
+ 4.134398178917575,
+ 4.399472215935768,
+ 5.196052968742087,
+ 6.241796315968224,
+ 6.625043308760825,
+ 7.019204966521843,
+ 7.455428246531946,
+ 7.8352792745551625,
+ 8.19000685408261,
+ 8.520338648061067,
+ 8.815217930037624,
+ 9.045500576623557,
+ 9.318444579888297,
+ 9.510760590633401,
+ 9.607234163454487,
+ 9.766125270029438
+ ],
+ "5._384._0.0875": [
+ 3.4971609162458233,
+ 4.051656615125228,
+ 4.732248351210825,
+ 5.893919652077772,
+ 7.3631917153337465,
+ 9.787660788126857,
+ 12.926033000028275,
+ 15.661017953707479,
+ 19.346600513663347,
+ 21.496639445791523,
+ 22.981860600869524,
+ 24.99308548712326,
+ 26.345530187761003,
+ 29.276388573997952,
+ 31.689549865259668,
+ 32.342595899677626,
+ 32.926373526045,
+ 33.4925044471273,
+ 33.92969208257005,
+ 34.30285565404692,
+ 34.62342694833785,
+ 34.89119459294894,
+ 35.09082250719603,
+ 35.31874308885447,
+ 35.47435720985385,
+ 35.550709681997546,
+ 35.67440933495609
+ ],
+ "5._48._0.075": [
+ 1.5268463243731418,
+ 1.8679037053125458,
+ 2.1622431316564765,
+ 2.5060808694258614,
+ 2.8001357853600726,
+ 3.1434799422447908,
+ 3.515612517816602,
+ 3.873773290653522,
+ 4.506122795199485,
+ 4.997198890417131,
+ 5.41272372077986,
+ 6.11681051077621,
+ 6.707327803870584,
+ 8.429089305083417,
+ 10.36366447234366,
+ 10.968263993871286,
+ 11.534670954770592,
+ 12.10622150797133,
+ 12.561157983519418,
+ 12.95626052909181,
+ 13.300027412729714,
+ 13.589249498360601,
+ 13.805461423269591,
+ 14.051629097627456,
+ 14.219885773491233,
+ 14.302747448049644,
+ 14.437444554948076
+ ],
+ "5._96._0.075": [
+ 2.209271810327403,
+ 2.555323564968504,
+ 2.851917240914291,
+ 3.200539346278396,
+ 3.5274031613593095,
+ 4.02432205207084,
+ 4.744889028751256,
+ 5.520988392549123,
+ 6.943133814435939,
+ 8.053168239942085,
+ 8.962949116562063,
+ 10.392868307378329,
+ 11.473530341995346,
+ 14.101483788574436,
+ 16.464069579688307,
+ 17.12428878395319,
+ 17.716151871093476,
+ 18.29245407136119,
+ 18.737611633137337,
+ 19.117499424844905,
+ 19.442986678155897,
+ 19.71391981844301,
+ 19.915529683643555,
+ 20.144650636173814,
+ 20.300975362123253,
+ 20.377780106752258,
+ 20.502493352845047
+ ]
+ },
+ "logtime": [
+ -8.5,
+ -7.8,
+ -7.2,
+ -6.5,
+ -5.9,
+ -5.2,
+ -4.5,
+ -3.963,
+ -3.27,
+ -2.864,
+ -2.577,
+ -2.171,
+ -1.884,
+ -1.191,
+ -0.497,
+ -0.274,
+ -0.051,
+ 0.196,
+ 0.419,
+ 0.642,
+ 0.873,
+ 1.112,
+ 1.335,
+ 1.679,
+ 2.028,
+ 2.275,
+ 3.003
+ ]
+ }
}
}
\ No newline at end of file
diff --git a/hpxml-measures/HPXMLtoOpenStudio/resources/data/g_functions/U_configurations_5m_v1.0.json b/hpxml-measures/HPXMLtoOpenStudio/resources/data/g_functions/U_configurations_5m_v1.0.json
index 3bf70b3f3e..b7352b5439 100644
--- a/hpxml-measures/HPXMLtoOpenStudio/resources/data/g_functions/U_configurations_5m_v1.0.json
+++ b/hpxml-measures/HPXMLtoOpenStudio/resources/data/g_functions/U_configurations_5m_v1.0.json
@@ -648,5 +648,1175 @@
3.003
]
}
+ },
+ "3_5": {
+ "1": {
+ "bore_locations": [
+ [
+ 0.0,
+ 0.0
+ ],
+ [
+ 5.0,
+ 0.0
+ ],
+ [
+ 10.0,
+ 0.0
+ ],
+ [
+ 0.0,
+ 5.0
+ ],
+ [
+ 10.0,
+ 5.0
+ ],
+ [
+ 0.0,
+ 10.0
+ ],
+ [
+ 10.0,
+ 10.0
+ ],
+ [
+ 0.0,
+ 15.0
+ ],
+ [
+ 10.0,
+ 15.0
+ ],
+ [
+ 0.0,
+ 20.0
+ ],
+ [
+ 10.0,
+ 20.0
+ ]
+ ],
+ "g": {
+ "5._192._0.08": [
+ 2.835166959499572,
+ 3.187125521522206,
+ 3.521463685390284,
+ 4.0292708101078425,
+ 4.644904567747859,
+ 5.71312819879793,
+ 7.307316673339804,
+ 8.909872319261455,
+ 11.35072167018288,
+ 12.895494747737084,
+ 14.003407905474937,
+ 15.547938805845172,
+ 16.60721797341642,
+ 18.942663349937895,
+ 20.88642415471305,
+ 21.414574413114533,
+ 21.88636839767081,
+ 22.344045572738686,
+ 22.697394497134884,
+ 22.998976881618432,
+ 23.25791886089577,
+ 23.474073345498063,
+ 23.63518508430462,
+ 23.818982153138496,
+ 23.944474714533282,
+ 24.006070079545342,
+ 24.10588687980541
+ ],
+ "5._24._0.075": [
+ 0.8740059532267965,
+ 1.1958031759615428,
+ 1.4813847491413066,
+ 1.819821321700434,
+ 2.111467924224729,
+ 2.451192833143698,
+ 2.7884196222714364,
+ 3.044991761646357,
+ 3.3878360996302237,
+ 3.6167568401041454,
+ 3.8018743251439515,
+ 4.107449030686344,
+ 4.36157985013461,
+ 5.140893214380187,
+ 6.167565736488154,
+ 6.532939316352233,
+ 6.900217762443361,
+ 7.296936524147332,
+ 7.634356648978209,
+ 7.943557694081454,
+ 8.226800511414552,
+ 8.476283596226876,
+ 8.669254929778113,
+ 8.89631837461781,
+ 9.05540591311694,
+ 9.134903266625964,
+ 9.265449892837756
+ ],
+ "5._384._0.0875": [
+ 3.4913458659637997,
+ 4.025031445778259,
+ 4.679459748673599,
+ 5.823514922526518,
+ 7.2496851339530926,
+ 9.465709095419118,
+ 12.162871522713194,
+ 14.430178619551123,
+ 17.426918448409662,
+ 19.15929141380058,
+ 20.353054328217997,
+ 21.969602052437914,
+ 23.0569638692773,
+ 25.421183037493776,
+ 27.375655065646225,
+ 27.905611261031314,
+ 28.380117646208024,
+ 28.840909851662392,
+ 29.197383891971214,
+ 29.5017622561314,
+ 29.763531311969654,
+ 29.982392436026295,
+ 30.145572332129515,
+ 30.331953946483488,
+ 30.459173127738946,
+ 30.521564128069652,
+ 30.62254759778572
+ ],
+ "5._48._0.075": [
+ 1.5268463243731416,
+ 1.8679037053125453,
+ 2.1622431316564765,
+ 2.5060808689637453,
+ 2.800134562146769,
+ 3.143277867550195,
+ 3.512110701279523,
+ 3.8597749208835066,
+ 4.465308288754424,
+ 4.94262858930153,
+ 5.352657638814721,
+ 6.048496013896075,
+ 6.623113848411969,
+ 8.221987555057126,
+ 9.908799233756627,
+ 10.419596527986892,
+ 10.893552161184349,
+ 11.368272036526335,
+ 11.744278866087644,
+ 12.069981280671444,
+ 12.353067937004344,
+ 12.591283097765539,
+ 12.769461842221771,
+ 12.972723000760597,
+ 13.111741413849153,
+ 13.180171278848512,
+ 13.291295356631528
+ ],
+ "5._96._0.075": [
+ 2.2092718103274045,
+ 2.555323563035404,
+ 2.851914450439797,
+ 3.2002206780378732,
+ 3.5239856416868593,
+ 4.0050212111086045,
+ 4.696255292797876,
+ 5.45794678858022,
+ 6.8523229596520485,
+ 7.899174082572373,
+ 8.727630982952416,
+ 9.986721281780245,
+ 10.912700366416587,
+ 13.108650994034377,
+ 15.04793483199602,
+ 15.586871383611614,
+ 16.070555900739027,
+ 16.541880472649677,
+ 16.906704976274135,
+ 17.218339711615098,
+ 17.485917232552556,
+ 17.709122540263706,
+ 17.87536677621204,
+ 18.064622313136528,
+ 18.19378180185433,
+ 18.25720919402969,
+ 18.360067072826144
+ ]
+ },
+ "logtime": [
+ -8.5,
+ -7.8,
+ -7.2,
+ -6.5,
+ -5.9,
+ -5.2,
+ -4.5,
+ -3.963,
+ -3.27,
+ -2.864,
+ -2.577,
+ -2.171,
+ -1.884,
+ -1.191,
+ -0.497,
+ -0.274,
+ -0.051,
+ 0.196,
+ 0.419,
+ 0.642,
+ 0.873,
+ 1.112,
+ 1.335,
+ 1.679,
+ 2.028,
+ 2.275,
+ 3.003
+ ]
+ }
+ },
+ "4_5": {
+ "1": {
+ "bore_locations": [
+ [
+ 0.0,
+ 0.0
+ ],
+ [
+ 5.0,
+ 0.0
+ ],
+ [
+ 10.0,
+ 0.0
+ ],
+ [
+ 15.0,
+ 0.0
+ ],
+ [
+ 0.0,
+ 5.0
+ ],
+ [
+ 15.0,
+ 5.0
+ ],
+ [
+ 0.0,
+ 10.0
+ ],
+ [
+ 15.0,
+ 10.0
+ ],
+ [
+ 0.0,
+ 15.0
+ ],
+ [
+ 15.0,
+ 15.0
+ ],
+ [
+ 0.0,
+ 20.0
+ ],
+ [
+ 15.0,
+ 20.0
+ ]
+ ],
+ "g": {
+ "5._192._0.08": [
+ 2.835167455722321,
+ 3.187164253368536,
+ 3.5217463021757833,
+ 4.028427836363309,
+ 4.624684630082045,
+ 5.596396180422826,
+ 7.021654999732946,
+ 8.516485795859836,
+ 10.922679147334124,
+ 12.504736239346794,
+ 13.658836270238554,
+ 15.286897355848462,
+ 16.412526210829927,
+ 18.90716185189082,
+ 20.988260218620216,
+ 21.553888068081033,
+ 22.058549347226762,
+ 22.547678348313518,
+ 22.924785442127003,
+ 23.246506041112095,
+ 23.522444349706053,
+ 23.752556634864902,
+ 23.924021079341824,
+ 24.1195019132571,
+ 24.252969516975394,
+ 24.318496397162527,
+ 24.424754094441145
+ ],
+ "5._24._0.075": [
+ 0.8740059532267963,
+ 1.1958031759615426,
+ 1.4813847491413068,
+ 1.8198213217004353,
+ 2.1114679242247276,
+ 2.4511928331518,
+ 2.7884197364921053,
+ 3.044998755151511,
+ 3.3879820910415375,
+ 3.617110145509905,
+ 3.802113944017799,
+ 4.104789809067644,
+ 4.35122359689819,
+ 5.069884325161107,
+ 5.985111909717598,
+ 6.3172037017256075,
+ 6.657572709404107,
+ 7.033770157964548,
+ 7.361258663222535,
+ 7.6675128839922255,
+ 7.953255729334022,
+ 8.209016631065653,
+ 8.409350881388876,
+ 8.647796141532217,
+ 8.816459337544055,
+ 8.901251809332873,
+ 9.041206675006105
+ ],
+ "5._384._0.0875": [
+ 3.491684148784791,
+ 4.023279636156971,
+ 4.652351039645069,
+ 5.686157113357087,
+ 6.961545153770087,
+ 9.042383172066298,
+ 11.731244489922352,
+ 14.07796471915153,
+ 17.247822837975477,
+ 19.100513820330104,
+ 20.381936081030982,
+ 22.119937946398608,
+ 23.290017266302243,
+ 25.831183370975197,
+ 27.927934039212506,
+ 28.49587688585577,
+ 29.00386861500027,
+ 29.496754840839348,
+ 29.877622933863588,
+ 30.202741434415195,
+ 30.48213787781195,
+ 30.715580588180487,
+ 30.889611742253454,
+ 31.088319475857705,
+ 31.22396489190118,
+ 31.290505095979746,
+ 31.39826375473448
+ ],
+ "5._48._0.075": [
+ 1.5268463243731443,
+ 1.8679037053125467,
+ 2.1622431316564783,
+ 2.506080869002253,
+ 2.8001346640586293,
+ 3.14329436699023,
+ 3.5123432739000746,
+ 3.860023494374007,
+ 4.454035537585791,
+ 4.9009907314408885,
+ 5.272074128547903,
+ 5.890863348417758,
+ 6.40420697216,
+ 7.88824247911931,
+ 9.55575813824719,
+ 10.07810160532861,
+ 10.569009178861092,
+ 11.065616271434864,
+ 11.462006453770927,
+ 11.807038786816884,
+ 12.108016745187705,
+ 12.361872337880557,
+ 12.55197315674844,
+ 12.768899382365463,
+ 12.917354994433628,
+ 12.990490268666912,
+ 13.109354087626448
+ ],
+ "5._96._0.075": [
+ 2.209271810327404,
+ 2.5553235631964983,
+ 2.85191468287134,
+ 3.2002464578628005,
+ 3.524214557727399,
+ 4.004769247598286,
+ 4.675512731336439,
+ 5.372544388972258,
+ 6.614708573868588,
+ 7.572011644721387,
+ 8.35376448018417,
+ 9.581192812625266,
+ 10.509754370843844,
+ 12.776316922635896,
+ 14.825606887511555,
+ 15.399996571961866,
+ 15.916126916831454,
+ 16.41953050033167,
+ 16.809142704362785,
+ 17.141933975522175,
+ 17.427464202576427,
+ 17.66542391275424,
+ 17.842574560868197,
+ 18.04404421612049,
+ 18.181513505321565,
+ 18.249038785093575,
+ 18.358611225228167
+ ]
+ },
+ "logtime": [
+ -8.5,
+ -7.8,
+ -7.2,
+ -6.5,
+ -5.9,
+ -5.2,
+ -4.5,
+ -3.963,
+ -3.27,
+ -2.864,
+ -2.577,
+ -2.171,
+ -1.884,
+ -1.191,
+ -0.497,
+ -0.274,
+ -0.051,
+ 0.196,
+ 0.419,
+ 0.642,
+ 0.873,
+ 1.112,
+ 1.335,
+ 1.679,
+ 2.028,
+ 2.275,
+ 3.003
+ ]
+ }
+ },
+ "5_5": {
+ "1": {
+ "bore_locations": [
+ [
+ 0.0,
+ 0.0
+ ],
+ [
+ 5.0,
+ 0.0
+ ],
+ [
+ 10.0,
+ 0.0
+ ],
+ [
+ 15.0,
+ 0.0
+ ],
+ [
+ 20.0,
+ 0.0
+ ],
+ [
+ 0.0,
+ 5.0
+ ],
+ [
+ 20.0,
+ 5.0
+ ],
+ [
+ 0.0,
+ 10.0
+ ],
+ [
+ 20.0,
+ 10.0
+ ],
+ [
+ 0.0,
+ 15.0
+ ],
+ [
+ 20.0,
+ 15.0
+ ],
+ [
+ 0.0,
+ 20.0
+ ],
+ [
+ 20.0,
+ 20.0
+ ]
+ ],
+ "g": {
+ "5._192._0.08": [
+ 2.8351678756032506,
+ 3.187197033234048,
+ 3.5219963792700995,
+ 4.029257161545586,
+ 4.625439813195518,
+ 5.581918076563316,
+ 6.933990603917165,
+ 8.343409539198467,
+ 10.682306034572184,
+ 12.27292622506223,
+ 13.455015982599358,
+ 15.146758080716909,
+ 16.328931987926094,
+ 18.971040219347593,
+ 21.186885586822314,
+ 21.790040722228873,
+ 22.32779285108981,
+ 22.84873536291079,
+ 23.249961972039905,
+ 23.59215328523894,
+ 23.885395855817396,
+ 24.129734539851317,
+ 24.311752570840557,
+ 24.519145420373643,
+ 24.660743710822437,
+ 24.73027853379732,
+ 24.843099967208566
+ ],
+ "5._24._0.075": [
+ 0.8740059532267966,
+ 1.1958031759615428,
+ 1.4813847491413072,
+ 1.8198213217004355,
+ 2.111467924224728,
+ 2.4511928331586517,
+ 2.788419833140358,
+ 3.045004672749363,
+ 3.3881065808541444,
+ 3.6174560345834483,
+ 3.8026776315843276,
+ 4.105665806331061,
+ 4.352128394869591,
+ 5.063781538734141,
+ 5.938762311957236,
+ 6.250846167726924,
+ 6.571007902567478,
+ 6.927526759376401,
+ 7.241737001718092,
+ 7.539835064668187,
+ 7.822320740946058,
+ 8.079156421197728,
+ 8.283171480085318,
+ 8.529448644853195,
+ 8.705911969659454,
+ 8.795360019155062,
+ 8.944111262053404
+ ],
+ "5._384._0.0875": [
+ 3.491994139759413,
+ 4.024195322361277,
+ 4.652756511449665,
+ 5.666195652760058,
+ 6.87397566775641,
+ 8.84136432472171,
+ 11.478860758463973,
+ 13.865186639973748,
+ 17.171757358351368,
+ 19.132163677896564,
+ 20.495455696933355,
+ 22.35005710100194,
+ 23.600978711799947,
+ 26.31771759579538,
+ 28.557226854855696,
+ 29.16343278711373,
+ 29.705165021229035,
+ 30.230406981773392,
+ 30.635871798031026,
+ 30.981901197422236,
+ 31.2790664638916,
+ 31.527203675858313,
+ 31.71216694327748,
+ 31.923287762128375,
+ 32.067415909683454,
+ 32.138132265115175,
+ 32.25270903482283
+ ],
+ "5._48._0.075": [
+ 1.526846324373142,
+ 1.8679037053125465,
+ 2.162243131656475,
+ 2.5060808690348373,
+ 2.800134750291741,
+ 3.1433083283920285,
+ 3.5125453321314977,
+ 3.860616026926391,
+ 4.455010512716528,
+ 4.899940946216643,
+ 5.26494227778323,
+ 5.861420441918838,
+ 6.347081096565084,
+ 7.745803779378014,
+ 9.369490750413814,
+ 9.893449331662142,
+ 10.392597214820164,
+ 10.903576860785785,
+ 11.315555495653392,
+ 11.676731963072786,
+ 11.993603874722568,
+ 12.262000667972892,
+ 12.4635272524625,
+ 12.693911196271408,
+ 12.851845828191463,
+ 12.929763191645833,
+ 13.056563502626716
+ ],
+ "5._96._0.075": [
+ 2.2092718103274045,
+ 2.5553235633328057,
+ 2.8519148795441818,
+ 3.2002682731670866,
+ 3.524412940781227,
+ 4.005510438850903,
+ 4.676217623216871,
+ 5.364959040807383,
+ 6.552010893962662,
+ 7.451409752832565,
+ 8.191003352594112,
+ 9.3733885417648,
+ 10.287988859750532,
+ 12.586847732805381,
+ 14.726017512491744,
+ 15.332735933927033,
+ 15.879551465801764,
+ 16.414041367682128,
+ 16.828152267784894,
+ 17.182075910973094,
+ 17.485727379908106,
+ 17.73870066966237,
+ 17.926992844773178,
+ 18.14099206118265,
+ 18.287011663381687,
+ 18.358761066128682,
+ 18.475259237687844
+ ]
+ },
+ "logtime": [
+ -8.5,
+ -7.8,
+ -7.2,
+ -6.5,
+ -5.9,
+ -5.2,
+ -4.5,
+ -3.963,
+ -3.27,
+ -2.864,
+ -2.577,
+ -2.171,
+ -1.884,
+ -1.191,
+ -0.497,
+ -0.274,
+ -0.051,
+ 0.196,
+ 0.419,
+ 0.642,
+ 0.873,
+ 1.112,
+ 1.335,
+ 1.679,
+ 2.028,
+ 2.275,
+ 3.003
+ ]
+ }
+ },
+ "4_6": {
+ "1": {
+ "bore_locations": [
+ [
+ 0.0,
+ 0.0
+ ],
+ [
+ 5.0,
+ 0.0
+ ],
+ [
+ 10.0,
+ 0.0
+ ],
+ [
+ 15.0,
+ 0.0
+ ],
+ [
+ 0.0,
+ 5.0
+ ],
+ [
+ 15.0,
+ 5.0
+ ],
+ [
+ 0.0,
+ 10.0
+ ],
+ [
+ 15.0,
+ 10.0
+ ],
+ [
+ 0.0,
+ 15.0
+ ],
+ [
+ 15.0,
+ 15.0
+ ],
+ [
+ 0.0,
+ 20.0
+ ],
+ [
+ 15.0,
+ 20.0
+ ],
+ [
+ 0.0,
+ 25.0
+ ],
+ [
+ 15.0,
+ 25.0
+ ]
+ ],
+ "g": {
+ "5._192._0.08": [
+ 2.835168235501287,
+ 3.187225130284909,
+ 3.5222107360218113,
+ 4.02997840041794,
+ 4.627409825333906,
+ 5.603248489768871,
+ 7.05243281246964,
+ 8.605984674689251,
+ 11.178826753871103,
+ 12.911691333108958,
+ 14.192145315858346,
+ 16.016131103395832,
+ 17.286801987111335,
+ 20.116973372286008,
+ 22.483534481875175,
+ 23.126927897093587,
+ 23.700214013485763,
+ 24.255286841487692,
+ 24.682534242150155,
+ 25.046870976012332,
+ 25.35898234727682,
+ 25.618970843623128,
+ 25.812648388034702,
+ 26.033311921476066,
+ 26.183988618234917,
+ 26.257993610467494,
+ 26.378107415172135
+ ],
+ "5._24._0.075": [
+ 0.8740059532267965,
+ 1.195803175961542,
+ 1.4813847491413066,
+ 1.8198213217004344,
+ 2.1114679242247285,
+ 2.4511928331645287,
+ 2.7884199159817205,
+ 3.045009744976354,
+ 3.3882132869747608,
+ 3.617752529133315,
+ 3.8031614371046776,
+ 4.106464011358775,
+ 4.353352429920457,
+ 5.074237492245742,
+ 6.000837952290013,
+ 6.34138033437576,
+ 6.693622153718276,
+ 7.087049110302825,
+ 7.433424975465707,
+ 7.760751439062382,
+ 8.0693160257882,
+ 8.348210963891466,
+ 8.56851690028365,
+ 8.83284946927001,
+ 9.02127848810832,
+ 9.116520435454001,
+ 9.274493727612288
+ ],
+ "5._384._0.0875": [
+ 3.492259894917149,
+ 4.025004936754169,
+ 4.6553378239473915,
+ 5.694428342145734,
+ 6.992152202699412,
+ 9.162314380873108,
+ 12.057849245018245,
+ 14.6510818727442,
+ 18.219063650460807,
+ 20.327334273521956,
+ 21.791517295290035,
+ 23.780808543593466,
+ 25.12140957263153,
+ 28.029136601412134,
+ 30.423206808084387,
+ 31.07092333391018,
+ 31.649599886851615,
+ 32.21052115801187,
+ 32.64339521242799,
+ 33.01280579162818,
+ 33.32999968850202,
+ 33.5948278881234,
+ 33.79223980563305,
+ 34.0175688954002,
+ 34.17141251753898,
+ 34.246904560203106,
+ 34.36924498034679
+ ],
+ "5._48._0.075": [
+ 1.5268463243731418,
+ 1.8679037053125458,
+ 2.1622431316564765,
+ 2.5060808690627714,
+ 2.800134824205838,
+ 3.143320295310389,
+ 3.5127185274099437,
+ 3.8611246029854076,
+ 4.456334420411525,
+ 4.904288889799071,
+ 5.276857311162185,
+ 5.901145716645142,
+ 6.423254393102804,
+ 7.960849779374967,
+ 9.74251159980519,
+ 10.312285707725744,
+ 10.852087706637393,
+ 11.402178752864387,
+ 11.843802223655274,
+ 12.229876834859011,
+ 12.567659921349026,
+ 12.853102212611725,
+ 13.067116296192332,
+ 13.311358681834932,
+ 13.478617334898406,
+ 13.561099489050957,
+ 13.695323354273706
+ ],
+ "5._96._0.075": [
+ 2.2092718103274027,
+ 2.55532356344964,
+ 2.8519150481209032,
+ 3.200286972006519,
+ 3.5245829858551394,
+ 4.006149810727657,
+ 4.678229392979975,
+ 5.37763655618152,
+ 6.635624639372579,
+ 7.621221753122868,
+ 8.43802635211238,
+ 9.741625539452174,
+ 10.743705895284736,
+ 13.236144010172131,
+ 15.532292302466427,
+ 16.180955443028406,
+ 16.764531231371677,
+ 17.334204095845855,
+ 17.77495214351862,
+ 18.151422697914864,
+ 18.474131899489475,
+ 18.742785124679088,
+ 18.942699175818188,
+ 19.169819199730124,
+ 19.3247833719786,
+ 19.40093639963708,
+ 19.524631143912814
+ ]
+ },
+ "logtime": [
+ -8.5,
+ -7.8,
+ -7.2,
+ -6.5,
+ -5.9,
+ -5.2,
+ -4.5,
+ -3.963,
+ -3.27,
+ -2.864,
+ -2.577,
+ -2.171,
+ -1.884,
+ -1.191,
+ -0.497,
+ -0.274,
+ -0.051,
+ 0.196,
+ 0.419,
+ 0.642,
+ 0.873,
+ 1.112,
+ 1.335,
+ 1.679,
+ 2.028,
+ 2.275,
+ 3.003
+ ]
+ }
+ },
+ "3_7": {
+ "1": {
+ "bore_locations": [
+ [
+ 0.0,
+ 0.0
+ ],
+ [
+ 5.0,
+ 0.0
+ ],
+ [
+ 10.0,
+ 0.0
+ ],
+ [
+ 0.0,
+ 5.0
+ ],
+ [
+ 10.0,
+ 5.0
+ ],
+ [
+ 0.0,
+ 10.0
+ ],
+ [
+ 10.0,
+ 10.0
+ ],
+ [
+ 0.0,
+ 15.0
+ ],
+ [
+ 10.0,
+ 15.0
+ ],
+ [
+ 0.0,
+ 20.0
+ ],
+ [
+ 10.0,
+ 20.0
+ ],
+ [
+ 0.0,
+ 25.0
+ ],
+ [
+ 10.0,
+ 25.0
+ ],
+ [
+ 0.0,
+ 30.0
+ ],
+ [
+ 10.0,
+ 30.0
+ ]
+ ],
+ "g": {
+ "5._192._0.08": [
+ 2.835168547412995,
+ 3.1872494898604957,
+ 3.522410946467774,
+ 4.032684670090972,
+ 4.654023445970472,
+ 5.750715925406672,
+ 7.441794543779469,
+ 9.209065650562295,
+ 12.028211908191846,
+ 13.887871931821303,
+ 15.253208244697303,
+ 17.192063513139097,
+ 18.542033858374815,
+ 21.550993372874228,
+ 24.071119764312858,
+ 24.7568454640089,
+ 25.3681009382456,
+ 25.96007756211007,
+ 26.415806384359716,
+ 26.804500877436972,
+ 27.137519762034753,
+ 27.414955087466684,
+ 27.621655802131386,
+ 27.857185290816126,
+ 28.018036820617635,
+ 28.09704802500887,
+ 28.225304676666546
+ ],
+ "5._24._0.075": [
+ 0.8740059532267965,
+ 1.1958031759615426,
+ 1.4813847491413072,
+ 1.8198213217004355,
+ 2.111467924224727,
+ 2.451192833169619,
+ 2.788419987777567,
+ 3.045014140927697,
+ 3.3883070230574344,
+ 3.6180717439013645,
+ 3.804063683447519,
+ 4.11140211546309,
+ 4.367751956161955,
+ 5.163554966124934,
+ 6.242767904109348,
+ 6.636768087182504,
+ 7.039017356441888,
+ 7.480903481108109,
+ 7.863533793910553,
+ 8.220093365652007,
+ 8.55225931305743,
+ 8.849672308609028,
+ 9.083140676566902,
+ 9.361880434062318,
+ 9.560131691390612,
+ 9.660293492069464,
+ 9.826512606569564
+ ],
+ "5._384._0.0875": [
+ 3.492521703980014,
+ 4.028952948525272,
+ 4.690360254763027,
+ 5.868855167821229,
+ 7.384184533385384,
+ 9.841524860263968,
+ 12.99462018636414,
+ 15.768848563789204,
+ 19.566011203576267,
+ 21.810059371382483,
+ 23.37007702002737,
+ 25.49127964773133,
+ 26.921820435757866,
+ 30.02683239339849,
+ 32.58488775849014,
+ 33.27714723415718,
+ 33.89566474901201,
+ 34.49523522545308,
+ 34.9579494645981,
+ 35.35284424283011,
+ 35.691929164403774,
+ 35.9750417098565,
+ 36.186091912798595,
+ 36.42699698419073,
+ 36.591483568970325,
+ 36.67220137615987,
+ 36.80301735521155
+ ],
+ "5._48._0.075": [
+ 1.526846324373142,
+ 1.8679037053125451,
+ 2.1622431316564765,
+ 2.50608086908698,
+ 2.8001348882647212,
+ 3.1433306670760293,
+ 3.512875564734423,
+ 3.8620768415013647,
+ 4.471986784846617,
+ 4.956955922636253,
+ 5.378117879718729,
+ 6.103932829009752,
+ 6.7143079519054565,
+ 8.46763682791091,
+ 10.41162110587674,
+ 11.021389478586116,
+ 11.59507234209772,
+ 12.177449672030301,
+ 12.643748388181887,
+ 13.051217446168089,
+ 13.40757798827984,
+ 13.708768285958596,
+ 13.93477373629367,
+ 14.192893401603552,
+ 14.36981357317643,
+ 14.457119684843972,
+ 14.599319600545355
+ ],
+ "5._96._0.075": [
+ 2.2092718103274023,
+ 2.555323563550898,
+ 2.8519151942207315,
+ 3.200303179752876,
+ 3.5247365251559386,
+ 4.0079874978489425,
+ 4.705451448765458,
+ 5.484941704219999,
+ 6.951699784385171,
+ 8.088410450547496,
+ 9.0101852007518,
+ 10.44827084159664,
+ 11.534294234850115,
+ 14.195133739335644,
+ 16.62997741968012,
+ 17.317641527636738,
+ 17.936737909514484,
+ 18.541441605971116,
+ 19.009514738877346,
+ 19.40958686361222,
+ 19.75267224583673,
+ 20.03840034048691,
+ 20.25110680017244,
+ 20.49285009536575,
+ 20.6578575935991,
+ 20.73897025242924,
+ 20.87076658806696
+ ]
+ },
+ "logtime": [
+ -8.5,
+ -7.8,
+ -7.2,
+ -6.5,
+ -5.9,
+ -5.2,
+ -4.5,
+ -3.963,
+ -3.27,
+ -2.864,
+ -2.577,
+ -2.171,
+ -1.884,
+ -1.191,
+ -0.497,
+ -0.274,
+ -0.051,
+ 0.196,
+ 0.419,
+ 0.642,
+ 0.873,
+ 1.112,
+ 1.335,
+ 1.679,
+ 2.028,
+ 2.275,
+ 3.003
+ ]
+ }
}
}
\ No newline at end of file
diff --git a/hpxml-measures/HPXMLtoOpenStudio/resources/data/g_functions/rectangle_5m_v1.0.json b/hpxml-measures/HPXMLtoOpenStudio/resources/data/g_functions/rectangle_5m_v1.0.json
index 0c946ad00a..f14e517f11 100644
--- a/hpxml-measures/HPXMLtoOpenStudio/resources/data/g_functions/rectangle_5m_v1.0.json
+++ b/hpxml-measures/HPXMLtoOpenStudio/resources/data/g_functions/rectangle_5m_v1.0.json
@@ -2019,6 +2019,1166 @@
3.003
]
},
+ "1_11": {
+ "bore_locations": [
+ [
+ 0.0,
+ 0.0
+ ],
+ [
+ 5.0,
+ 0.0
+ ],
+ [
+ 10.0,
+ 0.0
+ ],
+ [
+ 15.0,
+ 0.0
+ ],
+ [
+ 20.0,
+ 0.0
+ ],
+ [
+ 25.0,
+ 0.0
+ ],
+ [
+ 30.0,
+ 0.0
+ ],
+ [
+ 35.0,
+ 0.0
+ ],
+ [
+ 40.0,
+ 0.0
+ ],
+ [
+ 45.0,
+ 0.0
+ ],
+ [
+ 50.0,
+ 0.0
+ ]
+ ],
+ "g": {
+ "5._192._0.08": [
+ 2.835166956024766,
+ 3.1871129252249464,
+ 3.520843299054095,
+ 4.0192963642906365,
+ 4.590334438698769,
+ 5.475419106160404,
+ 6.651437097298937,
+ 7.781707252434485,
+ 9.539612397137628,
+ 10.714860604134,
+ 11.596057820139029,
+ 12.881376704471217,
+ 13.801466856553454,
+ 15.930291065085985,
+ 17.78481570776504,
+ 18.298205124324884,
+ 18.758899195704362,
+ 19.20740690890415,
+ 19.554318975188675,
+ 19.85076401646089,
+ 20.105351947785028,
+ 20.317816434551347,
+ 20.476169935446862,
+ 20.656682390937068,
+ 20.779948391530255,
+ 20.840479732116055,
+ 20.93864505768389
+ ],
+ "5._24._0.075": [
+ 0.8740059532267965,
+ 1.1958031759615428,
+ 1.4813847491413066,
+ 1.819821321700434,
+ 2.111467924224729,
+ 2.4511928331436974,
+ 2.78841962205322,
+ 3.0449912307209437,
+ 3.387670451818616,
+ 3.615443910896892,
+ 3.7978076640254574,
+ 4.092338233006955,
+ 4.328397553193087,
+ 4.992949163085869,
+ 5.76801250736593,
+ 6.029781236270641,
+ 6.290135391262823,
+ 6.571245316238277,
+ 6.81270184564937,
+ 7.037818082041057,
+ 7.249121229528879,
+ 7.44103788897673,
+ 7.59455565827571,
+ 7.78307532107633,
+ 7.921856227626152,
+ 7.993858404082789,
+ 8.117132356045662
+ ],
+ "5._384._0.0875": [
+ 3.490402800913484,
+ 4.01184638147444,
+ 4.61150240798044,
+ 5.5440182526867305,
+ 6.590958810264655,
+ 8.153610793987403,
+ 10.115939649202868,
+ 11.881302724298786,
+ 14.400601805455599,
+ 15.948062110204873,
+ 17.047258461578473,
+ 18.569929296323494,
+ 19.611649701583907,
+ 21.907553994334226,
+ 23.823090499190428,
+ 24.343997291013615,
+ 24.810051963914674,
+ 25.262410766911263,
+ 25.611924188571084,
+ 25.9102572189314,
+ 26.166533977087592,
+ 26.380555036910398,
+ 26.540061430332216,
+ 26.722083883867462,
+ 26.84631186145688,
+ 26.907250299777406,
+ 27.005945547819984
+ ],
+ "5._48._0.075": [
+ 1.5268463243731416,
+ 1.8679037053125453,
+ 2.1622431316564765,
+ 2.5060808689637444,
+ 2.8001345619743248,
+ 3.14327527284599,
+ 3.5116958341447164,
+ 3.855484903543964,
+ 4.429449886630906,
+ 4.848413008221112,
+ 5.185448909371842,
+ 5.721751958757662,
+ 6.142872548854635,
+ 7.277962610524241,
+ 8.505039016569283,
+ 8.89568453247388,
+ 9.269454692924638,
+ 9.656471499211035,
+ 9.973615359309843,
+ 10.256638514920573,
+ 10.509744197690857,
+ 10.728356525703933,
+ 10.895352532006921,
+ 11.089821263683508,
+ 11.225285805796554,
+ 11.292776078789121,
+ 11.403553804962254
+ ],
+ "5._96._0.075": [
+ 2.209271810327403,
+ 2.555323563035406,
+ 2.8519144496150726,
+ 3.2002147651518276,
+ 3.5235923654195167,
+ 3.9976127004527013,
+ 4.640906269211821,
+ 5.281367623165438,
+ 6.331716548673918,
+ 7.075964327686381,
+ 7.659847649426192,
+ 8.558731389182544,
+ 9.239232692351038,
+ 10.95194726014642,
+ 12.610870498066545,
+ 13.097618917410369,
+ 13.544065360682819,
+ 13.987168920322944,
+ 14.335354578843374,
+ 14.635872625326117,
+ 14.896104768736013,
+ 15.114567066122902,
+ 15.277937381557118,
+ 15.464478590925468,
+ 15.592182795289506,
+ 15.655049154130324,
+ 15.757209673764626
+ ]
+ },
+ "logtime": [
+ -8.5,
+ -7.8,
+ -7.2,
+ -6.5,
+ -5.9,
+ -5.2,
+ -4.5,
+ -3.963,
+ -3.27,
+ -2.864,
+ -2.577,
+ -2.171,
+ -1.884,
+ -1.191,
+ -0.497,
+ -0.274,
+ -0.051,
+ 0.196,
+ 0.419,
+ 0.642,
+ 0.873,
+ 1.112,
+ 1.335,
+ 1.679,
+ 2.028,
+ 2.275,
+ 3.003
+ ]
+ },
+ "3_4": {
+ "bore_locations": [
+ [
+ 0.0,
+ 0.0
+ ],
+ [
+ 0.0,
+ 5.0
+ ],
+ [
+ 0.0,
+ 10.0
+ ],
+ [
+ 0.0,
+ 15.0
+ ],
+ [
+ 5.0,
+ 0.0
+ ],
+ [
+ 5.0,
+ 5.0
+ ],
+ [
+ 5.0,
+ 10.0
+ ],
+ [
+ 5.0,
+ 15.0
+ ],
+ [
+ 10.0,
+ 0.0
+ ],
+ [
+ 10.0,
+ 5.0
+ ],
+ [
+ 10.0,
+ 10.0
+ ],
+ [
+ 10.0,
+ 15.0
+ ]
+ ],
+ "g": {
+ "5._192._0.08": [
+ 2.8352002410885504,
+ 3.189847920478392,
+ 3.5473525792099516,
+ 4.173513343591349,
+ 5.031103387411992,
+ 6.549814266069877,
+ 8.69442879239438,
+ 10.721324554732862,
+ 13.65066964685244,
+ 15.44052750504318,
+ 16.70336338021932,
+ 18.442387607021207,
+ 19.624242629285188,
+ 22.21124949222853,
+ 24.354935950516587,
+ 24.93652914059481,
+ 25.45632976083144,
+ 25.960761123219662,
+ 26.35050366363597,
+ 26.683238448122456,
+ 26.969127500138683,
+ 27.207942691806487,
+ 27.384862363531592,
+ 27.58807304902318,
+ 27.726771272570428,
+ 27.794843355039397,
+ 27.90509303114989
+ ],
+ "5._24._0.075": [
+ 0.8740059532267963,
+ 1.1958031759615426,
+ 1.4813847491413068,
+ 1.8198213217004353,
+ 2.1114679242247276,
+ 2.451192833686473,
+ 2.7884272772560266,
+ 3.0454656800625717,
+ 3.3993485393835376,
+ 3.6567087082817475,
+ 3.8824142106708246,
+ 4.285999244949475,
+ 4.64140506131016,
+ 5.752918587514246,
+ 7.150877891153093,
+ 7.625157114941832,
+ 8.089389542953798,
+ 8.578662964181403,
+ 8.985091297075328,
+ 9.350608889757698,
+ 9.679499813117744,
+ 9.964576379686473,
+ 10.182272185752982,
+ 10.435156613231342,
+ 10.610355923351054,
+ 10.697293161936095,
+ 10.839197931839957
+ ],
+ "5._384._0.0875": [
+ 3.524813013470324,
+ 4.196082597982126,
+ 5.115976700938693,
+ 6.735607643646009,
+ 8.64884312392933,
+ 11.433330763113077,
+ 14.640392275429818,
+ 17.244403752490573,
+ 20.612198870306447,
+ 22.53576380936692,
+ 23.85529131495063,
+ 25.637609078985058,
+ 26.834547309355262,
+ 29.43671810893321,
+ 31.589403095738646,
+ 32.17341065027805,
+ 32.69669213307692,
+ 33.205149395583696,
+ 33.59881448123163,
+ 33.93502709709848,
+ 34.22433851221049,
+ 34.46635467357401,
+ 34.64682518692814,
+ 34.85302282193397,
+ 34.99376891856543,
+ 35.06278474363444,
+ 35.174454122124004
+ ],
+ "5._48._0.075": [
+ 1.5268463243731443,
+ 1.8679037053125467,
+ 2.1622431316564783,
+ 2.506080871543884,
+ 2.800141391980189,
+ 3.144409505548065,
+ 3.532211674254694,
+ 3.9444357938732804,
+ 4.765296944453598,
+ 5.448739751006118,
+ 6.033258183172322,
+ 6.998288087184899,
+ 7.7674948917547475,
+ 9.79428865808197,
+ 11.802490368795349,
+ 12.390872724774988,
+ 12.930279814376554,
+ 13.464929069909926,
+ 13.884729934838585,
+ 14.246253191878566,
+ 14.55894010657095,
+ 14.821120177884682,
+ 15.016811451464584,
+ 15.23971426470978,
+ 15.391971646535712,
+ 15.466843972899632,
+ 15.588341534532205
+ ],
+ "5._96._0.075": [
+ 2.209271810327406,
+ 2.5553235738285265,
+ 2.851930031668963,
+ 3.202007625224777,
+ 3.543586030366084,
+ 4.124736958241059,
+ 5.082713019435455,
+ 6.171003447660342,
+ 8.075248025750884,
+ 9.427832536161716,
+ 10.462184889371523,
+ 11.986453113820447,
+ 13.078953428323361,
+ 15.599578889002377,
+ 17.769616806353657,
+ 18.366645113318807,
+ 18.901131312514813,
+ 19.42097004808437,
+ 19.82294703284428,
+ 20.166134149668775,
+ 20.460792123371245,
+ 20.706648075957443,
+ 20.889798157998282,
+ 21.09842186937948,
+ 21.240818571675668,
+ 21.31073706027092,
+ 21.424089701005023
+ ]
+ },
+ "logtime": [
+ -8.5,
+ -7.8,
+ -7.2,
+ -6.5,
+ -5.9,
+ -5.2,
+ -4.5,
+ -3.963,
+ -3.27,
+ -2.864,
+ -2.577,
+ -2.171,
+ -1.884,
+ -1.191,
+ -0.497,
+ -0.274,
+ -0.051,
+ 0.196,
+ 0.419,
+ 0.642,
+ 0.873,
+ 1.112,
+ 1.335,
+ 1.679,
+ 2.028,
+ 2.275,
+ 3.003
+ ]
+ },
+ "1_13": {
+ "bore_locations": [
+ [
+ 0.0,
+ 0.0
+ ],
+ [
+ 5.0,
+ 0.0
+ ],
+ [
+ 10.0,
+ 0.0
+ ],
+ [
+ 15.0,
+ 0.0
+ ],
+ [
+ 20.0,
+ 0.0
+ ],
+ [
+ 25.0,
+ 0.0
+ ],
+ [
+ 30.0,
+ 0.0
+ ],
+ [
+ 35.0,
+ 0.0
+ ],
+ [
+ 40.0,
+ 0.0
+ ],
+ [
+ 45.0,
+ 0.0
+ ],
+ [
+ 50.0,
+ 0.0
+ ],
+ [
+ 55.0,
+ 0.0
+ ],
+ [
+ 60.0,
+ 0.0
+ ]
+ ],
+ "g": {
+ "5._192._0.08": [
+ 2.835167872663028,
+ 3.1871863815472303,
+ 3.5214823555578953,
+ 4.022367016152781,
+ 4.598334354889267,
+ 5.4955590561422305,
+ 6.696755956292045,
+ 7.861774620507107,
+ 9.69693115383684,
+ 10.941721931534667,
+ 11.885403695052583,
+ 13.27827702288233,
+ 14.28786201533284,
+ 16.658889310291617,
+ 18.758565561855214,
+ 19.344236851889093,
+ 19.870461352435676,
+ 20.38328551672411,
+ 20.779898350722565,
+ 21.118955957936564,
+ 21.409981777397405,
+ 21.652687500813656,
+ 21.833573582954557,
+ 22.039651602239974,
+ 22.180420510309965,
+ 22.24959028613101,
+ 22.36189049207631
+ ],
+ "5._24._0.075": [
+ 0.8740059532267966,
+ 1.1958031759615428,
+ 1.4813847491413072,
+ 1.8198213217004355,
+ 2.111467924224728,
+ 2.4511928331586517,
+ 2.7884198329557117,
+ 3.0450042235209596,
+ 3.3879673742247722,
+ 3.6163919968135643,
+ 3.7995978097571586,
+ 4.096047138223399,
+ 4.334128068548515,
+ 5.006866139467722,
+ 5.796766371392239,
+ 6.0650541545499195,
+ 6.332829407521105,
+ 6.623127622742341,
+ 6.873635670032012,
+ 7.10831656766363,
+ 7.329818646947897,
+ 7.532282915710492,
+ 7.695359481580537,
+ 7.897427047661231,
+ 8.048031041316603,
+ 8.127069774893931,
+ 8.26445047623605
+ ],
+ "5._384._0.0875": [
+ 3.4912195269820585,
+ 4.01545481290049,
+ 4.620636677472281,
+ 5.566717952683127,
+ 6.636501504823167,
+ 8.249708950892252,
+ 10.306259867285037,
+ 12.189528252962543,
+ 14.935286344099918,
+ 16.65566289930807,
+ 17.891414395561412,
+ 19.618059217852274,
+ 20.807724507673704,
+ 23.44240787608797,
+ 25.646966615268383,
+ 26.246897065048557,
+ 26.783143508888283,
+ 27.303228637340194,
+ 27.704532810741817,
+ 28.04698473157598,
+ 28.3408721828442,
+ 28.5860779446347,
+ 28.768798278611836,
+ 28.977205245202754,
+ 29.119463312118796,
+ 29.189273922698433,
+ 29.302432892670183
+ ],
+ "5._48._0.075": [
+ 1.526846324373142,
+ 1.8679037053125465,
+ 2.1622431316564756,
+ 2.5060808690348395,
+ 2.800134750145825,
+ 3.143306133205904,
+ 3.5121995463964875,
+ 3.8573682325474326,
+ 4.435622543126915,
+ 4.859215607366215,
+ 5.2009338357739825,
+ 5.74660219449404,
+ 6.176807200826814,
+ 7.345095550275651,
+ 8.624966197136617,
+ 9.037289120058336,
+ 9.43440314533406,
+ 9.848652172295793,
+ 10.190846763722394,
+ 10.498577487908223,
+ 10.775903064501275,
+ 11.01724976589269,
+ 11.202898824820965,
+ 11.420574238336473,
+ 11.573343716214922,
+ 11.649889367609283,
+ 11.776258615251136
+ ],
+ "5._96._0.075": [
+ 2.2092718103274036,
+ 2.5553235633328053,
+ 2.851914878846339,
+ 3.2002632715487938,
+ 3.524084843889482,
+ 4.000198319686831,
+ 4.648922812711506,
+ 5.297679486622008,
+ 6.368431822809411,
+ 7.132613371363251,
+ 7.735622503083266,
+ 8.670576388448413,
+ 9.384199733351398,
+ 11.205025040342896,
+ 13.00920034546786,
+ 13.547507517930491,
+ 14.044362225422582,
+ 14.54057036604107,
+ 14.932413367974217,
+ 15.272017165308927,
+ 15.566941848969465,
+ 15.815046318043487,
+ 16.00091004159573,
+ 16.213327964554935,
+ 16.358981602902468,
+ 16.430799226610322,
+ 16.547727568787387
+ ]
+ },
+ "logtime": [
+ -8.5,
+ -7.8,
+ -7.2,
+ -6.5,
+ -5.9,
+ -5.2,
+ -4.5,
+ -3.963,
+ -3.27,
+ -2.864,
+ -2.577,
+ -2.171,
+ -1.884,
+ -1.191,
+ -0.497,
+ -0.274,
+ -0.051,
+ 0.196,
+ 0.419,
+ 0.642,
+ 0.873,
+ 1.112,
+ 1.335,
+ 1.679,
+ 2.028,
+ 2.275,
+ 3.003
+ ]
+ },
+ "2_7": {
+ "bore_locations": [
+ [
+ 0.0,
+ 0.0
+ ],
+ [
+ 0.0,
+ 5.0
+ ],
+ [
+ 0.0,
+ 10.0
+ ],
+ [
+ 0.0,
+ 15.0
+ ],
+ [
+ 0.0,
+ 20.0
+ ],
+ [
+ 0.0,
+ 25.0
+ ],
+ [
+ 0.0,
+ 30.0
+ ],
+ [
+ 5.0,
+ 0.0
+ ],
+ [
+ 5.0,
+ 5.0
+ ],
+ [
+ 5.0,
+ 10.0
+ ],
+ [
+ 5.0,
+ 15.0
+ ],
+ [
+ 5.0,
+ 20.0
+ ],
+ [
+ 5.0,
+ 25.0
+ ],
+ [
+ 5.0,
+ 30.0
+ ]
+ ],
+ "g": {
+ "5._192._0.08": [
+ 2.8351963373211526,
+ 3.189525432671323,
+ 3.5441586181564264,
+ 4.153863578420259,
+ 4.968837350679872,
+ 6.374765189955052,
+ 8.338435532940242,
+ 10.227924235923822,
+ 13.07667744467613,
+ 14.899216964004614,
+ 16.22157557832085,
+ 18.085611206462346,
+ 19.3773839575985,
+ 22.253326929252243,
+ 24.665607531774025,
+ 25.32290199772217,
+ 25.910008879139216,
+ 26.4794990185844,
+ 26.91887561651495,
+ 27.293881055164704,
+ 27.61566790717984,
+ 27.88411833618692,
+ 28.08419851671805,
+ 28.312364693175297,
+ 28.46818244123285,
+ 28.544691410541315,
+ 28.668765753189405
+ ],
+ "5._24._0.075": [
+ 0.8740059532267965,
+ 1.195803175961542,
+ 1.4813847491413066,
+ 1.8198213217004344,
+ 2.1114679242247285,
+ 2.451192833622822,
+ 2.7884263794937194,
+ 3.045409966528578,
+ 3.397956025424473,
+ 3.651681123419255,
+ 3.871861045175125,
+ 4.260544029058912,
+ 4.598036282181444,
+ 5.632233733917122,
+ 6.911990032935292,
+ 7.348562914574632,
+ 7.78038615503268,
+ 8.241930786777354,
+ 8.632288563414834,
+ 8.98993245080486,
+ 9.31834432206036,
+ 9.60908718406086,
+ 9.835583579650885,
+ 10.10436619003651,
+ 10.294663417617404,
+ 10.390522851782857,
+ 10.549284342416126
+ ],
+ "5._384._0.0875": [
+ 3.5207107105767967,
+ 4.172486685832283,
+ 5.04361535233427,
+ 6.539238771629346,
+ 8.290823424995548,
+ 10.897851125859063,
+ 14.053556094702584,
+ 16.750421010307743,
+ 20.387366959629162,
+ 22.52182567501487,
+ 24.0028806054672,
+ 26.016906929358765,
+ 27.37561986803111,
+ 30.333082187151593,
+ 32.77808502329351,
+ 33.4408977970093,
+ 34.033921738549736,
+ 34.609458476118434,
+ 35.05430372502859,
+ 35.43407705021292,
+ 35.76049119191312,
+ 36.03325310775754,
+ 36.236608202722216,
+ 36.46881511674917,
+ 36.62733410445668,
+ 36.705095253830414,
+ 36.831022119800515
+ ],
+ "5._48._0.075": [
+ 1.5268463243731418,
+ 1.8679037053125458,
+ 2.1622431316564765,
+ 2.5060808712413083,
+ 2.800140590995746,
+ 3.1442761302569138,
+ 3.5297485792209886,
+ 3.9333730661275474,
+ 4.719186917317336,
+ 5.358546917521309,
+ 5.897818294295266,
+ 6.781339816883465,
+ 7.485187602696929,
+ 9.37107376118838,
+ 11.330559442278814,
+ 11.928785231530378,
+ 12.48730495904651,
+ 13.05095909356793,
+ 13.500543415541326,
+ 13.892672496932104,
+ 14.235364076732068,
+ 14.52508549238362,
+ 14.742640279650308,
+ 14.991570236901701,
+ 15.16236207344109,
+ 15.246643307399514,
+ 15.383865538978908
+ ],
+ "5._96._0.075": [
+ 2.209271810327406,
+ 2.555323572562807,
+ 2.851928204233168,
+ 3.2017965492038645,
+ 3.541187283099064,
+ 4.108694827048994,
+ 5.020157591633424,
+ 6.0293823589962185,
+ 7.772395988356641,
+ 9.020893246502068,
+ 9.992125954630469,
+ 11.458833301601528,
+ 12.540663840621466,
+ 15.137968789154458,
+ 17.481764918967876,
+ 18.140996507450293,
+ 18.73505764069588,
+ 19.315730519637945,
+ 19.76601839452198,
+ 20.151266342940364,
+ 20.482270484553275,
+ 20.758468346547456,
+ 20.96427808400023,
+ 21.19856448999212,
+ 21.358556705411893,
+ 21.437185909378837,
+ 21.56483305389653
+ ]
+ },
+ "logtime": [
+ -8.5,
+ -7.8,
+ -7.2,
+ -6.5,
+ -5.9,
+ -5.2,
+ -4.5,
+ -3.963,
+ -3.27,
+ -2.864,
+ -2.577,
+ -2.171,
+ -1.884,
+ -1.191,
+ -0.497,
+ -0.274,
+ -0.051,
+ 0.196,
+ 0.419,
+ 0.642,
+ 0.873,
+ 1.112,
+ 1.335,
+ 1.679,
+ 2.028,
+ 2.275,
+ 3.003
+ ]
+ },
+ "3_5": {
+ "bore_locations": [
+ [
+ 0.0,
+ 0.0
+ ],
+ [
+ 0.0,
+ 5.0
+ ],
+ [
+ 0.0,
+ 10.0
+ ],
+ [
+ 0.0,
+ 15.0
+ ],
+ [
+ 0.0,
+ 20.0
+ ],
+ [
+ 5.0,
+ 0.0
+ ],
+ [
+ 5.0,
+ 5.0
+ ],
+ [
+ 5.0,
+ 10.0
+ ],
+ [
+ 5.0,
+ 15.0
+ ],
+ [
+ 5.0,
+ 20.0
+ ],
+ [
+ 10.0,
+ 0.0
+ ],
+ [
+ 10.0,
+ 5.0
+ ],
+ [
+ 10.0,
+ 10.0
+ ],
+ [
+ 10.0,
+ 15.0
+ ],
+ [
+ 10.0,
+ 20.0
+ ]
+ ],
+ "g": {
+ "5._192._0.08": [
+ 2.8352035193230685,
+ 3.190115138800661,
+ 3.5498609390674054,
+ 4.187688439336998,
+ 5.074041478141767,
+ 6.674851559973054,
+ 9.000044409053602,
+ 11.265363589488713,
+ 14.640705302321196,
+ 16.753121867319063,
+ 18.261395800878635,
+ 20.355240076506362,
+ 21.78665838351262,
+ 24.92844738952389,
+ 27.5317040745881,
+ 28.23775895426794,
+ 28.8677789647084,
+ 29.478403256846654,
+ 29.94933188617236,
+ 30.351197015774652,
+ 30.69604102364139,
+ 30.983769286271553,
+ 31.19824205188385,
+ 31.44289297464086,
+ 31.609982581668845,
+ 31.692023877482363,
+ 31.825060805735905
+ ],
+ "5._24._0.075": [
+ 0.8740059532267965,
+ 1.1958031759615426,
+ 1.4813847491413072,
+ 1.8198213217004355,
+ 2.111467924224727,
+ 2.451192833739939,
+ 2.7884280313124297,
+ 3.045512323934649,
+ 3.400470421944272,
+ 3.660565779681686,
+ 3.8902025074456943,
+ 4.303887086797668,
+ 4.671126564722622,
+ 5.836664507123772,
+ 7.340846191318556,
+ 7.862325920906742,
+ 8.378434762821415,
+ 8.928717654497387,
+ 9.390964497926422,
+ 9.810888100082494,
+ 10.192152505169856,
+ 10.525265720066491,
+ 10.781314206342634,
+ 11.080292619880323,
+ 11.288426782296373,
+ 11.392078377270282,
+ 11.561816421662916
+ ],
+ "5._384._0.0875": [
+ 3.5280599856953785,
+ 4.213080973607932,
+ 5.165964107748593,
+ 6.878390066508662,
+ 8.955789180466084,
+ 12.078589755638017,
+ 15.802405759794022,
+ 18.903720339012498,
+ 22.98036958608921,
+ 25.329307120729734,
+ 26.94539178766916,
+ 29.12973200874632,
+ 30.597052358018693,
+ 33.78032438092293,
+ 36.406449930074466,
+ 37.1179215124281,
+ 37.75463540337469,
+ 38.3726714132892,
+ 38.85052568468331,
+ 39.25853134546095,
+ 39.6093215162144,
+ 39.9025466523854,
+ 40.12118910579749,
+ 40.37091898315502,
+ 40.54141449038774,
+ 40.62504903311347,
+ 40.76047255508587
+ ],
+ "5._48._0.075": [
+ 1.526846324373142,
+ 1.8679037053125451,
+ 2.162243131656477,
+ 2.506080871798045,
+ 2.800142064756538,
+ 3.144520782096798,
+ 3.534162728595581,
+ 3.952628090970952,
+ 4.797262842492293,
+ 5.5104147945451665,
+ 6.127267242589088,
+ 7.159631758201581,
+ 7.995211026076231,
+ 10.248998514382093,
+ 12.556617414498104,
+ 13.24599147390895,
+ 13.882164392659803,
+ 14.51636929107626,
+ 15.016212753998312,
+ 15.447931515019524,
+ 15.82181908321612,
+ 16.135455325602557,
+ 16.369632358543218,
+ 16.636147059457226,
+ 16.81822829471624,
+ 16.907840987543533,
+ 17.0534457869186
+ ],
+ "5._96._0.075": [
+ 2.2092718103274054,
+ 2.55532357489173,
+ 2.851931566473131,
+ 3.202183201710241,
+ 3.54548916192579,
+ 4.136413501500515,
+ 5.125849398712307,
+ 6.269765395047149,
+ 8.32027253206208,
+ 9.8149750604999,
+ 10.97845798628486,
+ 12.722398994312112,
+ 13.992652563395433,
+ 16.97356671612827,
+ 19.578683271043086,
+ 20.29937994043897,
+ 20.944626862714102,
+ 21.572169037324258,
+ 22.05685533073115,
+ 22.47052748366812,
+ 22.8252259401652,
+ 23.120766658247714,
+ 23.34082659747316,
+ 23.591209104025143,
+ 23.762105877575106,
+ 23.846059645802825,
+ 23.982316413754653
+ ]
+ },
+ "logtime": [
+ -8.5,
+ -7.8,
+ -7.2,
+ -6.5,
+ -5.9,
+ -5.2,
+ -4.5,
+ -3.963,
+ -3.27,
+ -2.864,
+ -2.577,
+ -2.171,
+ -1.884,
+ -1.191,
+ -0.497,
+ -0.274,
+ -0.051,
+ 0.196,
+ 0.419,
+ 0.642,
+ 0.873,
+ 1.112,
+ 1.335,
+ 1.679,
+ 2.028,
+ 2.275,
+ 3.003
+ ]
+ },
"5_8": {
"bore_locations": [
[
diff --git a/hpxml-measures/HPXMLtoOpenStudio/resources/data/g_functions/util.rb b/hpxml-measures/HPXMLtoOpenStudio/resources/data/g_functions/util.rb
index 6d8c362a2e..321c7d82bc 100644
--- a/hpxml-measures/HPXMLtoOpenStudio/resources/data/g_functions/util.rb
+++ b/hpxml-measures/HPXMLtoOpenStudio/resources/data/g_functions/util.rb
@@ -1,6 +1,7 @@
# frozen_string_literal: true
# Downselect jsons found at https://gdr.openei.org/files/1325/g-function_library_1.0.zip.
+# See https://data.openei.org/submissions/7442 for more information.
#
# @param filepath [String] temporary file path to store downloaded g-function config json files
# @return [Integer] total number of g-function config json files generated
@@ -30,6 +31,11 @@ def process_g_functions(filepath)
add_m_n(json, json2, 8, '2_4')
add_m_n(json, json2, 9, '3_3')
add_m_n(json, json2, 10, '2_5')
+ add_m_n(json, json2, 11, '1_11')
+ add_m_n(json, json2, 12, '3_4')
+ add_m_n(json, json2, 13, '1_13')
+ add_m_n(json, json2, 14, '2_7')
+ add_m_n(json, json2, 15, '3_5')
add_m_n(json, json2, 40, '5_8') # test case
when 'L_configurations_5m_v1.0.json'
add_m_n(json, json2, 4, '2_3')
@@ -39,24 +45,45 @@ def process_g_functions(filepath)
add_m_n(json, json2, 8, '4_5')
add_m_n(json, json2, 9, '5_5')
add_m_n(json, json2, 10, '5_6')
+ add_m_n(json, json2, 11, '6_6')
+ add_m_n(json, json2, 12, '6_7')
+ add_m_n(json, json2, 13, '7_7')
+ add_m_n(json, json2, 14, '7_8')
+ add_m_n(json, json2, 15, '8_8')
when 'C_configurations_5m_v1.0.json' # has key2
add_m_n(json, json2, 7, '3_3', '1')
add_m_n(json, json2, 9, '3_4', '1')
+ add_m_n(json, json2, 11, '4_4', '1')
+ add_m_n(json, json2, 13, '4_5', '1')
+ add_m_n(json, json2, 14, '5_5', '2')
+ add_m_n(json, json2, 15, '5_5', '1')
when 'LopU_configurations_5m_v1.0.json'
add_m_n(json, json2, 6, '3_3', '1')
add_m_n(json, json2, 7, '3_4', '2')
add_m_n(json, json2, 8, '3_4', '1')
add_m_n(json, json2, 9, '4_4', '1')
add_m_n(json, json2, 10, '3_5', '1')
+ add_m_n(json, json2, 11, '4_5', '1')
+ add_m_n(json, json2, 12, '5_5', '1')
+ add_m_n(json, json2, 13, '5_6', '2')
+ add_m_n(json, json2, 14, '5_6', '1')
+ add_m_n(json, json2, 15, '6_6', '1')
when 'Open_configurations_5m_v1.0.json' # has key2
add_m_n(json, json2, 8, '3_3', '1')
add_m_n(json, json2, 10, '3_4', '1')
+ add_m_n(json, json2, 12, '4_4', '1')
+ add_m_n(json, json2, 14, '4_5', '1')
when 'U_configurations_5m_v1.0.json' # has key2
add_m_n(json, json2, 7, '3_3', '1')
add_m_n(json, json2, 9, '3_4', '1')
add_m_n(json, json2, 10, '4_4', '1')
- when 'zoned_rectangle_5m_v1.0.json' # there are none for which num_boreholes less than or equal to 10
- # add_m_n(json, json2, 17, '5_5', '1_1')
+ add_m_n(json, json2, 11, '3_5', '1')
+ add_m_n(json, json2, 12, '4_5', '1')
+ add_m_n(json, json2, 13, '5_5', '1')
+ add_m_n(json, json2, 14, '4_6', '1')
+ add_m_n(json, json2, 15, '3_7', '1')
+ when 'zoned_rectangle_5m_v1.0.json'
+ # requires larger number of boreholes and is unusual for residential application, skip it
else
fail "Unrecognized config_json: #{config_json}"
end
diff --git a/hpxml-measures/HPXMLtoOpenStudio/resources/defaults.rb b/hpxml-measures/HPXMLtoOpenStudio/resources/defaults.rb
index 88ab3c9e4c..ddd75b9032 100644
--- a/hpxml-measures/HPXMLtoOpenStudio/resources/defaults.rb
+++ b/hpxml-measures/HPXMLtoOpenStudio/resources/defaults.rb
@@ -2390,8 +2390,10 @@ def self.apply_hvac(runner, hpxml_bldg, weather, convert_shared_systems, unit_nu
set_hvac_heating_performance(heat_pump, hpxml_header)
if heat_pump.geothermal_loop.nil?
- hpxml_bldg.geothermal_loops.add(id: get_id('GeothermalLoop', hpxml_bldg.geothermal_loops, unit_num),
- loop_configuration: HPXML::GeothermalLoopLoopConfigurationVertical)
+ if hpxml_bldg.geothermal_loops.empty? # If there are multiple GSHPs, assign them all to the same geothermal loop
+ hpxml_bldg.geothermal_loops.add(id: get_id('GeothermalLoop', hpxml_bldg.geothermal_loops, unit_num),
+ loop_config: HPXML::GeothermalLoopConfigVertical)
+ end
heat_pump.geothermal_loop_idref = hpxml_bldg.geothermal_loops[-1].id
end
@@ -2441,8 +2443,8 @@ def self.apply_hvac(runner, hpxml_bldg, weather, convert_shared_systems, unit_nu
end
if heat_pump.geothermal_loop.shank_spacing.nil?
- hp_ap = heat_pump.additional_properties
- heat_pump.geothermal_loop.shank_spacing = (hp_ap.u_tube_spacing + hp_ap.pipe_od).round(2) # Distance from center of pipe to center of pipe
+ gl_ap = heat_pump.geothermal_loop.additional_properties
+ heat_pump.geothermal_loop.shank_spacing = (gl_ap.u_tube_spacing + gl_ap.pipe_od).round(2) # Distance from center of pipe to center of pipe
heat_pump.geothermal_loop.shank_spacing_isdefaulted = true
end
when HPXML::HVACTypeHeatPumpWaterLoopToAir
@@ -8624,47 +8626,47 @@ def self.set_detailed_performance_data_cooling(cooling_system)
# @param weather [WeatherFile] Weather object containing EPW information
# @return [nil]
def self.set_geothermal_loop_assumptions(heat_pump, weather)
- hp_ap = heat_pump.additional_properties
geothermal_loop = heat_pump.geothermal_loop
-
- hp_ap.design_chw = [85.0, weather.design.CoolingDrybulb - 15.0, weather.data.DeepGroundAnnualTemp + 10.0].max # Temperature of water entering indoor coil, use 85F as lower bound
- hp_ap.design_delta_t = 10.0
- hp_ap.fluid_type = EPlus::FluidPropyleneGlycol
- hp_ap.frac_glycol = 0.2 # This was changed from 0.3 to 0.2 -- more typical based on experts/spec sheets
- if hp_ap.fluid_type == EPlus::FluidWater
- hp_ap.design_hw = [45.0, weather.design.HeatingDrybulb + 35.0, weather.data.DeepGroundAnnualTemp - 10.0].max # Temperature of fluid entering indoor coil, use 45F as lower bound for water
+ gl_ap = geothermal_loop.additional_properties
+
+ gl_ap.design_chw = [85.0, weather.design.CoolingDrybulb - 15.0, weather.data.DeepGroundAnnualTemp + 10.0].max # Temperature of water entering indoor coil, use 85F as lower bound
+ gl_ap.design_delta_t = 10.0
+ gl_ap.fluid_type = EPlus::FluidPropyleneGlycol
+ gl_ap.frac_glycol = 0.2 # This was changed from 0.3 to 0.2 -- more typical based on experts/spec sheets
+ if gl_ap.fluid_type == EPlus::FluidWater
+ gl_ap.design_hw = [45.0, weather.design.HeatingDrybulb + 35.0, weather.data.DeepGroundAnnualTemp - 10.0].max # Temperature of fluid entering indoor coil, use 45F as lower bound for water
else
- hp_ap.design_hw = [35.0, weather.design.HeatingDrybulb + 35.0, weather.data.DeepGroundAnnualTemp - 10.0].min # Temperature of fluid entering indoor coil, use 35F as upper bound
+ gl_ap.design_hw = [35.0, weather.design.HeatingDrybulb + 35.0, weather.data.DeepGroundAnnualTemp - 10.0].min # Temperature of fluid entering indoor coil, use 35F as upper bound
end
# Pipe nominal size conversion to pipe outside diameter and inside diameter,
# only pipe sizes <= 2" are used here with DR11 (dimension ratio)
case geothermal_loop.pipe_diameter
when 0.75 # 3/4" pipe
- hp_ap.pipe_od = 1.050 # in
- hp_ap.pipe_id = 0.859 # in
+ gl_ap.pipe_od = 1.050 # in
+ gl_ap.pipe_id = 0.859 # in
when 1.0 # 1" pipe
- hp_ap.pipe_od = 1.315 # in
- hp_ap.pipe_id = 1.076 # in
+ gl_ap.pipe_od = 1.315 # in
+ gl_ap.pipe_id = 1.076 # in
when 1.25 # 1-1/4" pipe
- hp_ap.pipe_od = 1.660 # in
- hp_ap.pipe_id = 1.358 # in
+ gl_ap.pipe_od = 1.660 # in
+ gl_ap.pipe_id = 1.358 # in
else
fail "Unexpected pipe size: #{geothermal_loop.pipe_diameter}"
end
# Calculate distance between pipes
- hp_ap.u_tube_spacing_type = 'b' # Currently not exposed to the user
- case hp_ap.u_tube_spacing_type
+ gl_ap.u_tube_spacing_type = 'b' # Currently not exposed to the user
+ case gl_ap.u_tube_spacing_type
when 'as'
# Two tubes, spaced 1/8” apart at the center of the borehole
- hp_ap.u_tube_spacing = 0.125
+ gl_ap.u_tube_spacing = 0.125
when 'b'
# Two tubes equally spaced between the borehole edges
- hp_ap.u_tube_spacing = 0.9661
+ gl_ap.u_tube_spacing = 0.9661
when 'c'
# Both tubes placed against outer edge of borehole
- hp_ap.u_tube_spacing = geothermal_loop.bore_diameter - 2 * hp_ap.pipe_od
+ gl_ap.u_tube_spacing = geothermal_loop.bore_diameter - 2 * gl_ap.pipe_od
end
end
end
diff --git a/hpxml-measures/HPXMLtoOpenStudio/resources/geometry.rb b/hpxml-measures/HPXMLtoOpenStudio/resources/geometry.rb
index cc016b2bc2..be97422a51 100644
--- a/hpxml-measures/HPXMLtoOpenStudio/resources/geometry.rb
+++ b/hpxml-measures/HPXMLtoOpenStudio/resources/geometry.rb
@@ -1441,12 +1441,18 @@ def self.get_temperature_scheduled_space_values(location)
ground_weight: 1.0,
f_regain: 0.83 } # From LBNL's "Technical Background for default values used for Forced Air Systems in Proposed ASHRAE Standard 152P"
when HPXML::LocationManufacturedHomeBelly
- # From LBNL's "Technical Background for default values used for Forced Air Systems in Proposed ASHRAE Standard 152P"
- # 3.5 Manufactured House Belly Pan Temperatures
+ # Based on 2007 paper by Francisco & Palmiter "Thermal Characterization and Duct Losses of Belly Spaces in Manufactured Homes",
+ # Table 5 shows an average belly space connection to outdoors of 15%.
+ # https://www.researchgate.net/publication/290674828_Thermal_characterization_and_duct_losses_of_belly_spaces_in_manufactured_homes
+ #
+ # Regain assumption is based on LBNL's "Technical Background for default values used for Forced Air Systems in Proposed ASHRAE Standard 152P";
+ # see Section 3.5: Manufactured Home Belly Pan Temperatures.
+ # https://eta-publications.lbl.gov/sites/default/files/40588.pdf
+ #
# FUTURE: Consider modeling the belly as a separate thermal zone so that we dynamically calculate temperatures.
return { temp_min: nil,
- indoor_weight: 1.0,
- outdoor_weight: 0.0,
+ indoor_weight: 0.85,
+ outdoor_weight: 0.15,
ground_weight: 0.0,
f_regain: 0.62 }
end
@@ -1677,7 +1683,8 @@ def self.get_space_or_schedule_from_location(location, model, spaces)
HPXML::LocationOtherMultifamilyBufferSpace,
HPXML::LocationOtherNonFreezingSpace,
HPXML::LocationExteriorWall,
- HPXML::LocationUnderSlab].include? location
+ HPXML::LocationUnderSlab,
+ HPXML::LocationManufacturedHomeBelly].include? location
# if located in spaces where we don't model a thermal zone, create and return temperature schedule
sch = get_space_temperature_schedule(model, location, spaces)
else
diff --git a/hpxml-measures/HPXMLtoOpenStudio/resources/hpxml.rb b/hpxml-measures/HPXMLtoOpenStudio/resources/hpxml.rb
index aec378980b..a4cbd31b43 100644
--- a/hpxml-measures/HPXMLtoOpenStudio/resources/hpxml.rb
+++ b/hpxml-measures/HPXMLtoOpenStudio/resources/hpxml.rb
@@ -199,17 +199,16 @@ class HPXML < Object
FuelTypeWoodPellets = 'wood pellets'
FurnitureMassTypeLightWeight = 'light-weight'
FurnitureMassTypeHeavyWeight = 'heavy-weight'
- GeothermalLoopBorefieldConfigurationRectangle = 'Rectangle'
- GeothermalLoopBorefieldConfigurationZonedRectangle = 'Zoned Rectangle'
- GeothermalLoopBorefieldConfigurationOpenRectangle = 'Open Rectangle'
- GeothermalLoopBorefieldConfigurationC = 'C'
- GeothermalLoopBorefieldConfigurationL = 'L'
- GeothermalLoopBorefieldConfigurationU = 'U'
- GeothermalLoopBorefieldConfigurationLopsidedU = 'Lopsided U'
- GeothermalLoopLoopConfigurationDiagonal = 'diagonal'
- GeothermalLoopLoopConfigurationHorizontal = 'horizontal'
- GeothermalLoopLoopConfigurationOther = 'other'
- GeothermalLoopLoopConfigurationVertical = 'vertical'
+ GeothermalLoopBoreConfigRectangle = 'Rectangle'
+ GeothermalLoopBoreConfigOpenRectangle = 'Open Rectangle'
+ GeothermalLoopBoreConfigC = 'C'
+ GeothermalLoopBoreConfigL = 'L'
+ GeothermalLoopBoreConfigU = 'U'
+ GeothermalLoopBoreConfigLopsidedU = 'Lopsided U'
+ GeothermalLoopConfigDiagonal = 'diagonal'
+ GeothermalLoopConfigHorizontal = 'horizontal'
+ GeothermalLoopConfigOther = 'other'
+ GeothermalLoopConfigVertical = 'vertical'
GeothermalLoopGroutOrPipeTypeStandard = 'standard'
GeothermalLoopGroutOrPipeTypeThermallyEnhanced = 'thermally enhanced'
GroundToAirHeatPumpModelTypeStandard = 'standard'
@@ -7406,9 +7405,9 @@ def from_doc(building)
# Object for /HPXML/Building/BuildingDetails/Systems/HVAC/HVACPlant/GeothermalLoop.
class GeothermalLoop < BaseElement
- ATTRS = [:id, # [String] SystemIdentifier/@id
- :sameas_id, # [String] SystemIdentifier/@sameas
- :loop_configuration, # [String] LoopConfiguration (HPXML::GeothermalLoopLoopConfigurationXXX)
+ ATTRS = [:id, # [String] SystemIdentifier/@id
+ :sameas_id, # [String] SystemIdentifier/@sameas
+ :loop_config, # [String] LoopConfiguration (HPXML::GeothermalLoopConfigXXX)
:loop_flow, # [Double] LoopFlow (gal/min)
:num_bore_holes, # [Integer] BoreholesOrTrenches/Count
:bore_length, # [Double] BoreholesOrTrenches/Length (ft)
@@ -7420,13 +7419,13 @@ class GeothermalLoop < BaseElement
:pipe_conductivity, # [Double] Pipe/Conductivity (Btu/hr-ft-F)
:pipe_diameter, # [Double] Pipe/Diameter (in)
:shank_spacing, # [Double] Pipe/ShankSpacing (in)
- :bore_config] # [String] extension/BorefieldConfiguration (HPXML::GeothermalLoopBorefieldConfigurationXXX)
+ :bore_config] # [String] extension/BorefieldConfiguration (HPXML::GeothermalLoopBoreConfigXXX)
attr_accessor(*ATTRS)
# Returns all heat pumps connect to the geothermal loop.
#
# @return [Array] List of heat pump objects
- def heat_pump
+ def heat_pumps
list = []
@parent_object.heat_pumps.each do |heat_pump|
next if heat_pump.geothermal_loop_idref.nil?
@@ -7437,9 +7436,9 @@ def heat_pump
if list.size == 0
fail "Geothermal loop '#{@id}' found but no heat pump attached to it."
- elsif list.size > 1
- fail "Multiple heat pumps found attached to geothermal loop '#{@id}'."
end
+
+ return list
end
# Deletes the current object from the array.
@@ -7459,7 +7458,7 @@ def delete
# @return [Array] List of error messages
def check_for_errors
errors = []
- begin; heat_pump; rescue StandardError => e; errors << e.message; end
+ begin; heat_pumps; rescue StandardError => e; errors << e.message; end
return errors
end
@@ -7475,7 +7474,7 @@ def to_doc(building)
sys_id = XMLHelper.add_element(geothermal_loop, 'SystemIdentifier')
XMLHelper.add_attribute(sys_id, 'id', @id)
XMLHelper.add_attribute(sys_id, 'sameas', @sameas_id) unless @sameas_id.nil?
- XMLHelper.add_element(geothermal_loop, 'LoopConfiguration', @loop_configuration, :string, @loop_configuration_isdefaulted) unless @loop_configuration.nil?
+ XMLHelper.add_element(geothermal_loop, 'LoopConfiguration', @loop_config, :string, @loop_config_isdefaulted) unless @loop_config.nil?
XMLHelper.add_element(geothermal_loop, 'LoopFlow', @loop_flow, :float, @loop_flow_isdefaulted) unless @loop_flow.nil?
if (not @num_bore_holes.nil?) || (not @bore_spacing.nil?) || (not @bore_length.nil?) || (not @bore_diameter.nil?)
boreholes_or_trenches = XMLHelper.add_element(geothermal_loop, 'BoreholesOrTrenches')
@@ -7510,7 +7509,7 @@ def from_doc(geothermal_loop)
return if geothermal_loop.nil?
@id = HPXML::get_id(geothermal_loop)
- @loop_configuration = XMLHelper.get_value(geothermal_loop, 'LoopConfiguration', :string)
+ @loop_config = XMLHelper.get_value(geothermal_loop, 'LoopConfiguration', :string)
@loop_flow = XMLHelper.get_value(geothermal_loop, 'LoopFlow', :float)
@num_bore_holes = XMLHelper.get_value(geothermal_loop, 'BoreholesOrTrenches/Count', :integer)
@bore_length = XMLHelper.get_value(geothermal_loop, 'BoreholesOrTrenches/Length', :float)
diff --git a/hpxml-measures/HPXMLtoOpenStudio/resources/hpxml_schematron/EPvalidator.sch b/hpxml-measures/HPXMLtoOpenStudio/resources/hpxml_schematron/EPvalidator.sch
index 875adaba7f..85cdd0dae4 100644
--- a/hpxml-measures/HPXMLtoOpenStudio/resources/hpxml_schematron/EPvalidator.sch
+++ b/hpxml-measures/HPXMLtoOpenStudio/resources/hpxml_schematron/EPvalidator.sch
@@ -847,7 +847,7 @@
Expected FractionHeatLoadServed
Percent efficiency should typically be greater than or equal to 0.95.
- Heating capacity should typically be greater than or equal to 1000 Btu/hr.
+ Heating capacity should typically be greater than or equal to 1000 Btu/hr.
@@ -872,7 +872,7 @@
Expected extension/AirflowDefectRatio to be less than or equal to 9
AFUE should typically be greater than or equal to 0.5.
- Heating capacity should typically be greater than or equal to 1000 Btu/hr.
+ Heating capacity should typically be greater than or equal to 1000 Btu/hr.
@@ -888,7 +888,7 @@
Expected extension/FanPowerWatts to be greater than or equal to 0
AFUE should typically be greater than or equal to 0.5.
- Heating capacity should typically be greater than or equal to 1000 Btu/hr.
+ Heating capacity should typically be greater than or equal to 1000 Btu/hr.
@@ -904,7 +904,7 @@
Expected extension/FanPowerWatts to be greater than or equal to 0
AFUE should typically be greater than or equal to 0.5.
- Heating capacity should typically be greater than or equal to 1000 Btu/hr.
+ Heating capacity should typically be greater than or equal to 1000 Btu/hr.
@@ -919,7 +919,7 @@
Expected AnnualHeatingEfficiency[Units="AFUE"]/Value to be less than or equal to 1
Expected FractionHeatLoadServed
- Heating capacity should typically be greater than or equal to 1000 Btu/hr.
+ Heating capacity should typically be greater than or equal to 1000 Btu/hr.
AFUE should typically be greater than or equal to 0.5.
@@ -972,7 +972,7 @@
Expected extension/FanPowerWatts to be greater than or equal to 0
Percent efficiency should typically be greater than or equal to 0.5.
- Heating capacity should typically be greater than or equal to 1000 Btu/hr.
+ Heating capacity should typically be greater than or equal to 1000 Btu/hr.
@@ -988,7 +988,7 @@
Expected extension/FanPowerWatts to be greater than or equal to 0
Percent efficiency should typically be greater than or equal to 0.5.
- Heating capacity should typically be greater than or equal to 1000 Btu/hr.
+ Heating capacity should typically be greater than or equal to 1000 Btu/hr.
@@ -1003,7 +1003,7 @@
Expected FractionHeatLoadServed
Expected at most one extension/FanPowerWatts
Expected extension/FanPowerWatts to be greater than or equal to 0
- Heating capacity should typically be greater than or equal to 1000 Btu/hr.
+ Heating capacity should typically be greater than or equal to 1000 Btu/hr.
@@ -1063,7 +1063,7 @@
SEER2 should typically be greater than or equal to 7.6.
EER should typically be greater than or equal to 6.
EER2 should typically be greater than or equal to 5.7.
- Cooling capacity should typically be greater than or equal to 1000 Btu/hr.
+ Cooling capacity should typically be greater than or equal to 1000 Btu/hr.
@@ -1079,7 +1079,7 @@
EER should typically be greater than or equal to 6.
CEER should typically be greater than or equal to 5.9.
- Cooling capacity should typically be greater than or equal to 1000 Btu/hr.
+ Cooling capacity should typically be greater than or equal to 1000 Btu/hr.
@@ -1090,7 +1090,7 @@
Expected FractionCoolLoadServed
Expected no IntegratedHeatingSystemFuel
- Cooling capacity should typically be greater than or equal to 1000 Btu/hr.
+ Cooling capacity should typically be greater than or equal to 1000 Btu/hr.
@@ -1125,7 +1125,7 @@
SEER2 should typically be greater than or equal to 7.6.
EER should typically be greater than or equal to 6.
EER2 should typically be greater than or equal to 5.7.
- Cooling capacity should typically be greater than or equal to 1000 Btu/hr.
+ Cooling capacity should typically be greater than or equal to 1000 Btu/hr.
@@ -1146,7 +1146,7 @@
Expected extension/SharedLoopWatts
Expected extension/SharedLoopWatts to be greater than or equal to 0
- Cooling capacity should typically be greater than or equal to 1000 Btu/hr.
+ Cooling capacity should typically be greater than or equal to 1000 Btu/hr.
@@ -1193,7 +1193,7 @@
Expected IntegratedHeatingSystemAnnualEfficiency[Units="Percent"]/Value to be less than or equal to 1
Percent efficiency should typically be greater than or equal to 0.5.
- Integrated Heating capacity should typically be greater than or equal to 1000 Btu/hr.
+ Integrated Heating capacity should typically be greater than or equal to 1000 Btu/hr.
@@ -1266,8 +1266,8 @@
EER2 should typically be greater than or equal to 5.7.
HSPF should typically be greater than or equal to 6.
HSPF2 should typically be greater than or equal to 5.1.
- Heating capacity should typically be greater than or equal to 1000 Btu/hr.
- Cooling capacity should typically be greater than or equal to 1000 Btu/hr.
+ Heating capacity should typically be greater than or equal to 1000 Btu/hr.
+ Cooling capacity should typically be greater than or equal to 1000 Btu/hr.
@@ -1318,8 +1318,8 @@
SEER2 should typically be greater than or equal to 7.6.
HSPF should typically be greater than or equal to 6.
HSPF2 should typically be greater than or equal to 5.1.
- Heating capacity should typically be greater than or equal to 1000 Btu/hr.
- Cooling capacity should typically be greater than or equal to 1000 Btu/hr.
+ Heating capacity should typically be greater than or equal to 1000 Btu/hr.
+ Cooling capacity should typically be greater than or equal to 1000 Btu/hr.
@@ -1355,8 +1355,8 @@
EER should typically be greater than or equal to 6.
COP should typically be greater than or equal to 2.
- Heating capacity should typically be greater than or equal to 1000 Btu/hr.
- Cooling capacity should typically be greater than or equal to 1000 Btu/hr.
+ Heating capacity should typically be greater than or equal to 1000 Btu/hr.
+ Cooling capacity should typically be greater than or equal to 1000 Btu/hr.
@@ -1402,8 +1402,8 @@
Expected at most one extension/BackupHeatingActiveDuringDefrost
Expected extension/BackupHeatingActiveDuringDefrost to be 'true' or 'false'
- Heating capacity should typically be greater than or equal to 1000 Btu/hr.
- Cooling capacity should typically be greater than or equal to 1000 Btu/hr.
+ Heating capacity should typically be greater than or equal to 1000 Btu/hr.
+ Cooling capacity should typically be greater than or equal to 1000 Btu/hr.
@@ -1433,7 +1433,7 @@
Percent efficiency should typically be greater than or equal to 0.5.
AFUE should typically be greater than or equal to 0.5.
- Backup heating capacity should typically be greater than or equal to 1000 Btu/hr.
+ Backup heating capacity should typically be greater than or equal to 1000 Btu/hr.
@@ -1712,7 +1712,7 @@
Expected LoopConfiguration to be 'vertical'
Expected BoreholesOrTrenches/Count to be greater than or equal to 1
- Expected BoreholesOrTrenches/Count to be less than or equal to 10
+ Expected BoreholesOrTrenches/Count to be less than or equal to 15
Expected BoreholesOrTrenches/Length to be greater than or equal to 80
Expected BoreholesOrTrenches/Length to be less than or equal to 500
Expected Pipe/Diameter to be 0.75, 1.0, or 1.25
@@ -2101,9 +2101,9 @@
Expected at most one extension/TankModelType
Expected extension/TankModelType to be 'mixed' or 'stratified'
- UniformEnergyFactor should typically be greater than or equal to 0.45.
- EnergyFactor should typically be greater than or equal to 0.45.
- Heating capacity should typically be greater than or equal to 1000 Btu/hr.
+ UniformEnergyFactor should typically be greater than or equal to 0.4.
+ EnergyFactor should typically be greater than or equal to 0.4.
+ Heating capacity should typically be greater than or equal to 1000 Btu/hr.
Hot water setpoint should typically be greater than or equal to 110 deg-F.
@@ -2125,8 +2125,8 @@
Expected UniformEnergyFactor to be less than 1
Expected EnergyFactor to be less than 1
- UniformEnergyFactor should typically be greater than or equal to 0.45.
- EnergyFactor should typically be greater than or equal to 0.45.
+ UniformEnergyFactor should typically be greater than or equal to 0.4.
+ EnergyFactor should typically be greater than or equal to 0.4.
Hot water setpoint should typically be greater than or equal to 110 deg-F.
@@ -2365,7 +2365,7 @@
Expected UsableCapacity to be less than NominalCapacity
Expected UsableCapacity to be less than NominalCapacity
- Rated power output should typically be greater than or equal to 1000 W.
+ Rated power output should typically be greater than or equal to 1000 W.
diff --git a/hpxml-measures/HPXMLtoOpenStudio/resources/hvac.rb b/hpxml-measures/HPXMLtoOpenStudio/resources/hvac.rb
index 9291eac235..8689979855 100644
--- a/hpxml-measures/HPXMLtoOpenStudio/resources/hvac.rb
+++ b/hpxml-measures/HPXMLtoOpenStudio/resources/hvac.rb
@@ -585,6 +585,7 @@ def self.apply_ground_source_heat_pump(runner, model, weather, hpxml_bldg, hpxml
obj_name = Constants::ObjectTypeGroundSourceHeatPump
geothermal_loop = heat_pump.geothermal_loop
+ gl_ap = geothermal_loop.additional_properties
hp_ap = heat_pump.additional_properties
htg_cfm = hp_ap.heating_actual_airflow_cfm
@@ -592,9 +593,9 @@ def self.apply_ground_source_heat_pump(runner, model, weather, hpxml_bldg, hpxml
htg_air_flow_rated = calc_rated_airflow(heat_pump.heating_capacity, hp_ap.heat_rated_cfm_per_ton, 'm^3/s')
clg_air_flow_rated = calc_rated_airflow(heat_pump.cooling_capacity, hp_ap.cool_rated_cfm_per_ton, 'm^3/s')
- if hp_ap.frac_glycol == 0
- hp_ap.fluid_type = EPlus::FluidWater
- runner.registerWarning("Specified #{hp_ap.fluid_type} fluid type and 0 fraction of glycol, so assuming #{EPlus::FluidWater} fluid type.")
+ if gl_ap.frac_glycol == 0
+ gl_ap.fluid_type = EPlus::FluidWater
+ runner.registerWarning("Specified #{gl_ap.fluid_type} fluid type and 0 fraction of glycol, so assuming #{EPlus::FluidWater} fluid type.")
end
# Apply unit multiplier
@@ -813,94 +814,6 @@ def self.apply_ground_source_heat_pump(runner, model, weather, hpxml_bldg, hpxml
# Supplemental Heating Coil
htg_supp_coil = create_heat_pump_supplemental_heating_coil(model, obj_name, heat_pump)
- # Site Ground Temperature Undisturbed
- xing = OpenStudio::Model::SiteGroundTemperatureUndisturbedXing.new(model)
- xing.setSoilSurfaceTemperatureAmplitude1(UnitConversions.convert(weather.data.DeepGroundSurfTempAmp1, 'deltaf', 'deltac'))
- xing.setSoilSurfaceTemperatureAmplitude2(UnitConversions.convert(weather.data.DeepGroundSurfTempAmp2, 'deltaf', 'deltac'))
- xing.setPhaseShiftofTemperatureAmplitude1(weather.data.DeepGroundPhaseShiftTempAmp1)
- xing.setPhaseShiftofTemperatureAmplitude2(weather.data.DeepGroundPhaseShiftTempAmp2)
-
- # Ground Heat Exchanger
- ground_heat_exch_vert = OpenStudio::Model::GroundHeatExchangerVertical.new(model, xing)
- ground_heat_exch_vert.setName(obj_name + ' exchanger')
- ground_heat_exch_vert.setBoreHoleRadius(UnitConversions.convert(geothermal_loop.bore_diameter / 2.0, 'in', 'm'))
- ground_heat_exch_vert.setGroundThermalConductivity(UnitConversions.convert(hpxml_bldg.site.ground_conductivity, 'Btu/(hr*ft*R)', 'W/(m*K)'))
- ground_heat_exch_vert.setGroundThermalHeatCapacity(UnitConversions.convert(hpxml_bldg.site.ground_conductivity / hpxml_bldg.site.ground_diffusivity, 'Btu/(ft^3*F)', 'J/(m^3*K)'))
- ground_heat_exch_vert.setGroundTemperature(UnitConversions.convert(weather.data.DeepGroundAnnualTemp, 'F', 'C'))
- ground_heat_exch_vert.setGroutThermalConductivity(UnitConversions.convert(geothermal_loop.grout_conductivity, 'Btu/(hr*ft*R)', 'W/(m*K)'))
- ground_heat_exch_vert.setPipeThermalConductivity(UnitConversions.convert(geothermal_loop.pipe_conductivity, 'Btu/(hr*ft*R)', 'W/(m*K)'))
- ground_heat_exch_vert.setPipeOutDiameter(UnitConversions.convert(hp_ap.pipe_od, 'in', 'm'))
- ground_heat_exch_vert.setUTubeDistance(UnitConversions.convert(geothermal_loop.shank_spacing, 'in', 'm'))
- ground_heat_exch_vert.setPipeThickness(UnitConversions.convert((hp_ap.pipe_od - hp_ap.pipe_id) / 2.0, 'in', 'm'))
- ground_heat_exch_vert.setMaximumLengthofSimulation(1)
- ground_heat_exch_vert.setDesignFlowRate(UnitConversions.convert(geothermal_loop.loop_flow, 'gal/min', 'm^3/s'))
- ground_heat_exch_vert.setNumberofBoreHoles(geothermal_loop.num_bore_holes)
- ground_heat_exch_vert.setBoreHoleLength(UnitConversions.convert(geothermal_loop.bore_length, 'ft', 'm'))
- ground_heat_exch_vert.setBoreHoleTopDepth(2) # Consistent with G-function library
- ground_heat_exch_vert.setGFunctionReferenceRatio(ground_heat_exch_vert.boreHoleRadius.get / ground_heat_exch_vert.boreHoleLength.get) # ensure this ratio is consistent with rb/H so that g values will be taken as-is
- ground_heat_exch_vert.removeAllGFunctions
- for i in 0..(hp_ap.GSHP_G_Functions[0].size - 1)
- ground_heat_exch_vert.addGFunction(hp_ap.GSHP_G_Functions[0][i], hp_ap.GSHP_G_Functions[1][i])
- end
- xing = ground_heat_exch_vert.undisturbedGroundTemperatureModel.to_SiteGroundTemperatureUndisturbedXing.get
- xing.setSoilThermalConductivity(ground_heat_exch_vert.groundThermalConductivity.get)
- xing.setSoilSpecificHeat(ground_heat_exch_vert.groundThermalHeatCapacity.get / xing.soilDensity)
- xing.setAverageSoilSurfaceTemperature(ground_heat_exch_vert.groundTemperature.get)
-
- # Plant Loop
- plant_loop = Model.add_plant_loop(
- model,
- name: "#{obj_name} condenser loop",
- fluid_type: hp_ap.fluid_type,
- glycol_concentration: (hp_ap.frac_glycol * 100).to_i,
- min_temp: UnitConversions.convert(hp_ap.design_hw, 'F', 'C'),
- max_temp: 48.88889,
- max_flow_rate: UnitConversions.convert(geothermal_loop.loop_flow, 'gal/min', 'm^3/s')
- )
-
- plant_loop.addSupplyBranchForComponent(ground_heat_exch_vert)
- plant_loop.addDemandBranchForComponent(htg_coil)
- plant_loop.addDemandBranchForComponent(clg_coil)
-
- sizing_plant = plant_loop.sizingPlant
- sizing_plant.setLoopType('Condenser')
- sizing_plant.setDesignLoopExitTemperature(UnitConversions.convert(hp_ap.design_chw, 'F', 'C'))
- sizing_plant.setLoopDesignTemperatureDifference(UnitConversions.convert(hp_ap.design_delta_t, 'deltaF', 'deltaC'))
-
- setpoint_mgr_follow_ground_temp = OpenStudio::Model::SetpointManagerFollowGroundTemperature.new(model)
- setpoint_mgr_follow_ground_temp.setName(obj_name + ' condenser loop temp')
- setpoint_mgr_follow_ground_temp.setControlVariable('Temperature')
- setpoint_mgr_follow_ground_temp.setMaximumSetpointTemperature(48.88889)
- setpoint_mgr_follow_ground_temp.setMinimumSetpointTemperature(UnitConversions.convert(hp_ap.design_hw, 'F', 'C'))
- setpoint_mgr_follow_ground_temp.setReferenceGroundTemperatureObjectType('Site:GroundTemperature:Deep')
- setpoint_mgr_follow_ground_temp.addToNode(plant_loop.supplyOutletNode)
-
- # Pump
- pump_w = get_pump_power_watts(heat_pump)
- if heat_pump.is_shared_system
- pump_w += heat_pump.shared_loop_watts / heat_pump.number_of_units_served.to_f
- end
- pump_w = [pump_w, 1.0].max # prevent error if zero
- pump = Model.add_pump_variable_speed(
- model,
- name: "#{obj_name} pump",
- rated_power: pump_w
- )
- pump.addToNode(plant_loop.supplyInletNode)
- add_fan_pump_disaggregation_ems_program(model, pump, htg_coil, clg_coil, htg_supp_coil, heat_pump)
-
- # Pipes
- chiller_bypass_pipe = Model.add_pipe_adiabatic(model)
- plant_loop.addSupplyBranchForComponent(chiller_bypass_pipe)
- coil_bypass_pipe = Model.add_pipe_adiabatic(model)
- plant_loop.addDemandBranchForComponent(coil_bypass_pipe)
- supply_outlet_pipe = Model.add_pipe_adiabatic(model)
- supply_outlet_pipe.addToNode(plant_loop.supplyOutletNode)
- demand_inlet_pipe = Model.add_pipe_adiabatic(model)
- demand_inlet_pipe.addToNode(plant_loop.demandInletNode)
- demand_outlet_pipe = Model.add_pipe_adiabatic(model)
- demand_outlet_pipe.addToNode(plant_loop.demandOutletNode)
-
# Fan
fan_cfms = []
hp_ap.cool_capacity_ratios.each do |capacity_ratio|
@@ -914,13 +827,14 @@ def self.apply_ground_source_heat_pump(runner, model, weather, hpxml_bldg, hpxml
# Unitary System
air_loop_unitary = create_air_loop_unitary_system(model, obj_name, fan, htg_coil, clg_coil, htg_supp_coil, htg_cfm, clg_cfm, 40.0)
- add_pump_power_ems_program(model, pump, air_loop_unitary, heat_pump)
- if (heat_pump.compressor_type == HPXML::HVACCompressorTypeVariableSpeed) && (hpxml_header.ground_to_air_heat_pump_model_type == HPXML::GroundToAirHeatPumpModelTypeExperimental)
- add_ghp_pump_mass_flow_rate_ems_program(model, pump, control_zone, htg_coil, clg_coil)
- end
# Air Loop
- air_loop = create_air_loop(model, obj_name, air_loop_unitary, control_zone, hvac_sequential_load_fracs, [htg_cfm, clg_cfm].max, heat_pump, hvac_unavailable_periods)
+ air_loop = create_air_loop(model, obj_name, air_loop_unitary, control_zone, hvac_sequential_load_fracs,
+ [htg_cfm, clg_cfm].max, heat_pump, hvac_unavailable_periods)
+
+ # Geothermal Loop/Plant Loop
+ apply_geothermal_loop(model, obj_name, weather, hpxml_bldg, hpxml_header, geothermal_loop,
+ heat_pump, air_loop_unitary, htg_coil, clg_coil, htg_supp_coil, control_zone)
# HVAC Installation Quality
add_installation_quality_ems_program(model, heat_pump, heat_pump, air_loop_unitary, htg_coil, clg_coil)
@@ -931,6 +845,141 @@ def self.apply_ground_source_heat_pump(runner, model, weather, hpxml_bldg, hpxml
return air_loop
end
+ # Adds the HPXML GeothermalLoop to the OpenStudio model. If it has already been
+ # added to the model (because there are multiple ground-source heat pumps attached
+ # to it), then it reuses the existing one.
+ #
+ # @param model [OpenStudio::Model::Model] OpenStudio Model object
+ # @param obj_name [String] Name for the OpenStudio object
+ # @param weather [WeatherFile] Weather object containing EPW information
+ # @param hpxml_bldg [HPXML::Building] HPXML Building object representing an individual dwelling unit
+ # @param hpxml_header [HPXML::Header] HPXML Header object (one per HPXML file)
+ # @param geothermal_loop [HPXML::GeothermalLoop] The HPXML geothermal loop of interest
+ # @param heat_pump [HPXML::HeatPump] The HPXML heat pump of interest
+ # @param air_loop_unitary [OpenStudio::Model::AirLoopHVACUnitarySystem] Air loop for the HVAC system
+ # @param htg_coil [OpenStudio::Model::CoilHeatingWaterToAirHeatPumpEquationFit or OpenStudio::Model::CoilHeatingWaterToAirHeatPumpVariableSpeedEquationFit] OpenStudio Heating Coil object
+ # @param clg_coil [OpenStudio::Model::CoilCoolingWaterToAirHeatPumpEquationFit or OpenStudio::Model::CoilCoolingWaterToAirHeatPumpVariableSpeedEquationFit] OpenStudio Cooling Coil object
+ # @param htg_supp_coil [OpenStudio::Model::CoilHeatingXXX] Heat pump backup heating coil model object
+ # @param control_zone [OpenStudio::Model::ThermalZone] Conditioned space thermal zone
+ # @return [nil]
+ def self.apply_geothermal_loop(model, obj_name, weather, hpxml_bldg, hpxml_header, geothermal_loop, heat_pump,
+ air_loop_unitary, htg_coil, clg_coil, htg_supp_coil, control_zone)
+ # Check if we already created the plant loop for another GSHP
+ plant_loop = model.getPlantLoops.find { |pl| pl.additionalProperties.getFeatureAsString('HPXML_ID').to_s == geothermal_loop.id }
+ if plant_loop.nil?
+ # Create plant loop and supporting objects
+ gl_ap = geothermal_loop.additional_properties
+
+ # Site Ground Temperature Undisturbed
+ xing = OpenStudio::Model::SiteGroundTemperatureUndisturbedXing.new(model)
+ xing.setSoilSurfaceTemperatureAmplitude1(UnitConversions.convert(weather.data.DeepGroundSurfTempAmp1, 'deltaf', 'deltac'))
+ xing.setSoilSurfaceTemperatureAmplitude2(UnitConversions.convert(weather.data.DeepGroundSurfTempAmp2, 'deltaf', 'deltac'))
+ xing.setPhaseShiftofTemperatureAmplitude1(weather.data.DeepGroundPhaseShiftTempAmp1)
+ xing.setPhaseShiftofTemperatureAmplitude2(weather.data.DeepGroundPhaseShiftTempAmp2)
+
+ # Ground Heat Exchanger
+ ground_heat_exch_vert = OpenStudio::Model::GroundHeatExchangerVertical.new(model, xing)
+ ground_heat_exch_vert.setName(obj_name + ' exchanger')
+ ground_heat_exch_vert.setBoreHoleRadius(UnitConversions.convert(geothermal_loop.bore_diameter / 2.0, 'in', 'm'))
+ ground_heat_exch_vert.setGroundThermalConductivity(UnitConversions.convert(hpxml_bldg.site.ground_conductivity, 'Btu/(hr*ft*R)', 'W/(m*K)'))
+ ground_heat_exch_vert.setGroundThermalHeatCapacity(UnitConversions.convert(hpxml_bldg.site.ground_conductivity / hpxml_bldg.site.ground_diffusivity, 'Btu/(ft^3*F)', 'J/(m^3*K)'))
+ ground_heat_exch_vert.setGroundTemperature(UnitConversions.convert(weather.data.DeepGroundAnnualTemp, 'F', 'C'))
+ ground_heat_exch_vert.setGroutThermalConductivity(UnitConversions.convert(geothermal_loop.grout_conductivity, 'Btu/(hr*ft*R)', 'W/(m*K)'))
+ ground_heat_exch_vert.setPipeThermalConductivity(UnitConversions.convert(geothermal_loop.pipe_conductivity, 'Btu/(hr*ft*R)', 'W/(m*K)'))
+ ground_heat_exch_vert.setPipeOutDiameter(UnitConversions.convert(gl_ap.pipe_od, 'in', 'm'))
+ ground_heat_exch_vert.setUTubeDistance(UnitConversions.convert(geothermal_loop.shank_spacing, 'in', 'm'))
+ ground_heat_exch_vert.setPipeThickness(UnitConversions.convert((gl_ap.pipe_od - gl_ap.pipe_id) / 2.0, 'in', 'm'))
+ ground_heat_exch_vert.setMaximumLengthofSimulation(1)
+ ground_heat_exch_vert.setDesignFlowRate(UnitConversions.convert(geothermal_loop.loop_flow, 'gal/min', 'm^3/s'))
+ ground_heat_exch_vert.setNumberofBoreHoles(geothermal_loop.num_bore_holes)
+ ground_heat_exch_vert.setBoreHoleLength(UnitConversions.convert(geothermal_loop.bore_length, 'ft', 'm'))
+ ground_heat_exch_vert.setBoreHoleTopDepth(2) # Consistent with G-function library
+ ground_heat_exch_vert.setGFunctionReferenceRatio(ground_heat_exch_vert.boreHoleRadius.get / ground_heat_exch_vert.boreHoleLength.get) # ensure this ratio is consistent with rb/H so that g values will be taken as-is
+ ground_heat_exch_vert.removeAllGFunctions
+ for i in 0..(gl_ap.g_functions[0].size - 1)
+ ground_heat_exch_vert.addGFunction(gl_ap.g_functions[0][i], gl_ap.g_functions[1][i])
+ end
+ xing = ground_heat_exch_vert.undisturbedGroundTemperatureModel.to_SiteGroundTemperatureUndisturbedXing.get
+ xing.setSoilThermalConductivity(ground_heat_exch_vert.groundThermalConductivity.get)
+ xing.setSoilSpecificHeat(ground_heat_exch_vert.groundThermalHeatCapacity.get / xing.soilDensity)
+ xing.setAverageSoilSurfaceTemperature(ground_heat_exch_vert.groundTemperature.get)
+
+ # Plant Loop
+ plant_loop = Model.add_plant_loop(
+ model,
+ name: "#{obj_name} condenser loop",
+ fluid_type: gl_ap.fluid_type,
+ glycol_concentration: (gl_ap.frac_glycol * 100).to_i,
+ min_temp: UnitConversions.convert(gl_ap.design_hw, 'F', 'C'),
+ max_temp: 48.88889,
+ max_flow_rate: UnitConversions.convert(geothermal_loop.loop_flow, 'gal/min', 'm^3/s')
+ )
+ plant_loop.additionalProperties.setFeature('HPXML_ID', geothermal_loop.id)
+ plant_loop.addSupplyBranchForComponent(ground_heat_exch_vert)
+
+ sizing_plant = plant_loop.sizingPlant
+ sizing_plant.setLoopType('Condenser')
+ sizing_plant.setDesignLoopExitTemperature(UnitConversions.convert(gl_ap.design_chw, 'F', 'C'))
+ sizing_plant.setLoopDesignTemperatureDifference(UnitConversions.convert(gl_ap.design_delta_t, 'deltaF', 'deltaC'))
+
+ setpoint_mgr_follow_ground_temp = OpenStudio::Model::SetpointManagerFollowGroundTemperature.new(model)
+ setpoint_mgr_follow_ground_temp.setName(obj_name + ' condenser loop temp')
+ setpoint_mgr_follow_ground_temp.setControlVariable('Temperature')
+ setpoint_mgr_follow_ground_temp.setMaximumSetpointTemperature(48.88889)
+ setpoint_mgr_follow_ground_temp.setMinimumSetpointTemperature(UnitConversions.convert(gl_ap.design_hw, 'F', 'C'))
+ setpoint_mgr_follow_ground_temp.setReferenceGroundTemperatureObjectType('Site:GroundTemperature:Deep')
+ setpoint_mgr_follow_ground_temp.addToNode(plant_loop.supplyOutletNode)
+
+ # Pump
+ pump_w = 0 # Total pump power across all GSHPs attached to this geothermal loop
+ geothermal_loop.heat_pumps.each do |heat_pump|
+ pump_w += get_pump_power_watts(heat_pump)
+ if heat_pump.is_shared_system
+ pump_w += heat_pump.shared_loop_watts / heat_pump.number_of_units_served.to_f
+ end
+ end
+ pump_w = [pump_w, 1.0].max # prevent error if zero
+ pump = Model.add_pump_variable_speed(
+ model,
+ name: "#{obj_name} pump",
+ rated_power: pump_w
+ )
+ pump.addToNode(plant_loop.supplyInletNode)
+
+ # For all of these pump EMS programs, it's fine to just look at the first GSHP on the
+ # geothermal loop:
+ #
+ # fan_pump_disaggregation_ems_program: The program only cares if the GSHP is in heating
+ # or cooling mode, and all GSHPs will be in the same mode.
+ #
+ # pump_power_ems_program: The program ultimately calculates the system PLR; the PLR for
+ # the first GSHP should be a reasonably approximate the average PLR across all GSHPs.
+ #
+ # ghp_pump_mass_flow_rate: The program compares the estimated water flow rate to the
+ # 1st speed rated flow rate; using only the first GSHP should be fine.
+ add_fan_pump_disaggregation_ems_program(model, pump, htg_coil, clg_coil, htg_supp_coil, heat_pump)
+ add_pump_power_ems_program(model, pump, air_loop_unitary, heat_pump)
+ if (heat_pump.compressor_type == HPXML::HVACCompressorTypeVariableSpeed) && (hpxml_header.ground_to_air_heat_pump_model_type == HPXML::GroundToAirHeatPumpModelTypeExperimental)
+ add_ghp_pump_mass_flow_rate_ems_program(model, pump, control_zone, htg_coil, clg_coil)
+ end
+
+ # Pipes
+ chiller_bypass_pipe = Model.add_pipe_adiabatic(model)
+ plant_loop.addSupplyBranchForComponent(chiller_bypass_pipe)
+ coil_bypass_pipe = Model.add_pipe_adiabatic(model)
+ plant_loop.addDemandBranchForComponent(coil_bypass_pipe)
+ supply_outlet_pipe = Model.add_pipe_adiabatic(model)
+ supply_outlet_pipe.addToNode(plant_loop.supplyOutletNode)
+ demand_inlet_pipe = Model.add_pipe_adiabatic(model)
+ demand_inlet_pipe.addToNode(plant_loop.demandInletNode)
+ demand_outlet_pipe = Model.add_pipe_adiabatic(model)
+ demand_outlet_pipe.addToNode(plant_loop.demandOutletNode)
+ end
+
+ plant_loop.addDemandBranchForComponent(htg_coil)
+ plant_loop.addDemandBranchForComponent(clg_coil)
+ end
+
# Adds the HPXML water-loop heat pump system to the OpenStudio model.
#
# @param model [OpenStudio::Model::Model] OpenStudio Model object
@@ -1995,41 +2044,41 @@ def self.add_pump_power_ems_program(model, pump, heating_object, hvac_system)
pump_program.addLine("Set cooling_pump_vfr_max = #{clg_coil.speeds[-1].referenceUnitRatedWaterFlowRate}")
pump_program.addLine('Set htg_flow_rate = 0.0')
pump_program.addLine('Set clg_flow_rate = 0.0')
- (1..htg_coil.speeds.size).each do |i|
+ for i in 1..htg_coil.speeds.size
# Initialization
pump_program.addLine("Set heating_pump_vfr_#{i} = heating_pump_vfr_max * #{hvac_ap.heat_capacity_ratios[i - 1]}")
pump_program.addLine("Set heating_fraction_time_#{i} = 0.0")
end
pump_program.addLine("If #{heating_usl_sensor.name} == 1")
pump_program.addLine(" Set heating_fraction_time_1 = #{heating_plr_sensor.name}")
- (1..(htg_coil.speeds.size - 1)).each do |i|
+ for i in 1..(htg_coil.speeds.size - 1)
pump_program.addLine("ElseIf #{heating_usl_sensor.name} == #{i + 1}")
pump_program.addLine(" Set heating_fraction_time_#{i} = 1.0 - #{heating_nsl_sensor.name}")
pump_program.addLine(" Set heating_fraction_time_#{i + 1} = #{heating_nsl_sensor.name}")
end
pump_program.addLine('EndIf')
# sum up to get the actual flow rate
- (1..htg_coil.speeds.size).each do |i|
+ for i in 1..htg_coil.speeds.size
pump_program.addLine("Set htg_flow_rate = htg_flow_rate + heating_fraction_time_#{i} * heating_pump_vfr_#{i}")
end
pump_program.addLine('Set heating_plr = htg_flow_rate / heating_pump_vfr_max')
# Cooling
- (1..clg_coil.speeds.size).each do |i|
+ for i in 1..clg_coil.speeds.size
# Initialization
pump_program.addLine("Set cooling_pump_vfr_#{i} = cooling_pump_vfr_max * #{hvac_ap.cool_capacity_ratios[i - 1]}")
pump_program.addLine("Set cooling_fraction_time_#{i} = 0.0")
end
pump_program.addLine("If #{cooling_usl_sensor.name} == 1")
pump_program.addLine(" Set cooling_fraction_time_1 = #{cooling_plr_sensor.name}")
- (1..(clg_coil.speeds.size - 1)).each do |i|
+ for i in 1..(clg_coil.speeds.size - 1)
pump_program.addLine("ElseIf (#{cooling_usl_sensor.name}) == #{i + 1}")
pump_program.addLine(" Set cooling_fraction_time_#{i} = 1.0 - #{cooling_nsl_sensor.name}")
pump_program.addLine(" Set cooling_fraction_time_#{i + 1} = #{cooling_nsl_sensor.name}")
end
pump_program.addLine('EndIf')
# sum up to get the actual flow rate
- (1..clg_coil.speeds.size).each do |i|
+ for i in 1..clg_coil.speeds.size
pump_program.addLine("Set clg_flow_rate = clg_flow_rate + cooling_fraction_time_#{i} * heating_pump_vfr_#{i}")
end
pump_program.addLine('Set cooling_plr = clg_flow_rate / cooling_pump_vfr_max')
diff --git a/hpxml-measures/HPXMLtoOpenStudio/resources/hvac_sizing.rb b/hpxml-measures/HPXMLtoOpenStudio/resources/hvac_sizing.rb
index a6f6e1ffdf..b03b9b8f3e 100644
--- a/hpxml-measures/HPXMLtoOpenStudio/resources/hvac_sizing.rb
+++ b/hpxml-measures/HPXMLtoOpenStudio/resources/hvac_sizing.rb
@@ -72,7 +72,6 @@ def self.calculate(runner, weather, hpxml_bldg, hvac_systems, hpxml_header, upda
apply_hvac_installation_quality(mj, hvac_sizings, hvac_heating, hvac_cooling, hpxml_bldg)
apply_hvac_autosizing_factors_and_limits(hvac_sizings, hvac_heating, hvac_cooling)
apply_hvac_final_capacities(hvac_sizings, hvac_heating, hvac_cooling, hpxml_bldg)
- apply_hvac_ground_loop(mj, runner, hvac_sizings, weather, hvac_cooling, hpxml_bldg)
@all_hvac_sizings[hvac_system] = hvac_sizings
if update_hpxml
@@ -81,6 +80,17 @@ def self.calculate(runner, weather, hpxml_bldg, hvac_systems, hpxml_header, upda
end
end
+ # Calculate geothermal loop size if there are any GSHPs
+ hpxml_bldg.geothermal_loops.each do |geothermal_loop|
+ geothermal_loop_values = GeothermalLoopValues.new
+ apply_geothermal_loop(mj, runner, weather, geothermal_loop, geothermal_loop_values, hpxml_bldg)
+
+ if update_hpxml
+ # Assign geothermal loop properties to HPXML GeothermalLoop
+ apply_to_hpxml_geothermal_loop(geothermal_loop, geothermal_loop_values)
+ end
+ end
+
# Calculate building loads (sum of all zone loads)
bldg_loads = aggregate_zone_loads_to_bldg(all_zone_loads)
@@ -2801,7 +2811,9 @@ def self.apply_hvac_equipment_adjustments(mj, runner, hvac_sizings, weather, hva
elsif HPXML::HVACTypeHeatPumpGroundToAir == cooling_type
- entering_temp = clg_ap.design_chw
+ geothermal_loop = hvac_cooling.geothermal_loop
+ gl_ap = geothermal_loop.additional_properties
+ entering_temp = gl_ap.design_chw
hvac_cooling_speed = get_nominal_speed(clg_ap, true)
if [HPXML::GroundToAirHeatPumpModelTypeStandard].include? hpxml_header.ground_to_air_heat_pump_model_type
# TODO: replace hardcoded bypass factor and curve?
@@ -2896,8 +2908,10 @@ def self.apply_hvac_equipment_adjustments(mj, runner, hvac_sizings, weather, hva
hvac_sizings.Heat_Airflow = calc_airflow_rate(:htg, hvac_heating, hvac_sizings.Heat_Capacity, hpxml_bldg)
elsif [HPXML::HVACTypeHeatPumpGroundToAir].include? heating_type
+
+ gl_ap = hvac_heating.geothermal_loop.additional_properties
hvac_heating_speed = get_nominal_speed(htg_ap, false)
- htg_cap_curve_value = calc_gshp_htg_curve_value(htg_ap, hpxml_header, mj.heat_setpoint, htg_ap.design_hw, hvac_heating_speed)
+ htg_cap_curve_value = calc_gshp_htg_curve_value(htg_ap, hpxml_header, mj.heat_setpoint, gl_ap.design_hw, hvac_heating_speed)
hvac_sizings.Heat_Capacity = hvac_sizings.Heat_Load / htg_cap_curve_value
hvac_sizings.Heat_Capacity_Supp = hvac_sizings.Heat_Load_Supp
if hvac_sizings.Cool_Capacity > 0
@@ -3287,25 +3301,30 @@ def self.apply_hvac_final_capacities(hvac_sizings, hvac_heating, hvac_cooling, h
end
end
- # GSHP Ground Loop Sizing Calculations
+ # GSHP Geothermal Loop Sizing Calculations
#
# @param mj [MJValues] Object with a collection of misc Manual J values
# @param runner [OpenStudio::Measure::OSRunner] Object typically used to display warnings
- # @param hvac_sizings [HVACSizingValues] Object with sizing values for a given HVAC system
# @param weather [WeatherFile] Weather object containing EPW information
- # @param hvac_cooling [HPXML::CoolingSystem or HPXML::HeatPump] The cooling portion of the current HPXML HVAC system
+ # @param geothermal_loop [HPXML::GeothermalLoop] The HPXML geothermal loop of interest
+ # @param geothermal_loop_values [GeothermalLoopValues] Object with properties for a given geothermal loop
# @param hpxml_bldg [HPXML::Building] HPXML Building object representing an individual dwelling unit
# @return [nil]
- def self.apply_hvac_ground_loop(mj, runner, hvac_sizings, weather, hvac_cooling, hpxml_bldg)
- cooling_type = get_hvac_cooling_type(hvac_cooling)
-
- return if cooling_type != HPXML::HVACTypeHeatPumpGroundToAir
+ def self.apply_geothermal_loop(mj, runner, weather, geothermal_loop, geothermal_loop_values, hpxml_bldg)
+ total_heat_capacity, total_cool_capacity = 0.0, 0.0
+ bore_length_heat, bore_length_cool = 0.0, 0.0
+ geothermal_loop.heat_pumps.each do |gshp|
+ hvac_system = { heating: gshp, cooling: gshp }
+ heat_capacity = @all_hvac_sizings[hvac_system].Heat_Capacity
+ cool_capacity = @all_hvac_sizings[hvac_system].Cool_Capacity
- geothermal_loop = hvac_cooling.geothermal_loop
+ total_heat_capacity += heat_capacity
+ total_cool_capacity += cool_capacity
- loop_flow = geothermal_loop.loop_flow
- if loop_flow.nil?
- loop_flow = [1.0, UnitConversions.convert([hvac_sizings.Heat_Capacity, hvac_sizings.Cool_Capacity].max, 'Btu/hr', 'ton')].max.floor * 3.0
+ # Autosize ground loop heat exchanger length
+ nom_length_heat, nom_length_cool = get_geothermal_loop_borefield_ft_per_ton(mj, hpxml_bldg, geothermal_loop, weather, gshp)
+ bore_length_heat += nom_length_heat * UnitConversions.convert(heat_capacity, 'Btu/hr', 'ton')
+ bore_length_cool += nom_length_cool * UnitConversions.convert(cool_capacity, 'Btu/hr', 'ton')
end
min_bore_depth = 80 # ft; based on g-function library
@@ -3313,20 +3332,20 @@ def self.apply_hvac_ground_loop(mj, runner, hvac_sizings, weather, hvac_cooling,
# Sounds like people are pushing ever deeper but for now we can apply this limit and add a note about where it came from.
max_bore_depth = 500 # ft
min_num_boreholes = 1
- max_num_boreholes = 10
+ max_num_boreholes = 15
num_bore_holes = geothermal_loop.num_bore_holes
bore_depth = geothermal_loop.bore_length
if num_bore_holes.nil? || bore_depth.nil?
- # Autosize ground loop heat exchanger length
- nom_length_heat, nom_length_cool = get_geothermal_loop_borefield_ft_per_ton(mj, hpxml_bldg, geothermal_loop, weather, hvac_cooling)
- bore_length_heat = nom_length_heat * UnitConversions.convert(hvac_sizings.Heat_Capacity, 'Btu/hr', 'ton')
- bore_length_cool = nom_length_cool * UnitConversions.convert(hvac_sizings.Cool_Capacity, 'Btu/hr', 'ton')
bore_length = [bore_length_heat, bore_length_cool].max
if num_bore_holes.nil? && bore_depth.nil?
- num_bore_holes = [min_num_boreholes, (UnitConversions.convert(hvac_sizings.Cool_Capacity, 'Btu/hr', 'ton') + 0.5).floor].max
+ if total_cool_capacity > 0
+ num_bore_holes = [min_num_boreholes, (UnitConversions.convert(total_cool_capacity, 'Btu/hr', 'ton') + 0.5).floor].max
+ else # if GSHP only provides heating
+ num_bore_holes = [min_num_boreholes, (UnitConversions.convert(total_heat_capacity, 'Btu/hr', 'ton') + 0.5).floor].max
+ end
# Divide length by number of boreholes for average bore depth
bore_depth = (bore_length / num_bore_holes).floor # ft
@@ -3368,7 +3387,7 @@ def self.apply_hvac_ground_loop(mj, runner, hvac_sizings, weather, hvac_cooling,
bore_config = geothermal_loop.bore_config
if bore_config.nil?
- bore_config = HPXML::GeothermalLoopBorefieldConfigurationRectangle
+ bore_config = HPXML::GeothermalLoopBoreConfigRectangle
end
g_functions_json = get_geothermal_loop_g_functions_json(get_geothermal_loop_valid_configurations[bore_config])
@@ -3378,26 +3397,31 @@ def self.apply_hvac_ground_loop(mj, runner, hvac_sizings, weather, hvac_cooling,
fail "Number of bore holes (#{num_bore_holes}) with borefield configuration '#{bore_config}' not supported."
end
- hvac_sizings.GSHP_Loop_Flow = loop_flow
- hvac_sizings.GSHP_Bore_Depth = bore_depth
- hvac_sizings.GSHP_Bore_Holes = num_bore_holes
- hvac_sizings.GSHP_Bore_Config = bore_config
+ loop_flow = geothermal_loop.loop_flow
+ if loop_flow.nil?
+ loop_flow = [1.0, UnitConversions.convert([total_heat_capacity, total_cool_capacity].max, 'Btu/hr', 'ton')].max.floor * 3.0
+ end
- hvac_sizings.GSHP_G_Functions = get_geothermal_g_functions_data(bore_config, g_functions_json, geothermal_loop, num_bore_holes, bore_depth)
+ geothermal_loop_values.Loop_Flow = loop_flow
+ geothermal_loop_values.Bore_Depth = bore_depth
+ geothermal_loop_values.Bore_Holes = num_bore_holes
+ geothermal_loop_values.Bore_Config = bore_config
+ geothermal_loop_values.G_Functions = get_geothermal_g_functions_data(bore_config, g_functions_json, geothermal_loop, num_bore_holes, bore_depth)
end
# Calculates the total needed length of heating/cooling borehole length for the geothermal loop.
#
# @param mj [MJValues] Object with a collection of misc Manual J values
# @param hpxml_bldg [HPXML::Building] HPXML Building object representing an individual dwelling unit
- # @param geothermal_loop [HPXML::GeothermalLoop] Geothermal loop of interest
+ # @param geothermal_loop [HPXML::GeothermalLoop] The HPXML geothermal loop of interest
# @param weather [WeatherFile] Weather object containing EPW information
- # @param hvac_cooling [HPXML::HeatPump] The cooling portion of the current HPXML HVAC system
+ # @param heat_pump [HPXML::HeatPump] The cooling portion of the current HPXML HVAC system
# @return [Array] Nominal heating length, nominal cooling length (ft/ton)
- def self.get_geothermal_loop_borefield_ft_per_ton(mj, hpxml_bldg, geothermal_loop, weather, hvac_cooling)
- clg_ap = hvac_cooling.additional_properties
+ def self.get_geothermal_loop_borefield_ft_per_ton(mj, hpxml_bldg, geothermal_loop, weather, heat_pump)
+ gl_ap = geothermal_loop.additional_properties
+ hp_ap = heat_pump.additional_properties
- case clg_ap.u_tube_spacing_type
+ case gl_ap.u_tube_spacing_type
when 'b'
beta_0 = 17.4427
beta_1 = -0.6052
@@ -3410,8 +3434,8 @@ def self.get_geothermal_loop_borefield_ft_per_ton(mj, hpxml_bldg, geothermal_loo
end
r_value_ground = Math.log(geothermal_loop.bore_spacing / geothermal_loop.bore_diameter * 12.0) / 2.0 / Math::PI / hpxml_bldg.site.ground_conductivity
- r_value_grout = 1.0 / geothermal_loop.grout_conductivity / beta_0 / ((geothermal_loop.bore_diameter / clg_ap.pipe_od)**beta_1)
- r_value_pipe = Math.log(clg_ap.pipe_od / clg_ap.pipe_id) / 2.0 / Math::PI / hvac_cooling.geothermal_loop.pipe_conductivity
+ r_value_grout = 1.0 / geothermal_loop.grout_conductivity / beta_0 / ((geothermal_loop.bore_diameter / gl_ap.pipe_od)**beta_1)
+ r_value_pipe = Math.log(gl_ap.pipe_od / gl_ap.pipe_id) / 2.0 / Math::PI / geothermal_loop.pipe_conductivity
r_value_bore = r_value_grout + r_value_pipe / 2.0 # Note: Convection resistance is negligible when calculated against Glhepro (Jeffrey D. Spitler, 2000)
is_southern_hemisphere = (hpxml_bldg.latitude < 0)
@@ -3438,17 +3462,17 @@ def self.get_geothermal_loop_borefield_ft_per_ton(mj, hpxml_bldg, geothermal_loo
rtf_design_mon_heat = [[rtf_design_mon_heat, 0.25].max, 1.0].min
rtf_design_mon_cool = [[rtf_design_mon_cool, 0.25].max, 1.0].min
- nom_length_heat = (1.0 - 1.0 / clg_ap.heat_rated_cops[0]) * (r_value_bore + r_value_ground * rtf_design_mon_heat) / (weather.data.DeepGroundAnnualTemp - (2.0 * clg_ap.design_hw - clg_ap.design_delta_t) / 2.0) * UnitConversions.convert(1.0, 'ton', 'Btu/hr')
- nom_length_cool = (1.0 + 1.0 / clg_ap.cool_rated_cops[0]) * (r_value_bore + r_value_ground * rtf_design_mon_cool) / ((2.0 * clg_ap.design_chw + clg_ap.design_delta_t) / 2.0 - weather.data.DeepGroundAnnualTemp) * UnitConversions.convert(1.0, 'ton', 'Btu/hr')
+ nom_length_heat = (1.0 - 1.0 / hp_ap.heat_rated_cops[0]) * (r_value_bore + r_value_ground * rtf_design_mon_heat) / (weather.data.DeepGroundAnnualTemp - (2.0 * gl_ap.design_hw - gl_ap.design_delta_t) / 2.0) * UnitConversions.convert(1.0, 'ton', 'Btu/hr')
+ nom_length_cool = (1.0 + 1.0 / hp_ap.cool_rated_cops[0]) * (r_value_bore + r_value_ground * rtf_design_mon_cool) / ((2.0 * gl_ap.design_chw + gl_ap.design_delta_t) / 2.0 - weather.data.DeepGroundAnnualTemp) * UnitConversions.convert(1.0, 'ton', 'Btu/hr')
return nom_length_heat, nom_length_cool
end
# Returns the geothermal loop g-function response factors.
#
- # @param bore_config [String] Borefield configuration (HPXML::GeothermalLoopBorefieldConfigurationXXX)
+ # @param bore_config [String] Borefield configuration (HPXML::GeothermalLoopBoreConfigXXX)
# @param g_functions_json [JSON] JSON object with g-function data
- # @param geothermal_loop [HPXML::GeothermalLoop] Geothermal loop of interest
+ # @param geothermal_loop [HPXML::GeothermalLoop] The HPXML geothermal loop of interest
# @param num_bore_holes [Integer] Total number of boreholes
# @param bore_depth [Double] Depth of each borehole (ft)
# @return [Array, Array>] List of g-function lntts (natural log of time/steady state time) values, list of g-function values
@@ -3511,14 +3535,14 @@ def self.get_geothermal_g_functions_data(bore_config, g_functions_json, geotherm
# Returns the geothermal loop g-function logtimes/values for a specific configuration in the JSON file.
#
# @param g_functions_json [JSON] JSON object with g-function data
- # @param bore_config [String] Borefield configuration (HPXML::GeothermalLoopBorefieldConfigurationXXX)
+ # @param bore_config [String] Borefield configuration (HPXML::GeothermalLoopBoreConfigXXX)
# @param num_bore_holes [Integer] Total number of boreholes
# @param b_h_rb [String] The lookup key (B._H._rb) in the g-function data.
# @return [Array, Array>] List of logtimes, list of g-function values
def self.get_geothermal_loop_g_functions_data_from_json(g_functions_json, bore_config, num_bore_holes, b_h_rb)
g_functions_json.values.each do |values_1|
- if [HPXML::GeothermalLoopBorefieldConfigurationRectangle,
- HPXML::GeothermalLoopBorefieldConfigurationL].include?(bore_config)
+ if [HPXML::GeothermalLoopBoreConfigRectangle,
+ HPXML::GeothermalLoopBoreConfigL].include?(bore_config)
bore_locations = values_1[:bore_locations]
next if bore_locations.size != num_bore_holes
@@ -3526,10 +3550,10 @@ def self.get_geothermal_loop_g_functions_data_from_json(g_functions_json, bore_c
g = values_1[:g][b_h_rb.to_sym].map { |v| Float(v) }
return logtime, g
- elsif [HPXML::GeothermalLoopBorefieldConfigurationOpenRectangle,
- HPXML::GeothermalLoopBorefieldConfigurationC,
- HPXML::GeothermalLoopBorefieldConfigurationLopsidedU,
- HPXML::GeothermalLoopBorefieldConfigurationU].include?(bore_config)
+ elsif [HPXML::GeothermalLoopBoreConfigOpenRectangle,
+ HPXML::GeothermalLoopBoreConfigC,
+ HPXML::GeothermalLoopBoreConfigLopsidedU,
+ HPXML::GeothermalLoopBoreConfigU].include?(bore_config)
values_1.values.each do |values_2|
bore_locations = values_2[:bore_locations]
next if bore_locations.size != num_bore_holes
@@ -3547,12 +3571,12 @@ def self.get_geothermal_loop_g_functions_data_from_json(g_functions_json, bore_c
#
# @return [Hash] Map of configuration => datafile
def self.get_geothermal_loop_valid_configurations
- valid_configs = { HPXML::GeothermalLoopBorefieldConfigurationRectangle => 'rectangle_5m_v1.0.json',
- HPXML::GeothermalLoopBorefieldConfigurationOpenRectangle => 'Open_configurations_5m_v1.0.json',
- HPXML::GeothermalLoopBorefieldConfigurationC => 'C_configurations_5m_v1.0.json',
- HPXML::GeothermalLoopBorefieldConfigurationL => 'L_configurations_5m_v1.0.json',
- HPXML::GeothermalLoopBorefieldConfigurationU => 'U_configurations_5m_v1.0.json',
- HPXML::GeothermalLoopBorefieldConfigurationLopsidedU => 'LopU_configurations_5m_v1.0.json' }
+ valid_configs = { HPXML::GeothermalLoopBoreConfigRectangle => 'rectangle_5m_v1.0.json',
+ HPXML::GeothermalLoopBoreConfigOpenRectangle => 'Open_configurations_5m_v1.0.json',
+ HPXML::GeothermalLoopBoreConfigC => 'C_configurations_5m_v1.0.json',
+ HPXML::GeothermalLoopBoreConfigL => 'L_configurations_5m_v1.0.json',
+ HPXML::GeothermalLoopBoreConfigU => 'U_configurations_5m_v1.0.json',
+ HPXML::GeothermalLoopBoreConfigLopsidedU => 'LopU_configurations_5m_v1.0.json' }
return valid_configs
end
@@ -5274,31 +5298,6 @@ def self.assign_to_hpxml_system(hvac_heating, hvac_cooling, hvac_sizings)
end
htg_ap.heating_actual_airflow_cfm = Float(htg_ap.heating_actual_airflow_cfm.round)
- # Heating geothermal loop
- if hvac_heating.is_a? HPXML::HeatPump
- htg_ap.GSHP_G_Functions = hvac_sizings.GSHP_G_Functions
-
- geothermal_loop = hvac_heating.geothermal_loop
- if not geothermal_loop.nil?
- if geothermal_loop.loop_flow.nil?
- geothermal_loop.loop_flow = hvac_sizings.GSHP_Loop_Flow
- geothermal_loop.loop_flow_isdefaulted = true
- end
- if geothermal_loop.num_bore_holes.nil?
- geothermal_loop.num_bore_holes = hvac_sizings.GSHP_Bore_Holes
- geothermal_loop.num_bore_holes_isdefaulted = true
- end
- if geothermal_loop.bore_length.nil?
- geothermal_loop.bore_length = hvac_sizings.GSHP_Bore_Depth
- geothermal_loop.bore_length_isdefaulted = true
- end
- if geothermal_loop.bore_config.nil?
- geothermal_loop.bore_config = hvac_sizings.GSHP_Bore_Config
- geothermal_loop.bore_config_isdefaulted = true
- end
- end
- end
-
end
if not hvac_cooling.nil?
@@ -5348,6 +5347,33 @@ def self.assign_to_hpxml_system(hvac_heating, hvac_cooling, hvac_sizings)
end
end
+ # Assigns the final calculated borefield configuration to the HPXML GeothermalLoop.
+ # These values will end up in the in.xml file, among other outputs.
+ #
+ # @param geothermal_loop [HPXML::GeothermalLoop] The HPXML geothermal loop of interest
+ # @param geothermal_loop_values [GeothermalLoopValues] Object with properties for a given geothermal loop
+ # @return [nil]
+ def self.apply_to_hpxml_geothermal_loop(geothermal_loop, geothermal_loop_values)
+ gl_ap = geothermal_loop.additional_properties
+ gl_ap.g_functions = geothermal_loop_values.G_Functions
+ if geothermal_loop.loop_flow.nil?
+ geothermal_loop.loop_flow = geothermal_loop_values.Loop_Flow
+ geothermal_loop.loop_flow_isdefaulted = true
+ end
+ if geothermal_loop.num_bore_holes.nil?
+ geothermal_loop.num_bore_holes = geothermal_loop_values.Bore_Holes
+ geothermal_loop.num_bore_holes_isdefaulted = true
+ end
+ if geothermal_loop.bore_length.nil?
+ geothermal_loop.bore_length = geothermal_loop_values.Bore_Depth
+ geothermal_loop.bore_length_isdefaulted = true
+ end
+ if geothermal_loop.bore_config.nil?
+ geothermal_loop.bore_config = geothermal_loop_values.Bore_Config
+ geothermal_loop.bore_config_isdefaulted = true
+ end
+ end
+
# Sums all the zone loads to calculate the entire building's loads.
#
# @param all_zone_loads [Hash] Map of HPXML::Zones => DesignLoadValues object
@@ -5730,7 +5756,7 @@ def initialize
end
end
-# Object with sizing values (loads, capacities, airflows, etc.) for a specific HVAC system
+# Object with HVAC sizing values (loads, capacities, airflows, etc.) for a specific HVAC system
class HVACSizingValues
attr_accessor(:Cool_Load_Sens, # [Double] Total sensible cooling load (Btu/hr)
:Cool_Load_Lat, # [Double] Total latent cooling load (Btu/hr)
@@ -5742,12 +5768,16 @@ class HVACSizingValues
:Heat_Capacity, # [Double] Nominal heating capacity (Btu/hr)
:Heat_Capacity_Supp, # [Double] Nominal heating capacity for the HP backup (Btu/hr)
:Cool_Airflow, # [Double] Cooling airflow rate (cfm)
- :Heat_Airflow, # [Double] Heating airflow rate (cfm)
- :GSHP_Loop_Flow, # [Double] Ground-source heat pump water flow rate through the geothermal loop (gal/min)
- :GSHP_Bore_Holes, # [Integer] Ground-source heat pump number of boreholes (#)
- :GSHP_Bore_Depth, # [Double] Ground-source heat pump depth of each borehole (ft)
- :GSHP_G_Functions, # [Array, Array>] Ground-source heat pump G-functions
- :GSHP_Bore_Config) # [String] Ground-source heat pump borefield configuration (HPXML::GeothermalLoopBorefieldConfigurationXXX)
+ :Heat_Airflow) # [Double] Heating airflow rate (cfm)
+end
+
+# Object with geothermal loop values for ground-source heat pumps
+class GeothermalLoopValues
+ attr_accessor(:Loop_Flow, # [Double] Water flow rate (gal/min)
+ :Bore_Holes, # [Integer] Number of boreholes (#)
+ :Bore_Depth, # [Double] Depth of each borehole (ft)
+ :Bore_Config, # [String] Borefield configuration (HPXML::GeothermalLoopBoreConfigXXX)
+ :G_Functions) # [Array, Array>] G-functions
end
# Object with data needed to write out the detailed output (used for populating an ACCA J1 form).
diff --git a/hpxml-measures/HPXMLtoOpenStudio/resources/output.rb b/hpxml-measures/HPXMLtoOpenStudio/resources/output.rb
index 3440ab6188..31dc192fa4 100644
--- a/hpxml-measures/HPXMLtoOpenStudio/resources/output.rb
+++ b/hpxml-measures/HPXMLtoOpenStudio/resources/output.rb
@@ -108,8 +108,11 @@ def self.apply_unmet_hours_ems_program(model, hpxml_osm_map, hpxml_header)
clg_avail_sensors[unit] = unit_model.getEnergyManagementSystemSensors.find { |s| s.additionalProperties.getFeatureAsString('ObjectType').to_s == Constants::ObjectTypeSensorScheduleCoolingAvailability }
end
- htg_tol = model.getOutputControlReportingTolerances.toleranceforTimeHeatingSetpointNotMet
- clg_tol = model.getOutputControlReportingTolerances.toleranceforTimeCoolingSetpointNotMet
+ # Set unmet hours tolerance to 0.5 deg-F
+ rep_tols = model.getOutputControlReportingTolerances
+ unmet_tol = UnitConversions.convert(0.5, 'deltaF', 'deltaC')
+ rep_tols.setToleranceforTimeHeatingSetpointNotMet(unmet_tol)
+ rep_tols.setToleranceforTimeCoolingSetpointNotMet(unmet_tol)
# EMS program
clg_hrs = 'clg_unmet_hours'
@@ -134,7 +137,7 @@ def self.apply_unmet_hours_ems_program(model, hpxml_osm_map, hpxml_header)
line += " && (#{htg_avail_sensors[unit].name} == 1)" unless htg_avail_sensors[unit].nil?
program.addLine(line)
if not zone_air_temp_sensors[unit].nil? # on off deadband
- program.addLine(" If #{zone_air_temp_sensors[unit].name} < (#{htg_sp_sensors[unit].name} - #{htg_tol})")
+ program.addLine(" If #{zone_air_temp_sensors[unit].name} < (#{htg_sp_sensors[unit].name} - #{unmet_tol})")
program.addLine(" Set #{unit_htg_hrs} = #{unit_htg_hrs} + #{htg_sensors[unit].name}")
program.addLine(' EndIf')
else
@@ -156,7 +159,7 @@ def self.apply_unmet_hours_ems_program(model, hpxml_osm_map, hpxml_header)
line += " && (#{clg_avail_sensors[unit].name} == 1)" unless clg_avail_sensors[unit].nil?
program.addLine(line)
if not zone_air_temp_sensors[unit].nil? # on off deadband
- program.addLine(" If #{zone_air_temp_sensors[unit].name} > (#{clg_sp_sensors[unit].name} + #{clg_tol})")
+ program.addLine(" If #{zone_air_temp_sensors[unit].name} > (#{clg_sp_sensors[unit].name} + #{unmet_tol})")
program.addLine(" Set #{unit_clg_hrs} = #{unit_clg_hrs} + #{clg_sensors[unit].name}")
program.addLine(' EndIf')
else
diff --git a/hpxml-measures/HPXMLtoOpenStudio/tests/test_defaults.rb b/hpxml-measures/HPXMLtoOpenStudio/tests/test_defaults.rb
index 33ac69eba5..2395dc281b 100644
--- a/hpxml-measures/HPXMLtoOpenStudio/tests/test_defaults.rb
+++ b/hpxml-measures/HPXMLtoOpenStudio/tests/test_defaults.rb
@@ -2784,7 +2784,7 @@ def test_ground_source_heat_pumps
def test_geothermal_loops
# Test inputs not overridden by defaults
hpxml, hpxml_bldg = _create_hpxml('base-hvac-ground-to-air-heat-pump-detailed-geothermal-loop.xml')
- hpxml_bldg.geothermal_loops[0].loop_configuration = HPXML::GeothermalLoopLoopConfigurationVertical
+ hpxml_bldg.geothermal_loops[0].loop_config = HPXML::GeothermalLoopConfigVertical
hpxml_bldg.geothermal_loops[0].loop_flow = 1
hpxml_bldg.geothermal_loops[0].num_bore_holes = 2
hpxml_bldg.geothermal_loops[0].bore_spacing = 3
@@ -2796,10 +2796,10 @@ def test_geothermal_loops
hpxml_bldg.geothermal_loops[0].pipe_conductivity = 7
hpxml_bldg.geothermal_loops[0].pipe_diameter = 1.0
hpxml_bldg.geothermal_loops[0].shank_spacing = 9
- hpxml_bldg.geothermal_loops[0].bore_config = HPXML::GeothermalLoopBorefieldConfigurationRectangle
+ hpxml_bldg.geothermal_loops[0].bore_config = HPXML::GeothermalLoopBoreConfigRectangle
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_geothermal_loop_values(default_hpxml_bldg.geothermal_loops[0], HPXML::GeothermalLoopLoopConfigurationVertical, 1, 2, 3, 100, 5, HPXML::GeothermalLoopGroutOrPipeTypeThermallyEnhanced, 6, HPXML::GeothermalLoopGroutOrPipeTypeThermallyEnhanced, 7, 1.0, 9, HPXML::GeothermalLoopBorefieldConfigurationRectangle)
+ _test_default_geothermal_loop_values(default_hpxml_bldg.geothermal_loops[0], HPXML::GeothermalLoopConfigVertical, 1, 2, 3, 100, 5, HPXML::GeothermalLoopGroutOrPipeTypeThermallyEnhanced, 6, HPXML::GeothermalLoopGroutOrPipeTypeThermallyEnhanced, 7, 1.0, 9, HPXML::GeothermalLoopBoreConfigRectangle)
# Test defaults
hpxml_bldg.geothermal_loops[0].loop_flow = nil # autosized
@@ -2816,7 +2816,7 @@ def test_geothermal_loops
hpxml_bldg.geothermal_loops[0].bore_config = nil # rectangle
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_geothermal_loop_values(default_hpxml_bldg.geothermal_loops[0], HPXML::GeothermalLoopLoopConfigurationVertical, nil, nil, 16.4, nil, 5.0, HPXML::GeothermalLoopGroutOrPipeTypeStandard, 0.75, HPXML::GeothermalLoopGroutOrPipeTypeStandard, 0.23, 1.25, 2.63, HPXML::GeothermalLoopBorefieldConfigurationRectangle)
+ _test_default_geothermal_loop_values(default_hpxml_bldg.geothermal_loops[0], HPXML::GeothermalLoopConfigVertical, nil, nil, 16.4, nil, 5.0, HPXML::GeothermalLoopGroutOrPipeTypeStandard, 0.75, HPXML::GeothermalLoopGroutOrPipeTypeStandard, 0.23, 1.25, 2.63, HPXML::GeothermalLoopBoreConfigRectangle)
# Test defaults w/ specified loop flow
hpxml_bldg.geothermal_loops[0].loop_flow = 1
@@ -2824,7 +2824,7 @@ def test_geothermal_loops
hpxml_bldg.geothermal_loops[0].bore_length = nil
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_geothermal_loop_values(default_hpxml_bldg.geothermal_loops[0], HPXML::GeothermalLoopLoopConfigurationVertical, 1, nil, 16.4, nil, 5.0, HPXML::GeothermalLoopGroutOrPipeTypeStandard, 0.75, HPXML::GeothermalLoopGroutOrPipeTypeStandard, 0.23, 1.25, 2.63, HPXML::GeothermalLoopBorefieldConfigurationRectangle)
+ _test_default_geothermal_loop_values(default_hpxml_bldg.geothermal_loops[0], HPXML::GeothermalLoopConfigVertical, 1, nil, 16.4, nil, 5.0, HPXML::GeothermalLoopGroutOrPipeTypeStandard, 0.75, HPXML::GeothermalLoopGroutOrPipeTypeStandard, 0.23, 1.25, 2.63, HPXML::GeothermalLoopBoreConfigRectangle)
# Test defaults w/ specified num bore holes
hpxml_bldg.geothermal_loops[0].loop_flow = nil
@@ -2832,7 +2832,7 @@ def test_geothermal_loops
hpxml_bldg.geothermal_loops[0].bore_length = nil
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_geothermal_loop_values(default_hpxml_bldg.geothermal_loops[0], HPXML::GeothermalLoopLoopConfigurationVertical, nil, 2, 16.4, nil, 5.0, HPXML::GeothermalLoopGroutOrPipeTypeStandard, 0.75, HPXML::GeothermalLoopGroutOrPipeTypeStandard, 0.23, 1.25, 2.63, HPXML::GeothermalLoopBorefieldConfigurationRectangle)
+ _test_default_geothermal_loop_values(default_hpxml_bldg.geothermal_loops[0], HPXML::GeothermalLoopConfigVertical, nil, 2, 16.4, nil, 5.0, HPXML::GeothermalLoopGroutOrPipeTypeStandard, 0.75, HPXML::GeothermalLoopGroutOrPipeTypeStandard, 0.23, 1.25, 2.63, HPXML::GeothermalLoopBoreConfigRectangle)
# Test defaults w/ specified bore length
hpxml_bldg.geothermal_loops[0].loop_flow = nil
@@ -2840,7 +2840,7 @@ def test_geothermal_loops
hpxml_bldg.geothermal_loops[0].bore_length = 300
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_geothermal_loop_values(default_hpxml_bldg.geothermal_loops[0], HPXML::GeothermalLoopLoopConfigurationVertical, nil, nil, 16.4, 300, 5.0, HPXML::GeothermalLoopGroutOrPipeTypeStandard, 0.75, HPXML::GeothermalLoopGroutOrPipeTypeStandard, 0.23, 1.25, 2.63, HPXML::GeothermalLoopBorefieldConfigurationRectangle)
+ _test_default_geothermal_loop_values(default_hpxml_bldg.geothermal_loops[0], HPXML::GeothermalLoopConfigVertical, nil, nil, 16.4, 300, 5.0, HPXML::GeothermalLoopGroutOrPipeTypeStandard, 0.75, HPXML::GeothermalLoopGroutOrPipeTypeStandard, 0.23, 1.25, 2.63, HPXML::GeothermalLoopBoreConfigRectangle)
# Test defaults w/ specified loop flow, num bore holes
hpxml_bldg.geothermal_loops[0].loop_flow = 2
@@ -2848,7 +2848,7 @@ def test_geothermal_loops
hpxml_bldg.geothermal_loops[0].bore_length = nil
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_geothermal_loop_values(default_hpxml_bldg.geothermal_loops[0], HPXML::GeothermalLoopLoopConfigurationVertical, 2, 3, 16.4, nil, 5.0, HPXML::GeothermalLoopGroutOrPipeTypeStandard, 0.75, HPXML::GeothermalLoopGroutOrPipeTypeStandard, 0.23, 1.25, 2.63, HPXML::GeothermalLoopBorefieldConfigurationRectangle)
+ _test_default_geothermal_loop_values(default_hpxml_bldg.geothermal_loops[0], HPXML::GeothermalLoopConfigVertical, 2, 3, 16.4, nil, 5.0, HPXML::GeothermalLoopGroutOrPipeTypeStandard, 0.75, HPXML::GeothermalLoopGroutOrPipeTypeStandard, 0.23, 1.25, 2.63, HPXML::GeothermalLoopBoreConfigRectangle)
# Test defaults w/ specified num bore holes, bore length
hpxml_bldg.geothermal_loops[0].loop_flow = nil
@@ -2856,7 +2856,7 @@ def test_geothermal_loops
hpxml_bldg.geothermal_loops[0].bore_length = 400
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_geothermal_loop_values(default_hpxml_bldg.geothermal_loops[0], HPXML::GeothermalLoopLoopConfigurationVertical, nil, 4, 16.4, 400, 5.0, HPXML::GeothermalLoopGroutOrPipeTypeStandard, 0.75, HPXML::GeothermalLoopGroutOrPipeTypeStandard, 0.23, 1.25, 2.63, HPXML::GeothermalLoopBorefieldConfigurationRectangle)
+ _test_default_geothermal_loop_values(default_hpxml_bldg.geothermal_loops[0], HPXML::GeothermalLoopConfigVertical, nil, 4, 16.4, 400, 5.0, HPXML::GeothermalLoopGroutOrPipeTypeStandard, 0.75, HPXML::GeothermalLoopGroutOrPipeTypeStandard, 0.23, 1.25, 2.63, HPXML::GeothermalLoopBoreConfigRectangle)
# Test defaults w/ specified loop flow, bore length
hpxml_bldg.geothermal_loops[0].loop_flow = 5
@@ -2864,26 +2864,26 @@ def test_geothermal_loops
hpxml_bldg.geothermal_loops[0].bore_length = 450
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_geothermal_loop_values(default_hpxml_bldg.geothermal_loops[0], HPXML::GeothermalLoopLoopConfigurationVertical, 5, nil, 16.4, 450, 5.0, HPXML::GeothermalLoopGroutOrPipeTypeStandard, 0.75, HPXML::GeothermalLoopGroutOrPipeTypeStandard, 0.23, 1.25, 2.63, HPXML::GeothermalLoopBorefieldConfigurationRectangle)
+ _test_default_geothermal_loop_values(default_hpxml_bldg.geothermal_loops[0], HPXML::GeothermalLoopConfigVertical, 5, nil, 16.4, 450, 5.0, HPXML::GeothermalLoopGroutOrPipeTypeStandard, 0.75, HPXML::GeothermalLoopGroutOrPipeTypeStandard, 0.23, 1.25, 2.63, HPXML::GeothermalLoopBoreConfigRectangle)
# Test defaults w/ thermally enhanced grout type
hpxml_bldg.geothermal_loops[0].grout_type = HPXML::GeothermalLoopGroutOrPipeTypeThermallyEnhanced
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_geothermal_loop_values(default_hpxml_bldg.geothermal_loops[0], HPXML::GeothermalLoopLoopConfigurationVertical, nil, nil, 16.4, nil, 5.0, HPXML::GeothermalLoopGroutOrPipeTypeThermallyEnhanced, 1.2, HPXML::GeothermalLoopGroutOrPipeTypeStandard, 0.23, 1.25, 2.63, HPXML::GeothermalLoopBorefieldConfigurationRectangle)
+ _test_default_geothermal_loop_values(default_hpxml_bldg.geothermal_loops[0], HPXML::GeothermalLoopConfigVertical, nil, nil, 16.4, nil, 5.0, HPXML::GeothermalLoopGroutOrPipeTypeThermallyEnhanced, 1.2, HPXML::GeothermalLoopGroutOrPipeTypeStandard, 0.23, 1.25, 2.63, HPXML::GeothermalLoopBoreConfigRectangle)
# Test defaults w/ thermally enhanced pipe type
hpxml_bldg.geothermal_loops[0].pipe_type = HPXML::GeothermalLoopGroutOrPipeTypeThermallyEnhanced
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_geothermal_loop_values(default_hpxml_bldg.geothermal_loops[0], HPXML::GeothermalLoopLoopConfigurationVertical, nil, nil, 16.4, nil, 5.0, HPXML::GeothermalLoopGroutOrPipeTypeThermallyEnhanced, 1.2, HPXML::GeothermalLoopGroutOrPipeTypeThermallyEnhanced, 0.40, 1.25, 2.63, HPXML::GeothermalLoopBorefieldConfigurationRectangle)
+ _test_default_geothermal_loop_values(default_hpxml_bldg.geothermal_loops[0], HPXML::GeothermalLoopConfigVertical, nil, nil, 16.4, nil, 5.0, HPXML::GeothermalLoopGroutOrPipeTypeThermallyEnhanced, 1.2, HPXML::GeothermalLoopGroutOrPipeTypeThermallyEnhanced, 0.40, 1.25, 2.63, HPXML::GeothermalLoopBoreConfigRectangle)
# Test defaults w/ specified rectangle bore config
hpxml_bldg.geothermal_loops[0].num_bore_holes = nil
- hpxml_bldg.geothermal_loops[0].bore_config = HPXML::GeothermalLoopBorefieldConfigurationRectangle
+ hpxml_bldg.geothermal_loops[0].bore_config = HPXML::GeothermalLoopBoreConfigRectangle
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_geothermal_loop_values(default_hpxml_bldg.geothermal_loops[0], HPXML::GeothermalLoopLoopConfigurationVertical, nil, nil, 16.4, nil, 5.0, HPXML::GeothermalLoopGroutOrPipeTypeThermallyEnhanced, 1.2, HPXML::GeothermalLoopGroutOrPipeTypeThermallyEnhanced, 0.40, 1.25, 2.63, HPXML::GeothermalLoopBorefieldConfigurationRectangle)
+ _test_default_geothermal_loop_values(default_hpxml_bldg.geothermal_loops[0], HPXML::GeothermalLoopConfigVertical, nil, nil, 16.4, nil, 5.0, HPXML::GeothermalLoopGroutOrPipeTypeThermallyEnhanced, 1.2, HPXML::GeothermalLoopGroutOrPipeTypeThermallyEnhanced, 0.40, 1.25, 2.63, HPXML::GeothermalLoopBoreConfigRectangle)
end
def test_hvac_location
@@ -6155,12 +6155,11 @@ def _test_default_ground_to_air_heat_pump_values(heat_pump, pump_watts_per_ton,
end
end
- def _test_default_geothermal_loop_values(geothermal_loop, loop_configuration, loop_flow,
- num_bore_holes, bore_spacing, bore_length, bore_diameter,
- grout_type, grout_conductivity,
- pipe_type, pipe_conductivity, pipe_diameter,
+ def _test_default_geothermal_loop_values(geothermal_loop, loop_config, loop_flow, num_bore_holes,
+ bore_spacing, bore_length, bore_diameter, grout_type,
+ grout_conductivity, pipe_type, pipe_conductivity, pipe_diameter,
shank_spacing, bore_config)
- assert_equal(loop_configuration, geothermal_loop.loop_configuration)
+ assert_equal(loop_config, geothermal_loop.loop_config)
if loop_flow.nil? # nil implies an autosized value
assert(geothermal_loop.loop_flow > 0)
else
diff --git a/hpxml-measures/HPXMLtoOpenStudio/tests/test_hvac.rb b/hpxml-measures/HPXMLtoOpenStudio/tests/test_hvac.rb
index c9af5422b6..094f81093d 100644
--- a/hpxml-measures/HPXMLtoOpenStudio/tests/test_hvac.rb
+++ b/hpxml-measures/HPXMLtoOpenStudio/tests/test_hvac.rb
@@ -1691,9 +1691,8 @@ def test_geothermal_loop
# Check G-Functions
# Expected values
- # 4_4: 1: g: 5._96._0.075 from "LopU_configurations_5m_v1.0.json"
lntts = [-8.5, -7.8, -7.2, -6.5, -5.9, -5.2, -4.5, -3.963, -3.27, -2.864, -2.577, -2.171, -1.884, -1.191, -0.497, -0.274, -0.051, 0.196, 0.419, 0.642, 0.873, 1.112, 1.335, 1.679, 2.028, 2.275, 3.003]
- gfnc_coeff = [2.21, 2.56, 2.85, 3.20, 3.52, 4.0, 4.67, 5.36, 6.55, 7.43, 8.12, 9.17, 9.95, 11.78, 13.4, 13.85, 14.26, 14.66, 14.96, 15.22, 15.45, 15.64, 15.78, 15.94, 16.05, 16.1, 16.19]
+ gfnc_coeff = [1.50, 1.84, 2.13, 2.47, 2.77, 3.11, 3.47, 3.80, 4.34, 4.72, 5.02, 5.48, 5.82, 6.66, 7.42, 7.64, 7.84, 8.04, 8.20, 8.33, 8.45, 8.55, 8.62, 8.70, 8.76, 8.79, 8.84]
gFunctions = lntts.zip(gfnc_coeff)
ghx.gFunctions.each_with_index do |gFunction, i|
assert_in_epsilon(gFunction.lnValue, gFunctions[i][0], 0.01)
diff --git a/hpxml-measures/HPXMLtoOpenStudio/tests/test_hvac_sizing.rb b/hpxml-measures/HPXMLtoOpenStudio/tests/test_hvac_sizing.rb
index d3ae89aa56..82ac719b9c 100644
--- a/hpxml-measures/HPXMLtoOpenStudio/tests/test_hvac_sizing.rb
+++ b/hpxml-measures/HPXMLtoOpenStudio/tests/test_hvac_sizing.rb
@@ -1894,10 +1894,10 @@ def test_gshp_geothermal_loop
# Bore depth greater than the max -> increase number of boreholes until the max, set depth to the max, and issue warning
hpxml, hpxml_bldg = _create_hpxml(ghp_filename)
- hpxml_bldg.site.ground_conductivity = 0.07
+ hpxml_bldg.site.ground_conductivity = 0.01
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_model, _test_hpxml, test_hpxml_bldg = _test_measure(args_hash)
- assert_equal(10, test_hpxml_bldg.geothermal_loops[0].num_bore_holes)
+ assert_equal(15, test_hpxml_bldg.geothermal_loops[0].num_bore_holes)
assert_in_delta(500.0, test_hpxml_bldg.geothermal_loops[0].bore_length, 1.0)
# Boreholes greater than the max -> decrease the number of boreholes until the max
@@ -1905,13 +1905,13 @@ def test_gshp_geothermal_loop
hpxml_bldg.heat_pumps[0].cooling_capacity *= 5
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_model, _test_hpxml, test_hpxml_bldg = _test_measure(args_hash)
- assert_equal(10, test_hpxml_bldg.geothermal_loops[0].num_bore_holes)
- assert_in_delta(226.0, test_hpxml_bldg.geothermal_loops[0].bore_length, 1.0)
+ assert_equal(15, test_hpxml_bldg.geothermal_loops[0].num_bore_holes)
+ assert_in_delta(150.0, test_hpxml_bldg.geothermal_loops[0].bore_length, 1.0)
end
end
def test_gshp_g_function_library_linear_interpolation_example
- bore_config = HPXML::GeothermalLoopBorefieldConfigurationRectangle
+ bore_config = HPXML::GeothermalLoopBoreConfigRectangle
num_bore_holes = 40
bore_depth = UnitConversions.convert(150.0, 'm', 'ft')
g_functions_filename = HVACSizing.get_geothermal_loop_valid_configurations[bore_config]
@@ -1935,12 +1935,12 @@ def test_gshp_g_function_library_linear_interpolation_example
end
def test_gshp_all_g_function_configs_exist
- valid_configs = { HPXML::GeothermalLoopBorefieldConfigurationRectangle => [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
- HPXML::GeothermalLoopBorefieldConfigurationOpenRectangle => [8, 10],
- HPXML::GeothermalLoopBorefieldConfigurationC => [7, 9],
- HPXML::GeothermalLoopBorefieldConfigurationL => [4, 5, 6, 7, 8, 9, 10],
- HPXML::GeothermalLoopBorefieldConfigurationU => [7, 9, 10],
- HPXML::GeothermalLoopBorefieldConfigurationLopsidedU => [6, 7, 8, 9, 10] }
+ valid_configs = { HPXML::GeothermalLoopBoreConfigRectangle => [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+ HPXML::GeothermalLoopBoreConfigOpenRectangle => [8, 10],
+ HPXML::GeothermalLoopBoreConfigC => [7, 9],
+ HPXML::GeothermalLoopBoreConfigL => [4, 5, 6, 7, 8, 9, 10],
+ HPXML::GeothermalLoopBoreConfigU => [7, 9, 10],
+ HPXML::GeothermalLoopBoreConfigLopsidedU => [6, 7, 8, 9, 10] }
valid_configs.each do |bore_config, valid_num_bores|
g_functions_filename = HVACSizing.get_geothermal_loop_valid_configurations[bore_config]
diff --git a/hpxml-measures/HPXMLtoOpenStudio/tests/test_validation.rb b/hpxml-measures/HPXMLtoOpenStudio/tests/test_validation.rb
index 515a18e5b5..d24279bff8 100644
--- a/hpxml-measures/HPXMLtoOpenStudio/tests/test_validation.rb
+++ b/hpxml-measures/HPXMLtoOpenStudio/tests/test_validation.rb
@@ -990,10 +990,10 @@ def test_schema_schematron_warning_messages
'dhw-capacities-low' => ['Heating capacity should typically be greater than or equal to 1000 Btu/hr.',
'Heating capacity should typically be greater than or equal to 1000 Btu/hr.',
'No space cooling specified, the model will not include space cooling energy use.'],
- 'dhw-efficiencies-low' => ['EnergyFactor should typically be greater than or equal to 0.45.',
- 'EnergyFactor should typically be greater than or equal to 0.45.',
- 'EnergyFactor should typically be greater than or equal to 0.45.',
- 'EnergyFactor should typically be greater than or equal to 0.45.',
+ 'dhw-efficiencies-low' => ['EnergyFactor should typically be greater than or equal to 0.4.',
+ 'EnergyFactor should typically be greater than or equal to 0.4.',
+ 'EnergyFactor should typically be greater than or equal to 0.4.',
+ 'EnergyFactor should typically be greater than or equal to 0.4.',
'No space cooling specified, the model will not include space cooling energy use.'],
'dhw-setpoint-low' => ['Hot water setpoint should typically be greater than or equal to 110 deg-F.'],
'erv-atre-low' => ['Adjusted total recovery efficiency should typically be at least half of the adjusted sensible recovery efficiency.'],
@@ -1289,7 +1289,6 @@ def test_ruby_error_messages
'emissions-wrong-columns' => ['Emissions File has too few columns. Cannot find column number'],
'emissions-wrong-filename' => ["Emissions File file path 'invalid-wrong-filename.csv' does not exist."],
'emissions-wrong-rows' => ['Emissions File has invalid number of rows'],
- 'geothermal-loop-multiple-attached-hps' => ["Multiple heat pumps found attached to geothermal loop 'GeothermalLoop1'."],
'heat-pump-backup-system-load-fraction' => ['Heat pump backup system cannot have a fraction heat load served specified.'],
'heat-pump-switchover-temp-elec-backup' => ['Switchover temperature should only be used for a heat pump with fossil fuel backup; use compressor lockout temperature instead.'],
'heat-pump-lockout-temps-elec-backup' => ['Similar compressor/backup lockout temperatures should only be used for a heat pump with fossil fuel backup.'],
@@ -1513,19 +1512,6 @@ def test_ruby_error_messages
csv_data = CSV.read(File.join(File.dirname(hpxml.hpxml_path), scenario.elec_schedule_filepath))
File.write(@tmp_csv_path, csv_data[0..-2].map(&:to_csv).join)
hpxml.header.emissions_scenarios[1].elec_schedule_filepath = @tmp_csv_path
- when 'geothermal-loop-multiple-attached-hps'
- hpxml, hpxml_bldg = _create_hpxml('base-hvac-ground-to-air-heat-pump-detailed-geothermal-loop.xml')
- hpxml_bldg.heat_pumps[0].fraction_cool_load_served = 0.5
- hpxml_bldg.heat_pumps[0].fraction_heat_load_served = 0.5
- hpxml_bldg.heat_pumps << hpxml_bldg.heat_pumps[0].dup
- hpxml_bldg.heat_pumps[1].id = "HeatPump#{hpxml_bldg.heat_pumps.size}"
- hpxml_bldg.heat_pumps[0].primary_heating_system = false
- hpxml_bldg.heat_pumps[0].primary_cooling_system = false
- hpxml_bldg.hvac_distributions.add(id: "HVACDistribution#{hpxml_bldg.hvac_distributions.size + 1}",
- distribution_system_type: HPXML::HVACDistributionTypeDSE,
- annual_cooling_dse: 1.0,
- annual_heating_dse: 1.0)
- hpxml_bldg.heat_pumps[1].distribution_system_idref = hpxml_bldg.hvac_distributions[1].id
when 'heat-pump-backup-system-load-fraction'
hpxml, hpxml_bldg = _create_hpxml('base-hvac-air-to-air-heat-pump-var-speed-backup-boiler.xml')
hpxml_bldg.heating_systems[0].fraction_heat_load_served = 0.5
@@ -1586,6 +1572,7 @@ def test_ruby_error_messages
hpxml_bldg.site.ground_conductivity = 0.1
when 'hvac-gshp-invalid-num-bore-holes'
hpxml, hpxml_bldg = _create_hpxml('base-hvac-ground-to-air-heat-pump-detailed-geothermal-loop.xml')
+ hpxml_bldg.geothermal_loops[0].bore_config = HPXML::GeothermalLoopBoreConfigLopsidedU
hpxml_bldg.geothermal_loops[0].num_bore_holes = 5
when 'hvac-gshp-invalid-num-bore-holes-autosized'
hpxml, hpxml_bldg = _create_hpxml('base-hvac-ground-to-air-heat-pump-1-speed.xml')
@@ -2029,7 +2016,7 @@ def test_ruby_warning_messages
'HPWH exhaust air ducting for a water heater located outside conditioned space is not currently supported; exhaust ducting will not be modeled.',
'HPWH supply air ducted from another location is not currently supported; supply ducting will not be modeled.'],
'hpwh-small-containment-volume-without-backup-element' => ['Heat pump water heater: WaterHeatingSystem1 has no backup electric resistance element, COP adjustment for confined space may not be accurate when the containment space volume is below 450 cubic feet.'],
- 'hvac-gshp-bore-depth-autosized-high' => ['Reached a maximum of 10 boreholes; setting bore depth to the maximum (500 ft).'],
+ 'hvac-gshp-bore-depth-autosized-high' => ['Reached a maximum of 15 boreholes; setting bore depth to the maximum (500 ft).'],
'hvac-setpoint-adjustments' => ['HVAC setpoints have been automatically adjusted to prevent periods where the heating setpoint is greater than the cooling setpoint.'],
'hvac-setpoint-adjustments-daily-setbacks' => ['HVAC setpoints have been automatically adjusted to prevent periods where the heating setpoint is greater than the cooling setpoint.'],
'hvac-setpoint-adjustments-daily-schedules' => ['HVAC setpoints have been automatically adjusted to prevent periods where the heating setpoint is greater than the cooling setpoint.'],
@@ -2208,7 +2195,7 @@ def test_ruby_warning_messages
hpxml_bldg.water_heating_systems[0].hpwh_containment_volume = 250.0
when 'hvac-gshp-bore-depth-autosized-high'
hpxml, hpxml_bldg = _create_hpxml('base-hvac-ground-to-air-heat-pump-1-speed.xml')
- hpxml_bldg.site.ground_conductivity = 0.07
+ hpxml_bldg.site.ground_conductivity = 0.01
when 'hvac-setpoint-adjustments'
hpxml, hpxml_bldg = _create_hpxml('base.xml')
hpxml_bldg.hvac_controls[0].heating_setpoint_temp = 76.0
diff --git a/hpxml-measures/ReportSimulationOutput/measure.rb b/hpxml-measures/ReportSimulationOutput/measure.rb
index 6827e66d84..a41f362adc 100644
--- a/hpxml-measures/ReportSimulationOutput/measure.rb
+++ b/hpxml-measures/ReportSimulationOutput/measure.rb
@@ -898,9 +898,9 @@ def get_outputs(runner, args)
if key == UHT::Driving && unmet_hour.annual_output > 0.0
runner.registerWarning("A total of #{unmet_hour.annual_output} driving hours could not be met due to insufficient vehicle charge. This issue may result from a combination EV battery parameters, charging power, and driving or discharging schedules.")
elsif key == UHT::Heating && unmet_hour.annual_output > 300
- runner.registerWarning("There are a large number of unmet hours (#{unmet_hour.annual_output}) for heating; this may indicate the heating system is undersized or the presence of large thermostat setbacks.")
+ runner.registerWarning("There are a large number of unmet hours (#{unmet_hour.annual_output}) for heating; this may indicate the heating system is undersized or can be caused by recovery from thermostat setbacks.")
elsif key == UHT::Cooling && unmet_hour.annual_output > 300
- runner.registerWarning("There are a large number of unmet hours (#{unmet_hour.annual_output}) for cooling; this may indicate the cooling system is undersized or the presence of large thermostat setbacks.")
+ runner.registerWarning("There are a large number of unmet hours (#{unmet_hour.annual_output}) for cooling; this may indicate the cooling system is undersized or can be caused by recovery from thermostat setbacks.")
end
end
diff --git a/hpxml-measures/ReportSimulationOutput/measure.xml b/hpxml-measures/ReportSimulationOutput/measure.xml
index b7b9b96f01..6609c00fa3 100644
--- a/hpxml-measures/ReportSimulationOutput/measure.xml
+++ b/hpxml-measures/ReportSimulationOutput/measure.xml
@@ -3,8 +3,8 @@
3.1
report_simulation_output
df9d170c-c21a-4130-866d-0d46b06073fd
- 3cd8f87c-0a7f-4420-af7d-d1b9459f6260
- 2026-05-06T20:12:20Z
+ 2753743b-684e-4a8b-a2b6-ad5ae9b26c8b
+ 2026-05-13T03:02:08Z
9BF1E6AC
ReportSimulationOutput
HPXML Simulation Output Report
@@ -2029,13 +2029,13 @@
measure.rb
rb
script
- D68FD0C9
+ F8C75CFE
test_report_sim_output.rb
rb
test
- 85981580
+ B8A6AD1B
diff --git a/hpxml-measures/ReportSimulationOutput/tests/test_report_sim_output.rb b/hpxml-measures/ReportSimulationOutput/tests/test_report_sim_output.rb
index 5fd23743c9..b2f608328e 100644
--- a/hpxml-measures/ReportSimulationOutput/tests/test_report_sim_output.rb
+++ b/hpxml-measures/ReportSimulationOutput/tests/test_report_sim_output.rb
@@ -1544,8 +1544,8 @@ def test_geothermal_loop
assert(File.exist?(annual_csv))
assert(!File.exist?(timeseries_csv))
actual_annual_rows = _get_annual_values(annual_csv)
- assert_equal(9.0, actual_annual_rows['HVAC Geothermal Loop: Borehole/Trench Count'])
- assert_equal(315.0, actual_annual_rows['HVAC Geothermal Loop: Borehole/Trench Length (ft)'])
+ assert_equal(4.0, actual_annual_rows['HVAC Geothermal Loop: Borehole/Trench Count'])
+ assert_equal(150.0, actual_annual_rows['HVAC Geothermal Loop: Borehole/Trench Length (ft)'])
end
private
diff --git a/hpxml-measures/docs/source/workflow_inputs.rst b/hpxml-measures/docs/source/workflow_inputs.rst
index 1df9f0099c..25a5db9a2d 100644
--- a/hpxml-measures/docs/source/workflow_inputs.rst
+++ b/hpxml-measures/docs/source/workflow_inputs.rst
@@ -3414,7 +3414,7 @@ Each geothermal loop is entered as a ``/HPXML/Building/BuildingDetails/Systems/H
``SystemIdentifier`` id Yes Unique identifier
``LoopConfiguration`` string vertical Yes Geothermal loop configuration
``LoopFlow`` double gal/min > 0 No See [#]_ Water flow rate through the geothermal loop
- ``BoreholesOrTrenches/Count`` integer >= 1, <= 10 [#]_ No [#]_ See [#]_ Number of boreholes
+ ``BoreholesOrTrenches/Count`` integer >= 1, <= 15 [#]_ No [#]_ See [#]_ Number of boreholes
``BoreholesOrTrenches/Length`` double ft >= 80, <= 500 [#]_ No See [#]_ Length (i.e., average depth) of each borehole
``BoreholesOrTrenches/Spacing`` double ft > 0 No 16.4 Distance between boreholes
``BoreholesOrTrenches/Diameter`` double in > 0 No 5.0 Borehole diameter
@@ -3428,20 +3428,21 @@ Each geothermal loop is entered as a ``/HPXML/Building/BuildingDetails/Systems/H
.. [#] If LoopFlow not provided, is it autosized as 3 times the maximum of the ground source heat pump's heating/cooling capacity in tons, with a minimum of 3 gal/min.
.. [#] BoreholesOrTrenches/Count must be one of the following based on the borefield configuration:
- \- **Rectangle**: 1, 2, 3, 4, 5, 6, 7, 8, 9, or 10
+ \- **Rectangle**: 1-15
- \- **Open Rectangle**: 8 or 10
+ \- **Open Rectangle**: 8, 10, 12, 14
- \- **C**: 7 or 9
+ \- **C**: 7, 9, 11, 13-15
- \- **L**: 4, 5, 6, 7, 8, 9, or 10
+ \- **L**: 4-15
- \- **U**: 7, 9, or 10
+ \- **U**: 7, 9-15
- \- **Lopsided U**: 6, 7, 8, 9, or 10
+ \- **Lopsided U**: 6-15
.. [#] BoreholesOrTrenches/Count is only required if extension/BorefieldConfiguration is provided and not **Rectangle**.
- .. [#] If BoreholesOrTrenches/Count not provided, it is calculated as the required total length of the ground heat exchanger (calculated during sizing) divided by BoreholesOrTrenches/Length if BoreholesOrTrenches/Length is provided, otherwise autosized by assuming 1 for every ton of ground source heat pump cooling capacity (max of 10).
+ .. [#] If BoreholesOrTrenches/Count not provided, it is calculated as the required total length of the ground heat exchanger (calculated during sizing) divided by BoreholesOrTrenches/Length if BoreholesOrTrenches/Length is provided, otherwise assumes 1 borehole for every ton of ground source heat pump cooling capacity.
+ The maximum number of boreholes is 15.
.. [#] The minimum depth in the g-function library is 80 ft.
The maximum realistic depth to be used in residential applications is 500 ft.
.. [#] If BoreholesOrTrenches/Length not provided, it is calculated as the required total length of the ground heat exchanger (calculated during sizing) divided by the total number of boreholes.
@@ -5837,7 +5838,7 @@ The various locations used in an HPXML file are defined as follows:
crawlspace - conditioned Below-grade conditioned space maintained at setpoint EnergyPlus thermal zone calculation Any
garage Unconditioned garage (not shared parking garage) [#]_ EnergyPlus thermal zone calculation Any
manufactured home underbelly Underneath the belly, ambient environment Weather data Manufactured only
- manufactured home belly Within the belly Same as conditioned space Manufactured only
+ manufactured home belly Within the belly Weighted avg of 85% conditioned space/15% outside Manufactured only
other housing unit E.g., conditioned adjacent unit or conditioned corridor Same as conditioned space SFA/MF only
other heated space E.g., shared laundry/equipment space Avg of conditioned space/outside; min of heating setpoint SFA/MF only
other multifamily buffer space E.g., enclosed unconditioned stairwell Avg of conditioned space/outside; min of 50F SFA/MF only
diff --git a/hpxml-measures/docs/source/workflow_outputs.rst b/hpxml-measures/docs/source/workflow_outputs.rst
index bd229188d4..96899b120e 100644
--- a/hpxml-measures/docs/source/workflow_outputs.rst
+++ b/hpxml-measures/docs/source/workflow_outputs.rst
@@ -334,7 +334,7 @@ If running :ref:`bldg_type_whole_mf_buildings`, values will reflect hours in whi
Unmet Hours: EV Driving (hr) Number of hours where the EV driving demand is not met. [#]_
============================ =====
- .. [#] The unmet heating and cooling numbers reflect the number of hours during the heating/cooling season when the conditioned space temperature deviates more than 0.2 deg-C (0.36 deg-F) from the heating/cooling setpoint.
+ .. [#] The unmet heating and cooling numbers reflect the number of hours during the heating/cooling season when the conditioned space temperature deviates more than 0.5 deg-F from the heating/cooling setpoint.
OpenStudio-HPXML will issue a warning if there are more than 300 unmet hours for heating or cooling.
.. [#] The unmet EV driving number represents the total time in which the electric vehicle discharge schedule exceeds zero while the EV battery's state of charge is at its minimum level.
diff --git a/hpxml-measures/tasks.rb b/hpxml-measures/tasks.rb
index 2041e56590..901ffaae9d 100644
--- a/hpxml-measures/tasks.rb
+++ b/hpxml-measures/tasks.rb
@@ -2321,6 +2321,36 @@ def apply_hpxml_modification_sample_files(hpxml_path, hpxml)
hpxml_bldg.heat_pumps[0].heating_efficiency_hspf2 = nil
hpxml_bldg.heat_pumps[0].heating_efficiency_hspf = 7.7
end
+ if ['base-hvac-ground-to-air-heat-pump-detailed-geothermal-loop-multiple.xml'].include? hpxml_file
+ # Split into 2 GSHPs, each with its own geothermal loop
+ hpxml_bldg.heat_pumps[0].fraction_heat_load_served /= 2
+ hpxml_bldg.heat_pumps[0].fraction_cool_load_served /= 2
+ hpxml_bldg.heat_pumps[0].heating_capacity /= 2
+ hpxml_bldg.heat_pumps[0].cooling_capacity /= 2
+ hpxml_bldg.heat_pumps << hpxml_bldg.heat_pumps[0].dup
+ hpxml_bldg.heat_pumps[-1].id = 'HeatPump2'
+ hpxml_bldg.heat_pumps[-1].primary_heating_system = false
+ hpxml_bldg.heat_pumps[-1].primary_cooling_system = false
+ hpxml_bldg.hvac_distributions[0].duct_leakage_measurements[0].duct_leakage_value /= 2
+ hpxml_bldg.hvac_distributions[0].duct_leakage_measurements[1].duct_leakage_value /= 2
+ hpxml_bldg.hvac_distributions[0].conditioned_floor_area_served /= 2
+ hpxml_bldg.hvac_distributions.add(id: "HVACDistribution#{hpxml_bldg.hvac_distributions.size + 1}",
+ distribution_system_type: HPXML::HVACDistributionTypeAir,
+ air_type: HPXML::AirTypeRegularVelocity,
+ conditioned_floor_area_served: hpxml_bldg.hvac_distributions[0].conditioned_floor_area_served)
+ hpxml_bldg.heat_pumps[-1].distribution_system_idref = hpxml_bldg.hvac_distributions[-1].id
+ hpxml_bldg.hvac_distributions[-1].duct_leakage_measurements << hpxml_bldg.hvac_distributions[0].duct_leakage_measurements[0].dup
+ hpxml_bldg.hvac_distributions[-1].duct_leakage_measurements << hpxml_bldg.hvac_distributions[0].duct_leakage_measurements[1].dup
+ hpxml_bldg.hvac_distributions[0].ducts.each do |duct|
+ hpxml_bldg.hvac_distributions[-1].ducts << duct.dup
+ hpxml_bldg.hvac_distributions[-1].ducts[-1].id = "Ducts#{hpxml_bldg.hvac_distributions[0].ducts.size + hpxml_bldg.hvac_distributions[1].ducts.size}"
+ end
+ hpxml_bldg.geothermal_loops[0].num_bore_holes /= 2
+ hpxml_bldg.geothermal_loops[0].bore_config = HPXML::GeothermalLoopBoreConfigRectangle
+ hpxml_bldg.geothermal_loops << hpxml_bldg.geothermal_loops[0].dup
+ hpxml_bldg.geothermal_loops[-1].id = 'GeothermalLoop2'
+ hpxml_bldg.heat_pumps[-1].geothermal_loop_idref = hpxml_bldg.geothermal_loops[-1].id
+ end
# ------------------ #
# HPXML WaterHeating #
diff --git a/hpxml-measures/workflow/hpxml_inputs.json b/hpxml-measures/workflow/hpxml_inputs.json
index 537a68636f..020cbc1430 100644
--- a/hpxml-measures/workflow/hpxml_inputs.json
+++ b/hpxml-measures/workflow/hpxml_inputs.json
@@ -1860,9 +1860,12 @@
},
"sample_files/base-hvac-ground-to-air-heat-pump-detailed-geothermal-loop.xml": {
"parent_hpxml": "sample_files/base-hvac-ground-to-air-heat-pump-1-speed.xml",
- "hvac_geothermal_loop": "Detailed Example: Lopsided U Configuration, 10 Boreholes",
+ "hvac_geothermal_loop": "Detailed Example: Vertical Loop, L Configuration, 4 Boreholes",
"location_soil_type": "Detailed Example: Sand, Dry, 0.03 Diffusivity"
},
+ "sample_files/base-hvac-ground-to-air-heat-pump-detailed-geothermal-loop-multiple.xml": {
+ "parent_hpxml": "sample_files/base-hvac-ground-to-air-heat-pump-detailed-geothermal-loop.xml"
+ },
"sample_files/base-hvac-ground-to-air-heat-pump-cooling-only.xml": {
"parent_hpxml": "sample_files/base-hvac-ground-to-air-heat-pump-1-speed.xml",
"hvac_heat_pump_heating_load_served": "0%",
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-ground-to-air-heat-pump-detailed-geothermal-loop-multiple.xml b/hpxml-measures/workflow/sample_files/base-hvac-ground-to-air-heat-pump-detailed-geothermal-loop-multiple.xml
new file mode 100644
index 0000000000..39101ffff2
--- /dev/null
+++ b/hpxml-measures/workflow/sample_files/base-hvac-ground-to-air-heat-pump-detailed-geothermal-loop-multiple.xml
@@ -0,0 +1,639 @@
+
+
+
+ HPXML
+ tasks.rb
+ 2000-01-01T00:00:00-07:00
+ create
+
+
+
+
+
+ Default
+
+
+
+
+
+
+
+
+
+ CO
+
+
+
+ proposed workscope
+
+
+
+
+ stand-alone
+ no units above or below
+ 180
+
+ electricity
+ natural gas
+
+
+ sand
+ dry
+
+ 0.03
+
+
+
+
+ single-family detached
+ 2.0
+ 1.0
+ 8.0
+ 3
+ 2
+ 2700.0
+ 21600.0
+
+
+
+
+ 2006
+ 5B
+
+
+
+ USA_CO_Denver.Intl.AP.725650_TMY3
+
+ USA_CO_Denver.Intl.AP.725650_TMY3.epw
+
+
+
+
+
+
+
+ 50.0
+
+ ACH
+ 3.0
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+ attic - unvented
+ 1509.3
+ asphalt or fiberglass shingles
+ light
+ 6.0
+
+
+ 2.3
+
+
+
+
+
+
+ outside
+ basement - conditioned
+ 115.6
+ wood siding
+ medium
+
+
+ 13.9
+
+
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 1200.0
+ wood siding
+ medium
+
+
+ 22.7
+
+
+
+
+ outside
+ attic - unvented
+ gable
+
+
+
+ 225.0
+ wood siding
+ medium
+
+
+ 4.0
+
+
+
+
+
+
+ ground
+ basement - conditioned
+ solid concrete
+ 8.0
+ 1200.0
+ 7.0
+
+
+
+ continuous - exterior
+ 10.0
+
+
+ continuous - interior
+ 0.0
+
+
+
+
+
+
+
+ attic - unvented
+ conditioned space
+ ceiling
+
+
+
+ 1350.0
+
+
+ 39.6
+
+
+
+
+
+
+ basement - conditioned
+ 1350.0
+ 150.0
+
+
+
+ 0.0
+ 0.0
+
+
+
+
+
+ 0.0
+ 0.0
+
+
+
+ 0.0
+ 0.0
+
+
+
+
+
+
+ 108.0
+ 0
+ 0.35
+ 0.44
+
+
+ light curtains
+
+ 0.67
+
+
+
+
+ 72.0
+ 90
+ 0.35
+ 0.44
+
+
+ light curtains
+
+ 0.67
+
+
+
+
+ 108.0
+ 180
+ 0.35
+ 0.44
+
+
+ light curtains
+
+ 0.67
+
+
+
+
+ 72.0
+ 270
+ 0.35
+ 0.44
+
+
+ light curtains
+
+ 0.67
+
+
+
+
+
+
+
+ 40.0
+ 180
+ 4.4
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ground-to-air
+ electricity
+ 18000.0
+ 18000.0
+ single stage
+ 0.5
+ 0.5
+
+ EER
+ 16.6
+
+
+ COP
+ 3.6
+
+
+
+ 100.0
+
+
+
+
+
+ ground-to-air
+ electricity
+ 18000.0
+ 18000.0
+ single stage
+ 0.5
+ 0.5
+
+ EER
+ 16.6
+
+
+ COP
+ 3.6
+
+
+
+ 100.0
+
+
+
+
+ vertical
+ 10.0
+
+ 2
+ 150.0
+ 16.4
+ 5.9
+
+
+ standard
+
+
+ standard
+ 1.0
+ 2.5
+
+
+ Rectangle
+
+
+
+
+ vertical
+ 10.0
+
+ 2
+ 150.0
+ 16.4
+ 5.9
+
+
+ standard
+
+
+ standard
+ 1.0
+ 2.5
+
+
+ Rectangle
+
+
+
+
+
+ 68.0
+ 78.0
+
+
+
+
+
+ regular velocity
+
+ supply
+
+ CFM25
+ 40.5
+ to outside
+
+
+
+ return
+
+ CFM25
+ 13.5
+ to outside
+
+
+
+
+ supply
+ 4.0
+ attic - unvented
+ 0.75
+
+
+
+ return
+ 4.0
+ attic - unvented
+ 0.75
+
+
+
+ supply
+ 0.0
+ conditioned space
+ 0.25
+
+
+
+ return
+ 0.0
+ conditioned space
+ 0.25
+
+
+
+ 1350.0
+
+
+
+
+
+ regular velocity
+
+ supply
+
+ CFM25
+ 40.5
+ to outside
+
+
+
+ return
+
+ CFM25
+ 13.5
+ to outside
+
+
+
+
+ supply
+ 4.0
+ attic - unvented
+ 0.75
+
+
+
+ return
+ 4.0
+ attic - unvented
+ 0.75
+
+
+
+ supply
+ 0.0
+ conditioned space
+ 0.25
+
+
+
+ return
+ 0.0
+ conditioned space
+ 0.25
+
+
+
+ 1350.0
+
+
+
+
+
+ electricity
+ storage water heater
+ conditioned space
+ 1.0
+ 0.94
+
+
+
+
+
+
+
+ 0.0
+
+
+
+
+ shower head
+ false
+
+
+
+ faucet
+ false
+
+
+
+
+
+
+ 1.21
+ 380.0
+ 0.12
+ 1.09
+ 27.0
+ 6.0
+ 3.2
+
+
+
+ electricity
+ conventional
+ 3.73
+
+
+
+ 307.0
+ 12
+ 0.12
+ 1.09
+ 22.32
+ 4.0
+
+
+
+ 650.0
+
+
+
+ electricity
+ false
+
+
+
+ false
+
+
+
+
+
+ interior
+ 0.4
+
+
+
+
+
+
+ interior
+ 0.1
+
+
+
+
+
+
+ interior
+ 0.25
+
+
+
+
+
+
+ exterior
+ 0.4
+
+
+
+
+
+
+ exterior
+ 0.1
+
+
+
+
+
+
+ exterior
+ 0.25
+
+
+
+
+
+
+
+
+ TV other
+
+
+
+ other
+
+
+
+
+
\ No newline at end of file
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-ground-to-air-heat-pump-detailed-geothermal-loop.xml b/hpxml-measures/workflow/sample_files/base-hvac-ground-to-air-heat-pump-detailed-geothermal-loop.xml
index 7f25e25957..f228ef72b1 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-ground-to-air-heat-pump-detailed-geothermal-loop.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-ground-to-air-heat-pump-detailed-geothermal-loop.xml
@@ -329,8 +329,8 @@
vertical
10.0
- 9
- 315.0
+ 4
+ 150.0
16.4
5.9
@@ -343,7 +343,7 @@
2.5
- Lopsided U
+ L
diff --git a/hpxml-measures/workflow/tests/base_results/results_simulations_bills.csv b/hpxml-measures/workflow/tests/base_results/results_simulations_bills.csv
index 3d5f141ef1..e6b22da208 100644
--- a/hpxml-measures/workflow/tests/base_results/results_simulations_bills.csv
+++ b/hpxml-measures/workflow/tests/base_results/results_simulations_bills.csv
@@ -193,8 +193,8 @@ base-enclosure-windows-storms.xml,2048.89,144.0,1523.84,0.0,1667.84,144.0,237.05
base-ev-charger.xml,2073.51,144.0,1511.42,0.0,1655.42,144.0,274.09,418.09,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
base-foundation-ambient.xml,1690.26,144.0,1239.15,0.0,1383.15,144.0,163.11,307.11,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
base-foundation-basement-garage.xml,1865.54,144.0,1353.61,0.0,1497.61,144.0,223.93,367.93,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-base-foundation-belly-wing-no-skirt.xml,1899.16,144.0,1265.27,0.0,1409.27,144.0,345.89,489.89,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-base-foundation-belly-wing-skirt.xml,1896.05,144.0,1265.22,0.0,1409.22,144.0,342.83,486.83,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+base-foundation-belly-wing-no-skirt.xml,1602.49,144.0,1173.77,0.0,1317.77,144.0,140.72,284.72,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+base-foundation-belly-wing-skirt.xml,1601.19,144.0,1173.83,0.0,1317.83,144.0,139.36,283.36,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
base-foundation-complex.xml,2306.01,144.0,1571.47,0.0,1715.47,144.0,446.54,590.54,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
base-foundation-conditioned-basement-slab-insulation-full.xml,2071.59,144.0,1539.83,0.0,1683.83,144.0,243.76,387.76,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
base-foundation-conditioned-basement-slab-insulation.xml,2076.94,144.0,1528.73,0.0,1672.73,144.0,260.21,404.21,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
@@ -311,23 +311,24 @@ base-hvac-ground-to-air-heat-pump-2-speed.xml,1854.62,144.0,1710.62,0.0,1854.62,
base-hvac-ground-to-air-heat-pump-backup-integrated.xml,1931.0,144.0,1787.0,0.0,1931.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
base-hvac-ground-to-air-heat-pump-backup-stove.xml,1950.39,144.0,1806.38,0.0,1950.38,0.0,0.0,0.0,0.0,0.01,0.01,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
base-hvac-ground-to-air-heat-pump-cooling-only.xml,1560.11,144.0,1416.11,0.0,1560.11,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-base-hvac-ground-to-air-heat-pump-detailed-geothermal-loop.xml,1940.35,144.0,1796.35,0.0,1940.35,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-base-hvac-ground-to-air-heat-pump-heating-only.xml,1710.69,144.0,1566.69,0.0,1710.69,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+base-hvac-ground-to-air-heat-pump-detailed-geothermal-loop-multiple.xml,2017.8,144.0,1873.8,0.0,2017.8,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+base-hvac-ground-to-air-heat-pump-detailed-geothermal-loop.xml,1996.58,144.0,1852.58,0.0,1996.58,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+base-hvac-ground-to-air-heat-pump-heating-only.xml,1710.71,144.0,1566.71,0.0,1710.71,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
base-hvac-ground-to-air-heat-pump-var-speed-experimental.xml,1876.58,144.0,1732.58,0.0,1876.58,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
base-hvac-ground-to-air-heat-pump-var-speed.xml,1784.94,144.0,1640.94,0.0,1784.94,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-base-hvac-install-quality-air-to-air-heat-pump-1-speed.xml,2467.3,144.0,2323.3,0.0,2467.3,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-base-hvac-install-quality-air-to-air-heat-pump-2-speed.xml,2377.96,144.0,2233.96,0.0,2377.96,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-base-hvac-install-quality-air-to-air-heat-pump-var-speed-detailed-performance.xml,2515.42,144.0,2371.42,0.0,2515.42,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-base-hvac-install-quality-air-to-air-heat-pump-var-speed.xml,2393.29,144.0,2249.29,0.0,2393.29,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-base-hvac-install-quality-furnace-gas-central-ac-1-speed.xml,2134.86,144.0,1530.57,0.0,1674.57,144.0,316.29,460.29,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-base-hvac-install-quality-furnace-gas-central-ac-2-speed.xml,2112.49,144.0,1507.92,0.0,1651.92,144.0,316.57,460.57,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-base-hvac-install-quality-furnace-gas-central-ac-var-speed.xml,2080.47,144.0,1481.22,0.0,1625.22,144.0,311.25,455.25,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-base-hvac-install-quality-furnace-gas-only.xml,1855.71,144.0,1251.59,0.0,1395.59,144.0,316.12,460.12,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-base-hvac-install-quality-ground-to-air-heat-pump-1-speed.xml,2079.11,144.0,1935.11,0.0,2079.11,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-base-hvac-install-quality-ground-to-air-heat-pump-2-speed-experimental.xml,2106.02,144.0,1962.02,0.0,2106.02,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-base-hvac-install-quality-ground-to-air-heat-pump-var-speed-experimental.xml,2077.03,144.0,1933.03,0.0,2077.03,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-base-hvac-install-quality-mini-split-air-conditioner-only-ducted.xml,1515.09,144.0,1371.09,0.0,1515.09,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-base-hvac-install-quality-mini-split-heat-pump-ducted.xml,1989.6,144.0,1845.6,0.0,1989.6,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+base-hvac-install-quality-air-to-air-heat-pump-1-speed.xml,2467.3,144.0,2323.3,0.0,2467.3,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+base-hvac-install-quality-air-to-air-heat-pump-2-speed.xml,2377.96,144.0,2233.96,0.0,2377.96,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+base-hvac-install-quality-air-to-air-heat-pump-var-speed-detailed-performance.xml,2515.42,144.0,2371.42,0.0,2515.42,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+base-hvac-install-quality-air-to-air-heat-pump-var-speed.xml,2393.29,144.0,2249.29,0.0,2393.29,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+base-hvac-install-quality-furnace-gas-central-ac-1-speed.xml,2134.86,144.0,1530.57,0.0,1674.57,144.0,316.29,460.29,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+base-hvac-install-quality-furnace-gas-central-ac-2-speed.xml,2112.49,144.0,1507.92,0.0,1651.92,144.0,316.57,460.57,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+base-hvac-install-quality-furnace-gas-central-ac-var-speed.xml,2080.47,144.0,1481.22,0.0,1625.22,144.0,311.25,455.25,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+base-hvac-install-quality-furnace-gas-only.xml,1855.71,144.0,1251.59,0.0,1395.59,144.0,316.12,460.12,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+base-hvac-install-quality-ground-to-air-heat-pump-1-speed.xml,2079.11,144.0,1935.11,0.0,2079.11,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+base-hvac-install-quality-ground-to-air-heat-pump-2-speed-experimental.xml,2106.02,144.0,1962.02,0.0,2106.02,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+base-hvac-install-quality-ground-to-air-heat-pump-var-speed-experimental.xml,2077.03,144.0,1933.03,0.0,2077.03,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+base-hvac-install-quality-mini-split-air-conditioner-only-ducted.xml,1515.09,144.0,1371.09,0.0,1515.09,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+base-hvac-install-quality-mini-split-heat-pump-ducted.xml,1989.6,144.0,1845.6,0.0,1989.6,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
base-hvac-mini-split-air-conditioner-only-ducted.xml,1483.1,144.0,1339.1,0.0,1483.1,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
base-hvac-mini-split-air-conditioner-only-ductless-detailed-performance-autosize.xml,1518.55,144.0,1374.55,0.0,1518.55,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
base-hvac-mini-split-air-conditioner-only-ductless-detailed-performance.xml,1517.23,144.0,1373.23,0.0,1517.23,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
diff --git a/hpxml-measures/workflow/tests/base_results/results_simulations_energy.csv b/hpxml-measures/workflow/tests/base_results/results_simulations_energy.csv
index bcad890171..359b1a752a 100644
--- a/hpxml-measures/workflow/tests/base_results/results_simulations_energy.csv
+++ b/hpxml-measures/workflow/tests/base_results/results_simulations_energy.csv
@@ -193,8 +193,8 @@ base-enclosure-windows-storms.xml,67.768,67.768,39.54,39.54,28.227,0.0,0.0,0.0,0
base-ev-charger.xml,71.856,71.856,39.218,39.218,32.638,0.0,0.0,0.0,0.0,0.0,0.0,1.016,0.0,0.0,5.216,1.204,10.77,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.075,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,32.638,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
base-foundation-ambient.xml,51.576,51.576,32.153,32.153,19.422,0.0,0.0,0.0,0.0,0.0,0.0,0.605,0.0,0.0,4.813,1.092,10.76,0.0,0.0,2.646,0.0,0.238,0.0,0.0,0.0,0.0,2.096,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,4.192,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,19.422,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
base-foundation-basement-garage.xml,61.788,61.788,35.123,35.123,26.665,0.0,0.0,0.0,0.0,0.0,0.0,0.83,0.0,0.0,4.894,1.12,10.768,0.0,0.0,3.404,0.142,0.277,0.0,0.0,0.0,0.0,2.077,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,5.9,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,26.665,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-base-foundation-belly-wing-no-skirt.xml,74.018,74.018,32.831,32.831,41.187,0.0,0.0,0.0,0.0,0.0,0.0,1.285,0.0,0.0,4.812,1.094,10.762,0.0,0.0,2.646,0.0,0.238,0.0,0.0,0.0,0.0,2.091,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,4.192,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,41.187,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-base-foundation-belly-wing-skirt.xml,73.652,73.652,32.83,32.83,40.823,0.0,0.0,0.0,0.0,0.0,0.0,1.273,0.0,0.0,4.819,1.096,10.762,0.0,0.0,2.646,0.0,0.238,0.0,0.0,0.0,0.0,2.091,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,4.192,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,40.823,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+base-foundation-belly-wing-no-skirt.xml,47.213,47.213,30.457,30.457,16.756,0.0,0.0,0.0,0.0,0.0,0.0,0.522,0.0,0.0,3.521,0.771,10.762,0.0,0.0,2.646,0.0,0.238,0.0,0.0,0.0,0.0,2.094,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,4.192,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,16.756,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+base-foundation-belly-wing-skirt.xml,47.053,47.053,30.458,30.458,16.595,0.0,0.0,0.0,0.0,0.0,0.0,0.517,0.0,0.0,3.527,0.773,10.761,0.0,0.0,2.646,0.0,0.238,0.0,0.0,0.0,0.0,2.094,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,4.192,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,16.595,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
base-foundation-complex.xml,93.948,93.948,40.776,40.776,53.172,0.0,0.0,0.0,0.0,0.0,0.0,1.558,0.0,0.0,6.058,1.385,10.774,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.065,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,53.172,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
base-foundation-conditioned-basement-slab-insulation-full.xml,68.982,68.982,39.955,39.955,29.026,0.0,0.0,0.0,0.0,0.0,0.0,0.904,0.0,0.0,5.885,1.381,10.767,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.082,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,29.026,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
base-foundation-conditioned-basement-slab-insulation.xml,70.652,70.652,39.667,39.667,30.985,0.0,0.0,0.0,0.0,0.0,0.0,0.965,0.0,0.0,5.613,1.307,10.768,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.079,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,30.985,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
@@ -311,8 +311,9 @@ base-hvac-ground-to-air-heat-pump-2-speed.xml,44.387,44.387,44.387,44.387,0.0,0.
base-hvac-ground-to-air-heat-pump-backup-integrated.xml,46.369,46.369,46.369,46.369,0.0,0.0,0.0,0.0,0.0,0.0,7.162,2.151,0.0,0.0,3.372,1.902,10.77,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.074,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
base-hvac-ground-to-air-heat-pump-backup-stove.xml,46.872,46.872,46.872,46.872,0.0,0.0,0.0,0.0,0.0,0.0,7.574,2.278,0.0,0.0,3.35,1.89,10.771,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.073,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
base-hvac-ground-to-air-heat-pump-cooling-only.xml,36.745,36.745,36.745,36.745,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,3.368,1.698,10.842,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,1.9,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-base-hvac-ground-to-air-heat-pump-detailed-geothermal-loop.xml,46.611,46.611,46.611,46.611,0.0,0.0,0.0,0.0,0.0,0.0,7.754,2.278,0.0,0.0,2.91,1.89,10.771,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.071,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-base-hvac-ground-to-air-heat-pump-heating-only.xml,40.652,40.652,40.652,40.652,0.0,0.0,0.0,0.0,0.0,0.0,6.906,1.917,0.0,0.0,0.0,0.0,10.735,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.158,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+base-hvac-ground-to-air-heat-pump-detailed-geothermal-loop-multiple.xml,48.621,48.621,48.621,48.621,0.0,0.0,0.0,0.0,0.0,0.0,8.673,2.63,0.0,0.0,3.574,1.965,10.771,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.071,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+base-hvac-ground-to-air-heat-pump-detailed-geothermal-loop.xml,48.07,48.07,48.07,48.07,0.0,0.0,0.0,0.0,0.0,0.0,8.403,2.527,0.0,0.0,3.413,1.948,10.771,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.071,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+base-hvac-ground-to-air-heat-pump-heating-only.xml,40.653,40.653,40.653,40.653,0.0,0.0,0.0,0.0,0.0,0.0,6.906,1.917,0.0,0.0,0.0,0.0,10.735,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.158,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
base-hvac-ground-to-air-heat-pump-var-speed-experimental.xml,44.957,44.957,44.957,44.957,0.0,0.0,0.0,0.0,0.0,0.0,8.451,2.42,0.0,0.0,1.235,1.069,10.77,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.074,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
base-hvac-ground-to-air-heat-pump-var-speed.xml,42.579,42.579,42.579,42.579,0.0,0.0,0.0,0.0,0.0,0.0,5.861,1.818,0.0,0.0,1.562,1.558,10.77,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.074,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
base-hvac-install-quality-air-to-air-heat-pump-1-speed.xml,60.285,60.285,60.285,60.285,0.0,0.0,0.0,0.0,0.0,0.0,15.807,1.477,4.72,0.097,5.614,0.789,10.77,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.074,0.0,0.0,0.284,0.347,1.436,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
@@ -545,4 +546,4 @@ house048.xml,92.928,92.928,40.955,40.955,51.973,0.0,0.0,0.0,0.0,0.0,0.0,0.619,0.
house049.xml,34.377,34.377,30.883,30.883,3.493,0.0,0.0,0.0,0.0,0.0,7.322,0.045,0.0,0.0,6.75,0.204,2.639,0.249,0.0,1.473,0.057,0.099,2.092,0.0,0.0,0.0,2.964,0.0,0.0,0.324,0.006,0.052,0.096,0.0,1.88,4.63,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.693,2.8,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
house050.xml,51.59,51.59,21.746,21.746,29.844,0.0,0.0,0.0,0.0,0.0,0.0,0.525,0.0,0.0,1.921,0.386,0.0,0.0,0.0,1.781,0.057,0.111,2.23,0.0,0.0,0.0,2.185,0.0,0.0,0.42,0.472,3.469,0.105,0.0,2.116,5.968,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,16.015,0.0,10.759,0.0,3.07,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
house051.xml,59.863,59.863,51.114,51.114,8.749,0.0,0.0,0.0,0.0,0.0,8.47,0.814,0.0,0.0,3.409,0.799,11.24,0.0,0.0,1.114,0.057,0.085,0.0,0.0,0.0,0.0,2.083,0.0,0.0,0.311,0.386,1.6,1.662,0.931,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,7.652,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,2.886,0.0,5.863,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-house052.xml,208.355,208.355,182.103,182.103,26.253,0.0,0.0,0.0,0.0,0.0,34.526,7.043,0.0,0.0,9.12,5.743,0.0,0.249,0.0,22.66,0.057,0.941,5.156,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,96.607,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,26.253,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+house052.xml,207.83,207.83,181.577,181.577,26.253,0.0,0.0,0.0,0.0,0.0,34.175,6.937,0.0,0.0,9.06,5.733,0.0,0.249,0.0,22.66,0.057,0.941,5.156,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,96.607,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,26.253,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
diff --git a/hpxml-measures/workflow/tests/base_results/results_simulations_hvac.csv b/hpxml-measures/workflow/tests/base_results/results_simulations_hvac.csv
index cda226298e..41a9bc825f 100644
--- a/hpxml-measures/workflow/tests/base_results/results_simulations_hvac.csv
+++ b/hpxml-measures/workflow/tests/base_results/results_simulations_hvac.csv
@@ -193,8 +193,8 @@ base-enclosure-windows-storms.xml,6.8,91.76,35000.0,24000.0,0.0,40327.0,17567.0,
base-ev-charger.xml,6.8,91.76,35000.0,24000.0,0.0,41543.0,17659.0,7963.0,0.0,575.0,6833.0,0.0,0.0,1738.0,2155.0,4620.0,0.0,0.0,27993.0,13311.0,7750.0,0.0,207.0,507.0,0.0,0.0,0.0,2276.0,622.0,0.0,3320.0,0.0,0.0,265.0,126.0,-661.0,0.0,800.0
base-foundation-ambient.xml,6.8,91.76,35000.0,24000.0,0.0,30441.0,10813.0,7963.0,0.0,575.0,2227.0,0.0,4398.0,0.0,2155.0,2310.0,0.0,0.0,22423.0,7804.0,7750.0,0.0,207.0,284.0,0.0,470.0,0.0,2276.0,311.0,0.0,3320.0,0.0,0.0,720.0,251.0,-331.0,0.0,800.0
base-foundation-basement-garage.xml,6.8,91.76,35000.0,24000.0,0.0,37412.0,13967.0,7963.0,0.0,627.0,7633.0,0.0,592.0,1223.0,2155.0,3251.0,0.0,0.0,25241.0,10301.0,7750.0,0.0,223.0,751.0,0.0,181.0,0.0,2276.0,438.0,0.0,3320.0,0.0,0.0,566.0,231.0,-465.0,0.0,800.0
-base-foundation-belly-wing-no-skirt.xml,6.8,91.76,35000.0,24000.0,0.0,23781.0,4176.0,7078.0,0.0,575.0,3090.0,0.0,4398.0,0.0,2155.0,2310.0,0.0,0.0,14065.0,1226.0,5083.0,0.0,207.0,394.0,0.0,470.0,0.0,2276.0,311.0,0.0,3320.0,0.0,778.0,514.0,45.0,-331.0,0.0,800.0
-base-foundation-belly-wing-skirt.xml,6.8,91.76,35000.0,24000.0,0.0,23781.0,4176.0,7078.0,0.0,575.0,3090.0,0.0,4398.0,0.0,2155.0,2310.0,0.0,0.0,14065.0,1226.0,5083.0,0.0,207.0,394.0,0.0,470.0,0.0,2276.0,311.0,0.0,3320.0,0.0,778.0,514.0,45.0,-331.0,0.0,800.0
+base-foundation-belly-wing-no-skirt.xml,6.8,91.76,35000.0,24000.0,0.0,24791.0,5186.0,7078.0,0.0,575.0,3090.0,0.0,4398.0,0.0,2155.0,2310.0,0.0,0.0,14331.0,1491.0,5083.0,0.0,207.0,394.0,0.0,470.0,0.0,2276.0,311.0,0.0,3320.0,0.0,778.0,524.0,55.0,-331.0,0.0,800.0
+base-foundation-belly-wing-skirt.xml,6.8,91.76,35000.0,24000.0,0.0,24791.0,5186.0,7078.0,0.0,575.0,3090.0,0.0,4398.0,0.0,2155.0,2310.0,0.0,0.0,14331.0,1491.0,5083.0,0.0,207.0,394.0,0.0,470.0,0.0,2276.0,311.0,0.0,3320.0,0.0,778.0,524.0,55.0,-331.0,0.0,800.0
base-foundation-complex.xml,6.8,91.76,35000.0,30000.0,0.0,53676.0,18364.0,7963.0,0.0,575.0,17932.0,0.0,0.0,2066.0,2155.0,4620.0,0.0,0.0,29683.0,13429.0,7750.0,0.0,207.0,2079.0,0.0,0.0,0.0,2276.0,622.0,0.0,3320.0,0.0,0.0,254.0,115.0,-661.0,0.0,800.0
base-foundation-conditioned-basement-slab-insulation-full.xml,6.8,91.76,35000.0,24000.0,0.0,40979.0,17617.0,7963.0,0.0,575.0,6833.0,0.0,0.0,1217.0,2155.0,4620.0,0.0,0.0,27993.0,13311.0,7750.0,0.0,207.0,507.0,0.0,0.0,0.0,2276.0,622.0,0.0,3320.0,0.0,0.0,265.0,126.0,-661.0,0.0,800.0
base-foundation-conditioned-basement-slab-insulation.xml,6.8,91.76,35000.0,24000.0,0.0,40979.0,17617.0,7963.0,0.0,575.0,6833.0,0.0,0.0,1217.0,2155.0,4620.0,0.0,0.0,27993.0,13311.0,7750.0,0.0,207.0,507.0,0.0,0.0,0.0,2276.0,622.0,0.0,3320.0,0.0,0.0,265.0,126.0,-661.0,0.0,800.0
@@ -311,6 +311,7 @@ base-hvac-ground-to-air-heat-pump-2-speed.xml,6.8,91.76,36000.0,36000.0,0.0,3937
base-hvac-ground-to-air-heat-pump-backup-integrated.xml,6.8,91.76,36000.0,36000.0,34121.0,39371.0,15487.0,7963.0,0.0,575.0,6833.0,0.0,0.0,1738.0,2155.0,4620.0,0.0,0.0,27993.0,13311.0,7750.0,0.0,207.0,507.0,0.0,0.0,0.0,2276.0,622.0,0.0,3320.0,0.0,0.0,265.0,126.0,-661.0,0.0,800.0
base-hvac-ground-to-air-heat-pump-backup-stove.xml,6.8,91.76,36000.0,36000.0,60000.0,39371.0,15487.0,7963.0,0.0,575.0,6833.0,0.0,0.0,1738.0,2155.0,4620.0,0.0,0.0,27993.0,13311.0,7750.0,0.0,207.0,507.0,0.0,0.0,0.0,2276.0,622.0,0.0,3320.0,0.0,0.0,265.0,126.0,-661.0,0.0,800.0
base-hvac-ground-to-air-heat-pump-cooling-only.xml,6.8,91.76,0.0,36000.0,0.0,23884.0,0.0,7963.0,0.0,575.0,6833.0,0.0,0.0,1738.0,2155.0,4620.0,0.0,0.0,27993.0,13311.0,7750.0,0.0,207.0,507.0,0.0,0.0,0.0,2276.0,622.0,0.0,3320.0,0.0,0.0,265.0,126.0,-661.0,0.0,800.0
+base-hvac-ground-to-air-heat-pump-detailed-geothermal-loop-multiple.xml,6.8,91.76,36000.0,36000.0,0.0,36462.0,15330.0,7963.0,0.0,575.0,5370.0,0.0,0.0,450.0,2155.0,4620.0,0.0,0.0,27993.0,13311.0,7750.0,0.0,207.0,507.0,0.0,0.0,0.0,2276.0,622.0,0.0,3320.0,0.0,0.0,265.0,126.0,-661.0,0.0,800.0
base-hvac-ground-to-air-heat-pump-detailed-geothermal-loop.xml,6.8,91.76,36000.0,36000.0,0.0,36462.0,15330.0,7963.0,0.0,575.0,5370.0,0.0,0.0,450.0,2155.0,4620.0,0.0,0.0,27993.0,13311.0,7750.0,0.0,207.0,507.0,0.0,0.0,0.0,2276.0,622.0,0.0,3320.0,0.0,0.0,265.0,126.0,-661.0,0.0,800.0
base-hvac-ground-to-air-heat-pump-heating-only.xml,6.8,91.76,36000.0,0.0,0.0,39371.0,15487.0,7963.0,0.0,575.0,6833.0,0.0,0.0,1738.0,2155.0,4620.0,0.0,0.0,14683.0,0.0,7750.0,0.0,207.0,507.0,0.0,0.0,0.0,2276.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
base-hvac-ground-to-air-heat-pump-var-speed-experimental.xml,6.8,91.76,36000.0,36000.0,0.0,39371.0,15487.0,7963.0,0.0,575.0,6833.0,0.0,0.0,1738.0,2155.0,4620.0,0.0,0.0,27993.0,13311.0,7750.0,0.0,207.0,507.0,0.0,0.0,0.0,2276.0,622.0,0.0,3320.0,0.0,0.0,265.0,126.0,-661.0,0.0,800.0
diff --git a/hpxml-measures/workflow/tests/base_results/results_simulations_loads.csv b/hpxml-measures/workflow/tests/base_results/results_simulations_loads.csv
index bc50bf67bf..4782b85972 100644
--- a/hpxml-measures/workflow/tests/base_results/results_simulations_loads.csv
+++ b/hpxml-measures/workflow/tests/base_results/results_simulations_loads.csv
@@ -193,8 +193,8 @@ base-enclosure-windows-storms.xml,26.848,0.0,22.261,9.917,0.846,0.0,0.0,0.0,3.32
base-ev-charger.xml,31.045,0.0,20.512,9.917,0.849,0.0,0.0,0.0,3.243,3.875,0.882,7.07,0.676,11.539,-12.828,0.0,0.0,0.0,8.304,-0.111,5.504,0.0,0.509,0.0,13.466,-8.481,-2.634,0.0,-0.072,-0.246,-0.022,2.446,0.018,-0.381,12.67,0.0,0.0,0.0,-6.428,-0.107,-0.932,-4.178,-0.085,0.0,8.615,7.311,1.873
base-foundation-ambient.xml,18.468,0.0,18.401,9.917,0.839,0.0,0.0,0.0,3.602,3.705,0.0,0.0,0.784,10.752,-10.318,0.0,0.0,9.389,0.0,-0.747,2.23,0.0,0.475,0.0,5.404,-5.526,-1.266,0.0,-0.208,-0.701,0.0,0.0,0.048,-0.365,14.713,0.0,0.0,-3.935,0.0,-0.742,-0.529,-3.123,-0.146,0.0,5.446,6.694,1.38
base-foundation-basement-garage.xml,25.363,0.0,19.065,9.917,0.848,0.0,0.0,0.0,3.596,5.005,0.891,5.1,0.754,11.336,-12.726,0.0,0.0,0.853,5.933,-0.101,3.868,0.0,0.515,0.0,9.64,-7.341,-1.994,0.0,0.047,-0.368,-0.02,1.681,0.013,-0.091,12.64,0.0,0.0,-0.092,-4.868,-0.097,-0.606,-4.003,-0.082,0.0,7.153,6.328,1.41
-base-foundation-belly-wing-no-skirt.xml,39.208,0.0,18.373,9.917,0.842,0.0,0.0,0.0,3.92,5.24,0.0,0.0,0.764,8.975,-10.323,0.0,0.0,9.538,0.0,-0.636,2.139,0.0,0.486,0.0,26.149,-5.724,-1.317,0.0,0.362,-0.729,0.0,0.0,0.055,-0.096,11.097,0.0,0.0,-3.535,0.0,-0.631,-0.509,-2.877,-0.128,0.0,7.638,6.493,1.329
-base-foundation-belly-wing-skirt.xml,38.861,0.0,18.411,9.917,0.842,0.0,0.0,0.0,3.92,5.24,0.0,0.0,0.764,8.974,-10.301,0.0,0.0,9.371,0.0,-0.634,2.137,0.0,0.485,0.0,25.927,-5.711,-1.314,0.0,0.357,-0.738,0.0,0.0,0.053,-0.113,11.119,0.0,0.0,-3.504,0.0,-0.629,-0.512,-2.887,-0.129,0.0,7.65,6.507,1.331
+base-foundation-belly-wing-no-skirt.xml,15.928,0.0,12.713,9.917,0.841,0.0,0.0,0.0,3.914,5.218,0.0,0.0,0.773,8.98,-10.139,0.0,0.0,9.501,0.0,-0.66,2.14,0.0,0.483,0.0,2.634,-5.646,-1.296,0.0,0.338,-0.778,0.0,0.0,0.058,-0.147,11.281,0.0,0.0,-3.614,0.0,-0.655,-0.524,-2.835,-0.134,0.0,1.875,6.573,1.35
+base-foundation-belly-wing-skirt.xml,15.774,0.0,12.742,9.917,0.84,0.0,0.0,0.0,3.906,5.21,0.0,0.0,0.775,8.995,-10.086,0.0,0.0,9.328,0.0,-0.669,2.139,0.0,0.483,0.0,2.609,-5.636,-1.294,0.0,0.324,-0.795,0.0,0.0,0.059,-0.149,11.334,0.0,0.0,-3.587,0.0,-0.664,-0.526,-2.846,-0.135,0.0,1.879,6.583,1.352
base-foundation-complex.xml,50.478,0.0,23.559,9.917,0.853,0.0,0.0,0.0,3.049,3.95,0.919,20.89,0.696,11.743,-13.638,0.0,0.0,0.0,7.688,-0.254,6.983,0.0,0.527,0.0,19.567,-8.915,-2.764,0.0,0.105,-0.114,0.002,4.452,0.034,0.094,11.907,0.0,0.0,0.0,-4.233,-0.246,-0.869,-4.328,-0.058,0.0,8.174,6.871,1.743
base-foundation-conditioned-basement-slab-insulation-full.xml,27.605,0.0,23.636,9.917,0.846,0.0,0.0,0.0,3.404,3.961,0.905,8.063,0.694,11.794,-12.78,0.0,0.0,0.0,4.42,-0.164,5.528,0.0,0.515,0.0,12.215,-8.425,-2.622,0.0,-0.115,-0.259,-0.022,1.767,0.014,-0.45,12.767,0.0,0.0,0.0,-3.534,-0.158,-0.935,-4.354,-0.085,0.0,9.732,7.371,1.885
base-foundation-conditioned-basement-slab-insulation.xml,29.47,0.0,22.314,9.917,0.847,0.0,0.0,0.0,3.343,3.939,0.899,7.744,0.69,11.74,-12.842,0.0,0.0,0.0,6.161,-0.158,5.541,0.0,0.515,0.0,12.936,-8.48,-2.638,0.0,-0.08,-0.235,-0.016,2.078,0.021,-0.364,12.706,0.0,0.0,0.0,-4.942,-0.153,-0.912,-4.21,-0.083,0.0,9.311,7.315,1.869
@@ -311,8 +311,9 @@ base-hvac-ground-to-air-heat-pump-2-speed.xml,28.008,0.0,18.025,9.917,0.849,0.0,
base-hvac-ground-to-air-heat-pump-backup-integrated.xml,27.934,0.0,18.055,9.917,0.849,0.0,0.0,0.0,3.376,3.874,0.882,7.068,0.676,11.537,-12.828,0.0,0.0,0.0,8.3,-0.111,5.435,0.0,0.509,0.0,10.306,-8.481,-2.634,0.0,0.035,-0.244,-0.021,2.452,0.019,-0.374,12.67,0.0,0.0,0.0,-6.419,-0.107,-0.94,-4.164,-0.084,0.0,6.036,7.311,1.873
base-hvac-ground-to-air-heat-pump-backup-stove.xml,29.481,0.0,17.94,9.917,0.849,0.0,0.0,0.0,3.366,3.887,0.885,7.049,0.679,11.577,-12.876,0.0,0.0,0.0,8.267,-0.125,6.582,0.0,0.51,0.0,10.817,-8.519,-2.642,0.0,0.058,-0.223,-0.015,2.46,0.024,-0.304,12.622,0.0,0.0,0.0,-6.417,-0.121,-1.138,-4.092,-0.082,0.0,6.02,7.272,1.865
base-hvac-ground-to-air-heat-pump-cooling-only.xml,0.0,0.0,17.146,9.917,0.922,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.085,-0.212,-0.013,2.395,0.028,-0.287,12.462,0.0,0.0,0.0,-6.717,-0.121,-0.907,-4.023,-0.081,0.0,5.481,7.191,1.847
-base-hvac-ground-to-air-heat-pump-detailed-geothermal-loop.xml,32.234,0.0,18.474,9.917,0.85,0.0,0.0,0.0,3.292,3.836,0.874,7.348,0.669,11.436,-12.876,0.0,0.0,0.0,11.726,-0.128,5.437,0.0,0.508,0.0,11.267,-8.522,-2.641,0.0,0.045,-0.232,-0.017,2.832,0.024,-0.325,12.621,0.0,0.0,0.0,-6.415,-0.125,-0.923,-4.129,-0.083,0.0,6.061,7.268,1.866
-base-hvac-ground-to-air-heat-pump-heating-only.xml,26.771,0.0,0.0,9.917,0.814,0.0,0.0,0.0,3.384,3.838,0.873,7.052,0.669,11.438,-12.717,0.0,0.0,0.0,8.155,-0.101,5.387,0.0,0.505,0.0,9.277,-8.404,-2.613,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+base-hvac-ground-to-air-heat-pump-detailed-geothermal-loop-multiple.xml,32.965,0.0,18.542,9.917,0.85,0.0,0.0,0.0,3.261,3.836,0.874,7.347,0.669,11.435,-12.876,0.0,0.0,0.0,11.724,-0.128,5.491,0.0,0.508,0.0,11.98,-8.522,-2.641,0.0,0.041,-0.232,-0.017,2.832,0.024,-0.325,12.621,0.0,0.0,0.0,-6.415,-0.125,-0.922,-4.129,-0.083,0.0,6.135,7.268,1.866
+base-hvac-ground-to-air-heat-pump-detailed-geothermal-loop.xml,32.778,0.0,18.539,9.917,0.85,0.0,0.0,0.0,3.27,3.837,0.874,7.348,0.669,11.437,-12.876,0.0,0.0,0.0,11.727,-0.128,5.478,0.0,0.508,0.0,11.788,-8.522,-2.641,0.0,0.042,-0.232,-0.017,2.832,0.024,-0.325,12.621,0.0,0.0,0.0,-6.415,-0.125,-0.922,-4.129,-0.083,0.0,6.126,7.268,1.866
+base-hvac-ground-to-air-heat-pump-heating-only.xml,26.773,0.0,0.0,9.917,0.814,0.0,0.0,0.0,3.384,3.838,0.873,7.052,0.669,11.438,-12.717,0.0,0.0,0.0,8.155,-0.101,5.387,0.0,0.505,0.0,9.28,-8.404,-2.613,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
base-hvac-ground-to-air-heat-pump-var-speed-experimental.xml,36.593,0.0,20.504,9.917,0.849,0.0,0.0,0.0,3.012,3.876,0.882,7.073,0.676,11.541,-12.828,0.0,0.0,0.0,8.311,-0.111,5.789,0.0,0.509,0.0,18.936,-8.481,-2.634,0.0,-0.062,-0.243,-0.021,2.454,0.019,-0.372,12.67,0.0,0.0,0.0,-6.415,-0.107,-0.936,-4.171,-0.084,0.0,8.569,7.311,1.873
base-hvac-ground-to-air-heat-pump-var-speed.xml,28.007,0.0,18.019,9.917,0.849,0.0,0.0,0.0,3.373,3.875,0.882,7.068,0.676,11.537,-12.828,0.0,0.0,0.0,8.3,-0.111,5.44,0.0,0.509,0.0,10.376,-8.481,-2.634,0.0,0.037,-0.244,-0.021,2.452,0.019,-0.374,12.67,0.0,0.0,0.0,-6.419,-0.107,-0.941,-4.164,-0.084,0.0,6.0,7.311,1.873
base-hvac-install-quality-air-to-air-heat-pump-1-speed.xml,33.959,2.259,19.463,9.917,0.849,0.0,0.0,0.0,3.132,3.876,0.882,7.073,0.676,11.542,-12.828,0.0,0.0,0.0,8.311,-0.111,5.869,0.0,0.509,0.0,16.104,-9.847,-2.634,0.0,-0.022,-0.244,-0.021,2.453,0.019,-0.373,12.67,0.0,0.0,0.0,-6.417,-0.107,-0.936,-4.17,-0.084,0.0,7.493,7.311,1.873
@@ -545,4 +546,4 @@ house048.xml,29.539,0.0,57.021,7.18,2.641,0.0,0.0,1.101,2.509,12.132,0.0,0.0,0.7
house049.xml,6.54,0.0,32.718,4.263,1.296,0.0,0.0,0.0,1.543,4.696,0.0,0.0,0.0,5.028,-7.545,0.0,0.0,0.0,1.185,-0.168,3.012,0.0,2.206,0.0,0.0,-2.848,-0.599,0.0,2.096,7.876,0.0,0.0,0.0,4.575,10.32,0.0,0.0,0.0,3.101,-0.168,0.324,-3.581,0.998,0.0,0.0,6.304,0.874
house050.xml,15.895,0.0,6.365,8.503,0.0,0.0,0.0,0.0,3.919,6.204,0.0,0.0,1.86,4.814,-3.514,0.0,0.0,4.442,0.0,-0.127,2.126,0.0,3.362,0.0,1.927,-8.024,-1.097,0.0,-0.44,-0.618,0.0,0.0,-0.563,0.536,5.614,0.0,0.0,-1.362,0.0,-0.126,-0.65,-2.887,-1.05,0.0,0.983,6.244,0.685
house051.xml,12.323,0.0,12.387,10.999,0.792,0.0,0.0,0.0,2.758,3.431,0.0,0.0,0.657,9.619,-9.014,0.0,0.0,0.0,10.286,-0.043,2.104,0.0,0.764,0.0,2.769,-9.873,-0.634,0.0,-0.313,-0.667,0.0,0.0,-0.01,-1.222,6.969,0.0,0.0,0.0,-0.899,-0.042,-0.282,-3.696,-0.149,0.0,1.909,10.306,0.48
-house052.xml,154.241,0.0,56.958,10.027,0.967,0.0,0.0,20.112,0.0,53.043,7.756,13.38,1.389,59.363,-54.715,0.0,0.0,3.428,33.221,-1.291,76.277,0.0,6.02,0.0,0.87,-50.748,-13.891,6.549,0.0,6.65,1.38,7.732,-0.164,10.514,53.02,0.0,0.0,-0.369,-36.422,-0.986,-9.266,-28.109,-0.323,0.0,0.156,37.452,8.769
+house052.xml,154.235,0.0,56.958,10.027,0.967,0.0,0.0,20.112,0.0,53.043,7.756,13.38,1.389,59.363,-54.715,0.0,0.0,3.428,33.222,-1.291,76.277,0.0,6.02,0.0,0.861,-50.748,-13.891,6.549,0.0,6.65,1.38,7.732,-0.164,10.514,53.02,0.0,0.0,-0.369,-36.422,-0.986,-9.266,-28.109,-0.323,0.0,0.156,37.452,8.769
diff --git a/hpxml-measures/workflow/tests/base_results/results_simulations_misc.csv b/hpxml-measures/workflow/tests/base_results/results_simulations_misc.csv
index 75e8c2e1f1..49f21f95ee 100644
--- a/hpxml-measures/workflow/tests/base_results/results_simulations_misc.csv
+++ b/hpxml-measures/workflow/tests/base_results/results_simulations_misc.csv
@@ -1,5 +1,5 @@
HPXML,Unmet Hours: Heating (hr),Unmet Hours: Cooling (hr),Unmet Hours: EV Driving (hr),Hot Water: Clothes Washer (gal),Hot Water: Dishwasher (gal),Hot Water: Fixtures (gal),Hot Water: Distribution Waste (gal),Peak Electricity: Winter Total (W),Peak Electricity: Summer Total (W),Peak Electricity: Annual Total (W),Peak Electricity: Winter Net (W),Peak Electricity: Summer Net (W),Peak Electricity: Annual Net (W),Peak Load: Heating: Delivered (Btu/hr),Peak Load: Cooling: Delivered (Btu/hr),Resilience: Battery (hr)
-base-appliances-coal.xml,0.0,102.0,0.0,1286.4,890.5,11468.5,3942.3,2229.9,3677.3,3677.3,2229.9,3677.3,3677.3,33234.0,23022.0,0.0
+base-appliances-coal.xml,0.0,73.0,0.0,1286.4,890.5,11468.5,3942.3,2229.9,3677.3,3677.3,2229.9,3677.3,3677.3,33234.0,23022.0,0.0
base-appliances-dehumidifier-ef-portable.xml,0.0,0.0,0.0,1286.4,890.5,10049.5,3454.5,1897.7,3083.3,3083.3,1897.7,3083.3,3083.3,10347.0,16646.0,0.0
base-appliances-dehumidifier-ef-whole-home.xml,0.0,0.0,0.0,1286.4,890.5,10049.5,3454.5,1995.8,3083.3,3083.3,1995.8,3083.3,3083.3,10338.0,16646.0,0.0
base-appliances-dehumidifier-mechvent-latent-degradation-model-0s.xml,0.0,0.0,0.0,1286.4,890.5,9734.7,3346.3,2044.1,3396.8,3396.8,2044.1,3396.8,3396.8,7789.0,17048.0,0.0
@@ -8,24 +8,24 @@ base-appliances-dehumidifier-mechvent-latent-degradation-model-ashp.xml,0.0,0.0,
base-appliances-dehumidifier-mechvent.xml,0.0,0.0,0.0,1286.4,890.5,9734.7,3346.3,2086.2,3396.0,3396.0,2086.2,3396.0,3396.0,7789.0,17049.0,0.0
base-appliances-dehumidifier-multiple.xml,0.0,0.0,0.0,1286.4,890.5,10049.5,3454.5,2035.0,3147.5,3147.5,2035.0,3147.5,3147.5,10351.0,16646.0,0.0
base-appliances-dehumidifier.xml,0.0,0.0,0.0,1286.4,890.5,10049.5,3454.5,1987.3,3083.4,3083.4,1987.3,3083.4,3083.4,10322.0,16645.0,0.0
-base-appliances-freezer-temperature-dependent-schedule.xml,0.0,97.0,0.0,1286.4,890.5,11468.5,3942.3,2327.6,3830.3,3830.3,2327.6,3830.3,3830.3,33118.0,23014.0,0.0
-base-appliances-gas.xml,0.0,102.0,0.0,1286.4,890.5,11468.5,3942.3,2229.9,3677.3,3677.3,2229.9,3677.3,3677.3,33234.0,23022.0,0.0
-base-appliances-modified.xml,0.0,95.0,0.0,1286.4,1783.1,11468.6,3942.3,2372.2,4038.5,4038.5,2372.2,4038.5,4038.5,33231.0,23012.0,0.0
-base-appliances-none.xml,0.0,55.0,0.0,0.0,0.0,11468.5,3942.3,2046.6,3458.0,3458.0,2046.6,3458.0,3458.0,33698.0,22646.0,0.0
-base-appliances-oil.xml,0.0,102.0,0.0,1286.4,890.5,11468.5,3942.3,2229.9,3677.3,3677.3,2229.9,3677.3,3677.3,33234.0,23022.0,0.0
-base-appliances-propane.xml,0.0,102.0,0.0,1286.4,890.5,11468.5,3942.3,2229.9,3677.3,3677.3,2229.9,3677.3,3677.3,33234.0,23022.0,0.0
-base-appliances-refrigerator-temperature-dependent-schedule.xml,0.0,87.0,0.0,1286.4,890.5,11468.5,3942.3,2314.8,3776.5,3776.5,2314.8,3776.5,3776.5,33306.0,23005.0,0.0
-base-appliances-wood.xml,0.0,102.0,0.0,1286.4,890.5,11468.5,3942.3,2229.9,3677.3,3677.3,2229.9,3677.3,3677.3,33234.0,23022.0,0.0
+base-appliances-freezer-temperature-dependent-schedule.xml,0.0,72.0,0.0,1286.4,890.5,11468.5,3942.3,2327.6,3830.3,3830.3,2327.6,3830.3,3830.3,33118.0,23014.0,0.0
+base-appliances-gas.xml,0.0,73.0,0.0,1286.4,890.5,11468.5,3942.3,2229.9,3677.3,3677.3,2229.9,3677.3,3677.3,33234.0,23022.0,0.0
+base-appliances-modified.xml,0.0,70.0,0.0,1286.4,1783.1,11468.6,3942.3,2372.2,4038.5,4038.5,2372.2,4038.5,4038.5,33231.0,23012.0,0.0
+base-appliances-none.xml,0.0,36.0,0.0,0.0,0.0,11468.5,3942.3,2046.6,3458.0,3458.0,2046.6,3458.0,3458.0,33698.0,22646.0,0.0
+base-appliances-oil.xml,0.0,73.0,0.0,1286.4,890.5,11468.5,3942.3,2229.9,3677.3,3677.3,2229.9,3677.3,3677.3,33234.0,23022.0,0.0
+base-appliances-propane.xml,0.0,73.0,0.0,1286.4,890.5,11468.5,3942.3,2229.9,3677.3,3677.3,2229.9,3677.3,3677.3,33234.0,23022.0,0.0
+base-appliances-refrigerator-temperature-dependent-schedule.xml,0.0,59.0,0.0,1286.4,890.5,11468.5,3942.3,2314.8,3776.5,3776.5,2314.8,3776.5,3776.5,33306.0,23005.0,0.0
+base-appliances-wood.xml,0.0,73.0,0.0,1286.4,890.5,11468.5,3942.3,2229.9,3677.3,3677.3,2229.9,3677.3,3677.3,33234.0,23022.0,0.0
base-atticroof-cathedral.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,2288.5,3768.3,3768.3,2288.5,3768.3,3768.3,22986.0,18593.0,0.0
-base-atticroof-conditioned.xml,0.0,3.0,0.0,1286.4,890.5,11468.6,3942.3,2544.6,3957.8,3957.8,2544.6,3957.8,3957.8,24079.0,21002.0,0.0
+base-atticroof-conditioned.xml,0.0,1.0,0.0,1286.4,890.5,11468.6,3942.3,2544.6,3957.8,3957.8,2544.6,3957.8,3957.8,24079.0,21002.0,0.0
base-atticroof-flat.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,2237.2,3150.7,3150.7,2237.2,3150.7,3150.7,17878.0,14350.0,0.0
-base-atticroof-radiant-barrier-ceiling.xml,0.0,3.0,0.0,1286.4,890.5,10049.4,3454.5,1855.7,3494.4,3494.4,1855.7,3494.4,3494.4,14879.0,20710.0,0.0
+base-atticroof-radiant-barrier-ceiling.xml,0.0,2.0,0.0,1286.4,890.5,10049.4,3454.5,1855.7,3494.4,3494.4,1855.7,3494.4,3494.4,14879.0,20710.0,0.0
base-atticroof-radiant-barrier.xml,0.0,0.0,0.0,1286.4,890.5,10049.5,3454.5,1858.0,3513.2,3513.2,1858.0,3513.2,3513.2,13900.0,20130.0,0.0
base-atticroof-unvented-insulated-roof.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,2259.0,3616.7,3616.7,2259.0,3616.7,3616.7,21436.0,17223.0,0.0
-base-atticroof-vented.xml,0.0,27.0,0.0,1286.4,890.5,11468.5,3942.3,2379.3,3773.3,3773.3,2379.3,3773.3,3773.3,36233.0,22378.0,0.0
-base-battery-scheduled-power-outage.xml,0.0,66.0,0.0,1178.8,816.4,10565.4,3631.8,8119.7,8280.2,8280.2,8119.7,8280.2,8280.2,33306.0,23007.0,1.38
-base-battery-scheduled.xml,0.0,87.0,0.0,1286.4,890.5,11468.5,3942.3,8119.5,8427.4,8427.4,8119.5,8427.4,8427.4,33306.0,23005.0,1.473
-base-battery.xml,0.0,87.0,0.0,1286.4,890.5,11468.5,3942.3,2314.8,3776.5,3776.5,2314.8,3776.5,3776.5,33306.0,23005.0,0.0
+base-atticroof-vented.xml,0.0,18.0,0.0,1286.4,890.5,11468.5,3942.3,2379.3,3773.3,3773.3,2379.3,3773.3,3773.3,36233.0,22378.0,0.0
+base-battery-scheduled-power-outage.xml,0.0,45.0,0.0,1178.8,816.4,10565.4,3631.8,8119.7,8280.2,8280.2,8119.7,8280.2,8280.2,33306.0,23007.0,1.38
+base-battery-scheduled.xml,0.0,59.0,0.0,1286.4,890.5,11468.5,3942.3,8119.5,8427.4,8427.4,8119.5,8427.4,8427.4,33306.0,23005.0,1.473
+base-battery.xml,0.0,59.0,0.0,1286.4,890.5,11468.5,3942.3,2314.8,3776.5,3776.5,2314.8,3776.5,3776.5,33306.0,23005.0,0.0
base-bldgtype-mf-unit-adjacent-to-multifamily-buffer-space.xml,0.0,0.0,0.0,1323.0,910.7,12046.2,4107.6,1692.1,2019.7,2019.7,1692.1,2019.7,2019.7,8389.0,7257.0,0.0
base-bldgtype-mf-unit-adjacent-to-multiple-hvac-none.xml,0.0,0.0,0.0,1323.0,910.7,12046.2,4107.6,1654.5,1576.8,1654.5,1654.5,1576.8,1654.5,0.0,0.0,0.0
base-bldgtype-mf-unit-adjacent-to-multiple.xml,0.0,0.0,0.0,1323.0,910.7,12046.2,4107.6,1685.9,2675.7,2675.7,1685.9,2675.7,2675.7,6550.0,10446.0,0.0
@@ -38,10 +38,10 @@ base-bldgtype-mf-unit-infil-leakiness-description.xml,0.0,0.0,0.0,1323.0,910.7,1
base-bldgtype-mf-unit-neighbor-shading.xml,0.0,0.0,0.0,1323.0,910.7,12046.2,4107.6,1709.5,2115.2,2115.2,1709.5,2115.2,2115.2,3864.0,8332.0,0.0
base-bldgtype-mf-unit-residents-1.xml,0.0,0.0,0.0,821.3,625.4,3517.0,1830.1,1100.7,1911.4,1911.4,1100.7,1911.4,1911.4,4052.0,7914.0,0.0
base-bldgtype-mf-unit-shared-boiler-chiller-baseboard.xml,0.0,0.0,0.0,1323.0,910.7,12046.2,4107.6,1712.2,2180.9,2180.9,1712.2,2180.9,2180.9,3868.0,8096.0,0.0
-base-bldgtype-mf-unit-shared-boiler-chiller-fan-coil-ducted.xml,0.0,2.0,0.0,1323.0,910.7,12046.2,4107.6,1754.3,2412.9,2412.9,1754.3,2412.9,2412.9,4079.0,9506.0,0.0
+base-bldgtype-mf-unit-shared-boiler-chiller-fan-coil-ducted.xml,0.0,0.0,0.0,1323.0,910.7,12046.2,4107.6,1754.3,2412.9,2412.9,1754.3,2412.9,2412.9,4079.0,9506.0,0.0
base-bldgtype-mf-unit-shared-boiler-chiller-fan-coil.xml,0.0,0.0,0.0,1323.0,910.7,12046.2,4107.6,1727.0,2264.0,2264.0,1727.0,2264.0,2264.0,3870.0,8096.0,0.0
-base-bldgtype-mf-unit-shared-boiler-chiller-water-loop-heat-pump.xml,0.0,2.0,0.0,1323.0,910.7,12046.2,4107.6,2278.8,3773.8,3773.8,2278.8,3773.8,3773.8,3965.0,9507.0,0.0
-base-bldgtype-mf-unit-shared-boiler-cooling-tower-water-loop-heat-pump.xml,0.0,2.0,0.0,1323.0,910.7,12046.2,4107.6,1737.5,2354.6,2354.6,1737.5,2354.6,2354.6,3965.0,9506.0,0.0
+base-bldgtype-mf-unit-shared-boiler-chiller-water-loop-heat-pump.xml,0.0,0.0,0.0,1323.0,910.7,12046.2,4107.6,2278.8,3773.8,3773.8,2278.8,3773.8,3773.8,3965.0,9507.0,0.0
+base-bldgtype-mf-unit-shared-boiler-cooling-tower-water-loop-heat-pump.xml,0.0,0.0,0.0,1323.0,910.7,12046.2,4107.6,1737.5,2354.6,2354.6,1737.5,2354.6,2354.6,3965.0,9506.0,0.0
base-bldgtype-mf-unit-shared-boiler-only-baseboard-combi-tankless.xml,0.0,0.0,0.0,1094.7,763.8,9607.3,3275.9,801.0,766.4,801.0,801.0,766.4,801.0,3975.0,0.0,0.0
base-bldgtype-mf-unit-shared-boiler-only-baseboard.xml,0.0,0.0,0.0,1323.0,910.7,12046.3,4107.6,1666.8,1586.2,1666.8,1666.8,1586.2,1666.8,3868.0,0.0,0.0
base-bldgtype-mf-unit-shared-boiler-only-fan-coil-ducted.xml,0.0,0.0,0.0,1323.0,910.7,12046.3,4107.6,1685.2,1579.9,1685.2,1685.2,1579.9,1685.2,4080.0,0.0,0.0
@@ -50,10 +50,10 @@ base-bldgtype-mf-unit-shared-boiler-only-fan-coil-fireplace-elec.xml,0.0,0.0,0.0
base-bldgtype-mf-unit-shared-boiler-only-fan-coil.xml,0.0,0.0,0.0,1323.0,910.7,12046.3,4107.6,1702.2,1586.2,1702.2,1702.2,1586.2,1702.2,3872.0,0.0,0.0
base-bldgtype-mf-unit-shared-boiler-only-water-loop-heat-pump.xml,0.0,0.0,0.0,1323.0,910.7,12046.3,4107.6,1690.7,1579.9,1690.7,1690.7,1579.9,1690.7,3967.0,0.0,0.0
base-bldgtype-mf-unit-shared-chiller-only-baseboard.xml,0.0,0.0,0.0,1323.0,910.7,12046.2,4107.6,1712.6,2236.7,2236.7,1712.6,2236.7,2236.7,0.0,8096.0,0.0
-base-bldgtype-mf-unit-shared-chiller-only-fan-coil-ducted.xml,0.0,2.0,0.0,1323.0,910.7,12046.2,4107.6,1734.8,2617.2,2617.2,1734.8,2617.2,2617.2,0.0,9506.0,0.0
+base-bldgtype-mf-unit-shared-chiller-only-fan-coil-ducted.xml,0.0,0.0,0.0,1323.0,910.7,12046.2,4107.6,1734.8,2617.2,2617.2,1734.8,2617.2,2617.2,0.0,9506.0,0.0
base-bldgtype-mf-unit-shared-chiller-only-fan-coil.xml,0.0,0.0,0.0,1323.0,910.7,12046.2,4107.6,1721.2,2313.0,2313.0,1721.2,2313.0,2313.0,0.0,8096.0,0.0
-base-bldgtype-mf-unit-shared-chiller-only-water-loop-heat-pump.xml,0.0,2.0,0.0,1323.0,910.7,12046.2,4107.6,2098.3,4013.0,4013.0,2098.3,4013.0,4013.0,0.0,9507.0,0.0
-base-bldgtype-mf-unit-shared-cooling-tower-only-water-loop-heat-pump.xml,0.0,2.0,0.0,1323.0,910.7,12046.2,4107.6,1725.5,2563.7,2563.7,1725.5,2563.7,2563.7,0.0,9506.0,0.0
+base-bldgtype-mf-unit-shared-chiller-only-water-loop-heat-pump.xml,0.0,0.0,0.0,1323.0,910.7,12046.2,4107.6,2098.3,4013.0,4013.0,2098.3,4013.0,4013.0,0.0,9507.0,0.0
+base-bldgtype-mf-unit-shared-cooling-tower-only-water-loop-heat-pump.xml,0.0,0.0,0.0,1323.0,910.7,12046.2,4107.6,1725.5,2563.7,2563.7,1725.5,2563.7,2563.7,0.0,9506.0,0.0
base-bldgtype-mf-unit-shared-generator.xml,0.0,0.0,0.0,1323.0,910.7,12046.2,4107.6,1480.5,1894.4,1894.4,1480.5,1894.4,1894.4,3871.0,8399.0,0.0
base-bldgtype-mf-unit-shared-ground-loop-ground-to-air-heat-pump.xml,0.0,0.0,0.0,1323.0,910.7,12046.2,4107.6,1732.8,2048.5,2088.6,1732.8,2048.5,2088.6,3871.0,8399.0,0.0
base-bldgtype-mf-unit-shared-laundry-room-multiple-water-heaters.xml,0.0,0.0,0.0,1323.0,910.6,12046.4,4107.7,836.8,1678.5,1678.5,836.8,1678.5,1678.5,3987.0,8217.0,0.0
@@ -69,136 +69,136 @@ base-bldgtype-mf-unit-shared-water-heater-recirc-scheduled.xml,0.0,0.0,0.0,1323.
base-bldgtype-mf-unit-shared-water-heater-recirc.xml,0.0,0.0,0.0,1323.0,910.6,12046.2,4107.6,872.0,1724.8,1724.8,872.0,1724.8,1724.8,3977.0,8312.0,0.0
base-bldgtype-mf-unit-shared-water-heater.xml,0.0,0.0,0.0,1323.0,910.6,12046.2,4107.6,835.3,1688.2,1688.2,835.3,1688.2,1688.2,3977.0,8312.0,0.0
base-bldgtype-mf-unit.xml,0.0,0.0,0.0,1323.0,910.7,12046.2,4107.6,1708.8,2122.7,2122.7,1708.8,2122.7,2122.7,3871.0,8399.0,0.0
-base-bldgtype-mf-whole-building-common-spaces.xml,0.0,1.0,0.0,7938.3,5463.9,72300.8,24653.6,18244.3,14064.1,18244.3,18244.3,14064.1,18244.3,34079.0,24044.0,0.0
-base-bldgtype-mf-whole-building-detailed-electric-panel.xml,0.0,3.0,0.0,7938.3,5463.9,72300.5,24653.5,22673.0,17047.6,22673.0,22673.0,17047.6,22673.0,56417.0,56021.0,0.0
-base-bldgtype-mf-whole-building-fuels.xml,0.0,3.0,0.0,7938.3,5463.9,72281.5,24647.0,7208.7,11512.5,11512.5,7208.7,11512.5,11512.5,56578.0,58149.0,0.0
-base-bldgtype-mf-whole-building-inter-unit-heat-transfer.xml,0.0,13.0,0.0,7938.3,5463.9,72301.3,24653.8,17407.7,13347.9,17407.7,17407.7,13347.9,17407.7,32778.0,29247.0,0.0
-base-bldgtype-mf-whole-building-pv-battery.xml,0.0,3.0,0.0,7938.3,5463.9,72300.5,24653.5,22673.0,16870.2,22673.0,22673.0,11525.9,22673.0,56417.0,56021.0,3.201
-base-bldgtype-mf-whole-building-vehicle-ev-charger.xml,0.0,3.0,0.0,7938.3,5463.9,72300.5,24653.5,47792.2,44767.0,47792.2,47792.2,44767.0,47792.2,56417.0,56021.0,0.0
-base-bldgtype-mf-whole-building.xml,0.0,3.0,0.0,7938.3,5463.9,72300.5,24653.5,22673.0,17047.6,22673.0,22673.0,17047.6,22673.0,56417.0,56021.0,0.0
+base-bldgtype-mf-whole-building-common-spaces.xml,0.0,0.0,0.0,7938.3,5463.9,72300.8,24653.6,18244.3,14064.1,18244.3,18244.3,14064.1,18244.3,34079.0,24044.0,0.0
+base-bldgtype-mf-whole-building-detailed-electric-panel.xml,0.0,2.0,0.0,7938.3,5463.9,72300.5,24653.5,22673.0,17047.6,22673.0,22673.0,17047.6,22673.0,56417.0,56021.0,0.0
+base-bldgtype-mf-whole-building-fuels.xml,0.0,2.0,0.0,7938.3,5463.9,72281.5,24647.0,7208.7,11512.5,11512.5,7208.7,11512.5,11512.5,56578.0,58149.0,0.0
+base-bldgtype-mf-whole-building-inter-unit-heat-transfer.xml,0.0,9.0,0.0,7938.3,5463.9,72301.3,24653.8,17407.7,13347.9,17407.7,17407.7,13347.9,17407.7,32778.0,29247.0,0.0
+base-bldgtype-mf-whole-building-pv-battery.xml,0.0,2.0,0.0,7938.3,5463.9,72300.5,24653.5,22673.0,16870.2,22673.0,22673.0,11525.9,22673.0,56417.0,56021.0,3.201
+base-bldgtype-mf-whole-building-vehicle-ev-charger.xml,0.0,2.0,0.0,7938.3,5463.9,72300.5,24653.5,47792.2,44767.0,47792.2,47792.2,44767.0,47792.2,56417.0,56021.0,0.0
+base-bldgtype-mf-whole-building.xml,0.0,2.0,0.0,7938.3,5463.9,72300.5,24653.5,22673.0,17047.6,22673.0,22673.0,17047.6,22673.0,56417.0,56021.0,0.0
base-bldgtype-sfa-unit-2stories.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,2282.4,4156.5,4156.5,2282.4,4156.5,4156.5,23909.0,23996.0,0.0
base-bldgtype-sfa-unit-atticroof-cathedral.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,2346.7,4242.0,4242.0,2346.7,4242.0,4242.0,27680.0,24163.0,0.0
base-bldgtype-sfa-unit-infil-compartmentalization-test.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,1971.4,2890.4,2890.4,1971.4,2890.4,2890.4,16301.0,13938.0,0.0
base-bldgtype-sfa-unit.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,1971.4,2890.4,2890.4,1971.4,2890.4,2890.4,16301.0,13938.0,0.0
-base-detailed-electric-panel-no-calculation-types.xml,0.0,19.0,0.0,1286.4,0.0,11468.7,3942.3,837.8,2261.8,2261.8,837.8,2261.8,2261.8,17157.0,16772.0,0.0
-base-detailed-electric-panel.xml,0.0,19.0,0.0,1286.4,0.0,11468.7,3942.3,837.8,2261.8,2261.8,837.8,2261.8,2261.8,17157.0,16772.0,0.0
+base-detailed-electric-panel-no-calculation-types.xml,0.0,13.0,0.0,1286.4,0.0,11468.7,3942.3,837.8,2261.8,2261.8,837.8,2261.8,2261.8,17157.0,16772.0,0.0
+base-detailed-electric-panel.xml,0.0,13.0,0.0,1286.4,0.0,11468.7,3942.3,837.8,2261.8,2261.8,837.8,2261.8,2261.8,17157.0,16772.0,0.0
base-dhw-combi-tankless-outside.xml,0.0,0.0,0.0,1054.8,737.4,9054.0,3112.3,1290.6,1157.6,1290.6,1290.6,1157.6,1290.6,17064.0,0.0,0.0
base-dhw-combi-tankless.xml,0.0,0.0,0.0,1054.8,737.4,9054.0,3112.3,1290.6,1157.6,1290.6,1290.6,1157.6,1290.6,17064.0,0.0,0.0
-base-dhw-desuperheater-2-speed.xml,0.0,98.0,0.0,1286.4,890.5,11483.2,3947.3,2138.1,3059.0,3059.0,2138.1,3059.0,3059.0,0.0,22897.0,0.0
-base-dhw-desuperheater-ghp-experimental.xml,9.0,0.0,0.0,1286.4,890.5,11484.6,3947.8,5086.2,3162.8,5086.2,5086.2,3162.8,5086.2,28531.0,25447.0,0.0
+base-dhw-desuperheater-2-speed.xml,0.0,71.0,0.0,1286.4,890.5,11483.2,3947.3,2138.1,3059.0,3059.0,2138.1,3059.0,3059.0,0.0,22897.0,0.0
+base-dhw-desuperheater-ghp-experimental.xml,8.0,0.0,0.0,1286.4,890.5,11484.6,3947.8,5086.2,3162.8,5086.2,5086.2,3162.8,5086.2,28531.0,25447.0,0.0
base-dhw-desuperheater-ghp.xml,0.0,0.0,0.0,1286.4,890.5,11483.7,3947.5,4527.2,3159.4,4527.2,4527.2,3159.4,4527.2,31044.0,25807.0,0.0
-base-dhw-desuperheater-hpwh.xml,0.0,109.0,0.0,1286.3,890.4,11361.1,3905.3,1914.2,3354.7,3354.7,1914.2,3354.7,3354.7,34859.0,22821.0,0.0
-base-dhw-desuperheater-tankless.xml,0.0,92.0,0.0,1286.4,890.5,11420.9,3925.9,1881.5,3351.6,3351.6,1881.5,3351.6,3351.6,0.0,23001.0,0.0
-base-dhw-desuperheater-var-speed.xml,0.0,25.0,0.0,1286.4,890.5,11484.4,3947.7,2138.2,3294.8,3294.8,2138.2,3294.8,3294.8,0.0,24124.0,0.0
-base-dhw-desuperheater.xml,0.0,97.0,0.0,1286.4,890.5,11483.1,3947.3,2138.2,3351.6,3351.6,2138.2,3351.6,3351.6,0.0,23006.0,0.0
-base-dhw-dwhr.xml,0.0,87.0,0.0,1286.4,890.5,10339.3,3554.1,2038.6,3725.1,3725.1,2038.6,3725.1,3725.1,33307.0,23005.0,0.0
+base-dhw-desuperheater-hpwh.xml,0.0,82.0,0.0,1286.3,890.4,11361.1,3905.3,1914.2,3354.7,3354.7,1914.2,3354.7,3354.7,34859.0,22821.0,0.0
+base-dhw-desuperheater-tankless.xml,0.0,62.0,0.0,1286.4,890.5,11420.9,3925.9,1881.5,3351.6,3351.6,1881.5,3351.6,3351.6,0.0,23001.0,0.0
+base-dhw-desuperheater-var-speed.xml,0.0,18.0,0.0,1286.4,890.5,11484.4,3947.7,2138.2,3294.8,3294.8,2138.2,3294.8,3294.8,0.0,24124.0,0.0
+base-dhw-desuperheater.xml,0.0,69.0,0.0,1286.4,890.5,11483.1,3947.3,2138.2,3351.6,3351.6,2138.2,3351.6,3351.6,0.0,23006.0,0.0
+base-dhw-dwhr.xml,0.0,59.0,0.0,1286.4,890.5,10339.3,3554.1,2038.6,3725.1,3725.1,2038.6,3725.1,3725.1,33307.0,23005.0,0.0
base-dhw-indirect-detailed-setpoints.xml,0.0,0.0,0.0,1126.5,793.4,10132.0,3482.9,1289.9,1157.9,1289.9,1289.9,1157.9,1289.9,16735.0,0.0,0.0
base-dhw-indirect-dse.xml,0.0,0.0,0.0,1030.4,723.9,9285.9,3192.0,1296.3,1157.9,1296.3,1296.3,1157.9,1296.3,16806.0,0.0,0.0
base-dhw-indirect-outside.xml,0.0,0.0,0.0,1030.5,724.2,9286.8,3192.3,1290.6,1157.6,1290.6,1290.6,1157.6,1290.6,17064.0,0.0,0.0
base-dhw-indirect-standbyloss.xml,0.0,0.0,0.0,1030.5,723.9,9286.5,3192.2,1289.8,1157.9,1289.8,1289.8,1157.9,1289.8,16782.0,0.0,0.0
base-dhw-indirect-with-solar-fraction.xml,0.0,0.0,0.0,1066.3,738.7,9281.6,3190.5,1290.3,1157.7,1290.3,1290.3,1157.7,1290.3,16970.0,0.0,0.0
base-dhw-indirect.xml,0.0,0.0,0.0,1030.4,723.9,9285.9,3192.0,1289.8,1157.9,1289.8,1289.8,1157.9,1289.8,16806.0,0.0,0.0
-base-dhw-jacket-electric.xml,0.0,85.0,0.0,1286.4,890.5,11468.6,3942.3,2340.9,3849.0,3849.0,2340.9,3849.0,3849.0,33377.0,23003.0,0.0
-base-dhw-jacket-gas.xml,0.0,90.0,0.0,1286.4,890.5,11468.7,3942.3,1484.0,3351.7,3351.7,1484.0,3351.7,3351.7,34009.0,23009.0,0.0
-base-dhw-jacket-hpwh.xml,0.0,57.0,0.0,1286.4,890.5,10922.8,3754.7,1915.7,3735.2,3735.2,1915.7,3735.2,3735.2,36104.0,22706.0,0.0
+base-dhw-jacket-electric.xml,0.0,57.0,0.0,1286.4,890.5,11468.6,3942.3,2340.9,3849.0,3849.0,2340.9,3849.0,3849.0,33377.0,23003.0,0.0
+base-dhw-jacket-gas.xml,0.0,68.0,0.0,1286.4,890.5,11468.7,3942.3,1484.0,3351.7,3351.7,1484.0,3351.7,3351.7,34009.0,23009.0,0.0
+base-dhw-jacket-hpwh.xml,0.0,35.0,0.0,1286.4,890.5,10922.8,3754.7,1915.7,3735.2,3735.2,1915.7,3735.2,3735.2,36104.0,22706.0,0.0
base-dhw-jacket-indirect.xml,0.0,0.0,0.0,1030.5,724.1,9292.3,3194.2,1290.0,1157.9,1290.0,1290.0,1157.9,1290.0,16829.0,0.0,0.0
-base-dhw-low-flow-fixtures.xml,0.0,87.0,0.0,1286.4,890.5,10895.1,3745.2,2338.0,3775.0,3775.0,2338.0,3775.0,3775.0,33303.0,23005.0,0.0
+base-dhw-low-flow-fixtures.xml,0.0,59.0,0.0,1286.4,890.5,10895.1,3745.2,2338.0,3775.0,3775.0,2338.0,3775.0,3775.0,33303.0,23005.0,0.0
base-dhw-multiple.xml,0.0,0.0,0.0,1279.8,885.8,11477.0,3945.2,2151.7,2013.0,2151.7,2151.7,2013.0,2151.7,17323.0,0.0,0.0
-base-dhw-none.xml,0.0,78.0,0.0,0.0,0.0,0.0,0.0,1383.3,3259.2,3259.2,1383.3,3259.2,3259.2,33488.0,22998.0,0.0
-base-dhw-recirc-demand-scheduled.xml,0.0,87.0,0.0,1286.4,890.5,11468.6,1281.2,2287.3,3801.5,3801.5,2287.3,3801.5,3801.5,33304.0,23005.0,0.0
-base-dhw-recirc-demand.xml,0.0,87.0,0.0,1286.4,890.5,11468.6,1281.2,2287.3,3801.5,3801.5,2287.3,3801.5,3801.5,33304.0,23005.0,0.0
-base-dhw-recirc-manual.xml,0.0,87.0,0.0,1286.4,890.5,11468.6,1281.2,2248.1,3763.8,3763.8,2248.1,3763.8,3763.8,33304.0,23005.0,0.0
-base-dhw-recirc-nocontrol.xml,0.0,87.0,0.0,1286.4,890.5,11468.6,1281.2,3108.4,4386.6,4386.6,3108.4,4386.6,4386.6,33304.0,23005.0,0.0
-base-dhw-recirc-temperature.xml,0.0,87.0,0.0,1286.4,890.5,11468.6,1281.2,2754.8,4179.7,4179.7,2754.8,4179.7,4179.7,33304.0,23005.0,0.0
-base-dhw-recirc-timer.xml,0.0,87.0,0.0,1286.4,890.5,11468.6,1281.2,3108.4,4386.6,4386.6,3108.4,4386.6,4386.6,33304.0,23005.0,0.0
-base-dhw-setpoint-temperature.xml,0.0,90.0,0.0,1286.4,890.5,9980.5,3430.8,2315.6,3887.6,3887.6,2315.6,3887.6,3887.6,33275.0,23006.0,0.0
-base-dhw-solar-direct-evacuated-tube.xml,0.0,88.0,0.0,1286.3,890.4,11388.2,3914.7,2337.6,3383.6,3383.6,2337.6,3383.6,3383.6,33304.0,23005.0,0.0
-base-dhw-solar-direct-flat-plate.xml,0.0,90.0,0.0,1286.0,890.2,10691.6,3675.2,2200.1,3383.6,3383.6,2200.1,3383.6,3383.6,33303.0,23006.0,0.0
-base-dhw-solar-direct-ics.xml,0.0,90.0,0.0,1286.4,890.4,11138.8,3828.9,2344.2,3383.6,3383.6,2344.2,3383.6,3383.6,33307.0,23005.0,0.0
-base-dhw-solar-fraction.xml,0.0,83.0,0.0,1286.4,890.5,11468.6,3942.3,1884.0,3753.7,3753.7,1884.0,3753.7,3753.7,33417.0,23002.0,0.0
-base-dhw-solar-indirect-flat-plate.xml,0.0,101.0,0.0,1286.0,890.1,10798.5,3711.9,1984.1,3383.7,3383.7,1984.1,3383.7,3383.7,33353.0,23016.0,0.0
-base-dhw-solar-thermosyphon-flat-plate.xml,0.0,90.0,0.0,1286.1,890.2,10716.9,3683.9,2186.8,3351.6,3351.6,2186.8,3351.6,3351.6,33303.0,23006.0,0.0
-base-dhw-tank-coal.xml,0.0,96.0,0.0,1286.4,890.5,11468.8,3942.4,1483.0,3351.7,3351.7,1483.0,3351.7,3351.7,33901.0,23012.0,0.0
-base-dhw-tank-detailed-setpoints.xml,0.0,88.0,0.0,1286.4,890.4,11462.2,3940.1,2920.6,4128.2,4128.2,2920.6,4128.2,4128.2,33267.0,23005.0,0.0
-base-dhw-tank-elec-ef.xml,0.0,90.0,0.0,1286.4,890.5,11468.6,3942.3,2175.7,3982.7,3982.7,2175.7,3982.7,3982.7,33245.0,23006.0,0.0
-base-dhw-tank-gas-ef.xml,0.0,101.0,0.0,1286.4,890.5,11468.9,3942.4,1482.2,3351.7,3351.7,1482.2,3351.7,3351.7,33814.0,23014.0,0.0
-base-dhw-tank-gas-fhr.xml,0.0,96.0,0.0,1286.4,890.5,11468.8,3942.4,1483.0,3351.7,3351.7,1483.0,3351.7,3351.7,33901.0,23012.0,0.0
-base-dhw-tank-gas-outside.xml,0.0,81.0,0.0,1286.4,890.5,11468.6,3942.3,1479.2,3351.6,3351.6,1479.2,3351.6,3351.6,33478.0,23000.0,0.0
-base-dhw-tank-gas.xml,0.0,96.0,0.0,1286.4,890.5,11468.8,3942.4,1483.0,3351.7,3351.7,1483.0,3351.7,3351.7,33901.0,23012.0,0.0
-base-dhw-tank-heat-pump-capacities.xml,0.0,59.0,0.0,1286.4,890.5,11076.4,3807.5,1716.0,3353.3,3353.3,1716.0,3353.3,3353.3,32954.0,22790.0,0.0
-base-dhw-tank-heat-pump-confined-space.xml,0.0,54.0,0.0,1286.4,890.5,10972.3,3771.7,1973.3,3750.6,3750.6,1973.3,3750.6,3750.6,35754.0,23036.0,0.0
-base-dhw-tank-heat-pump-detailed-schedules.xml,0.0,64.0,0.0,1286.4,890.5,10054.2,3456.1,1839.6,3608.9,3608.9,1839.6,3608.9,3608.9,36443.0,22997.0,0.0
-base-dhw-tank-heat-pump-ducting.xml,1.0,112.0,0.0,1286.4,890.5,10967.0,3769.9,1887.7,3686.2,3686.2,1887.7,3686.2,3686.2,36621.0,23003.0,0.0
-base-dhw-tank-heat-pump-ef.xml,0.0,66.0,0.0,1286.4,890.5,10994.7,3779.4,1903.3,3768.5,3768.5,1903.3,3768.5,3768.5,36071.0,22795.0,0.0
-base-dhw-tank-heat-pump-operating-mode-heat-pump-only.xml,0.0,66.0,0.0,1286.4,890.5,10994.7,3779.4,1903.3,3768.5,3768.5,1903.3,3768.5,3768.5,36071.0,22795.0,0.0
-base-dhw-tank-heat-pump-outside.xml,0.0,81.0,0.0,1286.4,890.5,11190.6,3846.7,2644.8,3584.5,3584.5,2644.8,3584.5,3584.5,33478.0,23000.0,0.0
-base-dhw-tank-heat-pump-with-solar-fraction.xml,0.0,74.0,0.0,1286.4,890.5,11087.9,3811.4,1901.8,3527.7,3527.7,1901.8,3527.7,3527.7,35048.0,23002.0,0.0
-base-dhw-tank-heat-pump-with-solar.xml,0.0,103.0,0.0,1286.0,890.1,11904.0,4091.9,1917.0,3354.7,3354.7,1917.0,3354.7,3354.7,36066.0,23017.0,0.0
-base-dhw-tank-heat-pump.xml,0.0,53.0,0.0,1286.4,890.5,10972.4,3771.7,1900.6,3685.8,3685.8,1900.6,3685.8,3685.8,35983.0,23038.0,0.0
-base-dhw-tank-model-type-stratified-detailed-occupancy-stochastic.xml,0.0,96.0,0.0,1286.4,890.5,11158.6,3835.7,6231.7,6509.5,6876.0,6231.7,6509.5,6876.0,36215.0,22888.0,0.0
-base-dhw-tank-model-type-stratified.xml,0.0,87.0,0.0,1286.4,890.5,11161.6,3836.8,2059.0,3818.7,3818.7,2059.0,3818.7,3818.7,33328.0,23004.0,0.0
-base-dhw-tank-oil.xml,0.0,96.0,0.0,1286.4,890.5,11468.8,3942.4,1483.2,3351.7,3351.7,1483.2,3351.7,3351.7,33927.0,23011.0,0.0
-base-dhw-tank-wood.xml,0.0,96.0,0.0,1286.4,890.5,11468.8,3942.4,1483.0,3351.7,3351.7,1483.0,3351.7,3351.7,33901.0,23012.0,0.0
-base-dhw-tankless-detailed-setpoints.xml,0.0,81.0,0.0,1286.4,890.5,11646.9,4003.6,1479.2,3351.6,3351.6,1479.2,3351.6,3351.6,33478.0,23000.0,0.0
-base-dhw-tankless-electric-ef.xml,0.0,81.0,0.0,1286.4,890.5,11466.0,3941.4,2131.5,3823.5,3823.5,2131.5,3823.5,3823.5,33478.0,23000.0,0.0
-base-dhw-tankless-electric-outside.xml,0.0,81.0,0.0,1286.4,890.5,11466.0,3941.4,2117.9,3813.8,3813.8,2117.9,3813.8,3813.8,33478.0,23000.0,0.0
-base-dhw-tankless-electric.xml,0.0,81.0,0.0,1286.4,890.5,11466.0,3941.4,2103.9,3804.0,3804.0,2103.9,3804.0,3804.0,33478.0,23000.0,0.0
-base-dhw-tankless-gas-ef.xml,0.0,81.0,0.0,1286.4,890.5,11466.0,3941.4,1479.2,3351.6,3351.6,1479.2,3351.6,3351.6,33478.0,23000.0,0.0
-base-dhw-tankless-gas-with-solar-fraction.xml,0.0,81.0,0.0,1286.4,890.5,11466.0,3941.4,1479.2,3351.6,3351.6,1479.2,3351.6,3351.6,33478.0,23000.0,0.0
-base-dhw-tankless-gas-with-solar.xml,0.0,90.0,0.0,1276.0,881.8,10180.1,3499.4,1479.5,3351.7,3351.7,1479.5,3351.7,3351.7,33524.0,23009.0,0.0
-base-dhw-tankless-gas.xml,0.0,81.0,0.0,1286.4,890.5,11466.0,3941.4,1479.2,3351.6,3351.6,1479.2,3351.6,3351.6,33478.0,23000.0,0.0
-base-dhw-tankless-propane.xml,0.0,81.0,0.0,1286.4,890.5,11466.0,3941.4,1479.2,3351.6,3351.6,1479.2,3351.6,3351.6,33478.0,23000.0,0.0
-base-enclosure-2stories-garage.xml,0.0,203.0,0.0,1286.4,890.5,11468.6,3942.3,2611.3,5043.8,5043.8,2611.3,5043.8,5043.8,47547.0,34751.0,0.0
-base-enclosure-2stories.xml,5.0,250.0,0.0,1286.4,890.5,11468.6,3942.3,2773.4,5202.4,5202.4,2773.4,5202.4,5202.4,51913.0,34966.0,0.0
-base-enclosure-beds-1.xml,0.0,61.0,0.0,992.7,723.0,6269.7,2543.2,1903.0,3539.7,3539.7,1903.0,3539.7,3539.7,33725.0,22804.0,0.0
-base-enclosure-beds-2.xml,0.0,74.0,0.0,1139.6,806.8,8869.1,3353.4,1983.0,3725.1,3725.1,1983.0,3725.1,3725.1,33513.0,22991.0,0.0
-base-enclosure-beds-4.xml,0.0,102.0,0.0,1433.3,974.2,14067.8,4421.8,2396.6,4252.3,4252.3,2396.6,4252.3,4252.3,33094.0,23018.0,0.0
-base-enclosure-beds-5.xml,0.0,112.0,0.0,1580.2,1057.9,16667.2,4833.5,2687.0,4211.1,4211.1,2687.0,4211.1,4211.1,32885.0,23031.0,0.0
-base-enclosure-ceilingtypes.xml,1.0,69.0,0.0,1286.4,890.5,11468.6,3942.3,2334.2,3774.6,3774.6,2334.2,3774.6,3774.6,36295.0,22386.0,0.0
-base-enclosure-floortypes.xml,0.0,8.0,0.0,1286.4,890.5,11468.6,3942.3,2001.2,3495.1,3495.1,2001.2,3495.1,3495.1,31357.0,21973.0,0.0
+base-dhw-none.xml,0.0,52.0,0.0,0.0,0.0,0.0,0.0,1383.3,3259.2,3259.2,1383.3,3259.2,3259.2,33488.0,22998.0,0.0
+base-dhw-recirc-demand-scheduled.xml,0.0,59.0,0.0,1286.4,890.5,11468.6,1281.2,2287.3,3801.5,3801.5,2287.3,3801.5,3801.5,33304.0,23005.0,0.0
+base-dhw-recirc-demand.xml,0.0,59.0,0.0,1286.4,890.5,11468.6,1281.2,2287.3,3801.5,3801.5,2287.3,3801.5,3801.5,33304.0,23005.0,0.0
+base-dhw-recirc-manual.xml,0.0,59.0,0.0,1286.4,890.5,11468.6,1281.2,2248.1,3763.8,3763.8,2248.1,3763.8,3763.8,33304.0,23005.0,0.0
+base-dhw-recirc-nocontrol.xml,0.0,59.0,0.0,1286.4,890.5,11468.6,1281.2,3108.4,4386.6,4386.6,3108.4,4386.6,4386.6,33304.0,23005.0,0.0
+base-dhw-recirc-temperature.xml,0.0,59.0,0.0,1286.4,890.5,11468.6,1281.2,2754.8,4179.7,4179.7,2754.8,4179.7,4179.7,33304.0,23005.0,0.0
+base-dhw-recirc-timer.xml,0.0,59.0,0.0,1286.4,890.5,11468.6,1281.2,3108.4,4386.6,4386.6,3108.4,4386.6,4386.6,33304.0,23005.0,0.0
+base-dhw-setpoint-temperature.xml,0.0,60.0,0.0,1286.4,890.5,9980.5,3430.8,2315.6,3887.6,3887.6,2315.6,3887.6,3887.6,33275.0,23006.0,0.0
+base-dhw-solar-direct-evacuated-tube.xml,0.0,60.0,0.0,1286.3,890.4,11388.2,3914.7,2337.6,3383.6,3383.6,2337.6,3383.6,3383.6,33304.0,23005.0,0.0
+base-dhw-solar-direct-flat-plate.xml,0.0,60.0,0.0,1286.0,890.2,10691.6,3675.2,2200.1,3383.6,3383.6,2200.1,3383.6,3383.6,33303.0,23006.0,0.0
+base-dhw-solar-direct-ics.xml,0.0,60.0,0.0,1286.4,890.4,11138.8,3828.9,2344.2,3383.6,3383.6,2344.2,3383.6,3383.6,33307.0,23005.0,0.0
+base-dhw-solar-fraction.xml,0.0,57.0,0.0,1286.4,890.5,11468.6,3942.3,1884.0,3753.7,3753.7,1884.0,3753.7,3753.7,33417.0,23002.0,0.0
+base-dhw-solar-indirect-flat-plate.xml,0.0,75.0,0.0,1286.0,890.1,10798.5,3711.9,1984.1,3383.7,3383.7,1984.1,3383.7,3383.7,33353.0,23016.0,0.0
+base-dhw-solar-thermosyphon-flat-plate.xml,0.0,60.0,0.0,1286.1,890.2,10716.9,3683.9,2186.8,3351.6,3351.6,2186.8,3351.6,3351.6,33303.0,23006.0,0.0
+base-dhw-tank-coal.xml,0.0,72.0,0.0,1286.4,890.5,11468.8,3942.4,1483.0,3351.7,3351.7,1483.0,3351.7,3351.7,33901.0,23012.0,0.0
+base-dhw-tank-detailed-setpoints.xml,0.0,59.0,0.0,1286.4,890.4,11462.2,3940.1,2920.6,4128.2,4128.2,2920.6,4128.2,4128.2,33267.0,23005.0,0.0
+base-dhw-tank-elec-ef.xml,0.0,60.0,0.0,1286.4,890.5,11468.6,3942.3,2175.7,3982.7,3982.7,2175.7,3982.7,3982.7,33245.0,23006.0,0.0
+base-dhw-tank-gas-ef.xml,0.0,74.0,0.0,1286.4,890.5,11468.9,3942.4,1482.2,3351.7,3351.7,1482.2,3351.7,3351.7,33814.0,23014.0,0.0
+base-dhw-tank-gas-fhr.xml,0.0,72.0,0.0,1286.4,890.5,11468.8,3942.4,1483.0,3351.7,3351.7,1483.0,3351.7,3351.7,33901.0,23012.0,0.0
+base-dhw-tank-gas-outside.xml,0.0,56.0,0.0,1286.4,890.5,11468.6,3942.3,1479.2,3351.6,3351.6,1479.2,3351.6,3351.6,33478.0,23000.0,0.0
+base-dhw-tank-gas.xml,0.0,72.0,0.0,1286.4,890.5,11468.8,3942.4,1483.0,3351.7,3351.7,1483.0,3351.7,3351.7,33901.0,23012.0,0.0
+base-dhw-tank-heat-pump-capacities.xml,0.0,43.0,0.0,1286.4,890.5,11076.4,3807.5,1716.0,3353.3,3353.3,1716.0,3353.3,3353.3,32954.0,22790.0,0.0
+base-dhw-tank-heat-pump-confined-space.xml,0.0,37.0,0.0,1286.4,890.5,10972.3,3771.7,1973.3,3750.6,3750.6,1973.3,3750.6,3750.6,35754.0,23036.0,0.0
+base-dhw-tank-heat-pump-detailed-schedules.xml,0.0,42.0,0.0,1286.4,890.5,10054.2,3456.1,1839.6,3608.9,3608.9,1839.6,3608.9,3608.9,36443.0,22997.0,0.0
+base-dhw-tank-heat-pump-ducting.xml,1.0,80.0,0.0,1286.4,890.5,10967.0,3769.9,1887.7,3686.2,3686.2,1887.7,3686.2,3686.2,36621.0,23003.0,0.0
+base-dhw-tank-heat-pump-ef.xml,0.0,51.0,0.0,1286.4,890.5,10994.7,3779.4,1903.3,3768.5,3768.5,1903.3,3768.5,3768.5,36071.0,22795.0,0.0
+base-dhw-tank-heat-pump-operating-mode-heat-pump-only.xml,0.0,51.0,0.0,1286.4,890.5,10994.7,3779.4,1903.3,3768.5,3768.5,1903.3,3768.5,3768.5,36071.0,22795.0,0.0
+base-dhw-tank-heat-pump-outside.xml,0.0,56.0,0.0,1286.4,890.5,11190.6,3846.7,2644.8,3584.5,3584.5,2644.8,3584.5,3584.5,33478.0,23000.0,0.0
+base-dhw-tank-heat-pump-with-solar-fraction.xml,0.0,51.0,0.0,1286.4,890.5,11087.9,3811.4,1901.8,3527.7,3527.7,1901.8,3527.7,3527.7,35048.0,23002.0,0.0
+base-dhw-tank-heat-pump-with-solar.xml,0.0,75.0,0.0,1286.0,890.1,11904.0,4091.9,1917.0,3354.7,3354.7,1917.0,3354.7,3354.7,36066.0,23017.0,0.0
+base-dhw-tank-heat-pump.xml,0.0,35.0,0.0,1286.4,890.5,10972.4,3771.7,1900.6,3685.8,3685.8,1900.6,3685.8,3685.8,35983.0,23038.0,0.0
+base-dhw-tank-model-type-stratified-detailed-occupancy-stochastic.xml,0.0,70.0,0.0,1286.4,890.5,11158.6,3835.7,6231.7,6509.5,6876.0,6231.7,6509.5,6876.0,36215.0,22888.0,0.0
+base-dhw-tank-model-type-stratified.xml,0.0,57.0,0.0,1286.4,890.5,11161.6,3836.8,2059.0,3818.7,3818.7,2059.0,3818.7,3818.7,33328.0,23004.0,0.0
+base-dhw-tank-oil.xml,0.0,70.0,0.0,1286.4,890.5,11468.8,3942.4,1483.2,3351.7,3351.7,1483.2,3351.7,3351.7,33927.0,23011.0,0.0
+base-dhw-tank-wood.xml,0.0,72.0,0.0,1286.4,890.5,11468.8,3942.4,1483.0,3351.7,3351.7,1483.0,3351.7,3351.7,33901.0,23012.0,0.0
+base-dhw-tankless-detailed-setpoints.xml,0.0,56.0,0.0,1286.4,890.5,11646.9,4003.6,1479.2,3351.6,3351.6,1479.2,3351.6,3351.6,33478.0,23000.0,0.0
+base-dhw-tankless-electric-ef.xml,0.0,56.0,0.0,1286.4,890.5,11466.0,3941.4,2131.5,3823.5,3823.5,2131.5,3823.5,3823.5,33478.0,23000.0,0.0
+base-dhw-tankless-electric-outside.xml,0.0,56.0,0.0,1286.4,890.5,11466.0,3941.4,2117.9,3813.8,3813.8,2117.9,3813.8,3813.8,33478.0,23000.0,0.0
+base-dhw-tankless-electric.xml,0.0,56.0,0.0,1286.4,890.5,11466.0,3941.4,2103.9,3804.0,3804.0,2103.9,3804.0,3804.0,33478.0,23000.0,0.0
+base-dhw-tankless-gas-ef.xml,0.0,56.0,0.0,1286.4,890.5,11466.0,3941.4,1479.2,3351.6,3351.6,1479.2,3351.6,3351.6,33478.0,23000.0,0.0
+base-dhw-tankless-gas-with-solar-fraction.xml,0.0,56.0,0.0,1286.4,890.5,11466.0,3941.4,1479.2,3351.6,3351.6,1479.2,3351.6,3351.6,33478.0,23000.0,0.0
+base-dhw-tankless-gas-with-solar.xml,0.0,66.0,0.0,1276.0,881.8,10180.1,3499.4,1479.5,3351.7,3351.7,1479.5,3351.7,3351.7,33524.0,23009.0,0.0
+base-dhw-tankless-gas.xml,0.0,56.0,0.0,1286.4,890.5,11466.0,3941.4,1479.2,3351.6,3351.6,1479.2,3351.6,3351.6,33478.0,23000.0,0.0
+base-dhw-tankless-propane.xml,0.0,56.0,0.0,1286.4,890.5,11466.0,3941.4,1479.2,3351.6,3351.6,1479.2,3351.6,3351.6,33478.0,23000.0,0.0
+base-enclosure-2stories-garage.xml,0.0,168.0,0.0,1286.4,890.5,11468.6,3942.3,2611.3,5043.8,5043.8,2611.3,5043.8,5043.8,47547.0,34751.0,0.0
+base-enclosure-2stories.xml,3.0,212.0,0.0,1286.4,890.5,11468.6,3942.3,2773.4,5202.4,5202.4,2773.4,5202.4,5202.4,51913.0,34966.0,0.0
+base-enclosure-beds-1.xml,0.0,40.0,0.0,992.7,723.0,6269.7,2543.2,1903.0,3539.7,3539.7,1903.0,3539.7,3539.7,33725.0,22804.0,0.0
+base-enclosure-beds-2.xml,0.0,51.0,0.0,1139.6,806.8,8869.1,3353.4,1983.0,3725.1,3725.1,1983.0,3725.1,3725.1,33513.0,22991.0,0.0
+base-enclosure-beds-4.xml,0.0,72.0,0.0,1433.3,974.2,14067.8,4421.8,2396.6,4252.3,4252.3,2396.6,4252.3,4252.3,33094.0,23018.0,0.0
+base-enclosure-beds-5.xml,0.0,85.0,0.0,1580.2,1057.9,16667.2,4833.5,2687.0,4211.1,4211.1,2687.0,4211.1,4211.1,32885.0,23031.0,0.0
+base-enclosure-ceilingtypes.xml,0.0,48.0,0.0,1286.4,890.5,11468.6,3942.3,2334.2,3774.6,3774.6,2334.2,3774.6,3774.6,36295.0,22386.0,0.0
+base-enclosure-floortypes.xml,0.0,4.0,0.0,1286.4,890.5,11468.6,3942.3,2001.2,3495.1,3495.1,2001.2,3495.1,3495.1,31357.0,21973.0,0.0
base-enclosure-garage.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,2308.0,3674.0,3674.0,2308.0,3674.0,3674.0,28164.0,19325.0,0.0
-base-enclosure-infil-ach-house-pressure.xml,0.0,87.0,0.0,1286.4,890.5,11468.5,3942.3,2314.8,3776.5,3776.5,2314.8,3776.5,3776.5,33306.0,23005.0,0.0
-base-enclosure-infil-cfm-house-pressure.xml,0.0,87.0,0.0,1286.4,890.5,11468.5,3942.3,2314.9,3776.5,3776.5,2314.9,3776.5,3776.5,33317.0,23005.0,0.0
-base-enclosure-infil-cfm50.xml,0.0,87.0,0.0,1286.4,890.5,11468.5,3942.3,2314.8,3776.5,3776.5,2314.8,3776.5,3776.5,33306.0,23005.0,0.0
-base-enclosure-infil-ela.xml,3.0,100.0,0.0,1286.4,890.5,11468.6,3942.3,2327.8,3776.5,3776.5,2327.8,3776.5,3776.5,36350.0,23007.0,0.0
-base-enclosure-infil-flue.xml,0.0,89.0,0.0,1286.4,890.5,11468.5,3942.3,2291.9,3833.6,3833.6,2291.9,3833.6,3833.6,34116.0,23006.0,0.0
-base-enclosure-infil-leakiness-description.xml,84.0,130.0,0.0,1286.4,890.5,11468.6,3942.3,2417.3,3950.8,3950.8,2417.3,3950.8,3950.8,36927.0,23013.0,0.0
-base-enclosure-infil-natural-ach.xml,2.0,100.0,0.0,1286.4,890.5,11468.6,3942.3,2325.7,3776.5,3776.5,2325.7,3776.5,3776.5,36336.0,23007.0,0.0
-base-enclosure-infil-natural-cfm.xml,2.0,100.0,0.0,1286.4,890.5,11468.6,3942.3,2325.7,3776.5,3776.5,2325.7,3776.5,3776.5,36336.0,23007.0,0.0
-base-enclosure-infil-sla.xml,3.0,101.0,0.0,1286.4,890.5,11468.6,3942.3,2328.7,3776.5,3776.5,2328.7,3776.5,3776.5,36357.0,23007.0,0.0
-base-enclosure-orientations.xml,0.0,82.0,0.0,1286.4,890.5,11468.5,3942.3,2315.7,3776.5,3776.5,2315.7,3776.5,3776.5,33320.0,23002.0,0.0
-base-enclosure-overhangs.xml,0.0,75.0,0.0,1286.4,890.5,11468.5,3942.3,2315.0,3907.6,3907.6,2315.0,3907.6,3907.6,33290.0,23008.0,0.0
-base-enclosure-rooftypes.xml,0.0,29.0,0.0,1286.4,890.5,11468.5,3942.3,2315.1,3833.9,3833.9,2315.1,3833.9,3833.9,32795.0,22405.0,0.0
-base-enclosure-skylights-cathedral.xml,0.0,1.0,0.0,1286.4,890.5,11468.6,3942.3,2642.1,4050.5,4050.5,2642.1,4050.5,4050.5,25459.0,20572.0,0.0
-base-enclosure-skylights-physical-properties.xml,0.0,279.0,0.0,1286.4,890.5,11468.6,3942.3,2339.2,3778.6,3778.6,2339.2,3778.6,3778.6,36098.0,23286.0,0.0
-base-enclosure-skylights-shading.xml,0.0,115.0,0.0,1286.4,890.5,11468.5,3942.3,2297.7,3776.8,3776.8,2297.7,3776.8,3776.8,35213.0,23011.0,0.0
-base-enclosure-skylights-storms.xml,0.0,281.0,0.0,1286.4,890.5,11468.5,3942.3,2344.3,3921.2,3921.2,2344.3,3921.2,3921.2,34752.0,23290.0,0.0
-base-enclosure-skylights.xml,0.0,260.0,0.0,1286.4,890.5,11468.6,3942.3,2348.6,3778.2,3778.2,2348.6,3778.2,3778.2,35153.0,23227.0,0.0
+base-enclosure-infil-ach-house-pressure.xml,0.0,59.0,0.0,1286.4,890.5,11468.5,3942.3,2314.8,3776.5,3776.5,2314.8,3776.5,3776.5,33306.0,23005.0,0.0
+base-enclosure-infil-cfm-house-pressure.xml,0.0,59.0,0.0,1286.4,890.5,11468.5,3942.3,2314.9,3776.5,3776.5,2314.9,3776.5,3776.5,33317.0,23005.0,0.0
+base-enclosure-infil-cfm50.xml,0.0,59.0,0.0,1286.4,890.5,11468.5,3942.3,2314.8,3776.5,3776.5,2314.8,3776.5,3776.5,33306.0,23005.0,0.0
+base-enclosure-infil-ela.xml,0.0,74.0,0.0,1286.4,890.5,11468.6,3942.3,2327.8,3776.5,3776.5,2327.8,3776.5,3776.5,36350.0,23007.0,0.0
+base-enclosure-infil-flue.xml,0.0,62.0,0.0,1286.4,890.5,11468.5,3942.3,2291.9,3833.6,3833.6,2291.9,3833.6,3833.6,34116.0,23006.0,0.0
+base-enclosure-infil-leakiness-description.xml,78.0,100.0,0.0,1286.4,890.5,11468.6,3942.3,2417.3,3950.8,3950.8,2417.3,3950.8,3950.8,36927.0,23013.0,0.0
+base-enclosure-infil-natural-ach.xml,0.0,73.0,0.0,1286.4,890.5,11468.6,3942.3,2325.7,3776.5,3776.5,2325.7,3776.5,3776.5,36336.0,23007.0,0.0
+base-enclosure-infil-natural-cfm.xml,0.0,73.0,0.0,1286.4,890.5,11468.6,3942.3,2325.7,3776.5,3776.5,2325.7,3776.5,3776.5,36336.0,23007.0,0.0
+base-enclosure-infil-sla.xml,1.0,74.0,0.0,1286.4,890.5,11468.6,3942.3,2328.7,3776.5,3776.5,2328.7,3776.5,3776.5,36357.0,23007.0,0.0
+base-enclosure-orientations.xml,0.0,57.0,0.0,1286.4,890.5,11468.5,3942.3,2315.7,3776.5,3776.5,2315.7,3776.5,3776.5,33320.0,23002.0,0.0
+base-enclosure-overhangs.xml,0.0,49.0,0.0,1286.4,890.5,11468.5,3942.3,2315.0,3907.6,3907.6,2315.0,3907.6,3907.6,33290.0,23008.0,0.0
+base-enclosure-rooftypes.xml,0.0,19.0,0.0,1286.4,890.5,11468.5,3942.3,2315.1,3833.9,3833.9,2315.1,3833.9,3833.9,32795.0,22405.0,0.0
+base-enclosure-skylights-cathedral.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,2642.1,4050.5,4050.5,2642.1,4050.5,4050.5,25459.0,20572.0,0.0
+base-enclosure-skylights-physical-properties.xml,0.0,239.0,0.0,1286.4,890.5,11468.6,3942.3,2339.2,3778.6,3778.6,2339.2,3778.6,3778.6,36098.0,23286.0,0.0
+base-enclosure-skylights-shading.xml,0.0,86.0,0.0,1286.4,890.5,11468.5,3942.3,2297.7,3776.8,3776.8,2297.7,3776.8,3776.8,35213.0,23011.0,0.0
+base-enclosure-skylights-storms.xml,0.0,236.0,0.0,1286.4,890.5,11468.5,3942.3,2344.3,3921.2,3921.2,2344.3,3921.2,3921.2,34752.0,23290.0,0.0
+base-enclosure-skylights.xml,0.0,217.0,0.0,1286.4,890.5,11468.6,3942.3,2348.6,3778.2,3778.2,2348.6,3778.2,3778.2,35153.0,23227.0,0.0
base-enclosure-split-level.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,1867.9,2870.0,2870.0,1867.9,2870.0,2870.0,13954.0,14513.0,0.0
-base-enclosure-thermal-mass.xml,0.0,72.0,0.0,1286.4,890.5,11468.5,3942.3,2284.5,3776.3,3776.3,2284.5,3776.3,3776.3,33142.0,22806.0,0.0
+base-enclosure-thermal-mass.xml,0.0,46.0,0.0,1286.4,890.5,11468.5,3942.3,2284.5,3776.3,3776.3,2284.5,3776.3,3776.3,33142.0,22806.0,0.0
base-enclosure-walltypes.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,2340.8,3775.3,3775.3,2340.8,3775.3,3775.3,35750.0,21077.0,0.0
-base-enclosure-windows-exterior-shading-solar-film.xml,0.0,17.0,0.0,1286.4,890.5,11468.5,3942.3,2325.6,3775.8,3775.8,2325.6,3775.8,3775.8,33702.0,21678.0,0.0
+base-enclosure-windows-exterior-shading-solar-film.xml,0.0,10.0,0.0,1286.4,890.5,11468.5,3942.3,2325.6,3775.8,3775.8,2325.6,3775.8,3775.8,33702.0,21678.0,0.0
base-enclosure-windows-exterior-shading-solar-screens.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,2318.7,3775.7,3775.7,2318.7,3775.7,3775.7,34208.0,20873.0,0.0
-base-enclosure-windows-insect-screens-exterior.xml,0.0,22.0,0.0,1286.4,890.5,11468.6,3942.3,2297.4,3778.3,3778.3,2297.4,3778.3,3778.3,33625.0,21931.0,0.0
-base-enclosure-windows-insect-screens-interior.xml,0.0,73.0,0.0,1286.4,890.5,11468.5,3942.3,2316.1,4002.7,4002.7,2316.1,4002.7,4002.7,33354.0,22786.0,0.0
-base-enclosure-windows-interior-shading-blinds.xml,0.0,133.0,0.0,1286.4,890.5,11468.5,3942.3,2310.6,3776.8,3776.8,2310.6,3776.8,3776.8,33158.0,23044.0,0.0
-base-enclosure-windows-interior-shading-coefficients.xml,0.0,35.0,0.0,1286.4,890.5,11468.6,3942.3,2287.2,3777.9,3777.9,2287.2,3777.9,3777.9,33350.0,22528.0,0.0
-base-enclosure-windows-natural-ventilation-availability.xml,0.0,86.0,0.0,1286.4,890.5,11468.5,3942.3,2311.9,3777.9,3777.9,2311.9,3777.9,3777.9,33306.0,22866.0,0.0
+base-enclosure-windows-insect-screens-exterior.xml,0.0,17.0,0.0,1286.4,890.5,11468.6,3942.3,2297.4,3778.3,3778.3,2297.4,3778.3,3778.3,33625.0,21931.0,0.0
+base-enclosure-windows-insect-screens-interior.xml,0.0,50.0,0.0,1286.4,890.5,11468.5,3942.3,2316.1,4002.7,4002.7,2316.1,4002.7,4002.7,33354.0,22786.0,0.0
+base-enclosure-windows-interior-shading-blinds.xml,0.0,108.0,0.0,1286.4,890.5,11468.5,3942.3,2310.6,3776.8,3776.8,2310.6,3776.8,3776.8,33158.0,23044.0,0.0
+base-enclosure-windows-interior-shading-coefficients.xml,0.0,25.0,0.0,1286.4,890.5,11468.6,3942.3,2287.2,3777.9,3777.9,2287.2,3777.9,3777.9,33350.0,22528.0,0.0
+base-enclosure-windows-natural-ventilation-availability.xml,0.0,62.0,0.0,1286.4,890.5,11468.5,3942.3,2311.9,3777.9,3777.9,2311.9,3777.9,3777.9,33306.0,22866.0,0.0
base-enclosure-windows-none.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,2259.6,3342.2,3342.2,2259.6,3342.2,3342.2,25559.0,15231.0,0.0
-base-enclosure-windows-physical-properties.xml,1.0,161.0,0.0,1286.4,890.5,11468.6,3942.3,2317.1,3777.4,3777.4,2317.1,3777.4,3777.4,36319.0,23085.0,0.0
+base-enclosure-windows-physical-properties.xml,0.0,136.0,0.0,1286.4,890.5,11468.6,3942.3,2317.1,3777.4,3777.4,2317.1,3777.4,3777.4,36319.0,23085.0,0.0
base-enclosure-windows-shading-factors.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,2284.9,3734.6,3734.6,2284.9,3734.6,3734.6,33319.0,20252.0,0.0
-base-enclosure-windows-shading-seasons.xml,0.0,87.0,0.0,1286.4,890.5,11468.5,3942.3,2314.8,3776.5,3776.5,2314.8,3776.5,3776.5,33306.0,23005.0,0.0
-base-enclosure-windows-shading-types-detailed.xml,0.0,3.0,0.0,1286.4,890.5,11468.6,3942.3,2324.8,3776.0,3776.0,2324.8,3776.0,3776.0,33570.0,21339.0,0.0
-base-enclosure-windows-storms.xml,0.0,114.0,0.0,1286.4,890.5,11468.5,3942.3,2316.4,3776.5,3776.5,2316.4,3776.5,3776.5,31910.0,23036.0,0.0
-base-ev-charger.xml,0.0,87.0,0.0,1286.4,890.5,11468.5,3942.3,2314.8,3776.5,3776.5,2314.8,3776.5,3776.5,33306.0,23005.0,0.0
-base-foundation-ambient.xml,0.0,20.0,0.0,1286.4,890.5,11468.5,3942.3,1863.6,3495.8,3495.8,1863.6,3495.8,3495.8,22418.0,21972.0,0.0
-base-foundation-basement-garage.xml,0.0,30.0,0.0,1286.4,890.5,11468.5,3942.3,2101.9,3618.2,3618.2,2101.9,3618.2,3618.2,28562.0,22649.0,0.0
-base-foundation-belly-wing-no-skirt.xml,102.0,75.0,0.0,1286.4,890.5,11468.5,3942.3,2081.2,3499.5,3499.5,2081.2,3499.5,3499.5,37788.0,22535.0,0.0
-base-foundation-belly-wing-skirt.xml,101.0,75.0,0.0,1286.4,890.5,11468.5,3942.3,2081.3,3499.5,3499.5,2081.3,3499.5,3499.5,37776.0,22537.0,0.0
-base-foundation-complex.xml,14.0,31.0,0.0,1286.4,890.5,11468.6,3942.3,2345.9,4346.8,4346.8,2345.9,4346.8,4346.8,36484.0,28110.0,0.0
-base-foundation-conditioned-basement-slab-insulation-full.xml,0.0,176.0,0.0,1286.4,890.5,11468.5,3942.3,2313.4,3777.3,3777.3,2313.4,3777.3,3777.3,32816.0,23069.0,0.0
-base-foundation-conditioned-basement-slab-insulation.xml,0.0,147.0,0.0,1286.4,890.5,11468.5,3942.3,2332.6,3777.1,3777.1,2332.6,3777.1,3777.1,33401.0,23056.0,0.0
-base-foundation-conditioned-basement-wall-insulation.xml,0.0,92.0,0.0,1286.4,890.5,11468.6,3942.3,2330.3,3776.4,3776.4,2330.3,3776.4,3776.4,33854.0,23033.0,0.0
+base-enclosure-windows-shading-seasons.xml,0.0,59.0,0.0,1286.4,890.5,11468.5,3942.3,2314.8,3776.5,3776.5,2314.8,3776.5,3776.5,33306.0,23005.0,0.0
+base-enclosure-windows-shading-types-detailed.xml,0.0,1.0,0.0,1286.4,890.5,11468.6,3942.3,2324.8,3776.0,3776.0,2324.8,3776.0,3776.0,33570.0,21339.0,0.0
+base-enclosure-windows-storms.xml,0.0,90.0,0.0,1286.4,890.5,11468.5,3942.3,2316.4,3776.5,3776.5,2316.4,3776.5,3776.5,31910.0,23036.0,0.0
+base-ev-charger.xml,0.0,59.0,0.0,1286.4,890.5,11468.5,3942.3,2314.8,3776.5,3776.5,2314.8,3776.5,3776.5,33306.0,23005.0,0.0
+base-foundation-ambient.xml,0.0,15.0,0.0,1286.4,890.5,11468.5,3942.3,1863.6,3495.8,3495.8,1863.6,3495.8,3495.8,22418.0,21972.0,0.0
+base-foundation-basement-garage.xml,0.0,22.0,0.0,1286.4,890.5,11468.5,3942.3,2101.9,3618.2,3618.2,2101.9,3618.2,3618.2,28562.0,22649.0,0.0
+base-foundation-belly-wing-no-skirt.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,1887.7,3003.6,3003.6,1887.7,3003.6,3003.6,17941.0,15714.0,0.0
+base-foundation-belly-wing-skirt.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,1854.7,3002.9,3002.9,1854.7,3002.9,3002.9,17895.0,15710.0,0.0
+base-foundation-complex.xml,11.0,24.0,0.0,1286.4,890.5,11468.6,3942.3,2345.9,4346.8,4346.8,2345.9,4346.8,4346.8,36484.0,28110.0,0.0
+base-foundation-conditioned-basement-slab-insulation-full.xml,0.0,139.0,0.0,1286.4,890.5,11468.5,3942.3,2313.4,3777.3,3777.3,2313.4,3777.3,3777.3,32816.0,23069.0,0.0
+base-foundation-conditioned-basement-slab-insulation.xml,0.0,122.0,0.0,1286.4,890.5,11468.5,3942.3,2332.6,3777.1,3777.1,2332.6,3777.1,3777.1,33401.0,23056.0,0.0
+base-foundation-conditioned-basement-wall-insulation.xml,0.0,69.0,0.0,1286.4,890.5,11468.6,3942.3,2330.3,3776.4,3776.4,2330.3,3776.4,3776.4,33854.0,23033.0,0.0
base-foundation-conditioned-crawlspace.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,1870.4,2706.2,2706.2,1870.4,2706.2,2706.2,16391.0,12958.0,0.0
base-foundation-multiple.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,1852.6,3234.5,3234.5,1852.6,3234.5,3234.5,16832.0,17975.0,0.0
base-foundation-slab-exterior-horizontal-insulation.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,1854.6,2762.9,2762.9,1854.6,2762.9,2762.9,13558.0,13481.0,0.0
@@ -211,7 +211,7 @@ base-foundation-unvented-crawlspace.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,
base-foundation-vented-crawlspace-above-grade.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,1884.7,3320.1,3320.1,1884.7,3320.1,3320.1,18245.0,18851.0,0.0
base-foundation-vented-crawlspace-above-grade2.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,1879.0,3312.1,3312.1,1879.0,3312.1,3312.1,17622.0,18768.0,0.0
base-foundation-vented-crawlspace.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,1881.1,3279.8,3279.8,1881.1,3279.8,3279.8,17998.0,18425.0,0.0
-base-foundation-walkout-basement.xml,0.0,139.0,0.0,1286.4,890.5,11468.5,3942.3,2318.1,3777.1,3777.1,2318.1,3777.1,3777.1,36300.0,23033.0,0.0
+base-foundation-walkout-basement.xml,0.0,111.0,0.0,1286.4,890.5,11468.5,3942.3,2318.1,3777.1,3777.1,2318.1,3777.1,3777.1,36300.0,23033.0,0.0
base-hvac-air-to-air-heat-pump-1-speed-autosize-factor.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,9034.7,4233.1,9034.7,9034.7,4233.1,9034.7,31055.0,24785.0,0.0
base-hvac-air-to-air-heat-pump-1-speed-cooling-only.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,2151.6,4172.1,4172.1,2151.6,4172.1,4172.1,0.0,24255.0,0.0
base-hvac-air-to-air-heat-pump-1-speed-detailed-electric-panel.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,9034.1,4233.1,9034.1,9034.1,4233.1,9034.1,31055.0,24785.0,0.0
@@ -219,20 +219,20 @@ base-hvac-air-to-air-heat-pump-1-speed-detailed-performance.xml,0.0,0.0,0.0,1286
base-hvac-air-to-air-heat-pump-1-speed-heating-capacity-17f.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,9005.2,4233.1,9005.2,9005.2,4233.1,9005.2,31072.0,24785.0,0.0
base-hvac-air-to-air-heat-pump-1-speed-heating-only.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,9016.4,1891.8,9016.4,9016.4,1891.8,9016.4,31056.0,0.0,0.0
base-hvac-air-to-air-heat-pump-1-speed-hvac-seasons.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,9033.5,4233.0,9033.5,9033.5,4233.0,9033.5,31055.0,24783.0,0.0
-base-hvac-air-to-air-heat-pump-1-speed-lockout-temperatures.xml,148.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,15409.2,4217.6,15409.2,15409.2,4217.6,15409.2,51750.0,24621.0,0.0
-base-hvac-air-to-air-heat-pump-1-speed-power-outage.xml,6.0,0.0,0.0,1069.6,740.8,9450.0,3248.4,17136.6,4257.3,17136.6,17136.6,4257.3,17136.6,59177.0,24748.0,0.0
-base-hvac-air-to-air-heat-pump-1-speed-research-features.xml,405.05,0.0,0.0,1286.4,890.5,12241.8,4208.1,20793.9,9769.5,20793.9,20793.9,9769.5,20793.9,63206.0,33159.0,0.0
+base-hvac-air-to-air-heat-pump-1-speed-lockout-temperatures.xml,132.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,15409.2,4217.6,15409.2,15409.2,4217.6,15409.2,51750.0,24621.0,0.0
+base-hvac-air-to-air-heat-pump-1-speed-power-outage.xml,5.0,0.0,0.0,1069.6,740.8,9450.0,3248.4,17136.6,4257.3,17136.6,17136.6,4257.3,17136.6,59177.0,24748.0,0.0
+base-hvac-air-to-air-heat-pump-1-speed-research-features.xml,378.1,0.0,0.0,1286.4,890.5,12241.8,4208.1,20793.9,9769.5,20793.9,20793.9,9769.5,20793.9,63206.0,33159.0,0.0
base-hvac-air-to-air-heat-pump-1-speed-seer-hspf.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,9099.6,4416.7,9099.6,9099.6,4416.7,9099.6,31055.0,24785.0,0.0
base-hvac-air-to-air-heat-pump-1-speed.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,9034.1,4233.1,9034.1,9034.1,4233.1,9034.1,31055.0,24785.0,0.0
base-hvac-air-to-air-heat-pump-2-speed-detailed-performance.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,8940.7,4139.6,8940.7,8940.7,4139.6,8940.7,31066.0,26551.0,0.0
-base-hvac-air-to-air-heat-pump-2-speed-research-features.xml,372.067,0.0,0.0,1286.4,890.5,12241.8,4208.1,20434.6,8271.9,20434.6,20434.6,8271.9,20434.6,61182.0,24149.0,0.0
+base-hvac-air-to-air-heat-pump-2-speed-research-features.xml,302.283,0.0,0.0,1286.4,890.5,12241.8,4208.1,20434.6,8271.9,20434.6,20434.6,8271.9,20434.6,61182.0,24149.0,0.0
base-hvac-air-to-air-heat-pump-2-speed.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,8976.9,3885.5,8976.9,8976.9,3885.5,8976.9,31038.0,26784.0,0.0
base-hvac-air-to-air-heat-pump-var-speed-autosize-maxload.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,6255.2,3407.2,6255.2,6255.2,3407.2,6255.2,29024.0,24805.0,0.0
-base-hvac-air-to-air-heat-pump-var-speed-backup-boiler-hvac-seasons.xml,3.0,21.0,0.0,1286.4,890.5,11468.6,3942.3,3203.7,3856.9,3856.9,3203.7,3856.9,3856.9,26859.0,24082.0,0.0
-base-hvac-air-to-air-heat-pump-var-speed-backup-boiler-switchover-temperature.xml,122.0,21.0,0.0,1286.4,890.5,11468.6,3942.3,4196.8,3909.4,4196.8,4196.8,3909.4,4196.8,33919.0,24082.0,0.0
-base-hvac-air-to-air-heat-pump-var-speed-backup-boiler.xml,3.0,21.0,0.0,1286.4,890.5,11468.6,3942.3,3203.7,3850.9,3850.9,3203.7,3850.9,3850.9,26859.0,24082.0,0.0
+base-hvac-air-to-air-heat-pump-var-speed-backup-boiler-hvac-seasons.xml,3.0,16.0,0.0,1286.4,890.5,11468.6,3942.3,3203.7,3856.9,3856.9,3203.7,3856.9,3856.9,26859.0,24082.0,0.0
+base-hvac-air-to-air-heat-pump-var-speed-backup-boiler-switchover-temperature.xml,118.0,16.0,0.0,1286.4,890.5,11468.6,3942.3,4196.8,3909.4,4196.8,4196.8,3909.4,4196.8,33919.0,24082.0,0.0
+base-hvac-air-to-air-heat-pump-var-speed-backup-boiler.xml,3.0,16.0,0.0,1286.4,890.5,11468.6,3942.3,3203.7,3850.9,3850.9,3203.7,3850.9,3850.9,26859.0,24082.0,0.0
base-hvac-air-to-air-heat-pump-var-speed-backup-furnace-autosize-factor.xml,3.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,2970.4,3702.2,3702.2,2970.4,3702.2,3702.2,34880.0,24453.0,0.0
-base-hvac-air-to-air-heat-pump-var-speed-backup-furnace.xml,3.0,2.0,0.0,1286.4,890.5,11468.5,3942.3,3089.7,3810.0,3810.0,3089.7,3810.0,3810.0,30906.0,23073.0,0.0
+base-hvac-air-to-air-heat-pump-var-speed-backup-furnace.xml,3.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,3089.7,3810.0,3810.0,3089.7,3810.0,3810.0,30906.0,23073.0,0.0
base-hvac-air-to-air-heat-pump-var-speed-detailed-performance-autosize.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,7387.7,4948.9,7387.7,7387.7,4948.9,7387.7,30649.0,25950.0,0.0
base-hvac-air-to-air-heat-pump-var-speed-detailed-performance-normalized-capacities.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,7736.4,5074.0,7736.4,7736.4,5074.0,7736.4,30994.0,26197.0,0.0
base-hvac-air-to-air-heat-pump-var-speed-detailed-performance.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,7754.1,5068.5,7754.1,7754.1,5068.5,7754.1,30993.0,26198.0,0.0
@@ -240,31 +240,31 @@ base-hvac-air-to-air-heat-pump-var-speed-pan-heater-continuous-mode.xml,0.0,0.0,
base-hvac-air-to-air-heat-pump-var-speed-pan-heater-defrost-mode.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,7511.4,3867.0,7511.4,7511.4,3867.0,7511.4,30660.0,25945.0,0.0
base-hvac-air-to-air-heat-pump-var-speed-pan-heater-heat-pump-mode.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,7603.4,3867.0,7603.4,7603.4,3867.0,7603.4,30660.0,25945.0,0.0
base-hvac-air-to-air-heat-pump-var-speed-pan-heater-none.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,7503.4,3867.0,7503.4,7503.4,3867.0,7503.4,30660.0,25945.0,0.0
-base-hvac-air-to-air-heat-pump-var-speed-research-features-10-mins.xml,336.0,2.833,0.0,1286.4,890.5,11468.8,3942.3,17953.6,6732.7,17953.6,17953.6,6732.7,17953.6,64514.0,34418.0,0.0
-base-hvac-air-to-air-heat-pump-var-speed-research-features-two-systems.xml,31.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,6373.3,3319.8,6373.3,6373.3,3319.8,6373.3,27898.0,24246.0,0.0
-base-hvac-air-to-air-heat-pump-var-speed-research-features.xml,368.0,4.0,0.0,1286.4,890.5,11468.6,3942.3,10197.1,4925.5,10197.1,10197.1,4925.5,10197.1,37961.0,31815.0,0.0
+base-hvac-air-to-air-heat-pump-var-speed-research-features-10-mins.xml,300.0,2.833,0.0,1286.4,890.5,11468.8,3942.3,17953.6,6732.7,17953.6,17953.6,6732.7,17953.6,64514.0,34418.0,0.0
+base-hvac-air-to-air-heat-pump-var-speed-research-features-two-systems.xml,19.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,6373.3,3319.8,6373.3,6373.3,3319.8,6373.3,27898.0,24246.0,0.0
+base-hvac-air-to-air-heat-pump-var-speed-research-features.xml,320.0,4.0,0.0,1286.4,890.5,11468.6,3942.3,10197.1,4925.5,10197.1,10197.1,4925.5,10197.1,37961.0,31815.0,0.0
base-hvac-air-to-air-heat-pump-var-speed.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,7653.4,3867.0,7653.4,7653.4,3867.0,7653.4,30660.0,25945.0,0.0
base-hvac-autosize-sizing-controls.xml,0.0,0.0,0.0,1910.5,1245.6,22532.8,5645.9,2976.0,4521.8,4521.8,2976.0,4521.8,4521.8,21413.0,20816.0,0.0
base-hvac-autosize.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,2297.4,4258.8,4258.8,2297.4,4258.8,4258.8,29157.0,25202.0,0.0
base-hvac-boiler-coal-only.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,2168.7,1863.2,2168.7,2168.7,1863.2,2168.7,16946.0,0.0,0.0
base-hvac-boiler-elec-only.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,6256.4,1863.2,6256.4,6256.4,1863.2,6256.4,16946.0,0.0,0.0
-base-hvac-boiler-gas-central-ac-1-speed.xml,0.0,88.0,0.0,1286.4,890.5,11468.5,3942.3,2174.7,3776.5,3776.5,2174.7,3776.5,3776.5,16946.0,22990.0,0.0
+base-hvac-boiler-gas-central-ac-1-speed.xml,0.0,60.0,0.0,1286.4,890.5,11468.5,3942.3,2174.7,3776.5,3776.5,2174.7,3776.5,3776.5,16946.0,22990.0,0.0
base-hvac-boiler-gas-only-pilot.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,2153.2,1863.2,2153.2,2153.2,1863.2,2153.2,16946.0,0.0,0.0
base-hvac-boiler-gas-only.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,2153.2,1863.2,2153.2,2153.2,1863.2,2153.2,16946.0,0.0,0.0
base-hvac-boiler-oil-only.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,2168.7,1863.2,2168.7,2168.7,1863.2,2168.7,16946.0,0.0,0.0
base-hvac-boiler-propane-only.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,2149.6,1863.2,2149.6,2149.6,1863.2,2149.6,16946.0,0.0,0.0
base-hvac-boiler-wood-only.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,2149.6,1863.2,2149.6,2149.6,1863.2,2149.6,16946.0,0.0,0.0
base-hvac-central-ac-only-1-speed-autosize-factor.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,2151.6,4201.2,4201.2,2151.6,4201.2,4201.2,0.0,24447.0,0.0
-base-hvac-central-ac-only-1-speed-detailed-performance.xml,0.0,79.0,0.0,1286.4,890.5,11468.6,3942.3,2141.6,3896.8,3896.8,2141.6,3896.8,3896.8,0.0,23204.0,0.0
-base-hvac-central-ac-only-1-speed-seer.xml,0.0,81.0,0.0,1286.4,890.5,11468.6,3942.3,2141.6,3928.8,3928.8,2141.6,3928.8,3928.8,0.0,22988.0,0.0
-base-hvac-central-ac-only-1-speed.xml,0.0,81.0,0.0,1286.4,890.5,11468.6,3942.3,2141.6,3775.9,3775.9,2141.6,3775.9,3775.9,0.0,22987.0,0.0
-base-hvac-central-ac-only-2-speed-detailed-performance.xml,0.0,72.0,0.0,1286.4,890.5,11468.6,3942.3,2141.6,3649.5,3649.5,2141.6,3649.5,3649.5,0.0,23141.0,0.0
-base-hvac-central-ac-only-2-speed.xml,0.0,86.0,0.0,1286.4,890.5,11468.6,3942.3,2141.6,3483.3,3483.3,2141.6,3483.3,3483.3,0.0,22868.0,0.0
+base-hvac-central-ac-only-1-speed-detailed-performance.xml,0.0,51.0,0.0,1286.4,890.5,11468.6,3942.3,2141.6,3896.8,3896.8,2141.6,3896.8,3896.8,0.0,23204.0,0.0
+base-hvac-central-ac-only-1-speed-seer.xml,0.0,55.0,0.0,1286.4,890.5,11468.6,3942.3,2141.6,3928.8,3928.8,2141.6,3928.8,3928.8,0.0,22988.0,0.0
+base-hvac-central-ac-only-1-speed.xml,0.0,55.0,0.0,1286.4,890.5,11468.6,3942.3,2141.6,3775.9,3775.9,2141.6,3775.9,3775.9,0.0,22987.0,0.0
+base-hvac-central-ac-only-2-speed-detailed-performance.xml,0.0,48.0,0.0,1286.4,890.5,11468.6,3942.3,2141.6,3649.5,3649.5,2141.6,3649.5,3649.5,0.0,23141.0,0.0
+base-hvac-central-ac-only-2-speed.xml,0.0,57.0,0.0,1286.4,890.5,11468.6,3942.3,2141.6,3483.3,3483.3,2141.6,3483.3,3483.3,0.0,22868.0,0.0
base-hvac-central-ac-only-var-speed-detailed-performance-autosize.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,2153.5,4945.8,4945.8,2153.5,4945.8,4945.8,0.0,25783.0,0.0
base-hvac-central-ac-only-var-speed-detailed-performance.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,2151.6,5021.9,5021.9,2151.6,5021.9,5021.9,0.0,25934.0,0.0
-base-hvac-central-ac-only-var-speed-research-features.xml,0.0,186.0,0.0,1286.4,890.5,11468.5,3942.3,2141.3,3741.1,3741.1,2141.3,3741.1,3741.1,0.0,23558.0,0.0
-base-hvac-central-ac-only-var-speed.xml,0.0,19.0,0.0,1286.4,890.5,11468.6,3942.3,2141.6,3718.6,3718.6,2141.6,3718.6,3718.6,0.0,24052.0,0.0
-base-hvac-central-ac-plus-air-to-air-heat-pump-heating.xml,0.0,88.0,0.0,1286.4,890.5,11468.5,3942.3,9059.3,3776.5,9059.3,9059.3,3776.5,9059.3,31056.0,22990.0,0.0
+base-hvac-central-ac-only-var-speed-research-features.xml,0.0,183.0,0.0,1286.4,890.5,11468.5,3942.3,2141.3,3741.1,3741.1,2141.3,3741.1,3741.1,0.0,23558.0,0.0
+base-hvac-central-ac-only-var-speed.xml,0.0,14.0,0.0,1286.4,890.5,11468.6,3942.3,2141.6,3718.6,3718.6,2141.6,3718.6,3718.6,0.0,24052.0,0.0
+base-hvac-central-ac-plus-air-to-air-heat-pump-heating.xml,0.0,60.0,0.0,1286.4,890.5,11468.5,3942.3,9059.3,3776.5,9059.3,9059.3,3776.5,9059.3,31056.0,22990.0,0.0
base-hvac-dse.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,2273.4,3694.1,3694.1,2273.4,3694.1,3694.1,16963.0,13284.0,0.0
base-hvac-dual-fuel-air-to-air-heat-pump-1-speed-lockout-temperatures.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,4446.1,4233.1,4446.1,4446.1,4233.1,4446.1,31261.0,24785.0,0.0
base-hvac-dual-fuel-air-to-air-heat-pump-1-speed.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,4415.7,4233.2,4415.7,4415.7,4233.2,4415.7,31259.0,24785.0,0.0
@@ -272,28 +272,28 @@ base-hvac-dual-fuel-air-to-air-heat-pump-2-speed.xml,0.0,0.0,0.0,1286.4,890.5,11
base-hvac-dual-fuel-air-to-air-heat-pump-var-speed-dse.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,3072.1,3053.0,3072.1,3072.1,3053.0,3072.1,16963.0,13284.0,0.0
base-hvac-dual-fuel-air-to-air-heat-pump-var-speed.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,3861.9,3867.0,3867.0,3861.9,3867.0,3867.0,30844.0,25945.0,0.0
base-hvac-dual-fuel-mini-split-heat-pump-ducted.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,3001.8,2860.6,3001.8,3001.8,2860.6,3001.8,19503.0,15519.0,0.0
-base-hvac-ducts-area-multipliers.xml,0.0,6.0,0.0,1286.4,890.5,11468.5,3942.3,2291.1,3776.3,3776.3,2291.1,3776.3,3776.3,28396.0,21828.0,0.0
+base-hvac-ducts-area-multipliers.xml,0.0,3.0,0.0,1286.4,890.5,11468.5,3942.3,2291.1,3776.3,3776.3,2291.1,3776.3,3776.3,28396.0,21828.0,0.0
base-hvac-ducts-areas.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,2274.9,3765.5,3765.5,2274.9,3765.5,3765.5,24218.0,20777.0,0.0
base-hvac-ducts-buried.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,2274.8,3763.1,3763.1,2274.8,3763.1,3763.1,24187.0,20733.0,0.0
base-hvac-ducts-defaults.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,3169.4,3749.2,3749.2,3169.4,3749.2,3749.2,18911.0,13284.0,0.0
-base-hvac-ducts-effective-rvalue.xml,0.0,87.0,0.0,1286.4,890.5,11468.5,3942.3,2314.8,3776.5,3776.5,2314.8,3776.5,3776.5,33306.0,23005.0,0.0
-base-hvac-ducts-leakage-cfm50.xml,0.0,56.0,0.0,1286.4,890.5,11468.5,3942.3,2307.7,3775.8,3775.8,2307.7,3775.8,3775.8,31742.0,22653.0,0.0
-base-hvac-ducts-leakage-percent.xml,0.0,38.0,0.0,1286.4,890.5,11468.5,3942.3,2301.5,3777.7,3777.7,2301.5,3777.7,3777.7,30672.0,22840.0,0.0
-base-hvac-ducts-shape-rectangular.xml,0.0,49.0,0.0,1286.4,890.5,11468.5,3942.3,2308.3,3775.9,3775.9,2308.3,3775.9,3775.9,31917.0,22643.0,0.0
-base-hvac-ducts-shape-round.xml,0.0,101.0,0.0,1286.4,890.5,11468.5,3942.3,2317.2,3776.7,3776.7,2317.2,3776.7,3776.7,33814.0,23016.0,0.0
+base-hvac-ducts-effective-rvalue.xml,0.0,59.0,0.0,1286.4,890.5,11468.5,3942.3,2314.8,3776.5,3776.5,2314.8,3776.5,3776.5,33306.0,23005.0,0.0
+base-hvac-ducts-leakage-cfm50.xml,0.0,38.0,0.0,1286.4,890.5,11468.5,3942.3,2307.7,3775.8,3775.8,2307.7,3775.8,3775.8,31742.0,22653.0,0.0
+base-hvac-ducts-leakage-percent.xml,0.0,25.0,0.0,1286.4,890.5,11468.5,3942.3,2301.5,3777.7,3777.7,2301.5,3777.7,3777.7,30672.0,22840.0,0.0
+base-hvac-ducts-shape-rectangular.xml,0.0,34.0,0.0,1286.4,890.5,11468.5,3942.3,2308.3,3775.9,3775.9,2308.3,3775.9,3775.9,31917.0,22643.0,0.0
+base-hvac-ducts-shape-round.xml,0.0,75.0,0.0,1286.4,890.5,11468.5,3942.3,2317.2,3776.7,3776.7,2317.2,3776.7,3776.7,33814.0,23016.0,0.0
base-hvac-elec-resistance-only.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,6157.3,1863.2,6157.3,6157.3,1863.2,6157.3,16963.0,0.0,0.0
base-hvac-evap-cooler-furnace-gas.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,2256.2,2054.6,2256.2,2256.2,2054.6,2256.2,33616.0,13290.0,0.0
base-hvac-evap-cooler-only-ducted.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,2121.6,2235.9,2235.9,2121.6,2235.9,2235.9,0.0,20128.0,0.0
base-hvac-evap-cooler-only.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,2121.6,1985.9,2121.6,2121.6,1985.9,2121.6,0.0,13069.0,0.0
-base-hvac-fan-motor-type.xml,0.0,90.0,0.0,1286.4,890.5,11468.5,3942.3,2269.5,3791.7,3791.7,2269.5,3791.7,3791.7,33396.0,22984.0,0.0
+base-hvac-fan-motor-type.xml,0.0,67.0,0.0,1286.4,890.5,11468.5,3942.3,2269.5,3791.7,3791.7,2269.5,3791.7,3791.7,33396.0,22984.0,0.0
base-hvac-fireplace-wood-only.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,2129.0,1867.4,2129.0,2129.0,1867.4,2129.0,17519.0,0.0,0.0
base-hvac-floor-furnace-propane-only.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,2129.0,1867.4,2129.0,2129.0,1867.4,2129.0,17519.0,0.0,0.0
base-hvac-furnace-coal-only.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,2233.8,1883.4,2233.8,2233.8,1883.4,2233.8,33616.0,0.0,0.0
-base-hvac-furnace-elec-central-ac-1-speed.xml,0.0,87.0,0.0,1286.4,890.5,11468.5,3942.3,10976.9,3776.5,10976.9,10976.9,3776.5,10976.9,33306.0,23005.0,0.0
+base-hvac-furnace-elec-central-ac-1-speed.xml,0.0,59.0,0.0,1286.4,890.5,11468.5,3942.3,10976.9,3776.5,10976.9,10976.9,3776.5,10976.9,33306.0,23005.0,0.0
base-hvac-furnace-elec-only.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,11238.7,1883.4,11238.7,11238.7,1883.4,11238.7,33616.0,0.0,0.0
-base-hvac-furnace-gas-central-ac-2-speed.xml,0.0,93.0,0.0,1286.4,890.5,11468.5,3942.3,2269.5,3483.8,3483.8,2269.5,3483.8,3483.8,33396.0,22874.0,0.0
-base-hvac-furnace-gas-central-ac-var-speed-research-features.xml,0.0,188.0,0.0,1286.4,890.5,11468.5,3942.3,2236.4,3742.2,3742.2,2236.4,3742.2,3742.2,32896.0,23456.0,0.0
-base-hvac-furnace-gas-central-ac-var-speed.xml,0.0,22.0,0.0,1286.4,890.5,11468.5,3942.3,2254.6,3719.0,3719.0,2254.6,3719.0,3719.0,32896.0,24069.0,0.0
+base-hvac-furnace-gas-central-ac-2-speed.xml,0.0,58.0,0.0,1286.4,890.5,11468.5,3942.3,2269.5,3483.8,3483.8,2269.5,3483.8,3483.8,33396.0,22874.0,0.0
+base-hvac-furnace-gas-central-ac-var-speed-research-features.xml,0.0,185.0,0.0,1286.4,890.5,11468.5,3942.3,2236.4,3742.2,3742.2,2236.4,3742.2,3742.2,32896.0,23456.0,0.0
+base-hvac-furnace-gas-central-ac-var-speed.xml,0.0,16.0,0.0,1286.4,890.5,11468.5,3942.3,2254.6,3719.0,3719.0,2254.6,3719.0,3719.0,32896.0,24069.0,0.0
base-hvac-furnace-gas-only-autosize-factor.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,2223.2,1873.8,2223.2,2223.2,1873.8,2223.2,29144.0,0.0,0.0
base-hvac-furnace-gas-only-detailed-setpoints.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,2209.6,1843.1,2209.6,2209.6,1843.1,2209.6,25788.0,0.0,0.0
base-hvac-furnace-gas-only-pilot.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,2233.8,1883.4,2233.8,2233.8,1883.4,2233.8,33616.0,0.0,0.0
@@ -304,28 +304,29 @@ base-hvac-furnace-oil-only.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,2233.8,18
base-hvac-furnace-propane-only.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,2233.8,1883.4,2233.8,2233.8,1883.4,2233.8,33616.0,0.0,0.0
base-hvac-furnace-wood-only.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,2233.8,1883.4,2233.8,2233.8,1883.4,2233.8,33616.0,0.0,0.0
base-hvac-furnace-x3-dse.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,2247.6,3694.1,3694.1,2247.6,3694.1,3694.1,17133.0,13284.0,0.0
-base-hvac-ground-to-air-heat-pump-1-speed-experimental.xml,9.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,4953.9,3439.4,4953.9,4953.9,3439.4,4953.9,28527.0,24971.0,0.0
+base-hvac-ground-to-air-heat-pump-1-speed-experimental.xml,8.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,4953.9,3439.4,4953.9,4953.9,3439.4,4953.9,28527.0,24971.0,0.0
base-hvac-ground-to-air-heat-pump-1-speed.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,4519.2,3525.6,4519.2,4519.2,3525.6,4519.2,30898.0,25365.0,0.0
-base-hvac-ground-to-air-heat-pump-2-speed-experimental.xml,15.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,4447.0,3085.0,4447.0,4447.0,3085.0,4447.0,27069.0,26767.0,0.0
+base-hvac-ground-to-air-heat-pump-2-speed-experimental.xml,12.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,4447.0,3085.0,4447.0,4447.0,3085.0,4447.0,27069.0,26767.0,0.0
base-hvac-ground-to-air-heat-pump-2-speed.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,4220.4,3121.0,4220.4,4220.4,3121.0,4220.4,31059.0,25236.0,0.0
base-hvac-ground-to-air-heat-pump-backup-integrated.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,4519.2,3525.6,4519.2,4519.2,3525.6,4519.2,30898.0,25365.0,0.0
base-hvac-ground-to-air-heat-pump-backup-stove.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,4607.4,3696.9,4607.4,4607.4,3696.9,4607.4,31699.0,25580.0,0.0
base-hvac-ground-to-air-heat-pump-cooling-only.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,2121.6,3568.9,3568.9,2121.6,3568.9,3568.9,0.0,24823.0,0.0
-base-hvac-ground-to-air-heat-pump-detailed-geothermal-loop.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,4030.4,3242.1,4030.4,4030.4,3242.1,4030.4,30945.0,25031.0,0.0
-base-hvac-ground-to-air-heat-pump-heating-only.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,4469.7,1873.4,4469.7,4469.7,1873.4,4469.7,30691.0,0.0,0.0
-base-hvac-ground-to-air-heat-pump-var-speed-experimental.xml,23.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,4420.9,2564.5,4420.9,4420.9,2564.5,4420.9,26657.0,26356.0,0.0
+base-hvac-ground-to-air-heat-pump-detailed-geothermal-loop-multiple.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,4564.4,3582.8,4564.4,4564.4,3582.8,4564.4,32449.0,25412.0,0.0
+base-hvac-ground-to-air-heat-pump-detailed-geothermal-loop.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,4669.8,3511.3,4669.8,4669.8,3511.3,4669.8,32734.0,25378.0,0.0
+base-hvac-ground-to-air-heat-pump-heating-only.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,4494.2,1873.4,4494.2,4494.2,1873.4,4494.2,30757.0,0.0,0.0
+base-hvac-ground-to-air-heat-pump-var-speed-experimental.xml,16.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,4420.9,2564.5,4420.9,4420.9,2564.5,4420.9,26657.0,26356.0,0.0
base-hvac-ground-to-air-heat-pump-var-speed.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,4002.4,2679.4,4002.4,4002.4,2679.4,4002.4,31067.0,25206.0,0.0
base-hvac-install-quality-air-to-air-heat-pump-1-speed.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,9818.4,4591.9,9818.4,9818.4,4591.9,9818.4,32582.0,26645.0,0.0
base-hvac-install-quality-air-to-air-heat-pump-2-speed.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,9559.8,4294.5,9559.8,9559.8,4294.5,9559.8,32566.0,26239.0,0.0
-base-hvac-install-quality-air-to-air-heat-pump-var-speed-detailed-performance.xml,0.0,2.0,0.0,1286.4,890.5,11468.5,3942.3,8842.6,5574.7,8842.6,8842.6,5574.7,8842.6,32522.0,25952.0,0.0
+base-hvac-install-quality-air-to-air-heat-pump-var-speed-detailed-performance.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,8842.6,5574.7,8842.6,8842.6,5574.7,8842.6,32522.0,25952.0,0.0
base-hvac-install-quality-air-to-air-heat-pump-var-speed.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,8899.6,4491.7,8899.6,8899.6,4491.7,8899.6,31945.0,26925.0,0.0
-base-hvac-install-quality-furnace-gas-central-ac-1-speed.xml,0.0,436.0,0.0,1286.4,890.5,11468.6,3942.3,2233.0,3553.9,3553.9,2233.0,3553.9,3553.9,35711.0,19575.0,0.0
-base-hvac-install-quality-furnace-gas-central-ac-2-speed.xml,0.0,474.0,0.0,1286.4,890.5,11468.5,3942.3,2247.7,3364.1,3364.1,2247.7,3364.1,3364.1,35686.0,19331.0,0.0
-base-hvac-install-quality-furnace-gas-central-ac-var-speed.xml,0.0,316.0,0.0,1286.4,890.5,11468.6,3942.3,2219.7,3589.5,3589.5,2219.7,3589.5,3589.5,35594.0,20523.0,0.0
+base-hvac-install-quality-furnace-gas-central-ac-1-speed.xml,0.0,388.0,0.0,1286.4,890.5,11468.6,3942.3,2233.0,3553.9,3553.9,2233.0,3553.9,3553.9,35711.0,19575.0,0.0
+base-hvac-install-quality-furnace-gas-central-ac-2-speed.xml,0.0,415.0,0.0,1286.4,890.5,11468.5,3942.3,2247.7,3364.1,3364.1,2247.7,3364.1,3364.1,35686.0,19331.0,0.0
+base-hvac-install-quality-furnace-gas-central-ac-var-speed.xml,0.0,273.0,0.0,1286.4,890.5,11468.6,3942.3,2219.7,3589.5,3589.5,2219.7,3589.5,3589.5,35594.0,20523.0,0.0
base-hvac-install-quality-furnace-gas-only.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,2214.3,1893.5,2214.3,2214.3,1893.5,2214.3,35737.0,0.0,0.0
-base-hvac-install-quality-ground-to-air-heat-pump-1-speed.xml,6.0,3.0,0.0,1286.4,890.5,11468.5,3942.3,4663.4,3731.7,4663.4,4663.4,3731.7,4663.4,30269.0,25729.0,0.0
-base-hvac-install-quality-ground-to-air-heat-pump-2-speed-experimental.xml,143.0,17.0,0.0,1286.4,890.5,11468.5,3942.3,4722.7,3446.6,4722.7,4722.7,3446.6,4722.7,25598.0,24467.0,0.0
-base-hvac-install-quality-ground-to-air-heat-pump-var-speed-experimental.xml,169.0,8.0,0.0,1286.4,890.5,11468.6,3942.3,4592.4,3066.5,4592.4,4592.4,3066.5,4592.4,24809.0,25134.0,0.0
+base-hvac-install-quality-ground-to-air-heat-pump-1-speed.xml,5.0,1.0,0.0,1286.4,890.5,11468.5,3942.3,4663.4,3731.7,4663.4,4663.4,3731.7,4663.4,30269.0,25729.0,0.0
+base-hvac-install-quality-ground-to-air-heat-pump-2-speed-experimental.xml,116.0,9.0,0.0,1286.4,890.5,11468.5,3942.3,4722.7,3446.6,4722.7,4722.7,3446.6,4722.7,25598.0,24467.0,0.0
+base-hvac-install-quality-ground-to-air-heat-pump-var-speed-experimental.xml,149.0,1.0,0.0,1286.4,890.5,11468.6,3942.3,4592.4,3066.5,4592.4,4592.4,3066.5,4592.4,24809.0,25134.0,0.0
base-hvac-install-quality-mini-split-air-conditioner-only-ducted.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,2141.6,3392.2,3392.2,2141.6,3392.2,3392.2,0.0,15704.0,0.0
base-hvac-install-quality-mini-split-heat-pump-ducted.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,5917.1,3255.5,5917.1,5917.1,3255.5,5917.1,19604.0,15664.0,0.0
base-hvac-mini-split-air-conditioner-only-ducted.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,2141.6,2973.7,2973.7,2141.6,2973.7,2973.7,0.0,15498.0,0.0
@@ -333,22 +334,22 @@ base-hvac-mini-split-air-conditioner-only-ductless-detailed-performance-autosize
base-hvac-mini-split-air-conditioner-only-ductless-detailed-performance.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,2151.6,3149.9,3149.9,2151.6,3149.9,3149.9,0.0,13064.0,0.0
base-hvac-mini-split-air-conditioner-only-ductless.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,2141.6,2703.8,2703.8,2141.6,2703.8,2703.8,0.0,13064.0,0.0
base-hvac-mini-split-heat-pump-ducted-cooling-only.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,2151.6,2844.0,2844.0,2151.6,2844.0,2844.0,0.0,15306.0,0.0
-base-hvac-mini-split-heat-pump-ducted-heating-only-research-features.xml,93.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,5562.2,1861.0,5562.2,5562.2,1861.0,5562.2,21166.0,0.0,0.0
+base-hvac-mini-split-heat-pump-ducted-heating-only-research-features.xml,74.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,5562.2,1861.0,5562.2,5562.2,1861.0,5562.2,21166.0,0.0,0.0
base-hvac-mini-split-heat-pump-ducted-heating-only.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,5227.1,1864.3,5227.1,5227.1,1864.3,5227.1,19426.0,0.0,0.0
-base-hvac-mini-split-heat-pump-ducted-research-features.xml,93.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,5565.0,2860.5,5565.0,5565.0,2860.5,5565.0,21172.0,15519.0,0.0
+base-hvac-mini-split-heat-pump-ducted-research-features.xml,74.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,5565.0,2860.5,5565.0,5565.0,2860.5,5565.0,21172.0,15519.0,0.0
base-hvac-mini-split-heat-pump-ducted.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,5228.5,2860.6,5228.5,5228.5,2860.6,5228.5,19426.0,15519.0,0.0
base-hvac-mini-split-heat-pump-ductless-autosize-factor.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,4551.5,2606.2,4551.5,4551.5,2606.2,4551.5,16963.0,13284.0,0.0
base-hvac-mini-split-heat-pump-ductless-backup-baseboard.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,5071.1,2782.3,5071.1,5071.1,2782.3,5071.1,16963.0,13284.0,0.0
-base-hvac-mini-split-heat-pump-ductless-backup-furnace-ducts-defaults.xml,3.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,2595.1,2918.8,2918.8,2595.1,2918.8,2918.8,19574.0,13449.0,0.0
-base-hvac-mini-split-heat-pump-ductless-backup-furnace.xml,3.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,2562.6,2782.3,2782.3,2562.6,2782.3,2782.3,25511.0,13284.0,0.0
+base-hvac-mini-split-heat-pump-ductless-backup-furnace-ducts-defaults.xml,1.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,2595.1,2918.8,2918.8,2595.1,2918.8,2918.8,19574.0,13449.0,0.0
+base-hvac-mini-split-heat-pump-ductless-backup-furnace.xml,1.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,2562.6,2782.3,2782.3,2562.6,2782.3,2782.3,25511.0,13284.0,0.0
base-hvac-mini-split-heat-pump-ductless-backup-integrated-defrost-with-backup-heat-active.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,4685.9,2606.2,4685.9,4685.9,2606.2,4685.9,16963.0,13284.0,0.0
base-hvac-mini-split-heat-pump-ductless-backup-integrated.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,4551.5,2606.2,4551.5,4551.5,2606.2,4551.5,16963.0,13284.0,0.0
-base-hvac-mini-split-heat-pump-ductless-backup-stove.xml,3.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,2595.1,2918.8,2918.8,2595.1,2918.8,2918.8,17519.0,13449.0,0.0
-base-hvac-mini-split-heat-pump-ductless-detailed-performance-autosize.xml,90.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,4215.2,3340.1,4215.2,4215.2,3340.1,4215.2,16436.0,13283.0,0.0
+base-hvac-mini-split-heat-pump-ductless-backup-stove.xml,1.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,2595.1,2918.8,2918.8,2595.1,2918.8,2918.8,17519.0,13449.0,0.0
+base-hvac-mini-split-heat-pump-ductless-detailed-performance-autosize.xml,80.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,4215.2,3340.1,4215.2,4215.2,3340.1,4215.2,16436.0,13283.0,0.0
base-hvac-mini-split-heat-pump-ductless-detailed-performance.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,4795.1,3171.0,4795.1,4795.1,3171.0,4795.1,16899.0,13284.0,0.0
base-hvac-mini-split-heat-pump-ductless-heating-capacity-17f.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,4433.4,2606.2,4433.4,4433.4,2606.2,4433.4,16963.0,13284.0,0.0
base-hvac-mini-split-heat-pump-ductless.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,4551.5,2606.2,4551.5,4551.5,2606.2,4551.5,16963.0,13284.0,0.0
-base-hvac-multiple.xml,0.0,68.0,0.0,1286.4,890.5,11468.6,3942.3,8965.8,4351.4,8965.8,8965.8,4351.4,8965.8,47951.0,24104.0,0.0
+base-hvac-multiple.xml,0.0,33.0,0.0,1286.4,890.5,11468.6,3942.3,8965.8,4351.4,8965.8,8965.8,4351.4,8965.8,47951.0,24104.0,0.0
base-hvac-none.xml,0.0,0.0,0.0,1286.4,890.5,8592.3,2953.6,1350.1,1271.0,1350.1,1350.1,1271.0,1350.1,0.0,0.0,0.0
base-hvac-ptac-cfis.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,2152.7,3293.1,3293.1,2152.7,3293.1,3293.1,0.0,13374.0,0.0
base-hvac-ptac-with-heating-electricity.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,6157.3,3280.8,6157.3,6157.3,3280.8,6157.3,16963.0,13284.0,0.0
@@ -364,123 +365,123 @@ base-hvac-room-ac-only-research-features.xml,0.0,0.0,0.0,1286.4,890.5,11468.9,39
base-hvac-room-ac-only.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,2121.6,3723.5,3723.5,2121.6,3723.5,3723.5,0.0,13064.0,0.0
base-hvac-room-ac-with-heating.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,6157.3,3749.2,6157.3,6157.3,3749.2,6157.3,16963.0,13284.0,0.0
base-hvac-room-ac-with-reverse-cycle.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,5253.3,3189.1,5253.3,5253.3,3189.1,5253.3,16963.0,13284.0,0.0
-base-hvac-seasons-and-inverted-setpoints.xml,8.0,204.0,0.0,1286.4,890.5,11468.6,3942.3,2432.5,3773.0,3773.0,2432.5,3773.0,3773.0,36438.0,23161.0,0.0
-base-hvac-seasons.xml,0.0,87.0,0.0,1286.4,890.5,11468.5,3942.3,2331.8,3776.5,3776.5,2331.8,3776.5,3776.5,33306.0,23005.0,0.0
-base-hvac-setpoints-daily-schedules.xml,129.0,178.0,0.0,1286.4,890.5,11468.6,3942.3,2382.8,3778.7,3778.7,2382.8,3778.7,3778.7,35973.0,22725.0,0.0
-base-hvac-setpoints-daily-setbacks.xml,3.0,268.0,0.0,1286.4,890.5,11468.6,3942.3,2355.6,3778.7,3778.7,2355.6,3778.7,3778.7,35644.0,22969.0,0.0
-base-hvac-setpoints.xml,0.0,17.0,0.0,1286.4,890.5,11468.6,3942.3,2266.1,3978.4,3978.4,2266.1,3978.4,3978.4,25550.0,21937.0,0.0
+base-hvac-seasons-and-inverted-setpoints.xml,6.0,171.0,0.0,1286.4,890.5,11468.6,3942.3,2432.5,3773.0,3773.0,2432.5,3773.0,3773.0,36438.0,23161.0,0.0
+base-hvac-seasons.xml,0.0,59.0,0.0,1286.4,890.5,11468.5,3942.3,2331.8,3776.5,3776.5,2331.8,3776.5,3776.5,33306.0,23005.0,0.0
+base-hvac-setpoints-daily-schedules.xml,112.0,144.0,0.0,1286.4,890.5,11468.6,3942.3,2382.8,3778.7,3778.7,2382.8,3778.7,3778.7,35973.0,22725.0,0.0
+base-hvac-setpoints-daily-setbacks.xml,2.0,240.0,0.0,1286.4,890.5,11468.6,3942.3,2355.6,3778.7,3778.7,2355.6,3778.7,3778.7,35644.0,22969.0,0.0
+base-hvac-setpoints.xml,0.0,10.0,0.0,1286.4,890.5,11468.6,3942.3,2266.1,3978.4,3978.4,2266.1,3978.4,3978.4,25550.0,21937.0,0.0
base-hvac-space-heater-gas-only.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,2129.2,1863.3,2129.2,2129.2,1863.3,2129.2,16963.0,0.0,0.0
base-hvac-stove-oil-only.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,2139.7,1867.4,2139.7,2139.7,1867.4,2139.7,17519.0,0.0,0.0
base-hvac-stove-wood-pellets-only.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,2139.7,1867.4,2139.7,2139.7,1867.4,2139.7,17519.0,0.0,0.0
base-hvac-undersized-allow-increased-fixed-capacities.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,2285.2,4019.1,4019.1,2285.2,4019.1,4019.1,26784.0,23037.0,0.0
-base-hvac-undersized.xml,4152.0,2367.0,0.0,1286.4,890.5,11468.6,3942.3,2171.1,2360.9,2360.9,2171.1,2360.9,2360.9,5554.0,6657.0,0.0
+base-hvac-undersized.xml,4127.0,2321.0,0.0,1286.4,890.5,11468.6,3942.3,2171.1,2360.9,2360.9,2171.1,2360.9,2360.9,5554.0,6657.0,0.0
base-hvac-wall-furnace-elec-only.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,6253.9,1863.3,6253.9,6253.9,1863.3,6253.9,16963.0,0.0,0.0
-base-lighting-ceiling-fans-label-energy-use.xml,0.0,75.0,0.0,1286.4,890.5,11468.6,3942.3,2314.7,3870.3,3870.3,2314.7,3870.3,3870.3,33306.0,22996.0,0.0
-base-lighting-ceiling-fans.xml,0.0,74.0,0.0,1286.4,890.5,11468.6,3942.3,2314.7,3848.9,3848.9,2314.7,3848.9,3848.9,33306.0,22987.0,0.0
-base-lighting-holiday.xml,0.0,87.0,0.0,1286.4,890.5,11468.5,3942.3,2570.9,3776.5,3776.5,2570.9,3776.5,3776.5,33306.0,23005.0,0.0
-base-lighting-kwh-per-year.xml,0.0,90.0,0.0,1286.4,890.5,11468.5,3942.3,2405.9,3817.4,3817.4,2405.9,3817.4,3817.4,33244.0,23010.0,0.0
-base-lighting-mixed.xml,0.0,87.0,0.0,1286.4,890.5,11468.5,3942.3,2326.5,3783.8,3783.8,2326.5,3783.8,3783.8,33306.0,23005.0,0.0
-base-lighting-none-ceiling-fans.xml,0.0,51.0,0.0,1286.4,890.5,11468.5,3942.3,1920.4,3773.7,3773.7,1920.4,3773.7,3773.7,33762.0,22649.0,0.0
-base-lighting-none.xml,0.0,59.0,0.0,1286.4,890.5,11468.6,3942.3,1920.4,3531.5,3531.5,1920.4,3531.5,3531.5,33762.0,22646.0,0.0
-base-location-AMY-2012.xml,0.0,11.0,0.0,1290.0,892.9,11657.7,4007.3,2359.2,3515.5,3515.5,2359.2,3515.5,3515.5,33297.0,22849.0,0.0
-base-location-TMYx.xml,0.0,25.0,0.0,1286.4,890.5,11642.7,4002.1,2285.1,3688.3,3688.3,2285.1,3688.3,3688.3,34780.0,21206.0,0.0
+base-lighting-ceiling-fans-label-energy-use.xml,0.0,53.0,0.0,1286.4,890.5,11468.6,3942.3,2314.7,3870.3,3870.3,2314.7,3870.3,3870.3,33306.0,22996.0,0.0
+base-lighting-ceiling-fans.xml,0.0,50.0,0.0,1286.4,890.5,11468.6,3942.3,2314.7,3848.9,3848.9,2314.7,3848.9,3848.9,33306.0,22987.0,0.0
+base-lighting-holiday.xml,0.0,59.0,0.0,1286.4,890.5,11468.5,3942.3,2570.9,3776.5,3776.5,2570.9,3776.5,3776.5,33306.0,23005.0,0.0
+base-lighting-kwh-per-year.xml,0.0,62.0,0.0,1286.4,890.5,11468.5,3942.3,2405.9,3817.4,3817.4,2405.9,3817.4,3817.4,33244.0,23010.0,0.0
+base-lighting-mixed.xml,0.0,59.0,0.0,1286.4,890.5,11468.5,3942.3,2326.5,3783.8,3783.8,2326.5,3783.8,3783.8,33306.0,23005.0,0.0
+base-lighting-none-ceiling-fans.xml,0.0,32.0,0.0,1286.4,890.5,11468.5,3942.3,1920.4,3773.7,3773.7,1920.4,3773.7,3773.7,33762.0,22649.0,0.0
+base-lighting-none.xml,0.0,41.0,0.0,1286.4,890.5,11468.6,3942.3,1920.4,3531.5,3531.5,1920.4,3531.5,3531.5,33762.0,22646.0,0.0
+base-location-AMY-2012.xml,0.0,7.0,0.0,1290.0,892.9,11657.7,4007.3,2359.2,3515.5,3515.5,2359.2,3515.5,3515.5,33297.0,22849.0,0.0
+base-location-TMYx.xml,0.0,17.0,0.0,1286.4,890.5,11642.7,4002.1,2285.1,3688.3,3688.3,2285.1,3688.3,3688.3,34780.0,21206.0,0.0
base-location-baltimore-md.xml,0.0,0.0,0.0,1286.4,890.5,11102.7,3816.5,1850.0,2816.8,2816.8,1850.0,2816.8,2816.8,15322.0,16701.0,0.0
base-location-capetown-zaf.xml,0.0,0.0,0.0,1286.4,890.5,10644.5,3659.0,1969.2,2492.9,2579.5,1969.2,2492.9,2579.5,4847.0,14790.0,0.0
base-location-dallas-tx.xml,0.0,0.0,0.0,1286.4,890.5,10049.5,3454.5,1895.3,3147.4,3147.4,1895.3,3147.4,3147.4,10420.0,16646.0,0.0
-base-location-detailed.xml,0.0,58.0,0.0,1286.4,890.5,11468.6,3942.3,2331.3,3775.7,3775.7,2331.3,3775.7,3775.7,33377.0,22775.0,0.0
+base-location-detailed.xml,0.0,36.0,0.0,1286.4,890.5,11468.6,3942.3,2331.3,3775.7,3775.7,2331.3,3775.7,3775.7,33377.0,22775.0,0.0
base-location-duluth-mn.xml,0.0,0.0,0.0,1286.4,890.5,12241.5,4208.0,1975.4,2888.2,2888.2,1975.4,2888.2,2888.2,29212.0,13734.0,0.0
base-location-helena-mt.xml,0.0,0.0,0.0,1286.4,890.5,11923.7,4098.7,2402.8,3787.6,3787.6,2402.8,3787.6,3787.6,37808.0,22287.0,0.0
base-location-honolulu-hi.xml,0.0,0.0,0.0,1286.4,890.5,8592.2,2953.5,2198.7,2165.5,2407.4,2198.7,2165.5,2407.4,0.0,14458.0,0.0
base-location-miami-fl.xml,0.0,0.0,0.0,1286.4,890.5,8677.4,2982.8,2134.2,2631.1,2631.1,2134.2,2631.1,2631.1,0.0,15027.0,0.0
base-location-phoenix-az.xml,0.0,0.0,0.0,1286.4,890.5,8480.0,2915.0,2339.2,3594.3,3594.3,2339.2,3594.3,3594.3,1182.0,20049.0,0.0
base-location-portland-or.xml,0.0,0.0,0.0,1286.4,890.5,11307.5,3886.9,1837.9,3128.7,3128.7,1837.9,3128.7,3128.7,10213.0,17269.0,0.0
-base-location-zipcode.xml,0.0,87.0,0.0,1286.4,890.5,11468.5,3942.3,2314.8,3776.5,3776.5,2314.8,3776.5,3776.5,33303.0,23005.0,0.0
-base-mechvent-balanced.xml,18.0,146.0,0.0,1286.4,890.5,11468.5,3942.3,2437.5,3838.0,3838.0,2437.5,3838.0,3838.0,36551.0,23018.0,0.0
-base-mechvent-bath-kitchen-fans.xml,0.0,97.0,0.0,1286.4,890.5,11468.5,3942.3,2353.4,3901.4,3901.4,2353.4,3901.4,3901.4,35649.0,23005.0,0.0
-base-mechvent-cfis-15-mins.xml,20.0,178.5,0.0,1286.4,890.5,11468.7,3942.3,3367.8,4993.6,4993.6,3367.8,4993.6,4993.6,36636.0,22852.0,0.0
-base-mechvent-cfis-airflow-fraction-zero.xml,6.0,133.0,0.0,1286.4,890.5,11468.5,3942.3,2344.9,3777.2,3777.2,2344.9,3777.2,3777.2,36415.0,23008.0,0.0
-base-mechvent-cfis-control-type-timer.xml,6.0,140.0,0.0,1286.4,890.5,11468.5,3942.3,2401.5,3777.4,3777.4,2401.5,3777.4,3777.4,36388.0,22951.0,0.0
+base-location-zipcode.xml,0.0,59.0,0.0,1286.4,890.5,11468.5,3942.3,2314.8,3776.5,3776.5,2314.8,3776.5,3776.5,33303.0,23005.0,0.0
+base-mechvent-balanced.xml,16.0,129.0,0.0,1286.4,890.5,11468.5,3942.3,2437.5,3838.0,3838.0,2437.5,3838.0,3838.0,36551.0,23018.0,0.0
+base-mechvent-bath-kitchen-fans.xml,0.0,70.0,0.0,1286.4,890.5,11468.5,3942.3,2353.4,3901.4,3901.4,2353.4,3901.4,3901.4,35649.0,23005.0,0.0
+base-mechvent-cfis-15-mins.xml,14.0,146.5,0.0,1286.4,890.5,11468.7,3942.3,3367.8,4993.6,4993.6,3367.8,4993.6,4993.6,36636.0,22852.0,0.0
+base-mechvent-cfis-airflow-fraction-zero.xml,6.0,105.0,0.0,1286.4,890.5,11468.5,3942.3,2344.9,3777.2,3777.2,2344.9,3777.2,3777.2,36415.0,23008.0,0.0
+base-mechvent-cfis-control-type-timer.xml,3.0,113.0,0.0,1286.4,890.5,11468.5,3942.3,2401.5,3777.4,3777.4,2401.5,3777.4,3777.4,36388.0,22951.0,0.0
base-mechvent-cfis-dse.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,2310.3,3921.3,3921.3,2310.3,3921.3,3921.3,21769.0,14833.0,0.0
base-mechvent-cfis-evap-cooler-only-ducted.xml,0.0,0.0,0.0,1286.4,890.5,11468.6,3942.3,2218.4,2312.2,2312.2,2218.4,2312.2,2312.2,0.0,21966.0,0.0
-base-mechvent-cfis-no-additional-runtime.xml,6.0,130.0,0.0,1286.4,890.5,11468.5,3942.3,2363.1,3777.4,3777.4,2363.1,3777.4,3777.4,36415.0,23010.0,0.0
+base-mechvent-cfis-no-additional-runtime.xml,6.0,105.0,0.0,1286.4,890.5,11468.5,3942.3,2363.1,3777.4,3777.4,2363.1,3777.4,3777.4,36415.0,23010.0,0.0
base-mechvent-cfis-no-outdoor-air-control.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,2370.1,4916.5,4916.5,2370.1,4916.5,4916.5,51810.0,31908.0,0.0
-base-mechvent-cfis-supplemental-fan-exhaust-15-mins.xml,20.0,181.75,0.0,1286.4,890.5,11468.6,3942.3,3367.8,5077.5,5077.5,3367.8,5077.5,5077.5,36636.0,22873.0,0.0
-base-mechvent-cfis-supplemental-fan-exhaust-synchronized.xml,7.0,134.0,0.0,1286.4,890.5,11468.6,3942.3,2402.0,3990.2,3990.2,2402.0,3990.2,3990.2,36448.0,23007.0,0.0
-base-mechvent-cfis-supplemental-fan-exhaust.xml,6.0,128.0,0.0,1286.4,890.5,11468.6,3942.3,2384.6,3980.6,3980.6,2384.6,3980.6,3980.6,36415.0,23006.0,0.0
-base-mechvent-cfis-supplemental-fan-supply.xml,6.0,130.0,0.0,1286.4,890.5,11468.5,3942.3,2345.4,3777.4,3777.4,2345.4,3777.4,3777.4,36415.0,23007.0,0.0
-base-mechvent-cfis.xml,6.0,130.0,0.0,1286.4,890.5,11468.5,3942.3,2345.0,3777.4,3777.4,2345.0,3777.4,3777.4,36415.0,22999.0,0.0
-base-mechvent-erv-atre-asre.xml,0.0,113.0,0.0,1286.4,890.5,11468.6,3942.3,2368.7,3836.6,3836.6,2368.7,3836.6,3836.6,36202.0,23013.0,0.0
-base-mechvent-erv.xml,0.0,112.0,0.0,1286.4,890.5,11468.6,3942.3,2368.7,3836.6,3836.6,2368.7,3836.6,3836.6,36203.0,23013.0,0.0
-base-mechvent-exhaust.xml,13.0,141.0,0.0,1286.4,890.5,11468.6,3942.3,2432.1,4009.7,4009.7,2432.1,4009.7,4009.7,36493.0,23012.0,0.0
-base-mechvent-hrv-asre.xml,0.0,110.0,0.0,1286.4,890.5,11468.6,3942.3,2368.7,3836.7,3836.7,2368.7,3836.7,3836.7,36202.0,23013.0,0.0
-base-mechvent-hrv.xml,0.0,110.0,0.0,1286.4,890.5,11468.6,3942.3,2368.7,3836.7,3836.7,2368.7,3836.7,3836.7,36203.0,23013.0,0.0
-base-mechvent-multiple.xml,0.0,46.0,0.0,1286.4,890.5,11468.6,3942.3,2382.0,3834.9,3834.9,2382.0,3834.9,3834.9,35872.0,22640.0,0.0
-base-mechvent-supply.xml,6.0,136.0,0.0,1286.4,890.5,11468.5,3942.3,2373.9,3818.6,3818.6,2373.9,3818.6,3818.6,36407.0,23012.0,0.0
-base-mechvent-whole-house-fan.xml,0.0,35.0,0.0,1286.4,890.5,11468.6,3942.3,2332.5,3778.4,3778.4,2332.5,3778.4,3778.4,33306.0,22030.0,0.0
-base-misc-additional-properties.xml,0.0,87.0,0.0,1286.4,890.5,11468.5,3942.3,2314.8,3776.5,3776.5,2314.8,3776.5,3776.5,33306.0,23005.0,0.0
-base-misc-bills-battery-scheduled-detailed-only.xml,0.0,87.0,0.0,1286.4,890.5,11468.5,3942.3,8119.5,8427.4,8427.4,8119.5,8427.4,8427.4,33306.0,23005.0,1.473
-base-misc-bills-detailed-only.xml,0.0,87.0,0.0,1286.4,890.5,11468.5,3942.3,2314.8,3776.5,3776.5,2314.8,3776.5,3776.5,33306.0,23005.0,0.0
-base-misc-bills-pv-detailed-only.xml,0.0,87.0,0.0,1286.4,890.5,11468.5,3942.3,2314.8,3776.5,3776.5,2314.8,3611.3,3611.3,33306.0,23005.0,0.0
-base-misc-bills-pv-mixed.xml,0.0,87.0,0.0,1286.4,890.5,11468.5,3942.3,2314.8,3776.5,3776.5,2314.8,3611.3,3611.3,33306.0,23005.0,0.0
-base-misc-bills-pv.xml,0.0,87.0,0.0,1286.4,890.5,11468.5,3942.3,2314.8,3776.5,3776.5,2314.8,3559.1,3559.1,33306.0,23005.0,0.0
-base-misc-bills.xml,0.0,87.0,0.0,1286.4,890.5,11468.5,3942.3,2314.8,3776.5,3776.5,2314.8,3776.5,3776.5,33306.0,23005.0,0.0
+base-mechvent-cfis-supplemental-fan-exhaust-15-mins.xml,14.0,149.75,0.0,1286.4,890.5,11468.6,3942.3,3367.8,5077.5,5077.5,3367.8,5077.5,5077.5,36636.0,22873.0,0.0
+base-mechvent-cfis-supplemental-fan-exhaust-synchronized.xml,7.0,105.0,0.0,1286.4,890.5,11468.6,3942.3,2402.0,3990.2,3990.2,2402.0,3990.2,3990.2,36448.0,23007.0,0.0
+base-mechvent-cfis-supplemental-fan-exhaust.xml,6.0,102.0,0.0,1286.4,890.5,11468.6,3942.3,2384.6,3980.6,3980.6,2384.6,3980.6,3980.6,36415.0,23006.0,0.0
+base-mechvent-cfis-supplemental-fan-supply.xml,6.0,104.0,0.0,1286.4,890.5,11468.5,3942.3,2345.4,3777.4,3777.4,2345.4,3777.4,3777.4,36415.0,23007.0,0.0
+base-mechvent-cfis.xml,6.0,104.0,0.0,1286.4,890.5,11468.5,3942.3,2345.0,3777.4,3777.4,2345.0,3777.4,3777.4,36415.0,22999.0,0.0
+base-mechvent-erv-atre-asre.xml,0.0,82.0,0.0,1286.4,890.5,11468.6,3942.3,2368.7,3836.6,3836.6,2368.7,3836.6,3836.6,36202.0,23013.0,0.0
+base-mechvent-erv.xml,0.0,82.0,0.0,1286.4,890.5,11468.6,3942.3,2368.7,3836.6,3836.6,2368.7,3836.6,3836.6,36203.0,23013.0,0.0
+base-mechvent-exhaust.xml,9.0,121.0,0.0,1286.4,890.5,11468.6,3942.3,2432.1,4009.7,4009.7,2432.1,4009.7,4009.7,36493.0,23012.0,0.0
+base-mechvent-hrv-asre.xml,0.0,86.0,0.0,1286.4,890.5,11468.6,3942.3,2368.7,3836.7,3836.7,2368.7,3836.7,3836.7,36202.0,23013.0,0.0
+base-mechvent-hrv.xml,0.0,86.0,0.0,1286.4,890.5,11468.6,3942.3,2368.7,3836.7,3836.7,2368.7,3836.7,3836.7,36203.0,23013.0,0.0
+base-mechvent-multiple.xml,0.0,33.0,0.0,1286.4,890.5,11468.6,3942.3,2382.0,3834.9,3834.9,2382.0,3834.9,3834.9,35872.0,22640.0,0.0
+base-mechvent-supply.xml,4.0,109.0,0.0,1286.4,890.5,11468.5,3942.3,2373.9,3818.6,3818.6,2373.9,3818.6,3818.6,36407.0,23012.0,0.0
+base-mechvent-whole-house-fan.xml,0.0,28.0,0.0,1286.4,890.5,11468.6,3942.3,2332.5,3778.4,3778.4,2332.5,3778.4,3778.4,33306.0,22030.0,0.0
+base-misc-additional-properties.xml,0.0,59.0,0.0,1286.4,890.5,11468.5,3942.3,2314.8,3776.5,3776.5,2314.8,3776.5,3776.5,33306.0,23005.0,0.0
+base-misc-bills-battery-scheduled-detailed-only.xml,0.0,59.0,0.0,1286.4,890.5,11468.5,3942.3,8119.5,8427.4,8427.4,8119.5,8427.4,8427.4,33306.0,23005.0,1.473
+base-misc-bills-detailed-only.xml,0.0,59.0,0.0,1286.4,890.5,11468.5,3942.3,2314.8,3776.5,3776.5,2314.8,3776.5,3776.5,33306.0,23005.0,0.0
+base-misc-bills-pv-detailed-only.xml,0.0,59.0,0.0,1286.4,890.5,11468.5,3942.3,2314.8,3776.5,3776.5,2314.8,3611.3,3611.3,33306.0,23005.0,0.0
+base-misc-bills-pv-mixed.xml,0.0,59.0,0.0,1286.4,890.5,11468.5,3942.3,2314.8,3776.5,3776.5,2314.8,3611.3,3611.3,33306.0,23005.0,0.0
+base-misc-bills-pv.xml,0.0,59.0,0.0,1286.4,890.5,11468.5,3942.3,2314.8,3776.5,3776.5,2314.8,3559.1,3559.1,33306.0,23005.0,0.0
+base-misc-bills.xml,0.0,59.0,0.0,1286.4,890.5,11468.5,3942.3,2314.8,3776.5,3776.5,2314.8,3776.5,3776.5,33306.0,23005.0,0.0
base-misc-defaults.xml,0.0,0.0,0.0,1529.1,1405.1,10758.9,3698.3,7475.0,7687.8,7687.8,7475.0,6789.5,7475.0,30862.0,17778.0,2.94
-base-misc-emissions.xml,0.0,87.0,0.0,1286.4,890.5,11468.5,3942.3,10663.8,10189.2,10987.6,7999.5,6711.3,8056.0,33306.0,23005.0,9.875
-base-misc-generators-battery-scheduled.xml,0.0,87.0,0.0,1286.4,890.5,11468.5,3942.3,7845.5,8153.5,8153.5,7845.5,8153.5,8153.5,33306.0,23005.0,1.828
-base-misc-generators-battery.xml,0.0,87.0,0.0,1286.4,890.5,11468.5,3942.3,2040.9,3502.5,3502.5,2040.9,3502.5,3502.5,33306.0,23005.0,0.0
-base-misc-generators.xml,0.0,87.0,0.0,1286.4,890.5,11468.5,3942.3,2040.9,3502.5,3502.5,2040.9,3502.5,3502.5,33306.0,23005.0,0.0
-base-misc-ground-conductivity.xml,0.0,82.0,0.0,1286.4,890.5,11468.6,3942.3,2275.4,3776.2,3776.2,2275.4,3776.2,3776.2,32234.0,22998.0,0.0
-base-misc-loads-large-uncommon.xml,0.0,188.0,0.0,1286.4,890.5,11468.6,3942.3,3474.1,5303.5,5303.5,3474.1,5303.5,5303.5,31666.0,23071.0,0.0
-base-misc-loads-large-uncommon2.xml,0.0,188.0,0.0,1286.4,890.5,11468.6,3942.3,3424.0,4901.1,4901.1,3424.0,4901.1,4901.1,31666.0,23071.0,0.0
-base-misc-loads-none.xml,0.0,33.0,0.0,1286.4,890.5,11468.5,3942.3,1813.4,3298.7,3298.7,1813.4,3298.7,3298.7,34560.0,22533.0,0.0
-base-misc-multiple-buildings.xml,0.0,46.0,0.0,1286.4,890.5,11468.5,3942.3,2252.1,3775.8,3775.8,2252.1,3775.8,3775.8,28698.0,22662.0,0.0
-base-misc-neighbor-shading.xml,0.0,53.0,0.0,1286.4,890.5,11468.6,3942.3,2318.8,3777.4,3777.4,2318.8,3777.4,3777.4,33330.0,22584.0,0.0
-base-misc-terrain-shielding.xml,0.0,42.0,0.0,1286.4,890.5,11468.6,3942.3,2331.0,3774.9,3774.9,2331.0,3774.9,3774.9,33493.0,22478.0,0.0
-base-misc-unit-multiplier-detailed-electric-panel.xml,0.0,87.0,0.0,12864.4,8904.9,114685.4,39422.7,23148.4,37765.1,37765.1,23148.4,37765.1,37765.1,333055.0,230046.0,0.0
-base-misc-unit-multiplier.xml,0.0,87.0,0.0,12864.4,8904.9,114685.4,39422.7,23148.4,37765.1,37765.1,23148.4,37765.1,37765.1,333055.0,230046.0,0.0
-base-misc-usage-multiplier.xml,0.0,110.0,0.0,964.8,667.9,8601.5,2956.7,4091.3,5821.4,5821.4,4091.3,5821.4,5821.4,32971.0,23031.0,0.0
-base-pv-battery-ah.xml,0.0,87.0,0.0,1286.4,890.5,11468.5,3942.3,3996.5,4181.8,4674.8,2338.2,3731.3,3731.3,33306.0,23005.0,9.875
-base-pv-battery-and-vehicle-ev.xml,0.0,87.0,0.0,1286.4,890.5,11468.5,3942.3,10663.8,10189.2,10987.6,7999.5,6711.3,8056.0,33306.0,23005.0,9.875
+base-misc-emissions.xml,0.0,59.0,0.0,1286.4,890.5,11468.5,3942.3,10663.8,10189.2,10987.6,7999.5,6711.3,8056.0,33306.0,23005.0,9.875
+base-misc-generators-battery-scheduled.xml,0.0,59.0,0.0,1286.4,890.5,11468.5,3942.3,7845.5,8153.5,8153.5,7845.5,8153.5,8153.5,33306.0,23005.0,1.828
+base-misc-generators-battery.xml,0.0,59.0,0.0,1286.4,890.5,11468.5,3942.3,2040.9,3502.5,3502.5,2040.9,3502.5,3502.5,33306.0,23005.0,0.0
+base-misc-generators.xml,0.0,59.0,0.0,1286.4,890.5,11468.5,3942.3,2040.9,3502.5,3502.5,2040.9,3502.5,3502.5,33306.0,23005.0,0.0
+base-misc-ground-conductivity.xml,0.0,56.0,0.0,1286.4,890.5,11468.6,3942.3,2275.4,3776.2,3776.2,2275.4,3776.2,3776.2,32234.0,22998.0,0.0
+base-misc-loads-large-uncommon.xml,0.0,150.0,0.0,1286.4,890.5,11468.6,3942.3,3474.1,5303.5,5303.5,3474.1,5303.5,5303.5,31666.0,23071.0,0.0
+base-misc-loads-large-uncommon2.xml,0.0,150.0,0.0,1286.4,890.5,11468.6,3942.3,3424.0,4901.1,4901.1,3424.0,4901.1,4901.1,31666.0,23071.0,0.0
+base-misc-loads-none.xml,0.0,21.0,0.0,1286.4,890.5,11468.5,3942.3,1813.4,3298.7,3298.7,1813.4,3298.7,3298.7,34560.0,22533.0,0.0
+base-misc-multiple-buildings.xml,0.0,31.0,0.0,1286.4,890.5,11468.5,3942.3,2252.1,3775.8,3775.8,2252.1,3775.8,3775.8,28698.0,22662.0,0.0
+base-misc-neighbor-shading.xml,0.0,33.0,0.0,1286.4,890.5,11468.6,3942.3,2318.8,3777.4,3777.4,2318.8,3777.4,3777.4,33330.0,22584.0,0.0
+base-misc-terrain-shielding.xml,0.0,31.0,0.0,1286.4,890.5,11468.6,3942.3,2331.0,3774.9,3774.9,2331.0,3774.9,3774.9,33493.0,22478.0,0.0
+base-misc-unit-multiplier-detailed-electric-panel.xml,0.0,59.0,0.0,12864.4,8904.9,114685.4,39422.7,23148.4,37765.1,37765.1,23148.4,37765.1,37765.1,333055.0,230046.0,0.0
+base-misc-unit-multiplier.xml,0.0,59.0,0.0,12864.4,8904.9,114685.4,39422.7,23148.4,37765.1,37765.1,23148.4,37765.1,37765.1,333055.0,230046.0,0.0
+base-misc-usage-multiplier.xml,0.0,80.0,0.0,964.8,667.9,8601.5,2956.7,4091.3,5821.4,5821.4,4091.3,5821.4,5821.4,32971.0,23031.0,0.0
+base-pv-battery-ah.xml,0.0,59.0,0.0,1286.4,890.5,11468.5,3942.3,3996.5,4181.8,4674.8,2338.2,3731.3,3731.3,33306.0,23005.0,9.875
+base-pv-battery-and-vehicle-ev.xml,0.0,59.0,0.0,1286.4,890.5,11468.5,3942.3,10663.8,10189.2,10987.6,7999.5,6711.3,8056.0,33306.0,23005.0,9.875
base-pv-battery-garage.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,3996.5,4181.8,4674.8,2342.4,2897.6,2897.6,28158.0,19401.0,11.488
-base-pv-battery-round-trip-efficiency.xml,0.0,87.0,0.0,1286.4,890.5,11468.5,3942.3,3996.5,4181.8,4674.8,2452.9,3887.9,3887.9,33306.0,23005.0,4.042
-base-pv-battery-scheduled.xml,0.0,87.0,0.0,1286.4,890.5,11468.5,3942.3,8119.5,8427.4,8427.4,7933.3,7700.7,7933.3,33306.0,23005.0,6.506
-base-pv-battery.xml,0.0,87.0,0.0,1286.4,890.5,11468.5,3942.3,3996.5,4181.8,4674.8,2338.2,3731.3,3731.3,33306.0,23005.0,9.875
-base-pv-generators-battery-scheduled.xml,0.0,87.0,0.0,1286.4,890.5,11468.5,3942.3,7845.5,8153.5,8153.5,7659.3,7426.7,7659.3,33306.0,23005.0,16.185
-base-pv-generators-battery.xml,0.0,87.0,0.0,1286.4,890.5,11468.5,3942.3,3996.5,4181.8,4500.2,2003.8,3394.3,3394.3,33306.0,23005.0,54.52
-base-pv-generators.xml,0.0,87.0,0.0,1286.4,890.5,11468.5,3942.3,2040.9,3502.5,3502.5,2040.9,3337.3,3337.3,33306.0,23005.0,0.0
-base-pv-inverters.xml,0.0,87.0,0.0,1286.4,890.5,11468.5,3942.3,2314.8,3776.5,3776.5,2314.8,3612.1,3612.1,33306.0,23005.0,0.0
-base-pv.xml,0.0,87.0,0.0,1286.4,890.5,11468.5,3942.3,2314.8,3776.5,3776.5,2314.8,3611.3,3611.3,33306.0,23005.0,0.0
-base-residents-0.xml,0.0,7.0,0.0,0.0,0.0,0.0,0.0,797.7,2659.8,2659.8,797.7,2659.8,2659.8,35598.0,22456.0,0.0
-base-residents-1-misc-loads-large-uncommon.xml,0.0,98.0,0.0,821.3,625.4,3517.1,1830.1,2865.8,4961.0,4961.0,2865.8,4961.0,4961.0,33189.0,23017.0,0.0
-base-residents-1-misc-loads-large-uncommon2.xml,0.0,98.0,0.0,821.3,625.4,3517.1,1830.1,2761.1,4709.5,4709.5,2761.1,4709.5,4709.5,33189.0,23017.0,0.0
-base-residents-1.xml,0.0,55.0,0.0,821.3,625.4,3517.1,1830.1,1754.6,3568.6,3568.6,1754.6,3568.6,3568.6,33949.0,22769.0,0.0
+base-pv-battery-round-trip-efficiency.xml,0.0,59.0,0.0,1286.4,890.5,11468.5,3942.3,3996.5,4181.8,4674.8,2452.9,3887.9,3887.9,33306.0,23005.0,4.042
+base-pv-battery-scheduled.xml,0.0,59.0,0.0,1286.4,890.5,11468.5,3942.3,8119.5,8427.4,8427.4,7933.3,7700.7,7933.3,33306.0,23005.0,6.506
+base-pv-battery.xml,0.0,59.0,0.0,1286.4,890.5,11468.5,3942.3,3996.5,4181.8,4674.8,2338.2,3731.3,3731.3,33306.0,23005.0,9.875
+base-pv-generators-battery-scheduled.xml,0.0,59.0,0.0,1286.4,890.5,11468.5,3942.3,7845.5,8153.5,8153.5,7659.3,7426.7,7659.3,33306.0,23005.0,16.185
+base-pv-generators-battery.xml,0.0,59.0,0.0,1286.4,890.5,11468.5,3942.3,3996.5,4181.8,4500.2,2003.8,3394.3,3394.3,33306.0,23005.0,54.52
+base-pv-generators.xml,0.0,59.0,0.0,1286.4,890.5,11468.5,3942.3,2040.9,3502.5,3502.5,2040.9,3337.3,3337.3,33306.0,23005.0,0.0
+base-pv-inverters.xml,0.0,59.0,0.0,1286.4,890.5,11468.5,3942.3,2314.8,3776.5,3776.5,2314.8,3612.1,3612.1,33306.0,23005.0,0.0
+base-pv.xml,0.0,59.0,0.0,1286.4,890.5,11468.5,3942.3,2314.8,3776.5,3776.5,2314.8,3611.3,3611.3,33306.0,23005.0,0.0
+base-residents-0.xml,0.0,4.0,0.0,0.0,0.0,0.0,0.0,797.7,2659.8,2659.8,797.7,2659.8,2659.8,35598.0,22456.0,0.0
+base-residents-1-misc-loads-large-uncommon.xml,0.0,73.0,0.0,821.3,625.4,3517.1,1830.1,2865.8,4961.0,4961.0,2865.8,4961.0,4961.0,33189.0,23017.0,0.0
+base-residents-1-misc-loads-large-uncommon2.xml,0.0,73.0,0.0,821.3,625.4,3517.1,1830.1,2761.1,4709.5,4709.5,2761.1,4709.5,4709.5,33189.0,23017.0,0.0
+base-residents-1.xml,0.0,34.0,0.0,821.3,625.4,3517.1,1830.1,1754.6,3568.6,3568.6,1754.6,3568.6,3568.6,33949.0,22769.0,0.0
base-residents-5-5.xml,0.0,0.0,0.0,2432.4,2087.7,24539.4,5945.7,8279.1,8477.0,8477.0,8279.1,7676.5,8279.1,30058.0,19008.0,1.5
-base-schedules-detailed-all-10-mins.xml,2.667,136.333,0.0,1286.4,890.5,11334.6,3896.2,9797.2,12034.1,12034.1,9797.2,12034.1,12034.1,36708.0,22719.0,0.0
-base-schedules-detailed-mixed-timesteps-power-outage.xml,3.667,29.0,0.0,1090.3,777.9,9227.8,3172.0,9693.3,11701.6,11701.6,9693.3,11701.6,11701.6,45086.0,22494.0,0.0
-base-schedules-detailed-mixed-timesteps.xml,0.5,29.5,0.0,1286.4,890.5,11335.9,3896.7,9684.5,11703.4,11703.4,9684.5,11703.4,11703.4,36465.0,22495.0,0.0
-base-schedules-detailed-occupancy-stochastic-10-mins.xml,0.0,99.0,0.0,1286.4,890.5,11468.3,3942.2,6007.0,6961.3,6961.3,6007.0,6961.3,6961.3,36212.0,22917.0,0.0
-base-schedules-detailed-occupancy-stochastic-no-space-cooling.xml,0.0,68.0,0.0,1286.4,890.5,11469.9,3942.8,6414.0,6451.3,6969.6,6414.0,6451.3,6969.6,36212.0,23022.0,0.0
-base-schedules-detailed-occupancy-stochastic-no-space-heating.xml,1.0,99.0,0.0,1286.4,890.5,11469.9,3942.8,6262.0,6426.7,6971.4,6262.0,6426.7,6971.4,36214.0,22914.0,0.0
-base-schedules-detailed-occupancy-stochastic-power-outage.xml,36.0,95.0,0.0,1090.4,777.9,9323.6,3205.0,6194.2,6422.5,6971.7,6194.2,6422.5,6971.7,40997.0,22878.0,0.0
-base-schedules-detailed-occupancy-stochastic-vacancy.xml,0.0,98.0,0.0,1090.4,777.9,9319.3,3203.5,5382.9,6426.7,6971.4,5382.9,6426.7,6971.4,36233.0,22914.0,0.0
-base-schedules-detailed-occupancy-stochastic.xml,0.0,99.0,0.0,1286.4,890.5,11469.9,3942.8,6414.3,6426.8,6971.4,6414.3,6426.8,6971.4,36212.0,22915.0,0.0
-base-schedules-detailed-setpoints-daily-schedules.xml,129.0,178.0,0.0,1286.4,890.5,11468.6,3942.3,2382.8,3778.7,3778.7,2382.8,3778.7,3778.7,35973.0,22725.0,0.0
-base-schedules-detailed-setpoints-daily-setbacks.xml,3.0,268.0,0.0,1286.4,890.5,11468.6,3942.3,2355.6,3778.7,3778.7,2355.6,3778.7,3778.7,35644.0,22969.0,0.0
-base-schedules-detailed-setpoints.xml,0.0,17.0,0.0,1286.4,890.5,11468.6,3942.3,2266.1,3978.4,3978.4,2266.1,3978.4,3978.4,25550.0,21937.0,0.0
-base-schedules-simple-no-space-cooling.xml,0.0,76.0,0.0,1286.4,890.5,11468.6,3942.3,2285.5,3776.5,3776.5,2285.5,3776.5,3776.5,33306.0,23010.0,0.0
-base-schedules-simple-no-space-heating.xml,1.0,87.0,0.0,1286.4,890.5,11468.6,3942.3,2285.5,3776.5,3776.5,2285.5,3776.5,3776.5,33306.0,23005.0,0.0
-base-schedules-simple-power-outage.xml,0.0,70.0,0.0,1178.9,816.4,10565.4,1210.3,4307.5,17467.6,17467.6,4307.5,17467.6,17467.6,33016.0,22990.0,0.0
-base-schedules-simple-vacancy.xml,0.0,92.0,0.0,1067.9,739.2,9433.5,1080.6,4252.8,4963.4,4963.4,4252.8,4963.4,4963.4,33078.0,22987.0,0.0
-base-schedules-simple.xml,0.0,92.0,0.0,1286.4,890.5,11468.6,1313.8,9864.9,10794.6,10794.6,9864.9,10794.6,10794.6,33015.0,22987.0,0.0
-base-simcontrol-calendar-year-custom.xml,0.0,89.0,0.0,1286.4,890.5,11468.5,3942.3,2318.6,4022.5,4022.5,2318.6,4022.5,4022.5,33306.0,23008.0,0.0
-base-simcontrol-daylight-saving-custom.xml,0.0,87.0,0.0,1286.4,890.5,11468.5,3942.3,2314.7,3776.5,3776.5,2314.7,3776.5,3776.5,33306.0,23005.0,0.0
-base-simcontrol-daylight-saving-disabled.xml,0.0,79.0,0.0,1286.4,890.5,11468.6,3942.3,2320.0,3685.8,3685.8,2320.0,3685.8,3685.8,33306.0,22946.0,0.0
+base-schedules-detailed-all-10-mins.xml,2.667,104.5,0.0,1286.4,890.5,11334.6,3896.2,9797.2,12034.1,12034.1,9797.2,12034.1,12034.1,36708.0,22719.0,0.0
+base-schedules-detailed-mixed-timesteps-power-outage.xml,3.333,17.667,0.0,1090.3,777.9,9227.8,3172.0,9693.3,11701.6,11701.6,9693.3,11701.6,11701.6,45086.0,22494.0,0.0
+base-schedules-detailed-mixed-timesteps.xml,0.167,17.833,0.0,1286.4,890.5,11335.9,3896.7,9684.5,11703.4,11703.4,9684.5,11703.4,11703.4,36465.0,22495.0,0.0
+base-schedules-detailed-occupancy-stochastic-10-mins.xml,0.0,71.0,0.0,1286.4,890.5,11468.3,3942.2,6007.0,6961.3,6961.3,6007.0,6961.3,6961.3,36212.0,22917.0,0.0
+base-schedules-detailed-occupancy-stochastic-no-space-cooling.xml,0.0,51.0,0.0,1286.4,890.5,11469.9,3942.8,6414.0,6451.3,6969.6,6414.0,6451.3,6969.6,36212.0,23022.0,0.0
+base-schedules-detailed-occupancy-stochastic-no-space-heating.xml,1.0,71.0,0.0,1286.4,890.5,11469.9,3942.8,6262.0,6426.7,6971.4,6262.0,6426.7,6971.4,36214.0,22914.0,0.0
+base-schedules-detailed-occupancy-stochastic-power-outage.xml,33.0,70.0,0.0,1090.4,777.9,9323.6,3205.0,6194.2,6422.5,6971.7,6194.2,6422.5,6971.7,40997.0,22878.0,0.0
+base-schedules-detailed-occupancy-stochastic-vacancy.xml,0.0,71.0,0.0,1090.4,777.9,9319.3,3203.5,5382.9,6426.7,6971.4,5382.9,6426.7,6971.4,36233.0,22914.0,0.0
+base-schedules-detailed-occupancy-stochastic.xml,0.0,71.0,0.0,1286.4,890.5,11469.9,3942.8,6414.3,6426.8,6971.4,6414.3,6426.8,6971.4,36212.0,22915.0,0.0
+base-schedules-detailed-setpoints-daily-schedules.xml,112.0,144.0,0.0,1286.4,890.5,11468.6,3942.3,2382.8,3778.7,3778.7,2382.8,3778.7,3778.7,35973.0,22725.0,0.0
+base-schedules-detailed-setpoints-daily-setbacks.xml,2.0,240.0,0.0,1286.4,890.5,11468.6,3942.3,2355.6,3778.7,3778.7,2355.6,3778.7,3778.7,35644.0,22969.0,0.0
+base-schedules-detailed-setpoints.xml,0.0,10.0,0.0,1286.4,890.5,11468.6,3942.3,2266.1,3978.4,3978.4,2266.1,3978.4,3978.4,25550.0,21937.0,0.0
+base-schedules-simple-no-space-cooling.xml,0.0,53.0,0.0,1286.4,890.5,11468.6,3942.3,2285.5,3776.5,3776.5,2285.5,3776.5,3776.5,33306.0,23010.0,0.0
+base-schedules-simple-no-space-heating.xml,1.0,59.0,0.0,1286.4,890.5,11468.6,3942.3,2285.5,3776.5,3776.5,2285.5,3776.5,3776.5,33306.0,23005.0,0.0
+base-schedules-simple-power-outage.xml,0.0,46.0,0.0,1178.9,816.4,10565.4,1210.3,4307.5,17467.6,17467.6,4307.5,17467.6,17467.6,33016.0,22990.0,0.0
+base-schedules-simple-vacancy.xml,0.0,62.0,0.0,1067.9,739.2,9433.5,1080.6,4252.8,4963.4,4963.4,4252.8,4963.4,4963.4,33078.0,22987.0,0.0
+base-schedules-simple.xml,0.0,62.0,0.0,1286.4,890.5,11468.6,1313.8,9864.9,10794.6,10794.6,9864.9,10794.6,10794.6,33015.0,22987.0,0.0
+base-simcontrol-calendar-year-custom.xml,0.0,58.0,0.0,1286.4,890.5,11468.5,3942.3,2318.6,4022.5,4022.5,2318.6,4022.5,4022.5,33306.0,23008.0,0.0
+base-simcontrol-daylight-saving-custom.xml,0.0,59.0,0.0,1286.4,890.5,11468.5,3942.3,2314.7,3776.5,3776.5,2314.7,3776.5,3776.5,33306.0,23005.0,0.0
+base-simcontrol-daylight-saving-disabled.xml,0.0,54.0,0.0,1286.4,890.5,11468.6,3942.3,2320.0,3685.8,3685.8,2320.0,3685.8,3685.8,33306.0,22946.0,0.0
base-simcontrol-runperiod-1-month.xml,0.0,0.0,0.0,105.74,73.19,1006.78,346.08,2335.8,0.0,2335.8,2335.8,0.0,2335.8,32782.0,0.0,0.0
-base-simcontrol-temperature-capacitance-multiplier.xml,0.0,74.0,0.0,1286.4,890.5,11468.5,3942.3,2313.9,3775.8,3775.8,2313.9,3775.8,3775.8,33293.0,23058.0,0.0
-base-simcontrol-timestep-10-mins-occupancy-stochastic-10-mins.xml,2.667,136.667,0.0,1286.4,890.5,11485.0,3947.9,10171.4,10426.9,10426.9,10171.4,10426.9,10426.9,36708.0,22718.0,0.0
-base-simcontrol-timestep-10-mins-occupancy-stochastic-60-mins.xml,0.833,137.333,0.0,1286.4,890.5,11469.9,3942.7,8129.9,8899.3,8946.9,8129.9,8899.3,8946.9,36402.0,22705.0,0.0
-base-simcontrol-timestep-10-mins.xml,0.0,121.833,0.0,1286.4,890.5,11468.8,3942.4,4123.4,5760.2,5760.2,4123.4,5760.2,5760.2,33466.0,22762.0,0.0
-base-simcontrol-timestep-30-mins.xml,0.0,110.0,0.0,1286.4,890.5,11468.5,3942.3,2357.6,4225.5,4225.5,2357.6,4225.5,4225.5,33405.0,22799.0,0.0
+base-simcontrol-temperature-capacitance-multiplier.xml,0.0,50.0,0.0,1286.4,890.5,11468.5,3942.3,2313.9,3775.8,3775.8,2313.9,3775.8,3775.8,33293.0,23058.0,0.0
+base-simcontrol-timestep-10-mins-occupancy-stochastic-10-mins.xml,2.667,104.0,0.0,1286.4,890.5,11485.0,3947.9,10171.4,10426.9,10426.9,10171.4,10426.9,10426.9,36708.0,22718.0,0.0
+base-simcontrol-timestep-10-mins-occupancy-stochastic-60-mins.xml,0.5,104.833,0.0,1286.4,890.5,11469.9,3942.7,8129.9,8899.3,8946.9,8129.9,8899.3,8946.9,36402.0,22705.0,0.0
+base-simcontrol-timestep-10-mins.xml,0.0,87.0,0.0,1286.4,890.5,11468.8,3942.4,4123.4,5760.2,5760.2,4123.4,5760.2,5760.2,33466.0,22762.0,0.0
+base-simcontrol-timestep-30-mins.xml,0.0,80.5,0.0,1286.4,890.5,11468.5,3942.3,2357.6,4225.5,4225.5,2357.6,4225.5,4225.5,33405.0,22799.0,0.0
base-vehicle-ev-charger-level1.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,3908.0,5274.0,5274.0,3908.0,5274.0,5274.0,28164.0,19325.0,0.0
base-vehicle-ev-charger-miles-per-kwh.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,9087.2,9724.0,9724.0,9087.2,9724.0,9724.0,28164.0,19325.0,0.0
base-vehicle-ev-charger-mpge.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,9087.2,9715.7,9715.7,9087.2,9715.7,9715.7,28164.0,19325.0,0.0
@@ -493,29 +494,29 @@ base-vehicle-ev-no-charger.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,2308.0,36
base-vehicle-multiple.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,9087.2,9724.0,9724.0,9087.2,9724.0,9724.0,28164.0,19325.0,0.0
base-zones-spaces-multiple.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,2245.5,3277.9,3277.9,2245.5,3277.9,3277.9,19664.0,13956.0,0.0
base-zones-spaces.xml,0.0,0.0,0.0,1286.4,890.5,11468.5,3942.3,2257.0,3272.4,3272.4,2257.0,3272.4,3272.4,20345.0,14232.0,0.0
-base.xml,0.0,87.0,0.0,1286.4,890.5,11468.5,3942.3,2314.8,3776.5,3776.5,2314.8,3776.5,3776.5,33306.0,23005.0,0.0
+base.xml,0.0,59.0,0.0,1286.4,890.5,11468.5,3942.3,2314.8,3776.5,3776.5,2314.8,3776.5,3776.5,33306.0,23005.0,0.0
house001.xml,0.0,0.0,0.0,1878.8,1670.0,14605.4,4235.6,1979.1,7453.4,7453.4,1979.1,7453.4,7453.4,40458.0,49127.0,0.0
house002.xml,0.0,0.0,0.0,1529.6,1405.7,10049.9,3454.6,1628.3,5577.0,5577.0,1628.3,5577.0,5577.0,24628.0,32845.0,0.0
house003.xml,0.0,0.0,0.0,1529.6,1405.6,10049.9,3454.6,1716.5,6061.4,6061.4,1716.5,6061.4,6061.4,27235.0,38528.0,0.0
-house004.xml,0.0,193.0,0.0,1704.2,1537.8,12327.5,3874.7,3041.1,7723.3,7723.3,3041.1,7723.3,7723.3,54952.0,52956.0,0.0
-house005.xml,0.0,12.0,0.0,1704.2,1537.8,12327.5,3874.7,2246.6,7688.5,7688.5,2246.6,7688.5,7688.5,49066.0,53559.0,0.0
+house004.xml,0.0,154.0,0.0,1704.2,1537.8,12327.5,3874.7,3041.1,7723.3,7723.3,3041.1,7723.3,7723.3,54952.0,52956.0,0.0
+house005.xml,0.0,9.0,0.0,1704.2,1537.8,12327.5,3874.7,2246.6,7688.5,7688.5,2246.6,7688.5,7688.5,49066.0,53559.0,0.0
house006.xml,0.0,0.0,0.0,1529.6,1405.7,12241.8,4208.1,2109.0,3078.1,3078.1,2109.0,3078.1,3078.1,40395.0,16014.0,0.0
house007.xml,0.0,0.0,0.0,1704.2,1537.8,15016.4,4719.9,2348.4,3182.6,3182.6,2348.4,3182.6,3182.6,40269.0,14726.0,0.0
house008.xml,0.0,0.0,0.0,1878.8,1670.0,17791.0,5159.4,2651.7,4211.3,4211.3,2651.7,4211.3,4211.3,55557.0,22972.0,0.0
house009.xml,0.0,0.0,0.0,1704.2,1537.8,15016.4,4719.9,2381.1,3350.9,3350.9,2381.1,3350.9,3350.9,44468.0,16097.0,0.0
house010.xml,0.0,0.0,0.0,1878.8,1670.0,17791.0,5159.4,2562.3,3724.4,3724.4,2562.3,3724.4,3724.4,46426.0,17914.0,0.0
-house011.xml,0.0,28.0,0.0,0.0,1537.8,13055.7,4103.6,5585.9,3996.8,5585.9,5585.9,3996.8,5585.9,18536.0,19653.0,0.0
+house011.xml,0.0,22.0,0.0,0.0,1537.8,13055.7,4103.6,5585.9,3996.8,5585.9,5585.9,3996.8,5585.9,18536.0,19653.0,0.0
house012.xml,0.0,0.0,0.0,0.0,1405.7,10643.5,3658.7,3498.1,2794.4,3498.1,3498.1,2794.4,3498.1,11827.0,11924.0,0.0
house013.xml,0.0,0.0,0.0,1355.0,1273.5,8231.0,3112.1,3138.9,2331.7,3138.9,3138.9,2331.7,3138.9,9888.0,10559.0,0.0
house014.xml,0.0,0.0,0.0,1355.0,1273.5,8230.9,3112.1,3239.4,2418.3,3239.4,3239.4,2418.3,3239.4,11203.0,11493.0,0.0
house015.xml,0.0,0.0,0.0,1355.0,1273.5,8231.0,3112.1,3138.9,2331.7,3138.9,3138.9,2331.7,3138.9,9888.0,10559.0,0.0
house016.xml,0.0,0.0,0.0,1624.1,1476.6,13687.7,4149.5,7587.4,4067.3,7587.4,7587.4,4067.3,7587.4,39251.0,23617.0,0.0
-house017.xml,149.0,93.0,0.0,1947.8,1721.4,18904.8,5135.3,1801.5,3875.1,3875.1,1801.5,3875.1,3875.1,59778.0,19199.0,0.0
+house017.xml,136.0,78.0,0.0,1947.8,1721.4,18904.8,5135.3,1801.5,3875.1,3875.1,1801.5,3875.1,3875.1,59778.0,19199.0,0.0
house018.xml,0.0,0.0,0.0,1300.3,1231.9,8694.5,3125.2,5225.9,2932.0,5225.9,5225.9,2932.0,5225.9,19707.0,11456.0,0.0
-house019.xml,181.0,144.0,0.0,1300.3,1231.9,7524.5,2704.6,2979.0,6516.6,6516.6,2979.0,6516.6,6516.6,95100.0,48271.0,0.0
+house019.xml,172.0,133.0,0.0,1300.3,1231.9,7524.5,2704.6,2979.0,6516.6,6516.6,2979.0,6516.6,6516.6,95100.0,48271.0,0.0
house020.xml,0.0,0.0,0.0,1624.1,1476.6,13692.3,4150.9,2692.3,6745.2,6745.2,2692.3,6745.2,6745.2,32103.0,32380.0,0.0
house021.xml,0.0,0.0,0.0,1624.1,1476.6,13849.9,4198.7,2887.9,4832.8,4832.8,2887.9,4832.8,4832.8,85767.0,23419.0,0.0
-house022.xml,176.0,122.0,0.0,1624.1,1476.6,13849.5,4198.6,3227.4,5908.4,5929.4,3227.4,5908.4,5929.4,97518.0,28462.0,0.0
+house022.xml,88.0,78.0,0.0,1624.1,1476.6,13849.5,4198.6,3227.4,5908.4,5929.4,3227.4,5908.4,5929.4,97518.0,28462.0,0.0
house023.xml,0.0,0.0,0.0,1947.8,1721.4,8085.0,2196.2,4163.4,4888.1,4989.4,4163.4,4888.1,4989.4,67239.0,21351.0,0.0
house024.xml,0.0,0.0,0.0,1947.8,1721.4,15440.8,4194.3,3045.5,3907.8,4119.5,3045.5,3907.8,4119.5,70874.0,18575.0,0.0
house025.xml,0.0,0.0,0.0,1300.3,1231.9,3357.8,1206.9,5189.8,7317.2,7317.2,5189.8,7317.2,7317.2,37381.0,34577.0,0.0
@@ -524,25 +525,25 @@ house027.xml,0.0,0.0,0.0,1529.6,1405.7,10643.7,3658.7,1623.5,4116.5,4116.5,1623.
house028.xml,0.0,0.0,0.0,1704.2,1537.8,13056.0,4103.7,1554.6,3863.7,3863.7,1554.6,3863.7,3863.7,20552.0,23439.0,0.0
house029.xml,0.0,0.0,0.0,1529.6,1405.7,11099.8,3815.5,1695.6,3354.9,3354.9,1695.6,3354.9,3354.9,28567.0,14869.0,0.0
house030.xml,0.0,0.0,0.0,1057.4,979.7,6778.3,2562.9,1160.9,1088.0,1160.9,1160.9,1088.0,1160.9,16227.0,0.0,0.0
-house031.xml,3.0,0.0,0.0,2271.6,1966.1,19123.6,4791.7,3261.2,9148.6,9450.0,3261.2,9148.6,9450.0,123179.0,63325.0,0.0
-house032.xml,168.0,0.0,0.0,1300.3,1231.9,7019.6,2523.1,1546.7,986.8,1546.7,1546.7,986.8,1546.7,53929.0,0.0,0.0
+house031.xml,0.0,0.0,0.0,2271.6,1966.1,19123.6,4791.7,3261.2,9148.6,9450.0,3261.2,9148.6,9450.0,123179.0,63325.0,0.0
+house032.xml,155.0,0.0,0.0,1300.3,1231.9,7019.6,2523.1,1546.7,986.8,1546.7,1546.7,986.8,1546.7,53929.0,0.0,0.0
house033.xml,0.0,0.0,0.0,976.6,0.0,3198.9,1664.5,1120.2,938.3,1120.2,1120.2,938.3,1120.2,47760.0,0.0,0.0
house034.xml,0.0,0.0,0.0,1624.1,1476.6,10360.3,3140.8,2901.6,2415.3,2901.6,2901.6,2415.3,2901.6,111000.0,0.0,0.0
-house035.xml,114.0,0.0,0.0,976.6,987.1,3448.3,1794.3,1451.6,2279.2,2279.2,1451.6,2279.2,2279.2,42069.0,10111.0,0.0
-house036.xml,92.0,120.0,0.0,1300.3,1231.9,6190.7,2225.2,1568.3,3716.4,3716.4,1568.3,3716.4,3716.4,37512.0,20126.0,0.0
+house035.xml,78.0,0.0,0.0,976.6,987.1,3448.3,1794.3,1451.6,2279.2,2279.2,1451.6,2279.2,2279.2,42069.0,10111.0,0.0
+house036.xml,7.0,112.0,0.0,1300.3,1231.9,6190.7,2225.2,1568.3,3716.4,3716.4,1568.3,3716.4,3716.4,37512.0,20126.0,0.0
house037.xml,0.0,0.0,0.0,1300.3,1231.9,7993.2,2873.1,1507.8,1306.7,1507.8,1507.8,1306.7,1507.8,43197.0,0.0,0.0
-house038.xml,0.0,227.0,0.0,1947.8,1721.4,15089.0,4098.8,3478.8,5939.8,5943.9,3478.8,5939.8,5943.9,47399.0,29780.0,0.0
+house038.xml,0.0,206.0,0.0,1947.8,1721.4,15089.0,4098.8,3478.8,5939.8,5943.9,3478.8,5939.8,5943.9,47399.0,29780.0,0.0
house039.xml,0.0,0.0,0.0,1947.8,1721.4,17949.8,4875.9,1808.3,1671.2,1808.3,1808.3,1671.2,1808.3,47919.0,0.0,0.0
house040.xml,0.0,0.0,0.0,1300.3,1231.9,7019.7,2523.2,1912.7,1342.4,1912.7,1912.7,1342.4,1912.7,66701.0,0.0,0.0
-house041.xml,113.0,1.0,0.0,1704.2,1537.8,15016.5,4719.9,3424.6,5561.5,5561.5,3424.6,5561.5,5561.5,78466.0,24626.0,0.0
+house041.xml,100.0,0.0,0.0,1704.2,1537.8,15016.5,4719.9,3424.6,5561.5,5561.5,3424.6,5561.5,5561.5,78466.0,24626.0,0.0
house042.xml,0.0,0.0,0.0,1704.2,1537.8,15016.4,4719.9,2865.9,3920.9,3920.9,2865.9,3920.9,3920.9,88932.0,19044.0,0.0
house043.xml,0.0,0.0,0.0,1529.6,1405.7,12241.8,4208.1,2046.4,3348.3,3348.3,2046.4,3348.3,3348.3,54867.0,14450.0,0.0
house044.xml,0.0,0.0,0.0,1529.6,1405.7,12241.9,4208.1,3139.7,4459.9,4459.9,3139.7,4459.9,4459.9,81915.0,20735.0,0.0
house045.xml,0.0,0.0,0.0,1529.6,1405.7,12241.8,4208.1,2320.1,3555.0,3555.0,2320.1,3555.0,3555.0,47430.0,14834.0,0.0
-house046.xml,0.0,5.0,0.0,684.4,535.3,6807.6,2539.9,4468.6,2454.2,4468.6,4468.6,2454.2,4468.6,16764.0,13944.0,0.0
+house046.xml,0.0,3.0,0.0,684.4,535.3,6807.6,2539.9,4468.6,2454.2,4468.6,4468.6,2454.2,4468.6,16764.0,13944.0,0.0
house047.xml,0.0,0.0,0.0,288.7,535.3,7089.0,1752.8,907.4,1116.5,1116.5,907.4,1116.5,1116.5,4805.0,2741.0,0.0
-house048.xml,0.0,1.0,0.0,119.5,676.3,11711.2,3399.4,1506.7,5229.1,5229.1,1506.7,5229.1,5229.1,43926.0,36466.0,0.0
-house049.xml,0.0,235.0,0.0,723.8,560.1,7461.1,916.8,4267.2,2297.5,4267.2,4267.2,2297.5,4267.2,12018.0,15787.0,0.0
+house048.xml,0.0,0.0,0.0,119.5,676.3,11711.2,3399.4,1506.7,5229.1,5229.1,1506.7,5229.1,5229.1,43926.0,36466.0,0.0
+house049.xml,0.0,194.0,0.0,723.8,560.1,7461.1,916.8,4267.2,2297.5,4267.2,4267.2,2297.5,4267.2,12018.0,15787.0,0.0
house050.xml,0.0,0.0,0.0,1603.7,390.1,10739.6,2938.3,1097.7,3260.8,3260.8,1097.7,3260.8,3260.8,11086.0,20198.0,0.0
-house051.xml,12.0,0.0,0.0,1433.3,974.2,13786.6,3312.4,9930.3,8450.8,9930.3,9930.3,8450.8,9930.3,16813.0,12153.0,0.0
-house052.xml,0.0,0.0,0.0,0.0,0.0,17693.6,1372.5,13617.2,12743.9,13617.2,13617.2,12743.9,13617.2,123243.0,88740.0,0.0
+house051.xml,10.0,0.0,0.0,1433.3,974.2,13786.6,3312.4,9930.3,8450.8,9930.3,9930.3,8450.8,9930.3,16813.0,12153.0,0.0
+house052.xml,0.0,0.0,0.0,0.0,0.0,17693.6,1372.5,13178.0,12419.9,13178.0,13178.0,12419.9,13178.0,123206.0,88743.0,0.0
diff --git a/hpxml-measures/workflow/tests/base_results/results_simulations_panel.csv b/hpxml-measures/workflow/tests/base_results/results_simulations_panel.csv
index a4be760ed6..4a3332b3c7 100644
--- a/hpxml-measures/workflow/tests/base_results/results_simulations_panel.csv
+++ b/hpxml-measures/workflow/tests/base_results/results_simulations_panel.csv
@@ -311,6 +311,7 @@ base-hvac-ground-to-air-heat-pump-2-speed.xml,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.
base-hvac-ground-to-air-heat-pump-backup-integrated.xml,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
base-hvac-ground-to-air-heat-pump-backup-stove.xml,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
base-hvac-ground-to-air-heat-pump-cooling-only.xml,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
+base-hvac-ground-to-air-heat-pump-detailed-geothermal-loop-multiple.xml,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
base-hvac-ground-to-air-heat-pump-detailed-geothermal-loop.xml,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
base-hvac-ground-to-air-heat-pump-heating-only.xml,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
base-hvac-ground-to-air-heat-pump-var-speed-experimental.xml,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
diff --git a/hpxml-measures/workflow/tests/base_results/results_sizing.csv b/hpxml-measures/workflow/tests/base_results/results_sizing.csv
index b3490e38e6..f5bcf1daed 100644
--- a/hpxml-measures/workflow/tests/base_results/results_sizing.csv
+++ b/hpxml-measures/workflow/tests/base_results/results_sizing.csv
@@ -256,6 +256,9 @@ denver-hvac-autosize-ground-to-air-heat-pump-backup-stove-sizing-methodology-Max
denver-hvac-autosize-ground-to-air-heat-pump-cooling-only-sizing-methodology-ACCA.xml,0.0,37068.0,0.0,0.0,1112.0
denver-hvac-autosize-ground-to-air-heat-pump-cooling-only-sizing-methodology-HERS.xml,0.0,37068.0,0.0,0.0,1112.0
denver-hvac-autosize-ground-to-air-heat-pump-cooling-only-sizing-methodology-MaxLoad.xml,0.0,37068.0,0.0,0.0,1112.0
+denver-hvac-autosize-ground-to-air-heat-pump-detailed-geothermal-loop-multiple-sizing-methodology-ACCA.xml,40684.0,40684.0,0.0,1220.0,1220.0
+denver-hvac-autosize-ground-to-air-heat-pump-detailed-geothermal-loop-multiple-sizing-methodology-HERS.xml,40684.0,40684.0,0.0,1220.0,1220.0
+denver-hvac-autosize-ground-to-air-heat-pump-detailed-geothermal-loop-multiple-sizing-methodology-MaxLoad.xml,47830.0,47830.0,0.0,1434.0,1434.0
denver-hvac-autosize-ground-to-air-heat-pump-detailed-geothermal-loop-sizing-methodology-ACCA.xml,40683.0,40683.0,0.0,1221.0,1221.0
denver-hvac-autosize-ground-to-air-heat-pump-detailed-geothermal-loop-sizing-methodology-HERS.xml,40683.0,40683.0,0.0,1221.0,1221.0
denver-hvac-autosize-ground-to-air-heat-pump-detailed-geothermal-loop-sizing-methodology-MaxLoad.xml,47830.0,47830.0,0.0,1435.0,1435.0
@@ -686,6 +689,9 @@ houston-hvac-autosize-ground-to-air-heat-pump-backup-stove-sizing-methodology-Ma
houston-hvac-autosize-ground-to-air-heat-pump-cooling-only-sizing-methodology-ACCA.xml,0.0,43657.0,0.0,0.0,1310.0
houston-hvac-autosize-ground-to-air-heat-pump-cooling-only-sizing-methodology-HERS.xml,0.0,43657.0,0.0,0.0,1310.0
houston-hvac-autosize-ground-to-air-heat-pump-cooling-only-sizing-methodology-MaxLoad.xml,0.0,43657.0,0.0,0.0,1310.0
+houston-hvac-autosize-ground-to-air-heat-pump-detailed-geothermal-loop-multiple-sizing-methodology-ACCA.xml,43656.0,43656.0,0.0,1310.0,1310.0
+houston-hvac-autosize-ground-to-air-heat-pump-detailed-geothermal-loop-multiple-sizing-methodology-HERS.xml,43656.0,43656.0,0.0,1310.0,1310.0
+houston-hvac-autosize-ground-to-air-heat-pump-detailed-geothermal-loop-multiple-sizing-methodology-MaxLoad.xml,43656.0,43656.0,0.0,1310.0,1310.0
houston-hvac-autosize-ground-to-air-heat-pump-detailed-geothermal-loop-sizing-methodology-ACCA.xml,43657.0,43657.0,0.0,1310.0,1310.0
houston-hvac-autosize-ground-to-air-heat-pump-detailed-geothermal-loop-sizing-methodology-HERS.xml,43657.0,43657.0,0.0,1310.0,1310.0
houston-hvac-autosize-ground-to-air-heat-pump-detailed-geothermal-loop-sizing-methodology-MaxLoad.xml,43657.0,43657.0,0.0,1310.0,1310.0
diff --git a/hpxml-measures/workflow/tests/compare.py b/hpxml-measures/workflow/tests/compare.py
index dfe738f7c6..28615393e7 100644
--- a/hpxml-measures/workflow/tests/compare.py
+++ b/hpxml-measures/workflow/tests/compare.py
@@ -85,11 +85,11 @@ def results(self, aggregate_column=None, aggregate_function=None, excludes=[], e
feature_df = group_df.merge(feature_df, 'outer', left_index=True, right_index=True)\
.groupby(aggregate_columns)
if aggregate_function == 'sum':
- base_df = base_df.sum(min_count=1).stack(dropna=False)
- feature_df = feature_df.sum(min_count=1).stack(dropna=False)
+ base_df = base_df.sum(min_count=1).stack()
+ feature_df = feature_df.sum(min_count=1).stack()
elif aggregate_function == 'mean':
- base_df = base_df.mean(numeric_only=True).stack(dropna=False)
- feature_df = feature_df.mean(numeric_only=True).stack(dropna=False)
+ base_df = base_df.mean(numeric_only=True).stack()
+ feature_df = feature_df.mean(numeric_only=True).stack()
else:
if aggregate_function == 'sum':
base_df = base_df.sum(min_count=1)
@@ -112,6 +112,7 @@ def results(self, aggregate_column=None, aggregate_function=None, excludes=[], e
deltas = deltas.round(2)
deltas.reset_index(level=aggregate_columns, inplace=True)
deltas.index.name = 'enduse'
+ deltas[deltas.columns] = deltas[deltas.columns].astype('object')
deltas.fillna('n/a', inplace=True)
sims_df = pd.DataFrame({'base': sim_ct_base,
'feature': sim_ct_feature,
diff --git a/hpxml-measures/workflow/tests/test_simulations1.rb b/hpxml-measures/workflow/tests/test_simulations1.rb
index d3340f9148..bf5ba4a593 100644
--- a/hpxml-measures/workflow/tests/test_simulations1.rb
+++ b/hpxml-measures/workflow/tests/test_simulations1.rb
@@ -18,9 +18,9 @@ def test_simulations1
sample_files_dir = File.absolute_path(File.join(File.dirname(__FILE__), '..', 'sample_files'))
real_homes_dir = File.absolute_path(File.join(File.dirname(__FILE__), '..', 'real_homes'))
- # Run simulations BEFORE base-hvac-mini-split*.xml; the remaining simulations are run using test_simulations2.rb
+ # Run simulations BEFORE base-hvac-install-quality*.xml; the remaining simulations are run using test_simulations2.rb
# This distributes the simulations across two CI jobs for faster turnaround time.
- split_at_file = Dir["#{sample_files_dir}/*.xml"].sort.find_index { |f| f.include? 'base-hvac-mini-split' }
+ split_at_file = Dir["#{sample_files_dir}/*.xml"].sort.find_index { |f| f.include? 'base-hvac-install-quality' }
fail 'Unexpected error.' if split_at_file.nil?
xmls = []
diff --git a/hpxml-measures/workflow/tests/test_simulations2.rb b/hpxml-measures/workflow/tests/test_simulations2.rb
index b3b17fb273..967b30258d 100644
--- a/hpxml-measures/workflow/tests/test_simulations2.rb
+++ b/hpxml-measures/workflow/tests/test_simulations2.rb
@@ -18,9 +18,9 @@ def test_simulations2
sample_files_dir = File.absolute_path(File.join(File.dirname(__FILE__), '..', 'sample_files'))
real_homes_dir = File.absolute_path(File.join(File.dirname(__FILE__), '..', 'real_homes'))
- # Run simulations AFTER base-hvac-mini-split*.xml; the remaining simulations are run using test_simulations1.rb
+ # Run simulations AFTER base-hvac-install-quality*.xml; the remaining simulations are run using test_simulations1.rb
# This distributes the simulations across two CI jobs for faster turnaround time.
- split_at_file = Dir["#{sample_files_dir}/*.xml"].sort.find_index { |f| f.include? 'base-hvac-mini-split' }
+ split_at_file = Dir["#{sample_files_dir}/*.xml"].sort.find_index { |f| f.include? 'base-hvac-install-quality' }
fail 'Unexpected error.' if split_at_file.nil?
xmls = []
diff --git a/hpxml-measures/workflow/tests/util.rb b/hpxml-measures/workflow/tests/util.rb
index cd07c9ce63..2319b94b8d 100644
--- a/hpxml-measures/workflow/tests/util.rb
+++ b/hpxml-measures/workflow/tests/util.rb
@@ -302,8 +302,8 @@ def _verify_outputs(rundir, hpxml_path, results, hpxml, unit_multiplier)
end
# HVAC is undersized or poor install quality or advanced research features
if hpxml_path.include?('base-hvac-undersized.xml') || hpxml_path.include?('install-quality') || hpxml_path.include?('research-features')
- next if message.include?('There are a large number of unmet hours') && message.include?('for heating; this may indicate the heating system is undersized or the presence of large thermostat setbacks.')
- next if message.include?('There are a large number of unmet hours') && message.include?('for cooling; this may indicate the cooling system is undersized or the presence of large thermostat setbacks.')
+ next if message.include?('There are a large number of unmet hours') && message.include?('for heating; this may indicate the heating system is undersized or can be caused by recovery from thermostat setbacks.')
+ next if message.include?('There are a large number of unmet hours') && message.include?('for cooling; this may indicate the cooling system is undersized or can be caused by recovery from thermostat setbacks.')
end
# FUTURE: Revert this eventually
@@ -414,6 +414,7 @@ def _verify_outputs(rundir, hpxml_path, results, hpxml, unit_multiplier)
# GSHPs with hard-sized capacities
if hpxml_path.include? 'house052.xml'
next if message.include? 'heating capacity is disproportionate (> 20% different) to total cooling capacity' # safe to ignore
+ next if message.include? 'SimHVAC: Maximum iterations (20) exceeded for all HVAC loops'
end
# Solar thermal systems
if hpxml.buildings.any? { |hpxml_bldg| hpxml_bldg.solar_thermal_systems.size > 0 }
diff --git a/rulesets/resources/301ruleset.rb b/rulesets/resources/301ruleset.rb
index 130dd34a64..5ef0fd3eef 100644
--- a/rulesets/resources/301ruleset.rb
+++ b/rulesets/resources/301ruleset.rb
@@ -1339,7 +1339,7 @@ def self.set_systems_hvac_rated(orig_bldg, new_bldg)
backup_type = HPXML::HeatPumpBackupTypeIntegrated
backup_heating_fuel = HPXML::FuelTypeElectricity
backup_heating_efficiency_percent = 1.0
- backup_heating_capacity = 1 # Non-zero value will allow backup heating capacity to be increased as needed
+ backup_heating_capacity = 1000 # Capacity will be increased as needed
end
if [HPXML::HVACTypeHeatPumpAirToAir,
HPXML::HVACTypeHeatPumpMiniSplit].include? orig_heat_pump.heat_pump_type
diff --git a/tasks.rb b/tasks.rb
index 59d95de027..a4756fb16f 100644
--- a/tasks.rb
+++ b/tasks.rb
@@ -3088,6 +3088,9 @@ def display_usage(command_list)
if ENV['CI']
# CI doesn't have git, so default to everything
git_files = Dir['**/*.*']
+ git_files -= Dir['workflow/tests/run*/*.*']
+ git_files -= Dir['workflow/tests/test_results/*.*']
+ git_files -= Dir['workflow/tests/test_files/**/*.*']
else
# Only include files under git version control
command = 'git ls-files'
@@ -3114,30 +3117,7 @@ def display_usage(command_list)
'workflow/sample_files/*.*',
'workflow/tests/*.rb',
'workflow/tests/**/*.csv',
- 'workflow/tests/**/*.xml',
- 'documentation/index.html',
- 'documentation/_static/**/*.*']
-
- if not ENV['CI']
- # Generate documentation
- puts 'Generating documentation...'
- command = 'sphinx-build -b singlehtml docs/source documentation'
- begin
- `#{command}`
- if not File.exist? File.join(File.dirname(__FILE__), 'documentation', 'index.html')
- puts 'Documentation was not successfully generated. Aborting...'
- exit!
- end
- rescue
- puts "Command failed: '#{command}'. Perhaps sphinx needs to be installed?"
- exit!
- end
-
- fonts_dir = File.join(File.dirname(__FILE__), 'documentation', '_static', 'fonts')
- if Dir.exist? fonts_dir
- FileUtils.rm_r(fonts_dir)
- end
- end
+ 'workflow/tests/**/*.xml']
# Create zip files
require 'zip'
@@ -3147,23 +3127,14 @@ def display_usage(command_list)
Zip::File.open(zip_path, create: true) do |zipfile|
files.each do |f|
Dir[f].each do |file|
- if file.start_with? 'documentation'
- # always include
- else
- if not git_files.include? file
- next
- end
+ if not git_files.include? file
+ next
end
+
zipfile.add(File.join('OpenStudio-ERI', file), file)
end
end
- puts "Wrote file at #{zip_path}."
end
-
- # Cleanup
- if not ENV['CI']
- FileUtils.rm_r(File.join(File.dirname(__FILE__), 'documentation'))
- end
-
+ puts "Wrote file at #{zip_path}."
puts 'Done.'
end
diff --git a/workflow/real_homes/house004.xml b/workflow/real_homes/house004.xml
index 7274572d82..00c1987996 100644
--- a/workflow/real_homes/house004.xml
+++ b/workflow/real_homes/house004.xml
@@ -208,7 +208,7 @@
basement - unconditioned
7.6
981.9
- 0.7
+ 8.0
5.1
diff --git a/workflow/real_homes/house006.xml b/workflow/real_homes/house006.xml
index 8d83cfb378..1e105d5000 100644
--- a/workflow/real_homes/house006.xml
+++ b/workflow/real_homes/house006.xml
@@ -450,9 +450,9 @@
false
air-to-air
electricity
- -1.0
- -1.0
- -1.0
+ 24000.0
+ 13000.0
+ 24000.0
single stage
integrated
electricity
@@ -460,7 +460,7 @@
Percent
1.0
- -1.0
+ 17061.0
0.5
0.5
@@ -487,9 +487,9 @@
false
air-to-air
electricity
- -1.0
- -1.0
- -1.0
+ 24000.0
+ 13000.0
+ 24000.0
single stage
integrated
electricity
@@ -497,7 +497,7 @@
Percent
1.0
- -1.0
+ 17061.0
0.5
0.5
diff --git a/workflow/real_homes/house010.xml b/workflow/real_homes/house010.xml
index f2654b1bda..0a80bf48d9 100644
--- a/workflow/real_homes/house010.xml
+++ b/workflow/real_homes/house010.xml
@@ -1028,7 +1028,7 @@
fixed
135
20.0
- 1.0
+ 1000.0
0.14
diff --git a/workflow/real_homes/house036.xml b/workflow/real_homes/house036.xml
index 06d646bffb..39d0208f05 100644
--- a/workflow/real_homes/house036.xml
+++ b/workflow/real_homes/house036.xml
@@ -519,7 +519,7 @@
fixed
180
22.0
- 8.0
+ 8000.0
0.14
diff --git a/workflow/tests/base_results/real_homes.csv b/workflow/tests/base_results/real_homes.csv
index 9b52c7b86a..abf28d7708 100644
--- a/workflow/tests/base_results/real_homes.csv
+++ b/workflow/tests/base_results/real_homes.csv
@@ -2,13 +2,13 @@ XML,ERI,Total Loads TRL,Total Loads TnML,Total Loads TRL*IAF,IAD_Save (%),IAF CF
house001.xml,62.7,33.849,22.6298,36.0912,0.21295,1.0792,0.9706,1.0179,1.0662,1.0,20.2972,0.0,0.0,9.427,2.328,7.786,15.019,1.442,14.152,13.927,0.381,0.0,0.805,0.424,0.902,1.282,0.263,1.639,5.554,1.269,4.911,0.0,0.0,8.849,0.786,8.925,9.757,0.786,11.376,10.111,0.785,0.0,1.042,0.213,1.429,1.0943,0.403,3.809,0.0,1.1877,1.013,65.96,6008.02,8542.55,1.0662,49.66,1.0,49.66,62.57,62.57,0.0,45.14,1.0,45.14,62.57,62.57,0.0,62.57,32.213,21.4943,34.3499,0.21324,1.0794,0.9706,1.0179,1.0663,1.0,19.4434,0.0,0.0,9.457,2.312,6.487,15.067,1.434,12.475,13.576,0.381,0.0,0.805,0.423,0.852,1.282,0.263,1.639,5.568,1.262,4.004,0.0,0.0,8.872,0.783,7.701,9.782,0.783,9.815,9.874,0.785,0.0,1.042,0.213,1.429,1.0943,0.403,3.809,0.0,1.1877,1.013
house002.xml,68.71,117.363,79.2943,115.4032,0.18553,0.9833,1.0,1.0,0.9833,1.0,71.725,0.0,0.0,52.277,23.886,9.396,46.631,13.374,10.713,30.615,1.189,0.0,0.497,0.469,0.953,0.443,0.263,1.087,33.4,11.756,8.49,0.0,0.0,29.793,6.582,9.68,29.815,6.582,9.68,23.807,1.842,0.0,0.401,0.235,1.087,2.2561,0.0,3.809,0.0,0.92,0.0,69.88,13141.55,19125.19,0.9833,52.35,1.0,52.35,68.71,68.71,0.0,51.68,1.0,51.68,68.71,68.71,0.0,68.71,117.686,79.516,115.7273,0.18492,0.9834,1.0,1.0,0.9834,1.0,71.94,0.0,0.0,52.263,23.897,9.53,46.62,13.38,10.848,30.807,1.189,0.0,0.497,0.469,0.955,0.443,0.263,1.087,33.39,11.761,8.559,0.0,0.0,29.785,6.585,9.743,29.807,6.585,9.743,23.964,1.842,0.0,0.401,0.235,1.087,2.2561,0.0,3.809,0.0,0.92,0.0
house003.xml,62.49,90.874,56.3549,90.1777,0.24965,0.9923,1.0,1.0,0.9923,1.0,45.5046,0.0,0.0,27.810000000000002,24.557,8.692,38.797,13.781,15.86,28.813,1.002,0.0,1.431,0.468,0.929,1.725,0.263,1.695,18.611,12.762,1.961,0.0,0.0,24.415,7.162,3.578,26.009999999999998,7.162,7.205,21.843,1.177,0.0,1.488,0.244,1.132,3.3504,0.403,3.809,0.0,1.1877,1.013,77.92,10313.1,13336.97,0.9923,50.26,1.0,50.26,62.4,62.4,0.0,50.33,1.0,50.33,62.4,62.4,0.0,62.4,91.194,56.468,90.498,0.24867,0.9924,1.0,1.0,0.9924,1.0,45.6132,0.0,0.0,27.798,24.57,8.819,38.783,13.788,16.026,29.005,1.002,0.0,1.431,0.468,0.933,1.725,0.263,1.695,18.605,12.77,1.978,0.0,0.0,24.409,7.166,3.595,26.003,7.166,7.238,21.938,1.177,0.0,1.488,0.244,1.132,3.3504,0.403,3.809,0.0,1.1877,1.013
-house004.xml,59.92,90.437,56.5764,94.4153,0.31777,1.044,1.0,1.0,1.044,1.0,56.3072,0.0,0.0,50.767,3.147,12.907,54.364,1.616,14.535,21.969,1.647,0.0,0.414,0.511,0.955,0.443,0.263,1.075,32.281,0.744,4.685,0.0,0.0,34.568,0.382,5.276,34.594,0.382,5.333,15.764,3.103,0.0,0.401,0.244,0.5,2.2561,0.0,3.809,0.0,0.92,0.0,64.77,5302.33,7841.04,1.044,51.69,1.0,51.69,59.9,59.9,0.0,50.95,1.0,50.95,59.9,59.9,0.0,59.9,90.801,56.7756,94.782,0.31674,1.0438,1.0,1.0,1.0438,1.0,56.4612,0.0,0.0,50.746,3.153,13.078,54.345,1.618,14.706,22.177,1.647,0.0,0.414,0.512,0.956,0.443,0.263,1.075,32.308,0.739,4.758,0.0,0.0,34.599,0.379,5.351,34.625,0.379,5.409,15.868,3.103,0.0,0.401,0.244,0.5,2.2561,0.0,3.809,0.0,0.92,0.0
+house004.xml,59.82,90.235,56.3543,94.2044,0.31777,1.044,1.0,1.0,1.044,1.0,56.1142,0.0,0.0,50.609,3.103,12.907,54.226,1.595,14.527,21.969,1.647,0.0,0.413,0.511,0.955,0.443,0.263,1.075,32.106,0.695,4.687,0.0,0.0,34.401,0.357,5.276,34.427,0.357,5.333,15.763,3.103,0.0,0.401,0.244,0.5,2.2561,0.0,3.809,0.0,0.92,0.0,64.69,5283.82,7823.92,1.044,51.66,1.0,51.66,59.8,59.8,0.0,50.94,1.0,50.94,59.8,59.8,0.0,59.8,90.597,56.5547,94.5691,0.31674,1.0438,1.0,1.0,1.0438,1.0,56.2702,0.0,0.0,50.587,3.108,13.078,54.206,1.598,14.698,22.177,1.647,0.0,0.413,0.511,0.957,0.443,0.263,1.075,32.132,0.69,4.762,0.0,0.0,34.431,0.355,5.352,34.457,0.355,5.41,15.867,3.103,0.0,0.401,0.244,0.5,2.2561,0.0,3.809,0.0,0.92,0.0
house005.xml,58.46,29.837,18.8246,32.2035,0.20673,1.0921,0.9715,1.0173,1.0793,1.0,17.344,0.0,0.0,3.981,5.116,6.94,3.937,2.725,13.584,13.083,0.717,0.0,0.448,0.493,0.866,0.443,0.263,1.695,1.356,3.085,1.129,2.38,0.037,1.341,1.643,2.211,1.342,1.643,4.906,9.045,1.793,0.0,0.303,0.313,1.099,2.2561,0.0,3.809,0.0,1.1877,1.013,81.86,2854.12,3230.22,1.0793,48.4,1.0,48.4,59.99,59.99,0.0,46.08,1.0,46.08,59.99,59.99,0.0,59.99,28.331,18.3474,30.5836,0.20723,1.0923,0.9714,1.0174,1.0795,1.0,16.7782,0.0,0.0,3.989,5.109,5.783,3.942,2.72,12.085,12.733,0.717,0.0,0.448,0.493,0.811,0.443,0.263,1.695,1.359,3.082,0.874,2.381,0.037,1.343,1.641,1.826,1.344,1.641,4.053,8.822,1.793,0.0,0.303,0.313,1.099,2.2561,0.0,3.809,0.0,1.1877,1.013
-house006.xml,70.85,93.517,67.5091,95.286,0.24121,1.0022,1.0166,1.0,1.0189,1.0,58.63,0.0,0.0,32.13,23.052,10.29,25.765,13.23,11.864,27.14,0.907,0.0,1.104,0.915,0.953,0.886,0.526,1.099,21.978,13.747,9.378,0.0,0.0,17.624000000000002,7.89,10.813,17.637999999999998,7.89,10.695,20.947,1.459,0.0,0.832,0.47,1.087,4.5122,0.0,7.618,0.0,0.92,0.0,72.58,10501.54,14199.69,1.0189,47.27,1.0,47.27,70.83,70.83,0.0,46.05,1.0,46.05,70.83,70.83,0.0,70.83,94.121,67.9261,95.8946,0.24028,1.0022,1.0166,1.0,1.0188,1.0,59.027,0.0,0.0,32.106,23.076,10.531,25.747,13.244,12.106,27.502,0.907,0.0,1.104,0.915,0.956,0.886,0.526,1.099,21.963,13.765,9.514,0.0,0.0,17.613,7.9,10.937,17.627000000000002,7.9,10.818,21.225,1.459,0.0,0.832,0.47,1.087,4.5122,0.0,7.618,0.0,0.92,0.0
+house006.xml,69.62,93.517,66.3344,95.286,0.24121,1.0022,1.0166,1.0,1.0189,1.0,57.686,0.0,0.0,32.13,23.052,10.29,25.765,13.23,11.864,27.14,0.907,0.0,1.104,0.915,0.953,0.886,0.526,1.099,20.814999999999998,13.735,9.378,0.0,0.0,16.692999999999998,7.883,10.813,16.705,7.883,10.695,20.947,1.459,0.0,0.832,0.47,1.087,4.5122,0.0,7.618,0.0,0.92,0.0,71.24,10306.55,14199.69,1.0189,47.27,1.0,47.27,69.61,69.61,0.0,46.05,1.0,46.05,69.61,69.61,0.0,69.61,94.121,66.7489,95.8946,0.24028,1.0022,1.0166,1.0,1.0188,1.0,58.084,0.0,0.0,32.106,23.076,10.531,25.747,13.244,12.106,27.502,0.907,0.0,1.104,0.915,0.956,0.886,0.526,1.099,20.798000000000002,13.753,9.514,0.0,0.0,16.68,7.893000000000001,10.937,16.692,7.893000000000001,10.818,21.225,1.459,0.0,0.832,0.47,1.087,4.5122,0.0,7.618,0.0,0.92,0.0
house007.xml,85.31,48.181,43.3752,50.8457,0.22864,1.052,0.9842,1.0192,1.0553,1.0,43.862,0.0,0.0,15.696,5.265,9.657,15.716,2.908,10.983,17.153,0.41,0.0,0.442,0.475,0.956,0.443,0.263,1.087,17.227,1.544,8.341,0.0,0.0,17.249,0.853,9.486,17.262,0.853,9.486,14.918,1.345,0.0,0.502,0.103,1.099,2.2561,0.0,3.809,0.0,0.92,0.0,87.88,10757.17,11599.3,1.0553,53.03,1.0,53.03,85.34,85.34,0.0,49.41,1.0,49.41,85.34,85.34,0.0,85.34,47.247,42.5542,49.8667,0.22921,1.0522,0.9842,1.0192,1.0554,1.0,43.042,0.0,0.0,15.705,5.26,8.841,15.722,2.905,10.168,17.031,0.41,0.0,0.442,0.475,0.945,0.443,0.263,1.087,17.237,1.543,7.647,0.0,0.0,17.256,0.852,8.795,17.269,0.852,8.795,14.782,1.345,0.0,0.502,0.103,1.099,2.2561,0.0,3.809,0.0,0.92,0.0
house008.xml,61.96,163.21,98.2583,158.5901,0.20539,0.9677,1.0142,0.9901,0.9717,1.0,79.4576,0.0,0.0,98.699,12.285,12.927,157.195,7.357,21.866,38.074,1.225,0.0,0.805,0.438,1.019,1.282,0.263,1.724,47.522,5.893,7.519,0.0,0.0,75.687,3.529,12.718,83.547,3.529,14.492,36.996,0.329,0.0,1.04,0.228,1.493,1.0943,0.403,3.809,0.0,1.1877,1.013,68.29,24427.19,36810.41,0.9717,50.21,1.0,50.21,61.97,61.97,0.0,46.12,1.0,46.12,61.97,61.97,0.0,61.97,163.834,98.6632,159.2142,0.20459,0.9679,1.0141,0.9901,0.9718,1.0,79.7906,0.0,0.0,98.664,12.297,13.212,157.139,7.363,22.236,38.436,1.225,0.0,0.805,0.438,1.024,1.282,0.263,1.724,47.508,5.897,7.712,0.0,0.0,75.664,3.531,12.98,83.522,3.531,14.791,37.217,0.329,0.0,1.04,0.228,1.493,1.0943,0.403,3.809,0.0,1.1877,1.013
house009.xml,65.97,102.192,69.1203,104.7813,0.29637,1.0048,1.0204,1.0,1.0253,1.0,49.9964,0.0,0.0,19.836,45.23,8.758,31.639,25.856,16.054,27.488,0.88,0.0,0.804,0.459,0.941,1.282,0.263,1.724,11.083,28.288,6.21,0.0,0.0,17.677,16.171,11.384,17.863,16.171,12.241,22.906,0.633,0.0,1.25,0.213,1.563,1.0943,0.403,3.809,0.0,1.1877,1.013,87.4,10523.98,11743.27,1.0253,48.47,1.0,48.47,65.97,65.97,0.0,47.59,1.0,47.59,65.97,65.97,0.0,65.97,102.784,69.517,105.3793,0.29534,1.0048,1.0204,1.0,1.0253,1.0,50.3328,0.0,0.0,19.82,45.26,8.974,31.614,25.874,16.335,27.85,0.88,0.0,0.804,0.459,0.947,1.282,0.263,1.724,11.07,28.314,6.294,0.0,0.0,17.657,16.186,11.456,17.842,16.186,12.319,23.207,0.633,0.0,1.25,0.213,1.563,1.0943,0.403,3.809,0.0,1.1877,1.013
-house010.xml,63.5,266.9336,153.0114,240.9493,0.2921,0.9027,1.0,1.0,0.9027,0.9999,106.1804,0.006,0.0,51.467,149.619,6.992,82.06099999999999,79.961,13.392,58.857,0.0,0.0,2.4130000000000003,1.474,1.77,3.846,0.789,3.39,24.299,81.749,1.736,0.0,0.0,38.743,43.689,3.326,42.236999999999995,43.689,6.114,42.837,2.391,0.0,3.192,0.639,2.338,3.2829,1.209,11.427,0.0,2.3754,2.026,93.51,17451.48,20674.85,0.9027,52.91,1.0,52.91,63.47,63.47,0.0,49.6,1.0,49.6,63.47,63.47,0.0,63.47,267.2566,153.1788,241.3247,0.29111,0.903,1.0,1.0,0.903,0.9999,106.284,0.006,0.0,51.457,149.635,7.1,82.04599999999999,79.969,13.534,59.065,0.0,0.0,2.4130000000000003,1.474,1.778,3.846,0.789,3.39,24.294,81.756,1.75,0.0,0.0,38.735,43.693,3.338,42.229,43.693,6.134,42.987,2.391,0.0,3.192,0.639,2.338,3.2829,1.209,11.427,0.0,2.3754,2.026
+house010.xml,60.19,266.9336,153.0114,240.9493,0.2921,0.9027,1.0,1.0,0.9027,0.9479,106.1804,5.537,0.0,51.467,149.619,6.992,82.06099999999999,79.961,13.392,58.857,0.0,0.0,2.4130000000000003,1.474,1.77,3.846,0.789,3.39,24.299,81.749,1.736,0.0,0.0,38.743,43.689,3.326,42.236999999999995,43.689,6.114,42.837,2.391,0.0,3.192,0.639,2.338,3.2829,1.209,11.427,0.0,2.3754,2.026,90.78,16940.71,20674.85,0.9027,52.91,1.0,52.91,63.47,63.47,0.0,49.6,1.0,49.6,63.47,63.47,0.0,60.17,267.2566,153.1788,241.3247,0.29111,0.903,1.0,1.0,0.903,0.9479,106.284,5.537,0.0,51.457,149.635,7.1,82.04599999999999,79.969,13.534,59.065,0.0,0.0,2.4130000000000003,1.474,1.778,3.846,0.789,3.39,24.294,81.756,1.75,0.0,0.0,38.735,43.693,3.338,42.229,43.693,6.134,42.987,2.391,0.0,3.192,0.639,2.338,3.2829,1.209,11.427,0.0,2.3754,2.026
house011.xml,61.22,42.017,27.475,44.8815,0.26598,1.0643,0.9816,1.0224,1.0682,1.0,26.4498,0.0,0.0,8.627,7.318,8.602,13.756,4.131,9.91,16.9,0.57,0.0,0.804,0.465,0.943,1.282,0.263,1.087,4.038,2.652,7.956,0.0,0.0,6.438,1.497,9.166,7.099,1.497,9.166,12.662,0.167,0.0,1.042,0.213,1.075,1.0943,0.403,3.809,0.0,0.92,0.0,76.98,3615.56,4397.02,1.0682,49.34,1.0,49.34,60.63,60.63,0.0,51.66,1.0,51.66,60.63,60.63,0.0,60.63,41.173,26.6686,43.9866,0.26659,1.0645,0.9816,1.0224,1.0683,1.0,25.64,0.0,0.0,8.635,7.312,7.878,13.767,4.129,9.186,16.778,0.57,0.0,0.804,0.465,0.932,1.282,0.263,1.087,4.043,2.648,7.26,0.0,0.0,6.447,1.495,8.465,7.108,1.495,8.465,12.551,0.167,0.0,1.042,0.213,1.075,1.0943,0.403,3.809,0.0,0.92,0.0
house012.xml,58.56,70.837,43.3962,74.1113,0.31625,1.0462,1.0,1.0,1.0462,1.0,43.514,0.0,0.0,35.122,3.182,11.468,34.683,1.806,12.821,19.803,1.262,0.0,0.449,0.463,0.972,0.443,0.263,1.087,16.04,1.938,9.709,0.0,0.0,15.839,1.1,10.854,15.851,1.1,10.854,14.425,1.285,0.0,0.502,0.341,1.075,2.2561,0.0,3.809,0.0,0.92,0.0,58.15,6703.39,11018.18,1.0462,47.45,1.0,47.45,58.62,58.62,0.0,46.6,1.0,46.6,58.62,58.62,0.0,58.62,71.172,43.6416,74.4493,0.31508,1.046,1.0,1.0,1.046,1.0,43.758,0.0,0.0,35.103,3.188,11.624,34.668,1.81,12.976,19.995,1.262,0.0,0.448,0.462,0.974,0.443,0.263,1.087,16.03,1.943,9.834,0.0,0.0,15.831,1.103,10.978,15.843,1.103,10.978,14.55,1.285,0.0,0.502,0.341,1.075,2.2561,0.0,3.809,0.0,0.92,0.0
house013.xml,59.51,43.27,27.1698,45.6561,0.17077,1.0403,1.0,1.0143,1.0551,1.0,24.756,0.0,0.0,11.931,2.254,10.206,8.66,1.09,11.922,18.267,0.612,0.0,0.61,0.543,0.951,0.443,0.263,1.111,9.543,0.432,2.967,0.0,0.0,6.927,0.209,3.465,6.932,0.209,3.39,13.572,0.656,0.0,0.359,0.228,0.357,2.2561,0.0,3.809,0.0,0.92,0.0,58.07,1706.54,2785.06,1.0551,54.27,1.0,54.27,59.45,59.45,0.0,49.18,1.0,49.18,59.45,59.45,0.0,59.45,43.594,27.3361,45.9853,0.16989,1.0401,1.0,1.0142,1.0549,1.0,24.921,0.0,0.0,11.915,2.259,10.349,8.648,1.093,12.063,18.459,0.612,0.0,0.61,0.543,0.953,0.443,0.263,1.111,9.53,0.434,2.984,0.0,0.0,6.917,0.21,3.479,6.922,0.21,3.403,13.732,0.656,0.0,0.359,0.228,0.357,2.2561,0.0,3.809,0.0,0.92,0.0
@@ -34,7 +34,7 @@ house032.xml,74.03,130.041,98.1325,132.549,0.279,0.9771,1.0193,1.0235,1.0193,1.0
house033.xml,66.25,154.081,98.8294,149.1802,0.23284,0.9529,1.0161,1.0,0.9682,1.0,80.7376,0.0,0.0,69.666,31.651000000000003,11.126,111.00399999999999,18.122999999999998,19.058,41.638,0.0,0.0,1.61,0.917,0.989,2.564,0.526,1.695,52.087999999999994,12.472999999999999,3.342,0.0,0.0,82.995,7.1419999999999995,5.725,91.77199999999999,7.1419999999999995,10.523,30.926,0.0,0.0,2.072,0.441,1.169,2.1886,0.806,7.618,0.0,1.1877,1.013,89.78,21994.16,25302.66,0.9682,49.42,1.0,49.42,66.28,66.28,0.0,49.46,1.0,49.46,66.28,66.28,0.0,66.28,154.692,99.2736,149.7882,0.23205,0.953,1.016,1.0,0.9683,1.0,81.1768,0.0,0.0,69.639,31.671999999999997,11.381,110.96000000000001,18.135,19.388,42.0,0.0,0.0,1.61,0.917,0.995,2.564,0.526,1.695,52.068,12.483999999999998,3.407,0.0,0.0,82.964,7.148,5.804,91.737,7.148,10.669,31.314,0.0,0.0,2.072,0.441,1.169,2.1886,0.806,7.618,0.0,1.1877,1.013
house034.xml,62.85,60.156,38.9456,61.9621,0.1963,1.0133,1.0,1.0165,1.03,1.0,33.1174,0.0,0.0,18.356,5.593,9.834,29.263,3.183,17.471,24.346,2.027,0.0,0.804,0.461,0.954,1.282,0.263,1.695,9.199,3.437,4.347,0.0,0.0,14.664,1.956,7.723,16.169,1.956,10.759,19.733,2.23,0.0,1.042,0.244,1.326,1.0943,0.403,3.809,0.0,1.1877,1.013,153.52,5750.02,3636.38,1.03,55.25,1.0,55.25,63.02,63.02,0.0,50.91,1.0,50.91,63.02,63.02,0.0,63.02,60.479,39.2501,62.2858,0.19534,1.0133,1.0,1.0164,1.0299,1.0,33.4048,0.0,0.0,18.341,5.6,9.973,29.237,3.186,17.65,24.538,2.027,0.0,0.804,0.461,0.958,1.282,0.263,1.695,9.186,3.443,4.398,0.0,0.0,14.643,1.959,7.784,16.145,1.959,10.844,19.993,2.23,0.0,1.042,0.244,1.326,1.0943,0.403,3.809,0.0,1.1877,1.013
house035.xml,70.07,104.46,72.916,104.0544,0.19796,0.9798,1.0,1.0166,0.9961,1.0,61.5126,0.0,0.0,52.485,7.905,10.91,83.592,4.856,12.619,32.114,1.046,0.0,0.805,0.427,0.961,1.282,0.263,1.111,40.143,3.337,9.031,0.0,0.0,63.936,2.05,10.446,69.311,2.05,10.219,19.89,0.514,0.0,1.075,0.263,1.099,1.0943,0.403,3.809,0.0,0.92,0.0,75.79,18415.51,24394.1,0.9961,54.93,1.0,54.93,70.0,70.0,0.0,48.8,1.0,48.8,70.0,70.0,0.0,70.0,104.791,73.0669,104.3856,0.19724,0.9799,1.0,1.0165,0.9961,1.0,61.6624,0.0,0.0,52.467,7.912,11.06,83.563,4.86,12.769,32.306,1.046,0.0,0.805,0.427,0.962,1.282,0.263,1.111,40.139,3.337,9.144,0.0,0.0,63.928,2.05,10.558,69.303,2.05,10.328,19.932,0.514,0.0,1.075,0.263,1.099,1.0943,0.403,3.809,0.0,0.92,0.0
-house036.xml,75.75,115.859,86.022,113.5131,0.19118,0.9772,0.9868,1.016,0.9798,0.9995,72.7778,0.035,0.0,61.952,10.44,8.639,98.683,6.243,15.922,33.597,1.231,0.0,0.805,0.439,0.92,1.282,0.263,1.695,34.497,6.925,2.374,0.0,0.0,54.95,4.141,4.375,60.416,4.141,9.099,27.748,14.478,0.0,1.047,0.244,1.121,1.0943,0.403,3.809,0.0,1.1877,1.013,80.59,20736.61,26263.02,0.9798,54.24,1.0,54.24,75.77,75.77,0.0,49.03,1.0,49.03,75.77,75.77,0.0,75.73,115.892,86.04,113.5541,0.19046,0.9773,0.9869,1.016,0.9798,0.9995,72.7924,0.035,0.0,61.95,10.441,8.651,98.68,6.243,15.939,33.619,1.231,0.0,0.805,0.439,0.92,1.282,0.263,1.695,34.495,6.926,2.378,0.0,0.0,54.948,4.141,4.381,60.413,4.141,9.112,27.763,14.478,0.0,1.047,0.244,1.121,1.0943,0.403,3.809,0.0,1.1877,1.013
+house036.xml,39.28,115.859,86.022,113.5131,0.19118,0.9772,0.9868,1.016,0.9798,0.5183,72.7778,35.059,0.0,61.952,10.44,8.639,98.683,6.243,15.922,33.597,1.231,0.0,0.805,0.439,0.92,1.282,0.263,1.695,34.497,6.925,2.374,0.0,0.0,54.95,4.141,4.375,60.416,4.141,9.099,27.748,14.478,0.0,1.047,0.244,1.121,1.0943,0.403,3.809,0.0,1.1877,1.013,59.13,15214.29,26263.02,0.9798,54.24,1.0,54.24,75.77,75.77,0.0,49.03,1.0,49.03,75.77,75.77,0.0,39.28,115.892,86.04,113.5541,0.19046,0.9773,0.9869,1.016,0.9798,0.5184,72.7924,35.059,0.0,61.95,10.441,8.651,98.68,6.243,15.939,33.619,1.231,0.0,0.805,0.439,0.92,1.282,0.263,1.695,34.495,6.926,2.378,0.0,0.0,54.948,4.141,4.381,60.413,4.141,9.112,27.763,14.478,0.0,1.047,0.244,1.121,1.0943,0.403,3.809,0.0,1.1877,1.013
house037.xml,67.2,113.682,77.2455,114.9403,0.19872,0.9974,1.0137,1.0,1.0111,1.0,64.9272,0.0,0.0,64.997,7.964,12.927,103.52,4.935,14.647,26.963,0.831,0.0,0.805,0.424,0.981,1.282,0.263,1.111,41.25,4.725,10.056,0.0,0.0,65.698,2.928,11.394,71.221,2.928,11.146,20.804,0.411,0.0,1.075,0.263,1.099,1.0943,0.403,3.809,0.0,0.92,0.0,73.3,19335.4,26090.21,1.0111,52.66,1.0,52.66,67.18,67.18,0.0,47.52,1.0,47.52,67.18,67.18,0.0,67.18,114.308,77.6446,115.5686,0.19799,0.9974,1.0137,1.0,1.011,1.0,65.3158,0.0,0.0,64.963,7.977,13.212,103.464,4.942,14.932,27.325,0.831,0.0,0.805,0.424,0.983,1.282,0.263,1.111,41.232,4.733,10.221,0.0,0.0,65.669,2.932,11.551,71.19,2.932,11.3,21.048,0.411,0.0,1.075,0.263,1.099,1.0943,0.403,3.809,0.0,0.92,0.0
house038.xml,65.15,134.448,85.0723,130.5772,0.27969,0.9528,1.0193,1.0,0.9712,1.0,65.3906,0.0,0.0,39.272999999999996,44.980000000000004,9.683,41.247,24.834,17.233,39.235,1.276,0.0,2.2470000000000003,0.951,0.952,2.168,0.526,1.695,28.256999999999998,23.671,4.92,0.0,0.0,30.102999999999998,13.068999999999999,8.756,30.287,13.068999999999999,11.936,27.312,0.912,0.0,2.082,0.488,1.342,5.6065000000000005,0.403,7.618,0.0,1.1877,1.013,74.84,14950.75,20569.37,0.9712,48.92,1.0,48.92,65.14,65.14,0.0,48.29,1.0,48.29,65.14,65.14,0.0,65.14,135.048,85.4475,131.1739,0.27868,0.953,1.0192,1.0,0.9713,1.0,65.7296,0.0,0.0,39.254,45.006,9.915,41.231,24.849,17.534,39.597,1.276,0.0,2.247,0.951,0.958,2.168,0.526,1.695,28.247,23.679000000000002,5.075,0.0,0.0,30.094,13.074,8.975,30.278,13.074,12.235,27.533,0.912,0.0,2.082,0.488,1.342,5.6065000000000005,0.403,7.618,0.0,1.1877,1.013
house039.xml,58.72,160.4,155.3379,159.9152,0.11097,0.9746,1.023,1.0,0.997,0.6045,112.0718,44.32,0.0,72.755,25.205000000000002,15.968,115.937,13.764,27.771,46.473,0.0,0.0,2.414,1.442,1.085,3.846,0.789,1.887,92.07,12.339,15.402,0.0,0.0,146.71800000000002,6.7379999999999995,26.786,150.44799999999998,6.7379999999999995,24.481,35.527,0.0,0.0,3.542,0.895,1.667,3.2829,1.209,11.427,0.0,1.1877,1.013,213.51,26292.11,12351.34,0.997,51.78,1.0,51.78,96.9,96.9,0.0,48.29,1.0,48.29,96.9,96.9,0.0,58.78,161.602,156.1211,161.1176,0.11012,0.9748,1.0228,1.0,0.997,0.6066,112.6538,44.32,0.0,72.695,25.235,16.496,115.84100000000001,13.779,28.469,47.177,0.0,0.0,2.414,1.443,1.093,3.846,0.789,1.887,92.03800000000001,12.350999999999999,15.758,0.0,0.0,146.664,6.744,27.195,150.393,6.744,24.855,35.975,0.0,0.0,3.542,0.895,1.667,3.2829,1.209,11.427,0.0,1.1877,1.013
@@ -71,7 +71,7 @@ house069.xml,77.02,113.431,86.4581,112.2567,0.28792,0.9896,1.0,1.0,0.9896,1.0,62
house070.xml,43.48,184.708,76.1707,175.19,0.21041,0.9349,1.0145,1.0,0.9485,1.0,69.519,0.0,0.0,88.744,29.112,11.506,71.227,16.226,13.205,53.221,2.125,0.0,0.552,0.471,0.968,0.443,0.263,1.111,27.021,5.257,8.096,0.0,0.0,21.688,2.93,9.292,21.704,2.93,9.09,35.332,0.464,0.0,0.233,0.126,1.075,2.2561,0.0,3.809,0.0,0.92,0.0,45.34,7815.72,18174.58,0.9485,52.24,1.0,52.24,43.48,43.48,1.0,48.34,1.0,48.34,43.48,43.48,1.0,43.48,185.318,76.4433,175.8101,0.20948,0.9352,1.0145,1.0,0.9487,1.0,69.776,0.0,0.0,88.714,29.129,11.767,71.205,16.236,13.467,53.583,2.125,0.0,0.552,0.471,0.971,0.443,0.263,1.111,27.011,5.26,8.174,0.0,0.0,21.68,2.932,9.355,21.696,2.932,9.152,35.534,0.464,0.0,0.233,0.126,1.075,2.2561,0.0,3.809,0.0,0.92,0.0
house071.xml,73.61,59.057,45.8169,62.2466,0.20559,1.0361,1.0,1.0172,1.054,1.0,41.1352,0.0,0.0,19.805,9.966,9.715,17.112000000000002,5.416,11.404,19.009,0.562,0.0,1.408,0.483,0.947,1.725,0.263,1.111,21.722,4.061,7.21,0.0,0.0,18.825,2.207,8.464,18.892999999999997,2.207,8.28,12.435,0.389,0.0,1.6059999999999999,0.228,1.075,3.3504,0.403,3.809,0.0,0.92,0.0,76.12,4888.66,6093.11,1.054,53.12,1.0,53.12,73.49,73.49,0.0,48.9,1.0,48.9,73.49,73.49,0.0,73.49,59.382,45.9883,62.5754,0.20474,1.036,1.0,1.0172,1.0538,1.0,41.2998,0.0,0.0,19.790999999999997,9.976,9.853,17.101,5.421,11.541,19.201,0.562,0.0,1.407,0.483,0.949,1.725,0.263,1.111,21.709999999999997,4.065,7.264,0.0,0.0,18.817,2.209,8.509,18.885,2.209,8.324,12.56,0.389,0.0,1.6059999999999999,0.228,1.075,3.3504,0.403,3.809,0.0,0.92,0.0
house072.xml,59.28,133.845,77.9825,131.5445,0.23183,0.9797,0.984,1.0195,0.9828,1.0,64.0034,0.0,0.0,89.53500000000001,1.635,10.436,141.69099999999997,1.261,18.716,31.108,1.131,0.0,1.112,0.34,0.961,1.725,0.263,1.724,50.767,0.513,5.285,0.0,0.0,80.29299999999999,0.396,9.478,88.2,0.396,11.486,20.825,0.592,0.0,2.04,0.244,1.429,3.3504,0.403,3.809,0.0,1.1877,1.013,138.34,16160.64,11885.83,0.9828,49.27,1.0,49.27,59.27,59.27,0.0,48.68,1.0,48.68,59.27,59.27,0.0,59.27,133.879,77.9933,131.5856,0.23105,0.9798,0.9841,1.0194,0.9829,1.0,64.0118,0.0,0.0,89.533,1.636,10.451,141.688,1.261,18.734,31.128,1.131,0.0,1.112,0.341,0.962,1.725,0.263,1.724,50.767,0.514,5.286,0.0,0.0,80.292,0.396,9.475,88.199,0.396,11.483,20.835,0.592,0.0,2.04,0.244,1.429,3.3504,0.403,3.809,0.0,1.1877,1.013
-house073.xml,30.27,225.796,109.628,215.1198,0.16778,0.9418,1.0116,1.0,0.9527,0.594,88.7514,36.031,0.0,119.8,31.246000000000002,11.506,104.58800000000001,17.529,26.442,60.75,2.494,0.0,1.903,0.9359999999999999,0.989,2.136,0.526,2.273,24.844,23.29,14.46,0.0,0.0,23.570999999999998,13.065999999999999,33.23,24.397,13.065999999999999,31.9,43.986,3.049,0.0,1.4409999999999998,0.429,1.389,5.6065000000000005,0.403,7.618,0.0,1.1877,1.013,63.55,13417.56,22161.31,0.9527,49.96,1.0,49.96,51.15,51.15,0.0,49.73,1.0,49.73,51.15,51.15,0.0,30.49,226.433,110.3883,215.8333,0.16607,0.9424,1.0115,1.0,0.9532,0.5961,89.2014,36.031,0.0,119.766,31.262999999999998,11.767,104.558,17.538,26.791,61.143,2.494,0.0,1.903,0.9359999999999999,0.998,2.136,0.526,2.273,24.836,23.305,14.844,0.0,0.0,23.563000000000002,13.074,33.796,24.389,13.074,32.444,44.355,3.049,0.0,1.4409999999999998,0.429,1.389,5.6065000000000005,0.403,7.618,0.0,1.1877,1.013
+house073.xml,30.3,225.796,109.6881,215.1198,0.16778,0.9418,1.0116,1.0,0.9527,0.5943,88.8134,36.031,0.0,119.8,31.246000000000002,11.506,104.58800000000001,17.529,26.442,60.75,2.494,0.0,1.903,0.9359999999999999,0.989,2.136,0.526,2.273,24.859,23.335,14.46,0.0,0.0,23.612,13.088,33.23,24.438,13.088,31.9,43.986,3.049,0.0,1.4409999999999998,0.429,1.389,5.6065000000000005,0.403,7.618,0.0,1.1877,1.013,63.58,13424.6,22161.31,0.9527,49.96,1.0,49.96,51.17,51.17,0.0,49.73,1.0,49.73,51.17,51.17,0.0,30.52,226.433,110.4435,215.8333,0.16607,0.9424,1.0115,1.0,0.9532,0.5963,89.2628,36.031,0.0,119.766,31.262999999999998,11.767,104.558,17.538,26.791,61.143,2.494,0.0,1.903,0.9359999999999999,0.998,2.136,0.526,2.273,24.85,23.345,14.844,0.0,0.0,23.603,13.094000000000001,33.796,24.429000000000002,13.094000000000001,32.444,44.355,3.049,0.0,1.4409999999999998,0.429,1.389,5.6065000000000005,0.403,7.618,0.0,1.1877,1.013
house074.xml,81.75,80.125,69.0994,84.5244,0.25283,1.033,1.0,1.0213,1.0549,1.0,57.549,0.0,0.0,14.601,35.369,7.403,11.313,19.821,8.889,22.023,0.729,0.0,0.572,0.468,0.915,0.443,0.263,1.099,7.269,24.952,5.61,0.0,0.0,5.632,13.983,6.736,5.636,13.983,6.663,20.906,10.363,0.0,0.359,0.217,1.053,2.2561,0.0,3.809,0.0,0.92,0.0,85.1,8515.93,9485.97,1.0549,46.23,1.0,46.23,82.04,82.04,0.0,45.0,1.0,45.0,82.04,82.04,0.0,82.04,80.438,69.6,84.8392,0.25197,1.0328,1.0,1.0212,1.0547,1.0,58.035,0.0,0.0,14.593,35.384,7.517,11.307,19.831,9.003,22.215,0.729,0.0,0.572,0.468,0.918,0.443,0.263,1.099,7.257,24.977,5.656,0.0,0.0,5.623,13.998,6.774,5.627,13.998,6.7,21.35,10.361,0.0,0.359,0.217,1.053,2.2561,0.0,3.809,0.0,0.92,0.0
house075.xml,66.97,82.898,57.6159,86.0328,0.22049,1.0223,1.0152,1.0,1.0378,1.0,45.1014,0.0,0.0,32.305,17.12,11.126,51.481,9.94,19.065,22.347,0.0,0.0,0.805,0.452,0.989,1.282,0.263,1.695,20.685,9.309,10.068,0.0,0.0,32.963,5.405,17.252,35.734,5.405,18.188,17.285,0.269,0.0,1.075,0.244,1.613,1.0943,0.403,3.809,0.0,1.1877,1.013,85.38,12022.01,13568.29,1.0378,44.39,1.0,44.39,67.2,67.2,0.0,44.31,1.0,44.31,67.2,67.2,0.0,67.2,83.511,58.2379,86.6581,0.21974,1.0222,1.0152,1.0,1.0377,1.0,45.6204,0.0,0.0,32.278,17.143,11.381,51.439,9.954,19.396,22.709,0.0,0.0,0.804,0.452,0.995,1.282,0.263,1.695,20.664,9.324,10.297,0.0,0.0,32.931,5.414,17.549,35.7,5.414,18.501,17.683,0.269,0.0,1.075,0.244,1.613,1.0943,0.403,3.809,0.0,1.1877,1.013
house076.xml,60.99,33.518,21.6502,35.5,0.18467,1.0703,0.9745,1.0155,1.0591,1.0,18.4704,0.0,0.0,6.898,5.261,6.94,10.99,2.927,13.627,14.076,0.343,0.0,0.805,0.472,0.863,1.282,0.263,1.695,4.369,2.903,3.441,0.0,0.0,6.961,1.615,6.757,7.675,1.615,8.33,10.225,0.712,0.0,1.042,0.343,1.429,1.0943,0.403,3.809,0.0,1.1877,1.013,101.18,3815.59,3560.66,1.0591,49.3,1.0,49.3,61.31,61.31,0.0,45.52,1.0,45.52,61.31,61.31,0.0,61.31,31.982,20.7715,33.8776,0.18509,1.0704,0.9745,1.0155,1.0593,1.0,17.8772,0.0,0.0,6.925,5.24,5.783,11.033,2.917,12.127,13.691,0.343,0.0,0.805,0.472,0.808,1.282,0.263,1.695,4.381,2.89,2.794,0.0,0.0,6.98,1.609,5.859,7.696,1.609,7.223,9.994,0.712,0.0,1.042,0.343,1.429,1.0943,0.403,3.809,0.0,1.1877,1.013
diff --git a/workflow/tests/base_results/sample_files.csv b/workflow/tests/base_results/sample_files.csv
index 37a4a6ad5c..d288fb3ae7 100644
--- a/workflow/tests/base_results/sample_files.csv
+++ b/workflow/tests/base_results/sample_files.csv
@@ -126,7 +126,7 @@ base-hvac-furnace-gas-only.xml,84.89,77.473,66.4209,78.2462,0.20964,0.9925,1.0,1
base-hvac-furnace-gas-plus-air-to-air-heat-pump-cooling.xml,87.02,77.474,68.0913,78.249,0.21013,0.9925,1.0,1.0176,1.01,1.0,56.3374,0.0,0.0,30.12,9.972,10.343,47.993,5.44,11.675,27.039,0.0,0.0,0.805,0.481,0.963,1.282,0.263,1.087,28.501,10.293,8.243,0.0,0.0,45.413,5.615,9.305,48.957,5.615,9.305,20.991,0.063,0.0,1.087,0.242,1.042,1.0943,0.403,3.809,0.0,0.92,0.0,163.99,10039.56,6061.37,1.01,55.61,1.0,55.61,86.92,86.92,0.0,50.12,1.0,50.12,86.92,86.92,0.0,86.92,77.803,68.3027,78.5781,0.20926,0.9925,1.0,1.0176,1.01,1.0,56.5426,0.0,0.0,30.104,9.981,10.487,47.967,5.445,11.819,27.231,0.0,0.0,0.805,0.481,0.964,1.282,0.263,1.087,28.491,10.3,8.327,0.0,0.0,45.397,5.619,9.385,48.94,5.619,9.385,21.121,0.063,0.0,1.087,0.242,1.042,1.0943,0.403,3.809,0.0,0.92,0.0
base-hvac-ground-to-air-heat-pump-1-speed.xml,67.9,77.504,53.1517,78.2783,0.20985,0.9925,1.0,1.0176,1.01,1.0,49.614,0.0,0.0,30.121,10.001,10.343,27.374,5.333,11.675,27.039,0.0,0.0,0.487,0.492,0.963,0.443,0.263,1.087,17.371,6.483,8.243,0.0,0.0,15.787,3.457,9.305,15.799,3.457,9.305,20.991,0.063,0.0,0.278,0.206,1.042,2.2561,0.0,3.809,0.0,0.92,0.0,67.93,4158.45,6061.37,1.01,53.55,1.0,53.55,67.88,67.88,0.0,48.71,1.0,48.71,67.88,67.88,0.0,67.88,77.833,53.3623,78.6072,0.20893,0.9925,1.0,1.0175,1.0099,1.0,49.819,0.0,0.0,30.105,10.01,10.487,27.361,5.338,11.819,27.231,0.0,0.0,0.487,0.492,0.964,0.443,0.263,1.087,17.363,6.488,8.327,0.0,0.0,15.78,3.46,9.385,15.792,3.46,9.385,21.121,0.063,0.0,0.278,0.206,1.042,2.2561,0.0,3.809,0.0,0.92,0.0
base-hvac-ground-to-air-heat-pump-cooling-only.xml,84.66,77.474,66.2405,78.2475,0.20971,0.9925,1.0,1.0176,1.01,1.0,53.8604,0.0,0.0,30.12,9.972,10.343,47.993,5.474,11.675,27.039,0.0,0.0,0.805,0.478,0.963,1.282,0.263,1.087,29.27,7.673,8.243,0.0,0.0,46.639,4.212,9.305,46.641,4.212,9.305,20.991,0.063,0.0,1.282,0.206,1.042,1.0943,0.403,3.809,0.0,0.92,0.0,156.77,9609.38,6068.89,1.01,69.91,1.0,69.91,84.57,84.57,0.0,61.05,1.0,61.05,84.57,84.57,0.0,84.57,77.802,66.448,78.5755,0.20883,0.9926,1.0,1.0175,1.0099,1.0,54.0642,0.0,0.0,30.104,9.98,10.487,47.967,5.479,11.819,27.231,0.0,0.0,0.805,0.478,0.964,1.282,0.263,1.087,29.259,7.678,8.327,0.0,0.0,46.621,4.215,9.385,46.623,4.215,9.385,21.121,0.063,0.0,1.282,0.206,1.042,1.0943,0.403,3.809,0.0,0.92,0.0
-base-hvac-ground-to-air-heat-pump-heating-only.xml,70.16,77.474,54.8939,78.2397,0.20761,0.9926,1.0,1.0174,1.0099,1.0,50.502,0.0,0.0,30.121,9.971,10.343,27.286,5.501,11.675,27.039,0.0,0.0,0.489,0.476,0.963,0.443,0.263,1.087,16.974,8.623,8.243,0.0,0.0,15.376,4.757,9.305,15.388,4.757,9.305,20.991,0.063,0.0,0.278,0.263,1.042,2.2561,0.0,3.809,0.0,0.92,0.0,68.79,4217.14,6070.85,1.0099,55.59,1.0,55.59,70.14,70.14,0.0,50.77,1.0,50.77,70.14,70.14,0.0,70.14,77.803,55.1078,78.5685,0.20669,0.9926,1.0,1.0173,1.0098,1.0,50.709,0.0,0.0,30.105,9.98,10.487,27.272,5.505,11.819,27.231,0.0,0.0,0.489,0.476,0.964,0.443,0.263,1.087,16.967,8.629,8.327,0.0,0.0,15.37,4.76,9.385,15.382,4.76,9.385,21.121,0.063,0.0,0.278,0.263,1.042,2.2561,0.0,3.809,0.0,0.92,0.0
+base-hvac-ground-to-air-heat-pump-heating-only.xml,70.14,77.474,54.8796,78.2397,0.20761,0.9926,1.0,1.0174,1.0099,1.0,50.49,0.0,0.0,30.121,9.971,10.343,27.286,5.501,11.675,27.039,0.0,0.0,0.489,0.476,0.963,0.443,0.263,1.087,16.96,8.623,8.243,0.0,0.0,15.363,4.757,9.305,15.375,4.757,9.305,20.991,0.063,0.0,0.278,0.263,1.042,2.2561,0.0,3.809,0.0,0.92,0.0,68.77,4216.13,6070.85,1.0099,55.59,1.0,55.59,70.12,70.12,0.0,50.77,1.0,50.77,70.12,70.12,0.0,70.12,77.803,55.0935,78.5685,0.20669,0.9926,1.0,1.0173,1.0098,1.0,50.696,0.0,0.0,30.105,9.98,10.487,27.272,5.505,11.819,27.231,0.0,0.0,0.489,0.476,0.964,0.443,0.263,1.087,16.953,8.629,8.327,0.0,0.0,15.357,4.76,9.385,15.369,4.76,9.385,21.121,0.063,0.0,0.278,0.263,1.042,2.2561,0.0,3.809,0.0,0.92,0.0
base-hvac-install-quality-air-to-air-heat-pump-1-speed.xml,86.01,77.504,67.3287,78.2783,0.20985,0.9925,1.0,1.0176,1.01,1.0,61.993,0.0,0.0,30.121,10.001,10.343,27.374,5.333,11.675,27.039,0.0,0.0,0.487,0.492,0.963,0.443,0.263,1.087,30.177,7.854,8.243,0.0,0.0,27.425,4.188,9.305,27.446,4.188,9.305,20.991,0.063,0.0,0.414,0.242,1.042,2.2561,0.0,3.809,0.0,0.92,0.0,86.55,5298.3,6061.37,1.01,53.55,1.0,53.55,85.92,85.92,0.0,48.71,1.0,48.71,85.92,85.92,0.0,85.92,77.833,67.5374,78.6072,0.20893,0.9925,1.0,1.0175,1.0099,1.0,62.196,0.0,0.0,30.105,10.01,10.487,27.361,5.338,11.819,27.231,0.0,0.0,0.487,0.492,0.964,0.443,0.263,1.087,30.167,7.859,8.327,0.0,0.0,27.417,4.191,9.385,27.438,4.191,9.385,21.121,0.063,0.0,0.414,0.242,1.042,2.2561,0.0,3.809,0.0,0.92,0.0
base-hvac-install-quality-furnace-gas-central-ac-1-speed.xml,85.42,77.474,66.8431,78.249,0.21013,0.9925,1.0,1.0176,1.01,1.0,55.2692,0.0,0.0,30.12,9.972,10.343,47.993,5.44,11.675,27.039,0.0,0.0,0.805,0.481,0.963,1.282,0.263,1.087,27.979,9.567,8.243,0.0,0.0,44.581,5.219,9.305,48.06,5.219,9.305,20.991,0.063,0.0,1.087,0.242,1.042,1.0943,0.403,3.809,0.0,0.92,0.0,161.85,9908.36,6061.37,1.01,55.61,1.0,55.61,85.33,85.33,0.0,50.12,1.0,50.12,85.33,85.33,0.0,85.33,77.803,67.0516,78.5781,0.20926,0.9925,1.0,1.0176,1.01,1.0,55.474,0.0,0.0,30.104,9.981,10.487,47.967,5.445,11.819,27.231,0.0,0.0,0.805,0.481,0.964,1.282,0.263,1.087,27.968,9.572,8.327,0.0,0.0,44.564,5.222,9.385,48.041,5.222,9.385,21.121,0.063,0.0,1.087,0.242,1.042,1.0943,0.403,3.809,0.0,0.92,0.0
base-hvac-install-quality-ground-to-air-heat-pump-1-speed.xml,67.45,77.504,52.7989,78.2783,0.20985,0.9925,1.0,1.0176,1.01,1.0,49.375,0.0,0.0,30.121,10.001,10.343,27.374,5.333,11.675,27.039,0.0,0.0,0.487,0.492,0.963,0.443,0.263,1.087,17.236,6.265,8.243,0.0,0.0,15.664,3.341,9.305,15.676,3.341,9.305,20.991,0.063,0.0,0.278,0.206,1.042,2.2561,0.0,3.809,0.0,0.92,0.0,67.61,4138.86,6061.37,1.01,53.55,1.0,53.55,67.44,67.44,0.0,48.71,1.0,48.71,67.44,67.44,0.0,67.44,77.833,53.0088,78.6072,0.20893,0.9925,1.0,1.0175,1.0099,1.0,49.58,0.0,0.0,30.105,10.01,10.487,27.361,5.338,11.819,27.231,0.0,0.0,0.487,0.492,0.964,0.443,0.263,1.087,17.229,6.269,8.327,0.0,0.0,15.658,3.343,9.385,15.67,3.343,9.385,21.121,0.063,0.0,0.278,0.206,1.042,2.2561,0.0,3.809,0.0,0.92,0.0
diff --git a/workflow/tests/real_homes_test.rb b/workflow/tests/real_homes_test.rb
index e72e0ea032..3da1c3ff7a 100644
--- a/workflow/tests/real_homes_test.rb
+++ b/workflow/tests/real_homes_test.rb
@@ -7,9 +7,6 @@
require 'oga'
require_relative 'util.rb'
require_relative '../../rulesets/resources/constants'
-require_relative '../../hpxml-measures/HPXMLtoOpenStudio/resources/constants'
-require_relative '../../hpxml-measures/HPXMLtoOpenStudio/resources/hpxml'
-require_relative '../../hpxml-measures/HPXMLtoOpenStudio/resources/xmlhelper'
class RealHomesTest < Minitest::Test
def setup
diff --git a/workflow/tests/sample_files1_test.rb b/workflow/tests/sample_files1_test.rb
index 6e27d30ae5..f0d3ab4536 100644
--- a/workflow/tests/sample_files1_test.rb
+++ b/workflow/tests/sample_files1_test.rb
@@ -7,9 +7,6 @@
require 'oga'
require_relative 'util.rb'
require_relative '../../rulesets/resources/constants'
-require_relative '../../hpxml-measures/HPXMLtoOpenStudio/resources/constants'
-require_relative '../../hpxml-measures/HPXMLtoOpenStudio/resources/hpxml'
-require_relative '../../hpxml-measures/HPXMLtoOpenStudio/resources/xmlhelper'
class SampleFilesTest1 < Minitest::Test
def setup
diff --git a/workflow/tests/sample_files2_test.rb b/workflow/tests/sample_files2_test.rb
index 686d897f0b..f497016d53 100644
--- a/workflow/tests/sample_files2_test.rb
+++ b/workflow/tests/sample_files2_test.rb
@@ -7,9 +7,6 @@
require 'oga'
require_relative 'util.rb'
require_relative '../../rulesets/resources/constants'
-require_relative '../../hpxml-measures/HPXMLtoOpenStudio/resources/constants'
-require_relative '../../hpxml-measures/HPXMLtoOpenStudio/resources/hpxml'
-require_relative '../../hpxml-measures/HPXMLtoOpenStudio/resources/xmlhelper'
class SampleFilesTest1 < Minitest::Test
def setup
diff --git a/workflow/tests/util.rb b/workflow/tests/util.rb
index 42ff80f089..5832628a1e 100644
--- a/workflow/tests/util.rb
+++ b/workflow/tests/util.rb
@@ -7,15 +7,11 @@
require_relative '../util'
require_relative '../../rulesets/main'
require_relative '../../rulesets/resources/constants'
-require_relative '../../hpxml-measures/HPXMLtoOpenStudio/resources/constants'
-require_relative '../../hpxml-measures/HPXMLtoOpenStudio/resources/hotwater_appliances'
-require_relative '../../hpxml-measures/HPXMLtoOpenStudio/resources/hpxml'
-require_relative '../../hpxml-measures/HPXMLtoOpenStudio/resources/hvac_sizing'
-require_relative '../../hpxml-measures/HPXMLtoOpenStudio/resources/meta_measure'
-require_relative '../../hpxml-measures/HPXMLtoOpenStudio/resources/misc_loads'
-require_relative '../../hpxml-measures/HPXMLtoOpenStudio/resources/unit_conversions'
-require_relative '../../hpxml-measures/HPXMLtoOpenStudio/resources/xmlhelper'
-require_relative '../../hpxml-measures/HPXMLtoOpenStudio/resources/xmlvalidator'
+Dir["#{File.dirname(__FILE__)}/../../hpxml-measures/HPXMLtoOpenStudio/resources/*.rb"].each do |resource_file|
+ next if resource_file.include? 'minitest_helper.rb'
+
+ require resource_file
+end
def _run_workflow(xml, test_name, timeseries_frequency: 'none', component_loads: false, skip_simulation: false,
rated_home_only: false, output_format: 'csv', diagnostic_output: false)
@@ -206,15 +202,34 @@ def _run_workflow(xml, test_name, timeseries_frequency: 'none', component_loads:
assert(valid)
end
- # Check run.log for OS warnings
- Dir["#{rundir}/*/run.log"].sort.each do |log_path|
+ # Check run.logs for warnings
+ Dir["#{rundir}/**/run.log"].sort.each do |log_path|
run_log = File.readlines(log_path).map(&:strip)
run_log.each do |log_line|
- next unless log_line.include? 'OS Message:'
- next if log_line.include?('OS Message: Minutes field (60) on line 9 of EPW file')
- next if log_line.include?('OS Message: Error removing temporary directory at')
+ next unless log_line.start_with?('Warning:') || log_line.start_with?('Error:')
+ next if log_line.include? 'No emissions factor found for Scenario=ANSI301'
+ next if log_line.include? 'Could not look up Cambium GEA for zip code'
+ next if log_line.include? 'Ducts are entirely within conditioned space but there is moderate leakage to the outside.'
+
+ if log_path.include? 'base-battery.xml'
+ next if log_line.include? 'Battery without PV specified, and no charging/discharging schedule provided; battery is assumed to operate as backup and will not be modeled.'
+ end
+ if log_path.include? 'real_homes'
+ next if log_line.include? 'this may indicate incorrect ENERGY GUIDE label inputs'
+ next if log_line.include? 'Construction R-value increased'
+ next if log_line.include? 'Thickness is greater than 12 inches; this may indicate incorrect units'
+ next if log_line.include? 'DistanceToTopOfWindow is greater than 12 feet; this may indicate incorrect units.'
+ next if log_line.include? 'Slab has zero exposed perimeter, this may indicate an input error.'
+ end
+ # Skip these warnings (except for the ERI Rated Home, when we want extra checking)
+ if !log_path.include?('ERI_latest/RatedHome/run.log')
+ next if log_line.include? 'There are a large number of unmet hours'
+ next if log_line.include? 'Autosized HVAC equipment (e.g., Capacity=-1) found in the HPXML. This should only be used for research purposes or to run tests. It should *not* be used for a real home.'
+ next if log_line.include? 'capacity should typically be greater than or equal to 1000 Btu/hr'
+ next if log_line.include? 'ResidentialFacilityType is "single-family attached" or "apartment unit", but no attached surfaces were found. This may result in erroneous results (e.g., for infiltration).'
+ end
- flunk "Unexpected warning found in #{log_path} run.log: #{log_line}"
+ flunk "Unexpected message found in #{log_path}: #{log_line}"
end
end
diff --git a/workflow/tests/workflow_test.rb b/workflow/tests/workflow_test.rb
index 94263a2c57..bc94411e2d 100644
--- a/workflow/tests/workflow_test.rb
+++ b/workflow/tests/workflow_test.rb
@@ -154,7 +154,9 @@ def test_release_zips
system(command)
assert(File.exist? 'OpenStudio-ERI/workflow/tests/test_results/RESNET_Test_4.3_HERS_Method.csv')
- File.delete(zip_path)
+ if not ENV['CI'] # Keep on CI to store as an artifact
+ File.delete(zip_path)
+ end
rm_path('OpenStudio-ERI')
end
end