Merge branch 'develop' of https://github.com/NREL/EnergyPlus into #6028…

…-PTAC-heating-coil-undersized-for-ventilation-load-when-zone-design-heating-load-is-zero Conflicts: tst/EnergyPlus/unit/PackagedTerminalHeatPump.unit.cc
NREL · Aug 20, 2017 · e3b346e · e3b346e · nrel-bot-3 · Aug 20, 2017
2 parents a7c38d0 + 4631556
commit e3b346e
Show file tree

Hide file tree

Showing 393 changed files with 27,218 additions and 11,030 deletions.
diff --git a/datasets/ASHRAE_2005_HOF_Materials.idf b/datasets/ASHRAE_2005_HOF_Materials.idf
@@ -15,6 +15,9 @@
 !===============================================================================
 ! The objects and syntax in this dataset comply with EnergyPlus, Version 8.4.0 and above, unless otherwise noted.
 
+!  Version,
+!    8.8;                    !- Version Identifier
+
   Construction,
     Light Exterior Wall,     !- Name
     F08 Metal surface,       !- Outside Layer

diff --git a/datasets/AirCooledChiller.idf b/datasets/AirCooledChiller.idf
@@ -143,6 +143,9 @@
 ! Refrigerant = R407-C
 ! The objects and syntax in this dataset comply with EnergyPlus, Version 8.4.0 and above, unless otherwise noted.
 
+!  Version,
+!    8.8;                    !- Version Identifier
+
   Chiller:Electric:EIR,
     ElectricEIRChiller McQuay AGZ010BS 34.5kW/2.67COP,  !- Name
     34465,                   !- Reference Capacity {W}

diff --git a/datasets/Boilers.idf b/datasets/Boilers.idf
@@ -18,6 +18,9 @@
 !
 ! The objects and syntax in this dataset comply with EnergyPlus, Version 8.4.0 and above, unless otherwise noted.
 
+!  Version,
+!    8.8;                    !- Version Identifier
+
   Curve:Biquadratic,
     CondensingBoilerEff,     !- Name
     1.124970374,             !- Coefficient1 Constant

diff --git a/datasets/California_Title_24-2008.idf b/datasets/California_Title_24-2008.idf
@@ -21,6 +21,9 @@
 ! ;                         !Reserved
 ! The objects and syntax in this dataset comply with EnergyPlus, Version 8.4.0 and above, unless otherwise noted.
 
+!  Version,
+!    8.8;                    !- Version Identifier
+
   People,
     Auditoriums,             !- Name
     Auditoriums,             !- Zone or ZoneList Name

diff --git a/datasets/Chillers.idf b/datasets/Chillers.idf
@@ -184,6 +184,9 @@
 ! Unloading Mechanism = Inlet Vanes
 ! The objects and syntax in this dataset comply with EnergyPlus, Version 8.4.0 and above, unless otherwise noted.
 
+!  Version,
+!    8.8;                    !- Version Identifier
+
   Chiller:Electric:EIR,
     ElectricEIRChiller McQuay WSC 471kW/5.89COP/Vanes,  !- Name
     471200,                  !- Reference Capacity {W}

diff --git a/datasets/CompositeWallConstructions.idf b/datasets/CompositeWallConstructions.idf
@@ -19,6 +19,9 @@
 ! Material layer names follow:
 ! The objects and syntax in this dataset comply with EnergyPlus, Version 8.4.0 and above, unless otherwise noted.
 
+!  Version,
+!    8.8;                    !- Version Identifier
+
   Construction,
     Composite 2x4 Wood Stud R11,  !- Name
     Composite 2x4 Wood Stud R11 #3,  !- Outside Layer

diff --git a/datasets/DXCoolingCoil.idf b/datasets/DXCoolingCoil.idf
@@ -62,6 +62,9 @@
 ! Expansion Valve Type = Balance port TXV, removable head
 ! The objects and syntax in this dataset comply with EnergyPlus, Version 8.4.0 and above, unless otherwise noted.
 
+!  Version,
+!    8.8;                    !- Version Identifier
+
   Coil:Cooling:DX:SingleSpeed,
     Lennox KCA060S4,         !- Name
     CoolingCoilAvailSched,   !- Availability Schedule Name

diff --git a/datasets/ElectricGenerators.idf b/datasets/ElectricGenerators.idf
@@ -22,6 +22,9 @@
 !
 ! The objects and syntax in this dataset comply with EnergyPlus, Version 8.4.0 and above, unless otherwise noted.
 
+!  Version,
+!    8.8;                    !- Version Identifier
+
   Generator:MicroTurbine,
     Capstone C65,            !- Name
     65000,                   !- Reference Electrical Power Output {W}

diff --git a/datasets/ElectricityUSAEnvironmentalImpactFactors.idf b/datasets/ElectricityUSAEnvironmentalImpactFactors.idf
@@ -3,6 +3,9 @@
 !
 ! The objects and syntax in this dataset comply with EnergyPlus, Version 8.4.0 and above, unless otherwise noted.
 
+!  Version,
+!    8.8;                    !- Version Identifier
+
   Output:EnvironmentalImpactFactors,
     Monthly;                 !- Reporting Frequency
 

diff --git a/datasets/ElectronicEnthalpyEconomizerCurves.idf b/datasets/ElectronicEnthalpyEconomizerCurves.idf
@@ -128,6 +128,9 @@
 !
 ! The objects and syntax in this dataset comply with EnergyPlus, Version 8.4.0 and above, unless otherwise noted.
 
+!  Version,
+!    8.8;                    !- Version Identifier
+
   Curve:Cubic,
     ElectronicEnthalpyCurveA,!- Name
     0.01342704,              !- Coefficient1 Constant

diff --git a/datasets/ExhaustFiredChiller.idf b/datasets/ExhaustFiredChiller.idf
@@ -14,6 +14,9 @@
 ! Cooling Capacity function of temperature curve  - CoolCapfT
 ! The objects and syntax in this dataset comply with EnergyPlus, Version 8.4.0 and above, unless otherwise noted.
 
+!  Version,
+!    8.8;                    !- Version Identifier
+
   Curve:Biquadratic,
     ExhAbsorb_CapFt,         !- Name
     -0.115131E+01,           !- Coefficient1 Constant

diff --git a/datasets/FluidPropertiesRefData.idf b/datasets/FluidPropertiesRefData.idf
@@ -15,6 +15,9 @@
 ! =============================================================================
 ! The objects and syntax in this dataset comply with EnergyPlus, Version 8.4.0 and above, unless otherwise noted.
 
+!  Version,
+!    8.8;                    !- Version Identifier
+
   FluidProperties:Name,
     R11,                     !- Fluid Name
     Refrigerant;             !- Fluid Type

diff --git a/datasets/FossilFuelEnvironmentalImpactFactors.idf b/datasets/FossilFuelEnvironmentalImpactFactors.idf
@@ -3,6 +3,9 @@
 !
 ! The objects and syntax in this dataset comply with EnergyPlus, Version 8.4.0 and above, unless otherwise noted.
 
+!  Version,
+!    8.8;                    !- Version Identifier
+
   Output:EnvironmentalImpactFactors,
     Monthly;                 !- Reporting Frequency
 

diff --git a/datasets/GLHERefData.idf b/datasets/GLHERefData.idf
@@ -22,6 +22,9 @@
 !************ LINE CONFIGURATION: 1 x 2, line, Standard Grout *****************
 ! The G-function is defined by the following data pairs
 
+!  Version,
+!    8.8;                    !- Version Identifier
+
   GroundHeatExchanger:Vertical,
     Vertical GHE 1x2 Std,    !- Name
     GHE Inlet Node 1x2 Std,  !- Inlet Node Name

diff --git a/datasets/GlycolPropertiesRefData.idf b/datasets/GlycolPropertiesRefData.idf
@@ -13,6 +13,9 @@
 ! GLYCOL TEMPERATURES
 ! The objects and syntax in this dataset comply with EnergyPlus, Version 8.4.0 and above, unless otherwise noted.
 
+!  Version,
+!    8.8;                    !- Version Identifier
+
   FluidProperties:Temperatures,
     GlycolTemperatures,      !- Name
     -35,-30,-25,-20,-15,-10,-5,

diff --git a/datasets/LCCusePriceEscalationDataSet2012.idf b/datasets/LCCusePriceEscalationDataSet2012.idf
@@ -24,6 +24,9 @@
 ! which is available upon request.
 ! The objects and syntax in this dataset comply with EnergyPlus, Version 8.4.0 and above, unless otherwise noted.
 
+!  Version,
+!    8.8;                    !- Version Identifier
+
   LifeCycleCost:UsePriceEscalation,
     NorthEast  Residential-Electricity,  !- Name
     Electricity,             !- Resource

diff --git a/datasets/LCCusePriceEscalationDataSet2013.idf b/datasets/LCCusePriceEscalationDataSet2013.idf
@@ -24,6 +24,9 @@
 ! which is available upon request.
 ! The objects and syntax in this dataset comply with EnergyPlus, Version 8.4.0 and above, unless otherwise noted.
 
+!  Version,
+!    8.8;                    !- Version Identifier
+
   LifeCycleCost:UsePriceEscalation,
     NorthEast  Residential-Electricity,  !- Name
     Electricity,             !- Resource

diff --git a/datasets/LCCusePriceEscalationDataSet2014.idf b/datasets/LCCusePriceEscalationDataSet2014.idf
@@ -24,6 +24,9 @@
 ! which is available upon request.
 ! The objects and syntax in this dataset comply with EnergyPlus, Version 8.4.0 and above, unless otherwise noted.
 
+!  Version,
+!    8.8;                    !- Version Identifier
+
   LifeCycleCost:UsePriceEscalation,
     NorthEast  Residential-Electricity,  !- Name
     Electricity,             !- Resource

diff --git a/datasets/LCCusePriceEscalationDataSet2015.idf b/datasets/LCCusePriceEscalationDataSet2015.idf
@@ -16,6 +16,9 @@
 ! converted into EnergyPlus objects using a spreadsheet called ConvertENCOSTtoEnergyPlusLifeCycleCost.xls
 ! which is available upon request.
 
+!  Version,
+!    8.8;                    !- Version Identifier
+
   LifeCycleCost:UsePriceEscalation,
     NorthEast  Residential-Electricity,  !- Name
     Electricity,             !- Resource