Merge branch 'develop' into EnergyPlusEssentialsDocumentation

Author: JasonGlazer

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
@@ -68107,6 +68113,7 @@ Boiler:HotWater,
        \autosizable
        \ip-units gal/min
        \minimum 0.0
+       \default autosize
   N4 , \field Minimum Part Load Ratio
        \type real
        \minimum 0.0
@@ -68144,6 +68151,7 @@ Boiler:HotWater,
        \type real
        \units W
        \minimum 0.0
+       \default 0.0
   N9, \field Sizing Factor
        \note Multiplies the autosized capacity and flow rates
        \type real
@@ -89496,6 +89504,7 @@ Curve:Linear,
        \key Dimensionless
        \key Capacity
        \key Power
+       \key Temperature
        \default Dimensionless
 
 Curve:QuadLinear,
@@ -89653,6 +89662,7 @@ Curve:Quadratic,
        \key Dimensionless
        \key Capacity
        \key Power
+       \key Temperature
        \default Dimensionless
 
 Curve:Cubic,
@@ -89707,6 +89717,7 @@ Curve:Cubic,
        \key Dimensionless
        \key Capacity
        \key Power
+       \key Temperature
        \default Dimensionless
 
 Curve:Quartic,
@@ -89765,6 +89776,7 @@ Curve:Quartic,
        \key Dimensionless
        \key Capacity
        \key Power
+       \key Temperature
        \default Dimensionless
 
 Curve:Exponent,
@@ -89820,6 +89832,7 @@ Curve:Exponent,
        \key Dimensionless
        \key Capacity
        \key Power
+       \key Temperature
        \default Dimensionless
 
 Curve:Bicubic,
@@ -89910,6 +89923,7 @@ Curve:Bicubic,
        \key Dimensionless
        \key Capacity
        \key Power
+       \key Temperature
        \default Dimensionless
 
 Curve:Biquadratic,
@@ -89987,6 +90001,7 @@ Curve:Biquadratic,
        \key Dimensionless
        \key Capacity
        \key Power
+       \key Temperature
        \default Dimensionless
 
 Curve:QuadraticLinear,
@@ -90064,6 +90079,7 @@ Curve:QuadraticLinear,
        \key Dimensionless
        \key Capacity
        \key Power
+       \key Temperature
        \default Dimensionless
 
 Curve:CubicLinear,
@@ -90261,6 +90277,7 @@ Curve:Triquadratic,
        \key Dimensionless
        \key Capacity
        \key Power
+       \key Temperature
        \default Dimensionless
 
 Curve:Functional:PressureDrop,
@@ -90807,6 +90824,7 @@ Table:OneIndependentVariable,
        \key Dimensionless
        \key Capacity
        \key Power
+       \key Temperature
        \default Dimensionless
   N5 , \field Normalization Reference
        \type real
@@ -90923,6 +90941,7 @@ Table:TwoIndependentVariables,
        \key Dimensionless
        \key Capacity
        \key Power
+       \key Temperature
        \default Dimensionless
   N7 , \field Normalization Reference
        \type real
@@ -91159,6 +91178,7 @@ Table:MultiVariableLookup,
        \key Dimensionless
        \key Capacity
        \key Power
+       \key Temperature
        \default Dimensionless
   N17, \field Number of Independent Variables
        \type integer
@@ -91556,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)

src/EnergyPlus/DataHVACGlobals.cc

@@ -503,8 +503,7 @@ namespace DataHVACGlobals {
     bool SimZoneEquipmentFlag;     // True when zone equipment components need to be (re)simulated
     bool SimNonZoneEquipmentFlag;  // True when non-zone equipment components need to be (re)simulated
     bool ZoneMassBalanceHVACReSim; // True when zone air mass flow balance and air loop needs (re)simulated
-    int MinAirLoopIterationsAfterFirst(
-        1); // minimum number of HVAC iterations after FirstHVACIteration (must be at least 2 for sequenced loads to operate on air loops)
+    int MinAirLoopIterationsAfterFirst(1); // minimum number of HVAC iterations after FirstHVACIteration
 
     int const NumZoneHVACTerminalTypes(38);
 

src/EnergyPlus/DataZoneEquipment.cc

@@ -327,7 +327,6 @@ namespace DataZoneEquipment {
         Array1D_string cNumericFields;   // Numeric field names
         Array1D_bool lAlphaBlanks;       // Logical array, alpha field input BLANK = .TRUE.
         Array1D_bool lNumericBlanks;     // Logical array, numeric field input BLANK = .TRUE.
-        bool IdealLoadsOnEquipmentList;
         int maxEquipCount;
         int numEquipCount;
         int overallEquipCount;
@@ -577,9 +576,6 @@ namespace DataZoneEquipment {
                 ZoneEquipList(ControlledZoneNum).CoolingCapacity = 0;
                 ZoneEquipList(ControlledZoneNum).HeatingCapacity = 0;
 
-                IdealLoadsOnEquipmentList = false;
-                int countAirTermsInZone = 0;
-
                 for (ZoneEquipTypeNum = 1; ZoneEquipTypeNum <= ZoneEquipList(ControlledZoneNum).NumOfEquipTypes; ++ZoneEquipTypeNum) {
                     ZoneEquipList(ControlledZoneNum).EquipType(ZoneEquipTypeNum) = AlphArray(2 * ZoneEquipTypeNum + 1);
                     ZoneEquipList(ControlledZoneNum).EquipName(ZoneEquipTypeNum) = AlphArray(2 * ZoneEquipTypeNum + 2);
@@ -624,11 +620,9 @@ namespace DataZoneEquipment {
 
                         if (SELECT_CASE_var == "ZONEHVAC:AIRDISTRIBUTIONUNIT") {
                             ZoneEquipList(ControlledZoneNum).EquipType_Num(ZoneEquipTypeNum) = AirDistUnit_Num;
-                            ++countAirTermsInZone;
 
                         } else if (SELECT_CASE_var == "AIRTERMINAL:SINGLEDUCT:UNCONTROLLED") {
                             ZoneEquipList(ControlledZoneNum).EquipType_Num(ZoneEquipTypeNum) = DirectAir_Num;
-                            ++countAirTermsInZone;
 
                         } else if (SELECT_CASE_var == "ZONEHVAC:WINDOWAIRCONDITIONER") { // Window Air Conditioner
                             ZoneEquipList(ControlledZoneNum).EquipType_Num(ZoneEquipTypeNum) = WindowAC_Num;
@@ -738,8 +732,6 @@ namespace DataZoneEquipment {
                         }
                     }
                 }
-                // If there are two or more air terminals in a zone, then set minimum iterations to number of air terminals
-                DataHVACGlobals::MinAirLoopIterationsAfterFirst = max(MinAirLoopIterationsAfterFirst, countAirTermsInZone);
 
                 for (ZoneEquipTypeNum = 1; ZoneEquipTypeNum <= ZoneEquipList(ControlledZoneNum).NumOfEquipTypes; ++ZoneEquipTypeNum) {
                     if (count_eq(ZoneEquipList(ControlledZoneNum).CoolingPriority, ZoneEquipTypeNum) > 1) {
@@ -1825,6 +1817,24 @@ namespace DataZoneEquipment {
                 break;
             }
         }
+        // Set MinAirLoopIterationsAfterFirst for equipment that uses sequenced loads, based on zone equip load distribution scheme
+        int minIterations = DataHVACGlobals::MinAirLoopIterationsAfterFirst;
+        if (this->LoadDistScheme == DataZoneEquipment::LoadDist::SequentialLoading) {
+            // Sequential needs one extra iterations up to the highest airterminal unit equipment number
+            minIterations = max(coolingPriority, heatingPriority, minIterations);
+        }
+        else if (this->LoadDistScheme == DataZoneEquipment::LoadDist::UniformLoading) {
+            // Uniform needs one extra iteration which is the default
+        }
+        else if (this->LoadDistScheme == DataZoneEquipment::LoadDist::UniformPLRLoading) {
+            // UniformPLR needs two extra iterations, regardless of unit equipment number
+            minIterations = max(2, minIterations);
+        }
+        else if (this->LoadDistScheme == DataZoneEquipment::LoadDist::SequentialUniformPLRLoading) {
+            // SequentialUniformPLR needs one extra iterations up to the highest airterminal unit equipment number plus one more
+            minIterations = max((coolingPriority + 1), (heatingPriority + 1), minIterations);
+        }
+        DataHVACGlobals::MinAirLoopIterationsAfterFirst = minIterations;
     }
 
 } // namespace DataZoneEquipment

src/EnergyPlus/HVACManager.cc

@@ -889,7 +889,7 @@ namespace HVACManager {
                 SimAirLoopsFlag = true;
             }
             if (HVACManageIteration < MinAirLoopIterationsAfterFirst) {
-                // sequenced zone loads only work if there are at least two iterations after FirstHVACIteraion
+                // sequenced zone loads for airloops may require extra iterations depending upon zone equipment order and load distribution type
                 SimAirLoopsFlag = true;
                 SimZoneEquipmentFlag = true;
             }

src/EnergyPlus/Pumps.cc

@@ -438,6 +438,17 @@ namespace Pumps {
             PumpEquip(PumpNum).MinVolFlowRate = rNumericArgs(10);
             if (PumpEquip(PumpNum).MinVolFlowRate == AutoSize) {
                 PumpEquip(PumpNum).minVolFlowRateWasAutosized = true;
+            } else if (!PumpEquip(PumpNum).NomVolFlowRateWasAutoSized &&
+                       (PumpEquip(PumpNum).MinVolFlowRate > PumpEquip(PumpNum).NomVolFlowRate)) {
+                // Check that the minimum isn't greater than the maximum
+                ShowWarningError(RoutineName + cCurrentModuleObject + "=\"" + PumpEquip(PumpNum).Name
+                        + "\", Invalid '" + cNumericFieldNames(10) +"'");
+                ShowContinueError("Entered Value=[" + General::TrimSigDigits(PumpEquip(PumpNum).MinVolFlowRate, 5) + "] is above the "
+                        + cNumericFieldNames(1) + "=["
+                        + General::TrimSigDigits(PumpEquip(PumpNum).NomVolFlowRate, 5) + "].");
+                ShowContinueError("Reseting value of '" + cNumericFieldNames(10) + "' to the value of '" + cNumericFieldNames(1) +"'.");
+                // Set min to roughly max, but not quite, otherwise it can't turn on, ever
+                PumpEquip(PumpNum).MinVolFlowRate = 0.99 * PumpEquip(PumpNum).NomVolFlowRate;
             }
             // Probably the following two lines will be used if the team agrees on changing the F10 value from min flow rate to
             // minimum flow as a fraction of nominal flow.