Merge pull request #1412 from NREL/g_function_library

G function library
NREL · Jul 27, 2023 · 29c5dc1 · 29c5dc1
2 parents 2822a2c + b6222b9
commit 29c5dc1
Show file tree

Hide file tree

Showing 27 changed files with 7,472 additions and 493 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1015,3 +1015,4 @@
 /ReportUtilityBills/resources/detailed_rates/*.json
 !/ReportUtilityBills/resources/detailed_rates/Sample*.json
 /ReportUtilityBills/tests/results_bills.csv
+/HPXMLtoOpenStudio/resources/g_functions/g-function_library_1.0
diff --git a/BuildResidentialHPXML/measure.rb b/BuildResidentialHPXML/measure.rb
@@ -1417,13 +1417,13 @@ def arguments(model) # rubocop:disable Lint/UnusedMethodArgument
     args << arg
 
     geothermal_loop_borefield_configuration_choices = OpenStudio::StringVector.new
-    geothermal_loop_borefield_configuration_choices << HPXML::GeothermalLoopBorefieldConfigurationSingle
-    geothermal_loop_borefield_configuration_choices << HPXML::GeothermalLoopBorefieldConfigurationLine
-    geothermal_loop_borefield_configuration_choices << HPXML::GeothermalLoopBorefieldConfigurationLConfig
     geothermal_loop_borefield_configuration_choices << HPXML::GeothermalLoopBorefieldConfigurationRectangle
-    geothermal_loop_borefield_configuration_choices << HPXML::GeothermalLoopBorefieldConfigurationUConfig
-    geothermal_loop_borefield_configuration_choices << HPXML::GeothermalLoopBorefieldConfigurationl2Config
+    # geothermal_loop_borefield_configuration_choices << HPXML::GeothermalLoopBorefieldConfigurationZonedRectangle
     geothermal_loop_borefield_configuration_choices << HPXML::GeothermalLoopBorefieldConfigurationOpenRectangle
+    geothermal_loop_borefield_configuration_choices << HPXML::GeothermalLoopBorefieldConfigurationC
+    geothermal_loop_borefield_configuration_choices << HPXML::GeothermalLoopBorefieldConfigurationL
+    geothermal_loop_borefield_configuration_choices << HPXML::GeothermalLoopBorefieldConfigurationU
+    geothermal_loop_borefield_configuration_choices << HPXML::GeothermalLoopBorefieldConfigurationLopsidedU
 
     arg = OpenStudio::Measure::OSArgument::makeChoiceArgument('geothermal_loop_borefield_configuration', geothermal_loop_borefield_configuration_choices, false)
     arg.setDisplayName('Geothermal Loop: Borefield Configuration')

diff --git a/BuildResidentialHPXML/measure.xml b/BuildResidentialHPXML/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>build_residential_hpxml</name>
   <uid>a13a8983-2b01-4930-8af2-42030b6e4233</uid>
-  <version_id>852907d3-529a-4ce9-8510-f25b3915d167</version_id>
-  <version_modified>2023-07-25T20:39:26Z</version_modified>
+  <version_id>cc001732-b965-4815-ab79-90b489343e4f</version_id>
+  <version_modified>2023-07-27T16:11:46Z</version_modified>
   <xml_checksum>2C38F48B</xml_checksum>
   <class_name>BuildResidentialHPXML</class_name>
   <display_name>HPXML Builder</display_name>
@@ -2885,32 +2885,28 @@
       <model_dependent>false</model_dependent>
       <choices>
         <choice>
-          <value>single</value>
-          <display_name>single</display_name>
+          <value>Rectangle</value>
+          <display_name>Rectangle</display_name>
         </choice>
         <choice>
-          <value>line</value>
-          <display_name>line</display_name>
+          <value>Open Rectangle</value>
+          <display_name>Open Rectangle</display_name>
         </choice>
         <choice>
-          <value>l-config</value>
-          <display_name>l-config</display_name>
+          <value>C</value>
+          <display_name>C</display_name>
         </choice>
         <choice>
-          <value>rectangle</value>
-          <display_name>rectangle</display_name>
+          <value>L</value>
+          <display_name>L</display_name>
         </choice>
         <choice>
-          <value>u-config</value>
-          <display_name>u-config</display_name>
+          <value>U</value>
+          <display_name>U</display_name>
         </choice>
         <choice>
-          <value>l2-config</value>
-          <display_name>l2-config</display_name>
-        </choice>
-        <choice>
-          <value>open-rectangle</value>
-          <display_name>open-rectangle</display_name>
+          <value>Lopsided U</value>
+          <display_name>Lopsided U</display_name>
         </choice>
       </choices>
     </argument>
@@ -6833,7 +6829,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>B9C7AFAC</checksum>
+      <checksum>5AD047C0</checksum>
     </file>
     <file>
       <filename>geometry.rb</filename>

diff --git a/Changelog.md b/Changelog.md
@@ -8,6 +8,7 @@ __New Features__
   - Adds "Peak Electricity: Annual Total (W)" output.
   - Adds battery resilience hours output; allows requesting timeseries output.
   - ReportUtilityBills measure: Allows reporting monthly utility bills in addition to (or instead of) annual bills.
+- Connect to the [G-Function Library](https://gdr.openei.org/submissions/1325) (in the Geothermal Data Repository) for using precalculated g-function values with GSHP modeling.
 
 __Bugfixes__
 - Fixes lighting multipliers not being applied when kWh/yr inputs are used.

diff --git a/HPXMLtoOpenStudio/measure.xml b/HPXMLtoOpenStudio/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>hpxm_lto_openstudio</name>
   <uid>b1543b30-9465-45ff-ba04-1d1f85e763bc</uid>
-  <version_id>7d01a057-3b63-4525-8254-791e6b58602a</version_id>
-  <version_modified>2023-07-25T20:39:28Z</version_modified>
+  <version_id>011f8f1c-98f6-4ab6-80e8-2a466400b5ca</version_id>
+  <version_modified>2023-07-27T17:31:50Z</version_modified>
   <xml_checksum>D8922A73</xml_checksum>
   <class_name>HPXMLtoOpenStudio</class_name>
   <display_name>HPXML to OpenStudio Translator</display_name>
@@ -216,6 +216,54 @@
       <usage_type>resource</usage_type>
       <checksum>788F897B</checksum>
     </file>
+    <file>
+      <filename>g_functions/C_configurations_5m_v1.0.json</filename>
+      <filetype>json</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>E97DCCDD</checksum>
+    </file>
+    <file>
+      <filename>g_functions/L_configurations_5m_v1.0.json</filename>
+      <filetype>json</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>6B2B3787</checksum>
+    </file>
+    <file>
+      <filename>g_functions/LopU_configurations_5m_v1.0.json</filename>
+      <filetype>json</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>B13FA813</checksum>
+    </file>
+    <file>
+      <filename>g_functions/Open_configurations_5m_v1.0.json</filename>
+      <filetype>json</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>FF25A024</checksum>
+    </file>
+    <file>
+      <filename>g_functions/U_configurations_5m_v1.0.json</filename>
+      <filetype>json</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>B5BEF270</checksum>
+    </file>
+    <file>
+      <filename>g_functions/g-function_library_1.0/zoned_rectangle_5m_v1.0.json</filename>
+      <filetype>json</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>6A4C47AD</checksum>
+    </file>
+    <file>
+      <filename>g_functions/rectangle_5m_v1.0.json</filename>
+      <filetype>json</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>25FFB6A8</checksum>
+    </file>
+    <file>
+      <filename>g_functions/util.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>3C8E730B</checksum>
+    </file>
     <file>
       <filename>generator.rb</filename>
       <filetype>rb</filetype>
@@ -238,13 +286,13 @@
       <filename>hpxml.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>FDFBA25A</checksum>
+      <checksum>FC2CB4FC</checksum>
     </file>
     <file>
       <filename>hpxml_defaults.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>DA621829</checksum>
+      <checksum>0DC4F49E</checksum>
     </file>
     <file>
       <filename>hpxml_schema/HPXML.xsd</filename>
@@ -262,7 +310,7 @@
       <filename>hpxml_schematron/EPvalidator.xml</filename>
       <filetype>xml</filetype>
       <usage_type>resource</usage_type>
-      <checksum>8679F54D</checksum>
+      <checksum>8A99C360</checksum>
     </file>
     <file>
       <filename>hpxml_schematron/iso-schematron.xsd</filename>
@@ -274,13 +322,13 @@
       <filename>hvac.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>33984C7C</checksum>
+      <checksum>3BE25C2E</checksum>
     </file>
     <file>
       <filename>hvac_sizing.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>363FD013</checksum>
+      <checksum>71E6EFE7</checksum>
     </file>
     <file>
       <filename>lighting.rb</filename>
@@ -496,7 +544,7 @@
       <filename>test_defaults.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>D0DA357E</checksum>
+      <checksum>B77FF662</checksum>
     </file>
     <file>
       <filename>test_enclosure.rb</filename>
@@ -520,7 +568,7 @@
       <filename>test_hvac.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>E42B9F8E</checksum>
+      <checksum>3A823877</checksum>
     </file>
     <file>
       <filename>test_hvac_sizing.rb</filename>
@@ -568,7 +616,7 @@
       <filename>test_validation.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>030DE655</checksum>
+      <checksum>C281A791</checksum>
     </file>
     <file>
       <filename>test_water_heater.rb</filename>