Merge branch 'develop' of https://github.com/NREL/EnergyPlus into heat-emission

Author: xuanluo113

idd/Energy+.idd.in

@@ -240,7 +240,7 @@
 !      GJ                     =>   ton-hrs             78.9889415481832
 !      J                      =>   Wh                  0.000277777777777778
 !      J/K                    =>   Btu/F               526.565
-!      J/kg                   =>   Btu/lb              0.00042986
+!      J/kg                   =>   Btu/lb              0.00042986 (plus 7.686)
 !      J/kg-K                 =>   Btu/lb-F            0.000239005736137667
 !      J/kg-K2                =>   Btu/lb-F2           0.000132889924714692
 !      J/kg-K3                =>   Btu/lb-F3           7.38277359526066E-05
@@ -65078,6 +65078,7 @@ Connector:Splitter,
        \memo within a single Splitter list.
    A1, \field Name
         \required-field
+        \reference PlantConnectors
    A2, \field Inlet Branch Name
         \required-field
         \type object-list
@@ -65432,6 +65433,7 @@ Connector:Mixer,
        \memo a single mixer list.
    A1 , \field Name
         \required-field
+        \reference PlantConnectors
    A2 , \field Outlet Branch Name
         \required-field
         \type object-list
@@ -65792,11 +65794,15 @@ ConnectorList,
         \key Connector:Mixer
     A3, \field Connector 1 Name
         \required-field
+        \type object-list
+        \object-list PlantConnectors
     A4, \field Connector 2 Object Type
         \type choice
         \key Connector:Splitter
         \key Connector:Mixer
     A5; \field Connector 2 Name
+        \type object-list
+        \object-list PlantConnectors
 
 NodeList,
   \min-fields 2
@@ -89498,6 +89504,7 @@ Curve:Linear,
        \key Dimensionless
        \key Capacity
        \key Power
+       \key Temperature
        \default Dimensionless
 
 Curve:QuadLinear,
@@ -89655,6 +89662,7 @@ Curve:Quadratic,
        \key Dimensionless
        \key Capacity
        \key Power
+       \key Temperature
        \default Dimensionless
 
 Curve:Cubic,
@@ -89709,6 +89717,7 @@ Curve:Cubic,
        \key Dimensionless
        \key Capacity
        \key Power
+       \key Temperature
        \default Dimensionless
 
 Curve:Quartic,
@@ -89767,6 +89776,7 @@ Curve:Quartic,
        \key Dimensionless
        \key Capacity
        \key Power
+       \key Temperature
        \default Dimensionless
 
 Curve:Exponent,
@@ -89822,6 +89832,7 @@ Curve:Exponent,
        \key Dimensionless
        \key Capacity
        \key Power
+       \key Temperature
        \default Dimensionless
 
 Curve:Bicubic,
@@ -89912,6 +89923,7 @@ Curve:Bicubic,
        \key Dimensionless
        \key Capacity
        \key Power
+       \key Temperature
        \default Dimensionless
 
 Curve:Biquadratic,
@@ -89989,6 +90001,7 @@ Curve:Biquadratic,
        \key Dimensionless
        \key Capacity
        \key Power
+       \key Temperature
        \default Dimensionless
 
 Curve:QuadraticLinear,
@@ -90066,6 +90079,7 @@ Curve:QuadraticLinear,
        \key Dimensionless
        \key Capacity
        \key Power
+       \key Temperature
        \default Dimensionless
 
 Curve:CubicLinear,
@@ -90263,6 +90277,7 @@ Curve:Triquadratic,
        \key Dimensionless
        \key Capacity
        \key Power
+       \key Temperature
        \default Dimensionless
 
 Curve:Functional:PressureDrop,
@@ -90809,6 +90824,7 @@ Table:OneIndependentVariable,
        \key Dimensionless
        \key Capacity
        \key Power
+       \key Temperature
        \default Dimensionless
   N5 , \field Normalization Reference
        \type real
@@ -90925,6 +90941,7 @@ Table:TwoIndependentVariables,
        \key Dimensionless
        \key Capacity
        \key Power
+       \key Temperature
        \default Dimensionless
   N7 , \field Normalization Reference
        \type real
@@ -91161,6 +91178,7 @@ Table:MultiVariableLookup,
        \key Dimensionless
        \key Capacity
        \key Power
+       \key Temperature
        \default Dimensionless
   N17, \field Number of Independent Variables
        \type integer
@@ -91558,6 +91576,7 @@ FluidProperties:GlycolConcentration,
        \memo glycol and what concentration it is
   A1,  \field Name
        \required-field
+       \reference FluidAndGlycolNames
   A2,  \field Glycol Type
        \required-field
        \type choice

src/ConvertESOMTR/convert.txt

@@ -25,7 +25,7 @@ conv,J,MMBtu,9.4845E-10,0
 !   (1 J / 1 W-s) * (1 hr/3600 s) * (1 ton  / 3516.853 W)
 conv,J,ton-hr,7.89847E-08,0
 !   (1 Btu/1054.35 J) * (1 kBtu/1000 Btu) * (0.4535924 kg / 1 lb)
-conv,J/kg,kBtu/lb,4.302105E-07,0
+conv,J/kg,kBtu/lb,4.2986E-07,0.007686
 !   (1 Btu/1054.35 J) * (1 kBtu/1000 Btu) * (0.09290304 m2 / 1 ft2)
 conv,J/m2,kBtu/sqft,8.811404E-08,0
 !   (1 Btu/1054.35 J) * (1 kBtu/1000 Btu) * (1000 J / 1 kJ)