Merge develop; resolve conflicts

Author: amirroth

src/EnergyPlus/IndoorGreen.cc

@@ -374,89 +374,87 @@ namespace IndoorGreen {
                                 "Indoor Living Wall Plant Surface Temperature",
                                 Constant::Units::C,
                                 state.dataHeatBalSurf->SurfTempIn(ig.SurfPtr),
-                                OutputProcessor::SOVTimeStepType::Zone,
-                                OutputProcessor::SOVStoreType::Average,
+                                OutputProcessor::TimeStepType::Zone,
+                                OutputProcessor::StoreType::Average,
                                 ig.Name);
             SetupOutputVariable(
                 state,
                 "Indoor Living Wall Sensible Heat Gain Rate",
                 Constant::Units::W,
                 state.dataHeatBalSurf->SurfQConvInRep(ig.SurfPtr), // positive sign: heat loss from plants; negative sign: heat gain from plants
-                OutputProcessor::SOVTimeStepType::Zone,
-                OutputProcessor::SOVStoreType::Average,
+                OutputProcessor::TimeStepType::Zone,
+                OutputProcessor::StoreType::Average,
                 ig.Name);
             SetupOutputVariable(state,
                                 "Indoor Living Wall Latent Heat Gain Rate",
                                 Constant::Units::W,
                                 ig.LatentRate,
-                                OutputProcessor::SOVTimeStepType::Zone,
-                                OutputProcessor::SOVStoreType::Average,
+                                OutputProcessor::TimeStepType::Zone,
+                                OutputProcessor::StoreType::Average,
                                 ig.Name);
             SetupOutputVariable(state,
                                 "Indoor Living Wall Evapotranspiration Rate",
                                 Constant::Units::kg_m2s,
                                 ig.ETRate,
-                                OutputProcessor::SOVTimeStepType::Zone,
-                                OutputProcessor::SOVStoreType::Average,
+                                OutputProcessor::TimeStepType::Zone,
+                                OutputProcessor::StoreType::Average,
                                 ig.Name);
             SetupOutputVariable(state,
                                 "Indoor Living Wall Energy Required For Evapotranspiration Per Unit Area",
                                 Constant::Units::W_m2,
                                 ig.LambdaET,
-                                OutputProcessor::SOVTimeStepType::Zone,
-                                OutputProcessor::SOVStoreType::Average,
+                                OutputProcessor::TimeStepType::Zone,
+                                OutputProcessor::StoreType::Average,
                                 ig.Name);
             SetupOutputVariable(state,
                                 "Indoor Living Wall LED Operational PPFD",
                                 Constant::Units::umol_m2s,
                                 ig.LEDActualPPFD,
-                                OutputProcessor::SOVTimeStepType::Zone,
-                                OutputProcessor::SOVStoreType::Average,
+                                OutputProcessor::TimeStepType::Zone,
+                                OutputProcessor::StoreType::Average,
                                 ig.Name);
             SetupOutputVariable(state,
                                 "Indoor Living Wall PPFD",
                                 Constant::Units::umol_m2s,
                                 ig.ZPPFD,
-                                OutputProcessor::SOVTimeStepType::Zone,
-                                OutputProcessor::SOVStoreType::Average,
+                                OutputProcessor::TimeStepType::Zone,
+                                OutputProcessor::StoreType::Average,
                                 ig.Name);
             SetupOutputVariable(state,
                                 "Indoor Living Wall Vapor Pressure Deficit",
                                 Constant::Units::Pa,
                                 ig.ZVPD,
-                                OutputProcessor::SOVTimeStepType::Zone,
-                                OutputProcessor::SOVStoreType::Average,
+                                OutputProcessor::TimeStepType::Zone,
+                                OutputProcessor::StoreType::Average,
                                 ig.Name);
             SetupOutputVariable(state,
                                 "Indoor Living Wall LED Sensible Heat Gain Rate",
                                 Constant::Units::W,
                                 ig.SensibleRate,
-                                OutputProcessor::SOVTimeStepType::Zone,
-                                OutputProcessor::SOVStoreType::Average,
+                                OutputProcessor::TimeStepType::Zone,
+                                OutputProcessor::StoreType::Average,
                                 ig.Name);
             SetupOutputVariable(state,
                                 "Indoor Living Wall LED Operational Power",
                                 Constant::Units::W,
                                 ig.LEDActualEleP,
-                                OutputProcessor::SOVTimeStepType::Zone,
-                                OutputProcessor::SOVStoreType::Average,
+                                OutputProcessor::TimeStepType::Zone,
+                                OutputProcessor::StoreType::Average,
                                 ig.Name);
             SetupOutputVariable(state,
                                 "Indoor Living Wall LED Electricity Energy",
                                 Constant::Units::J,
                                 ig.LEDActualEleCon,
-                                OutputProcessor::SOVTimeStepType::Zone,
-                                OutputProcessor::SOVStoreType::Summed,
+                                OutputProcessor::TimeStepType::Zone,
+                                OutputProcessor::StoreType::Sum,
                                 ig.Name,
                                 Constant::eResource::Electricity,
-                                OutputProcessor::SOVEndUseCat::InteriorLights,
+                                OutputProcessor::Group::Building,
+                                OutputProcessor::EndUseCat::InteriorLights,
                                 "IndoorLivingWall", // End Use subcategory
-                                OutputProcessor::SOVGroup::Building,
                                 state.dataHeatBal->Zone(ig.ZonePtr).Name,
                                 state.dataHeatBal->Zone(ig.ZonePtr).Multiplier,
                                 state.dataHeatBal->Zone(ig.ZonePtr).ListMultiplier,
-                                {},
-                                {},
                                 state.dataHeatBal->space(ig.SpacePtr).spaceType);
         }
     }