merge develop, fixed merge conflicts

idd/Energy+.idd.in

@@ -678,7 +678,7 @@ SurfaceConvectionAlgorithm:Inside,
        \note  for ceiling diffuser configuration with simple natural convection limit
        \note AdaptiveConvectionAlgorithm = dynamic selection of convection models based on conditions
        \note ASTMC1340 = mixed convection correlations based on heat flow direction,
-       \note  surface tilt angle, surface characteristic length, and air speed past the surface. 
+       \note  surface tilt angle, surface characteristic length, and air speed past the surface.
 
 SurfaceConvectionAlgorithm:Outside,
        \memo Default outside surface heat transfer convection algorithm to be used for all zones
@@ -791,29 +791,29 @@ ZoneAirContaminantBalance,
        \object-list ScheduleNames
 
 ZoneAirMassFlowConservation,
-       \memo Enforces the zone air mass flow balance by either adjusting zone mixing object flow only, 
-       \memo adjusting zone total return flow only, zone mixing and the zone total return flows, 
-       \memo or adjusting the zone total return and zone mixing object flows. Zone infiltration flow air 
+       \memo Enforces the zone air mass flow balance by either adjusting zone mixing object flow only,
+       \memo adjusting zone total return flow only, zone mixing and the zone total return flows,
+       \memo or adjusting the zone total return and zone mixing object flows. Zone infiltration flow air
        \memo flow is increased or decreased depending user selection in the infiltration treatment method.
-       \memo If either of zone mixing or zone return flow adjusting methods or infiltration is active, 
-       \memo then the zone air mass flow balance calculation will attempt to enforce conservation of 
+       \memo If either of zone mixing or zone return flow adjusting methods or infiltration is active,
+       \memo then the zone air mass flow balance calculation will attempt to enforce conservation of
        \memo mass for each zone. If flow balancing method is "None" and infiltration is "None", then the
-       \memo zone air mass flow calculation defaults to assume self-balanced simple flow mixing and 
+       \memo zone air mass flow calculation defaults to assume self-balanced simple flow mixing and
        \memo infiltration objects.
        \unique-object
        \min-fields 3
   A1,  \field Adjust Zone Mixing and Return For Air Mass Flow Balance
        \note If "AdjustMixingOnly", zone mixing object flow rates are adjusted to balance the zone air mass
        \note flow and zone infiltration air flow may be increased or decreased if required in order to balance
-       \note the zone air mass flow. If "AdjustReturnOnly", zone total return flow rate is adjusted to balance 
-       \note the zone air mass flow and zone infiltration air flow may be increased or decreased if required 
-       \note in order to balance the zone air mass flow. If "AdjustMixingThenReturn", first the zone mixing 
-       \note objects flow rates are adjusted to balance the zone air flow, second zone total return flow rate 
+       \note the zone air mass flow. If "AdjustReturnOnly", zone total return flow rate is adjusted to balance
+       \note the zone air mass flow and zone infiltration air flow may be increased or decreased if required
+       \note in order to balance the zone air mass flow. If "AdjustMixingThenReturn", first the zone mixing
+       \note objects flow rates are adjusted to balance the zone air flow, second zone total return flow rate
        \note is adjusted and zone infiltration air flow may be increased or decreased if required in order to
-       \note balance the zone air mass flow. If "AdjustReturnThenMixing", first zone total return flow rate is 
-	   \note adjusted to balance the zone air flow, second the zone mixing object flow rates are adjusted and 
-	   \note infiltration air flow may be increased or decreased if required in order to balance the zone
-	   \note air mass flow.	   
+       \note balance the zone air mass flow. If "AdjustReturnThenMixing", first zone total return flow rate is
+       \note adjusted to balance the zone air flow, second the zone mixing object flow rates are adjusted and
+       \note infiltration air flow may be increased or decreased if required in order to balance the zone
+       \note air mass flow.
        \type choice
        \key AdjustMixingOnly
        \key AdjustReturnOnly
@@ -44351,9 +44351,7 @@ ZoneHVAC:LowTemperatureRadiant:ConstantFlow:Design,
         \min-fields 11
    A1 , \field Name
         \required-field
-        \reference-class-name validBranchEquipmentTypes
-        \reference validBranchEquipmentNames
-        \reference ZoneEquipmentNames
+        \reference RadiantDesignObject
    A2 , \field Fluid to Radiant Surface Heat Transfer Model
         \note This parameter identifies how the heat transfer between
         \note fluid being circulated through the radiant system and

src/EnergyPlus/LowTempRadiantSystem.cc

@@ -442,17 +442,18 @@ namespace LowTempRadiantSystem {
 
         state.dataLowTempRadSys->ElecRadSys.allocate(state.dataLowTempRadSys->NumOfElecLowTempRadSys);
         state.dataLowTempRadSys->ElecRadSysNumericFields.allocate(state.dataLowTempRadSys->NumOfElecLowTempRadSys);
+
         state.dataLowTempRadSys->HydronicRadiantSysNumericFields.allocate(state.dataLowTempRadSys->NumOfHydrLowTempRadSys);
         state.dataLowTempRadSys->HydronicRadiantSysDesign.allocate(state.dataLowTempRadSys->NumOfHydrLowTempRadSysDes);
-        state.dataLowTempRadSys->CflowRadiantSysDesign.allocate(state.dataLowTempRadSys->NumOfCFloLowTempRadSysDes); //state->
         VarFlowRadDesignNames.allocate(state.dataLowTempRadSys->NumOfHydrLowTempRadSysDes);
+
+        state.dataLowTempRadSys->CflowRadiantSysDesign.allocate(state.dataLowTempRadSys->NumOfCFloLowTempRadSysDes);
         CFlowRadDesignNames.allocate(state.dataLowTempRadSys->NumOfCFloLowTempRadSysDes);
 
         // make sure data is gotten for surface lists
         GetNumberOfSurfaceLists(state);
 
         // Obtain all of the design data related to hydronic low temperature radiant systems...
-        BaseNum = 0;
         CurrentModuleObject = "ZoneHVAC:LowTemperatureRadiant:VariableFlow:Design";
         for (Item = 1; Item <= state.dataLowTempRadSys->NumOfHydrLowTempRadSysDes; ++Item) {
 
@@ -476,7 +477,6 @@ namespace LowTempRadiantSystem {
             state.dataLowTempRadSys->HydronicRadiantSysDesign(Item).FieldNames = cNumericFields;
             GlobalNames::VerifyUniqueInterObjectName(state, LowTempRadUniqueNames, Alphas(1), CurrentModuleObject, cAlphaFields(1), ErrorsFound);
 
-            ++BaseNum;
             auto &thisRadSysDesign(state.dataLowTempRadSys->HydronicRadiantSysDesign(Item));
 
             // General user input data
@@ -847,7 +847,6 @@ namespace LowTempRadiantSystem {
         }
 
         // Obtain all of the design data related to Constant flow low temperature radiant systems...
-        BaseNum = 0;
         CurrentModuleObject = "ZoneHVAC:LowTemperatureRadiant:ConstantFlow:Design";
         for (Item = 1; Item <= state.dataLowTempRadSys->NumOfCFloLowTempRadSysDes; ++Item) {
 
@@ -871,7 +870,6 @@ namespace LowTempRadiantSystem {
             state.dataLowTempRadSys->CflowRadiantSysDesign(Item).FieldNames = cNumericFields;
             GlobalNames::VerifyUniqueInterObjectName(state, LowTempRadUniqueNames, Alphas(1), CurrentModuleObject, cAlphaFields(1), ErrorsFound);
 
-            ++BaseNum;
             auto &thisRadSysDesign(state.dataLowTempRadSys->CflowRadiantSysDesign(Item));
 
             // General user input data
@@ -917,7 +915,6 @@ namespace LowTempRadiantSystem {
         }
 
         // Obtain all of the user data related to constant flow (hydronic) low temperature radiant systems...
-        BaseNum = 0;
         CurrentModuleObject = "ZoneHVAC:LowTemperatureRadiant:ConstantFlow";
         for (Item = 1; Item <= state.dataLowTempRadSys->NumOfCFloLowTempRadSys; ++Item) {