Merge develop, resolve tiny conflict

doc/input-output-reference/src/overview/group-daylighting.tex

@@ -505,21 +505,21 @@ \subsubsection{Outputs}\label{outputs-1-004}
 
 \subsection{Output:IlluminanceMap}\label{outputilluminancemap}
 
-The Output:IlluminanceMap object expands on the reporting capabilities of the daylighting simulation. For any zone simulated with \hyperref[daylightingcontrols-000]{Daylighting:Controls}, the illuminance map can generate up to 2,500 points of additional daylighting illuminance values. The resulting map is output as a comma delimited text file that can be imported into a spreadsheet program for rapid visualization of the daylighting illuminance patterns in a zone. The values are produced on an hourly basis. The Z height of the map is constant (parallel to a flat floor). More than one illuminance map can be created for a zone. IlluminanceMap output is available only when SplitFlux daylighting method is selected in \hyperref[daylightingcontrols-000]{Daylighting:Controls} object.
+The Output:IlluminanceMap object expands on the reporting capabilities of the daylighting simulation. For any space or zone simulated with \hyperref[daylightingcontrols-000]{Daylighting:Controls}, the illuminance map can generate up to 2,500 points of additional daylighting illuminance values. The resulting map is output as a comma delimited text file that can be imported into a spreadsheet program for rapid visualization of the daylighting illuminance patterns in a space or zone. The values are produced on an hourly basis. The Z height of the map is constant (parallel to a flat floor). More than one illuminance map can be created for a space or zone. IlluminanceMap output is available only when SplitFlux daylighting method is selected in \hyperref[daylightingcontrols-000]{Daylighting:Controls} object.
 
 \subsubsection{Inputs}\label{inputs-4-006}
 
 \paragraph{Field: Name}\label{field-name-2-007}
 
 The name of the map object.
 
-\paragraph{Field: Zone Name}\label{field-zone-name-2-000}
+\paragraph{Field: Zone or Space Name}\label{field-zone-name-2-000}
 
-Reference to a zone with \hyperref[daylightingcontrols-000]{Daylighting:Controls}. The zone must lie completely within a single solar enclosure.
+Reference to a zone or space with \hyperref[daylightingcontrols-000]{Daylighting:Controls}. If a zone name is specified, all spaces in the zone must be within the same solar enclosure.
 
 \paragraph{Field: Z Height}\label{field-z-height}
 
-The height or elevation of the grid of daylighting points.
+The height or elevation of the grid of daylighting points.  Coordinates may be world or relative as specified in the \hyperref[globalgeometryrules]{GlobalGeometryRules} object Daylighting Reference Point CoordinateSystem field. If a space name is specifice for this map, relative coodinates are relative to the origin of the zone that contains the space  (spaces do not have a separate origin).
 
 \paragraph{Field: X Minimum Coordinate}\label{field-x-minimum-coordinate}
 
@@ -551,7 +551,7 @@ \subsubsection{Inputs}\label{inputs-4-006}
 
 Output:IlluminanceMap,
     Daylit Map,      ! Map Name
-    Daylit Zone,     ! Zone Name
+    Daylit Zone,     ! Zone or Space Name
     0,               ! Z Height [m]
     0.1,             ! X Minimum Coordinate [m]
     4.9,             ! X Maximum Coordinate [m]

doc/input-output-reference/src/overview/group-thermal-zone-description-geometry.tex

@@ -2772,11 +2772,11 @@ \subsubsection{Inputs}\label{inputs-25-004}
 
 \paragraph{Field: Zone or ZoneList Name}\label{field-zone-or-zonelist-name-14}
 
-This field is the name of the \hyperref[zone]{Zone} or \hyperref[zonelist]{ZoneList} in which the internal mass will be added. When the ZoneList option is used then this internal mass object is applied to each of zone in the list. The name of the actual internal mass object in each zone becomes <Zone Name> <InternalMass Object Name> and should be less than the standard length (100 characters) for a name field. If it is greater than this standard length, it may be difficult to specify in output reporting as it will be truncated. A warning will be shown if the generated name is greater than 100 characters. If it duplicates another such concatenated name, there will be a severe error and terminate the run.
+This field is the name of the \hyperref[zone]{Zone} or \hyperref[zonelist]{ZoneList} in which the internal mass will be added. When the ZoneList option is used then this internal mass object is applied to each zone in the list. The name of the actual internal mass object in each zone becomes <Zone Name> <InternalMass Object Name> and should be less than the standard length (100 characters) for a name field. If it is greater than this standard length, it may be difficult to specify in output reporting as it will be truncated. A warning will be shown if the generated name is greater than 100 characters. If it duplicates another such concatenated name, there will be a severe error and terminate the run. This field is ignored when a Space or SpaceList Name is specified.
 
 \paragraph{Field: Space or SpaceList Name}\label{field-space-or-spacelist-name-14}
 
-This field is the name of the \hyperref[space]{Space} or \hyperref[spacelist]{SpaceList} in which the internal mass will be added. When the SpaceList option is used then this internal mass object is applied to each space in the list. The name of the actual internal mass object in each space becomes <Space Name> <InternalMass Object Name> and should be less than the standard length (100 characters) for a name field. If it is greater than this standard length, it may be difficult to specify in output reporting as it will be truncated. A warning will be shown if the generated name is greater than 100 characters. If it duplicates another such concatenated name, there will be a severe error and terminate the run. This field is ignored when a ZoneList Name is specified for Zone or ZoneList Name. If a Space Name is used, then the Space must be part of Zone Name. If a SpaceList Name is used, then the Zone Name is ignored (even though it is a required field), and the surface is assigned to the corresponding Zone(s) for each Space in the SpaceList.
+This field is the name of the \hyperref[space]{Space} or \hyperref[spacelist]{SpaceList} in which the internal mass will be added. If this field is blank (or a ZoneList Name is specified), the internal mass will be added to the last space attached to the zone. When the SpaceList option is used then this internal mass object is applied to each space in the list. The name of the actual internal mass object in each space becomes <Space Name> <InternalMass Object Name> and should be less than the standard length (100 characters) for a name field. If it is greater than this standard length, it may be difficult to specify in output reporting as it will be truncated. A warning will be shown if the generated name is greater than 100 characters. If it duplicates another such concatenated name, there will be a severe error and terminate the run. This field is ignored when a ZoneList Name is specified for Zone or ZoneList Name. If this field is entered, then the Zone or ZoneList Name is ignored, and the surface is assigned to the corresponding Zone(s) for the Space(s).
 
 \paragraph{Field: Surface Area}\label{field-surface-area}
 
@@ -2789,13 +2789,15 @@ \subsubsection{Inputs}\label{inputs-25-004}
   Zn002:IntM001,                !- Surface Name
   INTERIOR,                     !- Construction Name
   DORM ROOMS AND COMMON AREAS,  !- Zone or ZoneList Name
-  408.7734;                     !- Total area exposed to Zone {m2}
+  ,                             !- Space or SpaceList Name
+  408.7734;                     !- Surface Area {m2}
 
 InternalMass,
   Zn002:IntM002,                !- Surface Name
   PARTITION02,                  !- Construction Name
   DORM ROOMS AND COMMON AREAS,  !- Zone or ZoneList Name
-  371.6122;                     !- Total area exposed to Zone {m2}
+  ,                             !- Space or SpaceList Name
+  371.6122;                     !- Surface Area {m2}
 \end{lstlisting}
 
 \subsection{Surface Output Variables/Reports}\label{surface-output-variablesreports}

idd/Energy+.idd.in

@@ -13371,16 +13371,16 @@ InternalMass,
        \type object-list
        \object-list ConstructionNames
   A3 , \field Zone or ZoneList Name
-       \required-field
        \type object-list
        \object-list ZoneAndZoneListNames
-       \note Zone the surface is a part of.
-       \note used to be Interior Environment
+       \note Zone(s) the surface is a part of. 
+       \note This field is ignored when a Space or SpaceList Name is specified.
   A4 , \field Space or SpaceList Name
        \type object-list
        \object-list SpaceAndSpaceListNames
-       \note Space the surface is a part of (optional, see description of Space object for more details).
+       \note Space(s) the surface is a part of.
        \note This field is ignored when a ZoneList Name is specified for Zone or ZoneList Name.
+       \note An internal mass surface will be added to every Space in every Zone in the ZoneList.
   N1 ; \field Surface Area
        \required-field
        \units m2
@@ -23840,10 +23840,11 @@ Output:IlluminanceMap,
    \memo Daylighting Reference Point CoordinateSystem field
   A1 , \field Name
        \required-field
-  A2 , \field Zone Name
+  A2 , \field Zone or Space Name
        \required-field
        \type object-list
        \object-list ZoneNames
+       \object-list SpaceNames
   N1 , \field Z height
        \units m
        \type real

src/EnergyPlus/DataDaylighting.hh

@@ -245,6 +245,7 @@ namespace Dayltg {
     {
         // Members
         std::string Name;                    // Map name
+        int spaceIndex = 0;                  // Index to space being mapped
         int zoneIndex = 0;                   // Index to zone being mapped
         int enclIndex = 0;                   // Index to enclosure for this map
         Real64 Z = 0.0;                      // Elevation or height