Merge pull request #202 from NREL/prep-3.7.0

Prep 3.7.0
NREL · Oct 10, 2023 · 7909686 · 7909686
2 parents a12773d + b0ea959
commit 7909686
Show file tree

Hide file tree

Showing 6 changed files with 1,373 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -27,10 +27,10 @@ test/*out_*.sqltest
 test/*out_*.xml
 # TODO: keep updating as new versions are incoming
 # We do not commit the current develop version until it's final
-test/*_3.5.2*_out.osw
-test/*_3.5.2*_out*.status
-test/*_3.5.2*_out.sqltest
-test/*_3.5.2*_out*.xml
+test/*_3.7.0*_out.osw
+test/*_3.7.0*_out*.status
+test/*_3.7.0*_out.sqltest
+test/*_3.7.0*_out*.xml
 # Ignore alphas and rcs. CI will force add anything under test/ so it's unaffected
 test/*_[0-9].[0-9].[0-9]-*_out*
 

diff --git a/model/simulationtests/heatrecovery_chiller.osm b/model/simulationtests/heatrecovery_chiller.osm
@@ -3455,7 +3455,7 @@ OS:AvailabilityManagerAssignmentList,
 
 OS:Pump:VariableSpeed,
   {8363b13b-1a90-4a2e-a6a4-1b0d019cc8fe}, !- Handle
-  OS:PlantLoop&#44&#10  {40d91371-fbd3-495c-b8d5-92c53a0a4149}&#44 &#33- Handle&#10  HeatRecovery Loop&#44                      &#33- Name&#10  &#44                                       &#33- Fluid Type&#10  0&#44                                      &#33- Glycol Concentration&#10  &#44                                       &#33- User Defined Fluid Type&#10  &#44                                       &#33- Plant Equipment Operation Heating Load&#10  &#44                                       &#33- Plant Equipment Operation Cooling Load&#10  &#44                                       &#33- Primary Plant Equipment Operation Scheme&#10  {46863787-cb22-40bf-bddd-9e64a477960e}&#44 &#33- Loop Temperature Setpoint Node Name&#10  &#44                                       &#33- Maximum Loop Temperature {C}&#10  &#44                                       &#33- Minimum Loop Temperature {C}&#10  &#44                                       &#33- Maximum Loop Flow Rate {m3/s}&#10  &#44                                       &#33- Minimum Loop Flow Rate {m3/s}&#10  Autocalculate&#44                          &#33- Plant Loop Volume {m3}&#10  {2ab118a5-aed6-4f87-937f-b8b0a3f93535}&#44 &#33- Plant Side Inlet Node Name&#10  {2defaab7-4cb3-4e87-a1e8-9aca55fd68e5}&#44 &#33- Plant Side Outlet Node Name&#10  &#44                                       &#33- Plant Side Branch List Name&#10  {b8789e50-d5fc-4270-b752-b984f1f1c7a4}&#44 &#33- Demand Side Inlet Node Name&#10  {3908b1a5-fcfb-4970-a2bd-83f3ee7d36e2}&#44 &#33- Demand Side Outlet Node Name&#10  &#44                                       &#33- Demand Side Branch List Name&#10  &#44                                       &#33- Demand Side Connector List Name&#10  Optimal&#44                                &#33- Load Distribution Scheme&#10  {fe8b5a26-d00b-4994-93e6-cd5d54976284}&#44 &#33- Availability Manager List Name&#10  &#44                                       &#33- Plant Loop Demand Calculation Scheme&#10  &#44                                       &#33- Common Pipe Simulation&#10  &#44                                       &#33- Pressure Simulation Type&#10  &#44                                       &#33- Plant Equipment Operation Heating Load Schedule&#10  &#44                                       &#33- Plant Equipment Operation Cooling Load Schedule&#10  &#44                                       &#33- Primary Plant Equipment Operation Scheme Schedule&#10  &#44                                       &#33- Component Setpoint Operation Scheme Schedule&#10  {3b6fcd29-f051-42e4-90bc-5dff76411493}&#44 &#33- Demand Mixer Name&#10  {cbf728a5-1d7c-4f3f-9dbd-bd33f04f8539}&#44 &#33- Demand Splitter Name&#10  {138abcf4-ad85-4cb8-b2b6-12dd9476f8dd}&#44 &#33- Supply Mixer Name&#10  {3c5b52c9-9c51-40b9-a09d-1e0eac1b1d10}&#59 &#33- Supply Splitter Name&#10&#10 VSD Pump, !- Name
+  HeatRecovery Loop VSD Pump,             !- Name
   {06033e86-694b-4dbe-92fb-65f6a8e28e08}, !- Inlet Node Name
   {662c7ec1-29a2-4cd8-82d3-3e9617c4556c}, !- Outlet Node Name
   ,                                       !- Rated Flow Rate {m3/s}