convert SolarShading

src/EnergyPlus/Data/CommonIncludes.hh

@@ -82,6 +82,7 @@
 #include <EnergyPlus/Fans.hh>
 #include <EnergyPlus/Pipes.hh>
 #include <EnergyPlus/PlantChillers.hh>
+#include <EnergyPlus/SolarShading.hh>
 #include <EnergyPlus/SplitterComponent.hh>
 #include <EnergyPlus/SteamBaseboardRadiator.hh>
 #include <EnergyPlus/SteamCoils.hh>

src/EnergyPlus/Data/EnergyPlusData.cc

@@ -84,6 +84,7 @@ namespace EnergyPlus {
         this->dataGlobal = std::unique_ptr<DataGlobal>(new DataGlobal);
         this->dataPipes = std::unique_ptr<PipesData>(new PipesData);
         this->dataPlantChillers = std::unique_ptr<PlantChillersData>(new PlantChillersData);
+        this->dataSolarShading = std::unique_ptr<SolarShadingData>(new SolarShadingData);
         this->dataSplitterComponent = std::unique_ptr<SplitterComponentData>(new SplitterComponentData);
         this->dataSteamBaseboardRadiator = std::unique_ptr<SteamBaseboardRadiatorData>(new SteamBaseboardRadiatorData);
         this->dataSteamCoils = std::unique_ptr<SteamCoilsData>(new SteamCoilsData);
@@ -149,6 +150,7 @@ namespace EnergyPlus {
         this->dataGlobal->clear_state();
         this->dataPipes->clear_state();
         this->dataPlantChillers->clear_state();
+        this->dataSolarShading->clear_state();
         this->dataSplitterComponent->clear_state();
         this->dataSteamBaseboardRadiator->clear_state();
         this->dataSteamCoils->clear_state();

src/EnergyPlus/Data/EnergyPlusData.hh

@@ -93,6 +93,7 @@ struct ExteriorEnergyUseData;
 struct FansData;
 struct PipesData;
 struct PlantChillersData;
+struct SolarShadingData;
 struct SplitterComponentData;
 struct SteamBaseboardRadiatorData;
 struct SteamCoilsData;
@@ -161,6 +162,7 @@ struct EnergyPlusData : BaseGlobalStruct {
     std::unique_ptr<FansData> dataFans;
     std::unique_ptr<PipesData> dataPipes;
     std::unique_ptr<PlantChillersData> dataPlantChillers;
+    std::unique_ptr<SolarShadingData> dataSolarShading;
     std::unique_ptr<SplitterComponentData> dataSplitterComponent;
     std::unique_ptr<SteamBaseboardRadiatorData> dataSteamBaseboardRadiator;
     std::unique_ptr<SteamCoilsData> dataSteamCoils;

src/EnergyPlus/SimulationManager.cc

@@ -1906,8 +1906,6 @@ namespace SimulationManager {
         using OutputProcessor::NumVarMeterArrays;
         using OutputReportTabular::maxUniqueKeyCount;
         using OutputReportTabular::MonthlyFieldSetInputCount;
-        using SolarShading::MAXHCArrayBounds;
-        using SolarShading::maxNumberOfFigures;
         using namespace DataRuntimeLanguage;
         using DataBranchNodeConnections::MaxNumOfNodeConnections;
         using DataBranchNodeConnections::NumOfNodeConnections;
@@ -1953,8 +1951,8 @@ namespace SimulationManager {
         print(state.files.audit, variable_fmt, "NumEnergyMeters", NumEnergyMeters);
         print(state.files.audit, variable_fmt, "NumVarMeterArrays", NumVarMeterArrays);
         print(state.files.audit, variable_fmt, "maxUniqueKeyCount", maxUniqueKeyCount);
-        print(state.files.audit, variable_fmt, "maxNumberOfFigures", maxNumberOfFigures);
-        print(state.files.audit, variable_fmt, "MAXHCArrayBounds", MAXHCArrayBounds);
+        print(state.files.audit, variable_fmt, "maxNumberOfFigures", state.dataSolarShading->maxNumberOfFigures);
+        print(state.files.audit, variable_fmt, "MAXHCArrayBounds", state.dataSolarShading->MAXHCArrayBounds);
         print(state.files.audit, variable_fmt, "MaxVerticesPerSurface", MaxVerticesPerSurface);
         print(state.files.audit, variable_fmt, "NumReportList", NumReportList);
         print(state.files.audit, variable_fmt, "InstMeterCacheSize", InstMeterCacheSize);