NREL · Myoldmopar · Aug 21, 2021 · Nov 25, 2020 · Dec 11, 2020 · Dec 11, 2020
diff --git a/design/FY2021/NFP-Spaces.md b/design/FY2021/NFP-Spaces.md
diff --git a/design/FY2021/Space-Examples-FloorArea.png b/design/FY2021/Space-Examples-FloorArea.png
diff --git a/design/FY2021/Space-Examples-FullGeometry.png b/design/FY2021/Space-Examples-FullGeometry.png
diff --git a/design/FY2021/ZZZ-OLDNFP Space-2020-04-06-early discussions.md b/design/FY2021/ZZZ-OLDNFP Space-2020-04-06-early discussions.md
diff --git a/idd/Energy+.idd.in b/idd/Energy+.idd.in
diff --git a/performance_tests/15zonePSZ.idf b/performance_tests/15zonePSZ.idf
diff --git a/performance_tests/15zonePTAC.idf b/performance_tests/15zonePTAC.idf
diff --git a/performance_tests/15zonePVAV.idf b/performance_tests/15zonePVAV.idf
diff --git a/performance_tests/15zonevav.idf b/performance_tests/15zonevav.idf
diff --git a/performance_tests/15zonevav_no_reports.idf b/performance_tests/15zonevav_no_reports.idf
diff --git a/performance_tests/30zonePSZ.idf b/performance_tests/30zonePSZ.idf
diff --git a/performance_tests/30zonePTAC.idf b/performance_tests/30zonePTAC.idf
diff --git a/performance_tests/30zonePVAV.idf b/performance_tests/30zonePVAV.idf
diff --git a/performance_tests/30zonevav.idf b/performance_tests/30zonevav.idf
diff --git a/performance_tests/45zonePSZ.idf b/performance_tests/45zonePSZ.idf
diff --git a/performance_tests/45zonePTAC.idf b/performance_tests/45zonePTAC.idf
diff --git a/performance_tests/45zonePVAV.idf b/performance_tests/45zonePVAV.idf
diff --git a/performance_tests/45zonevav.idf b/performance_tests/45zonevav.idf
diff --git a/performance_tests/BenchmarkHospitalNew_USA_CA_SAN_FRANCISCO.idf b/performance_tests/BenchmarkHospitalNew_USA_CA_SAN_FRANCISCO.idf
diff --git a/performance_tests/BenchmarkLargeOfficeNew_USA_CA_SAN_FRANCISCO_10_windows_per_zone.idf b/performance_tests/BenchmarkLargeOfficeNew_USA_CA_SAN_FRANCISCO_10_windows_per_zone.idf
diff --git a/performance_tests/Benchmarklargeofficenew_usa_ca_san_francisco_no_reports.idf b/performance_tests/Benchmarklargeofficenew_usa_ca_san_francisco_no_reports.idf
diff --git a/performance_tests/PipingSystem_Underground_FHX.idf b/performance_tests/PipingSystem_Underground_FHX.idf
@@ -59,7 +59,7 @@
     FHX House,               !- Name
     0.0,                     !- North Axis {deg}
     Suburbs,                 !- Terrain
-    0.05,                    !- Loads Convergence Tolerance Value
+    0.05,                    !- Loads Convergence Tolerance Value {W}
     0.05,                    !- Temperature Convergence Tolerance Value {deltaC}
     FullInteriorAndExterior, !- Solar Distribution
     35,                      !- Maximum Number of Warmup Days
@@ -92,7 +92,9 @@
     Yes,                     !- Do System Sizing Calculation
     Yes,                     !- Do Plant Sizing Calculation
     Yes,                     !- Run Simulation for Sizing Periods
-    No;                      !- Run Simulation for Weather File Run Periods
+    No,                      !- Run Simulation for Weather File Run Periods
+    ,                        !- Do HVAC Sizing Simulation for Sizing Periods
+    ;                        !- Maximum Number of HVAC Sizing Simulation Passes
 
 !***********************************************************
 !****** LOCATION SPECIFIC OBJECTS **************************
@@ -201,7 +203,12 @@
     0,                       !- Heating Design Air Flow Rate {m3/s}
     ,                        !- Heating Maximum Air Flow per Zone Floor Area {m3/s-m2}
     ,                        !- Heating Maximum Air Flow {m3/s}
-    ;                        !- Heating Maximum Air Flow Fraction
+    ,                        !- Heating Maximum Air Flow Fraction
+    ,                        !- Design Specification Zone Air Distribution Object Name
+    ,                        !- Account for Dedicated Outdoor Air System
+    ,                        !- Dedicated Outdoor Air System Control Strategy
+    ,                        !- Dedicated Outdoor Air Low Setpoint Temperature for Design {C}
+    ;                        !- Dedicated Outdoor Air High Setpoint Temperature for Design {C}
 
   Sizing:Zone,
     Main Floor,              !- Zone or ZoneList Name
@@ -225,7 +232,12 @@
     0,                       !- Heating Design Air Flow Rate {m3/s}
     ,                        !- Heating Maximum Air Flow per Zone Floor Area {m3/s-m2}
     ,                        !- Heating Maximum Air Flow {m3/s}
-    ;                        !- Heating Maximum Air Flow Fraction
+    ,                        !- Heating Maximum Air Flow Fraction
+    ,                        !- Design Specification Zone Air Distribution Object Name
+    ,                        !- Account for Dedicated Outdoor Air System
+    ,                        !- Dedicated Outdoor Air System Control Strategy
+    ,                        !- Dedicated Outdoor Air Low Setpoint Temperature for Design {C}
+    ;                        !- Dedicated Outdoor Air High Setpoint Temperature for Design {C}
 
   Sizing:Plant,
     Condenser Loop,          !- Plant or Condenser Loop Name
@@ -352,6 +364,7 @@
     Wall,                    !- Surface Type
     Basement Wall/Floor Construction,  !- Construction Name
     Basement,                !- Zone Name
+    ,                        !- Space Name
     OtherSideConditionsModel,!- Outside Boundary Condition
     BasementWallOSCM,        !- Outside Boundary Condition Object
     NoSun,                   !- Sun Exposure
@@ -368,6 +381,7 @@
     Wall,                    !- Surface Type
     Basement Wall/Floor Construction,  !- Construction Name
     Basement,                !- Zone Name
+    ,                        !- Space Name
     OtherSideConditionsModel,!- Outside Boundary Condition
     BasementWallOSCM,        !- Outside Boundary Condition Object
     NoSun,                   !- Sun Exposure
@@ -384,6 +398,7 @@
     Wall,                    !- Surface Type
     Basement Wall/Floor Construction,  !- Construction Name
     Basement,                !- Zone Name
+    ,                        !- Space Name
     OtherSideConditionsModel,!- Outside Boundary Condition
     BasementWallOSCM,        !- Outside Boundary Condition Object
     NoSun,                   !- Sun Exposure
@@ -400,6 +415,7 @@
     Wall,                    !- Surface Type
     Basement Wall/Floor Construction,  !- Construction Name
     Basement,                !- Zone Name
+    ,                        !- Space Name
     OtherSideConditionsModel,!- Outside Boundary Condition
     BasementWallOSCM,        !- Outside Boundary Condition Object
     NoSun,                   !- Sun Exposure
@@ -416,6 +432,7 @@
     Floor,                   !- Surface Type
     Basement Wall/Floor Construction,  !- Construction Name
     Basement,                !- Zone Name
+    ,                        !- Space Name
     OtherSideConditionsModel,!- Outside Boundary Condition
     BasementFloorOSCM,       !- Outside Boundary Condition Object
     NoSun,                   !- Sun Exposure
@@ -432,6 +449,7 @@
     Ceiling,                 !- Surface Type
     Ceiling Construction,    !- Construction Name
     Basement,                !- Zone Name
+    ,                        !- Space Name
     Zone,                    !- Outside Boundary Condition
     Main Floor,              !- Outside Boundary Condition Object
     NoSun,                   !- Sun Exposure
@@ -475,6 +493,7 @@
     Wall,                    !- Surface Type
     Main Floor Wall Construction,  !- Construction Name
     Main Floor,              !- Zone Name
+    ,                        !- Space Name
     Outdoors,                !- Outside Boundary Condition
     ,                        !- Outside Boundary Condition Object
     SunExposed,              !- Sun Exposure
@@ -491,6 +510,7 @@
     Wall,                    !- Surface Type
     Main Floor Wall Construction,  !- Construction Name
     Main Floor,              !- Zone Name
+    ,                        !- Space Name
     Outdoors,                !- Outside Boundary Condition
     ,                        !- Outside Boundary Condition Object
     SunExposed,              !- Sun Exposure
@@ -507,6 +527,7 @@
     Wall,                    !- Surface Type
     Main Floor Wall Construction,  !- Construction Name
     Main Floor,              !- Zone Name
+    ,                        !- Space Name
     Outdoors,                !- Outside Boundary Condition
     ,                        !- Outside Boundary Condition Object
     SunExposed,              !- Sun Exposure
@@ -523,6 +544,7 @@
     Wall,                    !- Surface Type
     Main Floor Wall Construction,  !- Construction Name
     Main Floor,              !- Zone Name
+    ,                        !- Space Name
     Outdoors,                !- Outside Boundary Condition
     ,                        !- Outside Boundary Condition Object
     SunExposed,              !- Sun Exposure
@@ -539,6 +561,7 @@
     Roof,                    !- Surface Type
     Roof Construction,       !- Construction Name
     Main Floor,              !- Zone Name
+    ,                        !- Space Name
     Outdoors,                !- Outside Boundary Condition
     ,                        !- Outside Boundary Condition Object
     SunExposed,              !- Sun Exposure
@@ -830,97 +853,97 @@
     Zone 2 Outlet Node;      !- Return Air Stream Node Name
 
   Curve:QuadLinear,
-    TotCoolCapCurve,      ! Curve Name
-    -9.149069561,            !- CoefficientC1
-    10.87814026,             !- CoefficientC2
-    -1.718780157,            !- CoefficientC3
-    0.746414818,             !- CoefficientC4
-    0.0,                     !- CoefficientC5
-    -100,                   ! Minimum Value of w
-    100,                 ! Maximum Value of w
-    -100,                   ! Minimum Value of x
-    100,                 ! Maximum Value of x
-    0,                   ! Minimum Value of y
-    100,                 ! Maximum Value of y
-    0,                    ! Minimum Value of z
-    100,                  ! Maximum Value of z
-    0,                   ! Minimum Curve Output
-    38;                  ! Maximum Curve Output
+    TotCoolCapCurve,         !- Name
+    -9.149069561,            !- Coefficient1 Constant
+    10.87814026,             !- Coefficient2 w
+    -1.718780157,            !- Coefficient3 x
+    0.746414818,             !- Coefficient4 y
+    0.0,                     !- Coefficient5 z
+    -100,                    !- Minimum Value of w
+    100,                     !- Maximum Value of w
+    -100,                    !- Minimum Value of x
+    100,                     !- Maximum Value of x
+    0,                       !- Minimum Value of y
+    100,                     !- Maximum Value of y
+    0,                       !- Minimum Value of z
+    100,                     !- Maximum Value of z
+    0,                       !- Minimum Curve Output
+    38;                      !- Maximum Curve Output
 
   Curve:QuadLinear,
-    CoolPowCurve,      ! Curve Name
-    -3.205409884,            !- CoefficientC1
-    -0.976409399,            !- CoefficientC2
-    3.97892546,              !- CoefficientC3
-    0.938181818,             !- CoefficientC4
-    0.0,                     !- CoefficientC5
-    -100,                   ! Minimum Value of w
-    100,                 ! Maximum Value of w
-    -100,                   ! Minimum Value of x
-    100,                 ! Maximum Value of x
-    0,                   ! Minimum Value of y
-    100,                 ! Maximum Value of y
-    0,                    ! Minimum Value of z
-    100,                  ! Maximum Value of z
-    0,                   ! Minimum Curve Output
-    38;                  ! Maximum Curve Output
+    CoolPowCurve,            !- Name
+    -3.205409884,            !- Coefficient1 Constant
+    -0.976409399,            !- Coefficient2 w
+    3.97892546,              !- Coefficient3 x
+    0.938181818,             !- Coefficient4 y
+    0.0,                     !- Coefficient5 z
+    -100,                    !- Minimum Value of w
+    100,                     !- Maximum Value of w
+    -100,                    !- Minimum Value of x
+    100,                     !- Maximum Value of x
+    0,                       !- Minimum Value of y
+    100,                     !- Maximum Value of y
+    0,                       !- Minimum Value of z
+    100,                     !- Maximum Value of z
+    0,                       !- Minimum Curve Output
+    38;                      !- Maximum Curve Output
 
   Curve:QuadLinear,
-    HeatCapCurve,      ! Curve Name
-    -1.361311959,            !- CoefficientC1
-    -2.471798046,            !- CoefficientC2
-    4.173164514,             !- CoefficientC3
-    0.640757401,             !- CoefficientC4
-    0.0,                     !- CoefficientC5
-    -100,                   ! Minimum Value of w
-    100,                 ! Maximum Value of w
-    -100,                   ! Minimum Value of x
-    100,                 ! Maximum Value of x
-    0,                   ! Minimum Value of y
-    100,                 ! Maximum Value of y
-    0,                    ! Minimum Value of z
-    100,                  ! Maximum Value of z
-    0,                   ! Minimum Curve Output
-    38;                  ! Maximum Curve Output
+    HeatCapCurve,            !- Name
+    -1.361311959,            !- Coefficient1 Constant
+    -2.471798046,            !- Coefficient2 w
+    4.173164514,             !- Coefficient3 x
+    0.640757401,             !- Coefficient4 y
+    0.0,                     !- Coefficient5 z
+    -100,                    !- Minimum Value of w
+    100,                     !- Maximum Value of w
+    -100,                    !- Minimum Value of x
+    100,                     !- Maximum Value of x
+    0,                       !- Minimum Value of y
+    100,                     !- Maximum Value of y
+    0,                       !- Minimum Value of z
+    100,                     !- Maximum Value of z
+    0,                       !- Minimum Curve Output
+    38;                      !- Maximum Curve Output
 
   Curve:QuadLinear,
-    HeatPowCurve,      ! Curve Name
-    -2.176941116,            !- CoefficientC1
-    0.832114286,             !- CoefficientC2
-    1.570743399,             !- CoefficientC3
-    0.690793651,             !- CoefficientC4
-    0.0,                     !- CoefficientC5
-    -100,                   ! Minimum Value of w
-    100,                 ! Maximum Value of w
-    -100,                   ! Minimum Value of x
-    100,                 ! Maximum Value of x
-    0,                   ! Minimum Value of y
-    100,                 ! Maximum Value of y
-    0,                    ! Minimum Value of z
-    100,                  ! Maximum Value of z
-    0,                   ! Minimum Curve Output
-    38;                  ! Maximum Curve Output
+    HeatPowCurve,            !- Name
+    -2.176941116,            !- Coefficient1 Constant
+    0.832114286,             !- Coefficient2 w
+    1.570743399,             !- Coefficient3 x
+    0.690793651,             !- Coefficient4 y
+    0.0,                     !- Coefficient5 z
+    -100,                    !- Minimum Value of w
+    100,                     !- Maximum Value of w
+    -100,                    !- Minimum Value of x
+    100,                     !- Maximum Value of x
+    0,                       !- Minimum Value of y
+    100,                     !- Maximum Value of y
+    0,                       !- Minimum Value of z
+    100,                     !- Maximum Value of z
+    0,                       !- Minimum Curve Output
+    38;                      !- Maximum Curve Output
 
   Curve:QuintLinear,
-    CoolSensCapCurve,      ! Curve Name
-    -5.462690012,            !- CoefficientC1
-    17.95968138,             !- CoefficientC2
-    -11.87818402,            !- CoefficientC3
-    -0.980163419,            !- CoefficientC4
-    0.767285761,             !- CoefficientC5
-    0.0,                     !- CoefficientC6
-    -100,                   ! Minimum Value of v
-    100,                 ! Maximum Value of v
-    -100,                   ! Minimum Value of w
-    100,                 ! Maximum Value of w
-    -100,                   ! Minimum Value of x
-    100,                 ! Maximum Value of x
-    0,                   ! Minimum Value of y
-    100,                 ! Maximum Value of y
-    0,                    ! Minimum Value of z
-    100,                  ! Maximum Value of z
-    0,                   ! Minimum Curve Output
-    38;                  ! Maximum Curve Output
+    CoolSensCapCurve,        !- Name
+    -5.462690012,            !- Coefficient1 Constant
+    17.95968138,             !- Coefficient2 v
+    -11.87818402,            !- Coefficient3 w
+    -0.980163419,            !- Coefficient4 x
+    0.767285761,             !- Coefficient5 y
+    0.0,                     !- Coefficient6 z
+    -100,                    !- Minimum Value of v
+    100,                     !- Maximum Value of v
+    -100,                    !- Minimum Value of w
+    100,                     !- Maximum Value of w
+    -100,                    !- Minimum Value of x
+    100,                     !- Maximum Value of x
+    0,                       !- Minimum Value of y
+    100,                     !- Maximum Value of y
+    0,                       !- Minimum Value of z
+    100,                     !- Maximum Value of z
+    0,                       !- Minimum Curve Output
+    38;                      !- Maximum Curve Output
 
   Coil:Cooling:WaterToAirHeatPump:EquationFit,
     Sys 2 Heat Pump Cooling Mode,  !- Name

diff --git a/scripts/dev/generate_epJSON_schema/modify_schema.py b/scripts/dev/generate_epJSON_schema/modify_schema.py
@@ -124,6 +124,9 @@ def isInt(s):
     'RoofCeiling:Detailed': 'vertices',
     'Shading:Site:Detailed': 'vertices',
     'Wall:Detailed': 'vertices',
+    'Space': 'tags',
+    'SpaceList': 'spaces',
+    'DesignSpecification:OutdoorAir:SpaceList': 'space_specs',
     'ZoneList': 'zones',
     'Floor:Detailed': 'vertices',
     'Shading:Building:Detailed': 'vertices',

diff --git a/src/EnergyPlus/DataDaylighting.hh b/src/EnergyPlus/DataDaylighting.hh
@@ -116,6 +116,13 @@ namespace DataDaylighting {
         }
     };
 
+    struct EnclDaylightCalc
+    {
+        Real64 aveVisDiffReflect = 0.0; // Area-weighted average inside surface visible reflectance of zone
+        Real64 totInsSurfArea = 0.0;    // Total inside surface area of a daylit zone (m2)
+        Real64 floorVisRefl = 0.0;      // Area-weighted visible reflectance of floor of a daylit zone
+    };
+
     struct ZoneDaylightCalc
     {
         // Members
@@ -141,7 +148,6 @@ namespace DataDaylighting {
         int LightControlSteps;                     // Number of levels (excluding zero) of stepped control system
         Real64 LightControlProbability;            // For manual control of stepped systems, probability that lighting will
         int TotalExtWindows;                       // Total number of exterior windows in the zone or same solar enclosure
-        Real64 AveVisDiffReflect;                  // Area-weighted average inside surface visible reflectance of zone
         Real64 DElightGriddingResolution;          // Field: Delight Gridding Resolution
         Array1D<Real64> RefPtPowerReductionFactor; // =1.0  ! Electric power reduction factor at reference points
         // due to daylighting
@@ -163,8 +169,6 @@ namespace DataDaylighting {
         // sublists a just a single index to a fenestration surface if they are deployed one at a time.
         Array1D_int MapShdOrdToLoopNum; // list that maps back the original loop order when using ShadeDeployOrderExtWins for shade deployment
         Real64 MinIntWinSolidAng;       // Minimum solid angle subtended by an interior window in a zone
-        Real64 TotInsSurfArea;          // Total inside surface area of a daylit zone (m2)
-        Real64 FloorVisRefl;            // Area-weighted visible reflectance of floor of a daylit zone
         Real64 InterReflIllFrIntWins;   // Inter-reflected illuminance due to beam and diffuse solar passing
         //  through a zone's interior windows (lux)
         Array1D<Real64> BacLum;                  // =0.0 ! Background luminance at each reference point (cd/m2)
@@ -209,9 +213,9 @@ namespace DataDaylighting {
         ZoneDaylightCalc()
             : DaylightMethod(iDaylightingMethod::NoDaylighting), AvailSchedNum(0), TotalDaylRefPoints(0), LightControlType(iLtgCtrlType::Continuous),
               glareRefPtNumber(0), ViewAzimuthForGlare(0.0), MaxGlareallowed(0), MinPowerFraction(0.0), MinLightFraction(0.0), LightControlSteps(0),
-              LightControlProbability(0.0), TotalExtWindows(0), AveVisDiffReflect(0.0), DElightGriddingResolution(0.0), ZonePowerReductionFactor(1.0),
-              NumOfIntWinAdjZones(0), NumOfIntWinAdjZoneExtWins(0), NumOfDayltgExtWins(0), MinIntWinSolidAng(0.0), TotInsSurfArea(0.0),
-              FloorVisRefl(0.0), InterReflIllFrIntWins(0.0), AdjZoneHasDayltgCtrl(false), MapCount(0)
+              LightControlProbability(0.0), TotalExtWindows(0), DElightGriddingResolution(0.0), ZonePowerReductionFactor(1.0), NumOfIntWinAdjZones(0),
+              NumOfIntWinAdjZoneExtWins(0), NumOfDayltgExtWins(0), MinIntWinSolidAng(0.0), InterReflIllFrIntWins(0.0), AdjZoneHasDayltgCtrl(false),
+              MapCount(0)
         {
         }
     };
@@ -329,6 +333,7 @@ struct DaylightingData : BaseGlobalStruct
     bool DFSReportAllShadowCalculationDays = false;
     int TotDElightCFS = 0;
 
+    Array1D<DataDaylighting::EnclDaylightCalc> enclDaylight;
     Array1D<DataDaylighting::ZoneDaylightCalc> ZoneDaylight;
     Array1D<DataDaylighting::IllumMapData> IllumMap;
     Array1D<DataDaylighting::MapCalcData> IllumMapCalc;