diff --git a/scripts/dev/generate_embeddable_epJSON_schema/generate_embedded_epJSON_schema.cmake b/scripts/dev/generate_embeddable_epJSON_schema/generate_embedded_epJSON_schema.cmake index c8aafc61cb1..8d68ad992fd 100644 --- a/scripts/dev/generate_embeddable_epJSON_schema/generate_embedded_epJSON_schema.cmake +++ b/scripts/dev/generate_embeddable_epJSON_schema/generate_embedded_epJSON_schema.cmake @@ -1,4 +1,4 @@ -execute_process( COMMAND "${EnergyPlus_embeddable_epJSON_schema}" "${EnergyPlus_RUNTIME_OUTPUT_DIRECTORY}/Energy+.schema.epJSON" TIMEOUT 30 RESULT_VARIABLE generate_embedded_epJSON_schema OUTPUT_VARIABLE embedded_epJSON_schema) +execute_process( COMMAND "${EnergyPlus_embeddable_epJSON_schema}" "${EnergyPlus_RUNTIME_OUTPUT_DIRECTORY}/Energy+.schema.epJSON" TIMEOUT 90 RESULT_VARIABLE generate_embedded_epJSON_schema OUTPUT_VARIABLE embedded_epJSON_schema) if( ${generate_embedded_epJSON_schema} MATCHES ".*timeout.*" ) message(FATAL_ERROR "Generating embedded epJSON Schema from epJSON Schema failed: ${generate_embedded_epJSON_schema}") endif() diff --git a/src/EnergyPlus/BranchInputManager.cc b/src/EnergyPlus/BranchInputManager.cc index 1f4b636e1c5..c1b16d59db5 100644 --- a/src/EnergyPlus/BranchInputManager.cc +++ b/src/EnergyPlus/BranchInputManager.cc @@ -228,7 +228,7 @@ namespace BranchInputManager { void GetBranchList(std::string const &LoopName, // Name of Loop Branch List is on std::string const &BranchListName, // Branch List Name from Input int &NumBranchNames, // Number of Branches for this Branch List - Array1S_string BranchNames, // Names of Branches on this Branch List + Array1D_string &BranchNames, // Names of Branches on this Branch List std::string const &LoopType // Type of Loop Branch list is on ) { @@ -325,17 +325,17 @@ namespace BranchInputManager { return NumBranchesInBranchList; } - void GetBranchData(std::string const &LoopName, // Loop Name of this Branch - std::string const &BranchName, // Requested Branch Name - int &PressCurveType, // Index of a pressure curve object - int &PressCurveIndex, // Index of a pressure curve object - int &NumComps, // Number of Components on Branch - Array1S_string CompType, // Component Type for each item on Branch - Array1S_string CompName, // Component Name for each item on Branch - Array1S_string CompInletNodeNames, // Component Inlet Node IDs for each item on Branch - Array1S_int CompInletNodeNums, // Component Inlet Node Numbers for each item on Branch - Array1S_string CompOutletNodeNames, // Component Outlet Node IDs for each item on Branch - Array1S_int CompOutletNodeNums, // Component Outlet Node Numbers for each item on Branch + void GetBranchData(std::string const &LoopName, // Loop Name of this Branch + std::string const &BranchName, // Requested Branch Name + int &PressCurveType, // Index of a pressure curve object + int &PressCurveIndex, // Index of a pressure curve object + int &NumComps, // Number of Components on Branch + Array1D_string &CompType, // Component Type for each item on Branch + Array1D_string &CompName, // Component Name for each item on Branch + Array1D_string &CompInletNodeNames, // Component Inlet Node IDs for each item on Branch + Array1D_int &CompInletNodeNums, // Component Inlet Node Numbers for each item on Branch + Array1D_string &CompOutletNodeNames, // Component Outlet Node IDs for each item on Branch + Array1D_int &CompOutletNodeNums, // Component Outlet Node Numbers for each item on Branch bool &ErrorsFound) { @@ -603,13 +603,13 @@ namespace BranchInputManager { } } - void GetInternalBranchData(std::string const &LoopName, // Loop Name for Branch - std::string const &BranchName, // Requested Branch Name - int &PressCurveType, // Index of pressure curve object - int &PressCurveIndex, // Index of pressure curve object - int &NumComps, // Number of Components on Branch - Array1S BComponents, // Component data returned - bool &ErrorsFound // True when Loop Name is already assigned and this not same loop + void GetInternalBranchData(std::string const &LoopName, // Loop Name for Branch + std::string const &BranchName, // Requested Branch Name + int &PressCurveType, // Index of pressure curve object + int &PressCurveIndex, // Index of pressure curve object + int &NumComps, // Number of Components on Branch + Array1D &BComponents, // Component data returned + bool &ErrorsFound // True when Loop Name is already assigned and this not same loop ) { @@ -839,8 +839,8 @@ namespace BranchInputManager { std::string &OutletNodeName, // Outlet Node ID int &OutletNodeNum, // Outlet Node Number int &NumInletNodes, // Number of Inlet Nodes - Array1S_string InletNodeNames, // Inlet Node IDs - Array1S_int InletNodeNums, // Inlet Node Numbers + Array1D_string &InletNodeNames, // Inlet Node IDs + Array1D_int &InletNodeNums, // Inlet Node Numbers bool &ErrorsFound, Optional_int_const ConnectorNumber, // number of the current item in connector list Optional_int MixerNumber // Mixer number for this specific splitter @@ -999,8 +999,8 @@ namespace BranchInputManager { std::string &InletNodeName, // Inlet Node ID int &InletNodeNum, // Inlet Node Number int &NumOutletNodes, // Number of Outlet Nodes - Array1S_string OutletNodeNames, // Outlet Node IDs - Array1S_int OutletNodeNums, // Outlet Node Numbers + Array1D_string &OutletNodeNames, // Outlet Node IDs + Array1D_int &OutletNodeNums, // Outlet Node Numbers bool &ErrorsFound, Optional_int_const ConnectorNumber, // number of the current item in connector list Optional_int SplitterNumber // splitter number for this specific splitter diff --git a/src/EnergyPlus/BranchInputManager.hh b/src/EnergyPlus/BranchInputManager.hh index 89eede93ee2..585373999be 100644 --- a/src/EnergyPlus/BranchInputManager.hh +++ b/src/EnergyPlus/BranchInputManager.hh @@ -50,7 +50,6 @@ // ObjexxFCL Headers #include -#include #include // EnergyPlus Headers @@ -210,23 +209,23 @@ namespace BranchInputManager { void GetBranchList(std::string const &LoopName, // Name of Loop Branch List is on std::string const &BranchListName, // Branch List Name from Input int &NumBranchNames, // Number of Branches for this Branch List - Array1S_string BranchNames, // Names of Branches on this Branch List + Array1D_string &BranchNames, // Names of Branches on this Branch List std::string const &LoopType // Type of Loop Branch list is on ); int NumBranchesInBranchList(std::string const &BranchListName); - void GetBranchData(std::string const &LoopName, // Loop Name of this Branch - std::string const &BranchName, // Requested Branch Name - int &PressCurveType, // Index of a pressure curve object - int &PressCurveIndex, // Index of a pressure curve object - int &NumComps, // Number of Components on Branch - Array1S_string CompType, // Component Type for each item on Branch - Array1S_string CompName, // Component Name for each item on Branch - Array1S_string CompInletNodeNames, // Component Inlet Node IDs for each item on Branch - Array1S_int CompInletNodeNums, // Component Inlet Node Numbers for each item on Branch - Array1S_string CompOutletNodeNames, // Component Outlet Node IDs for each item on Branch - Array1S_int CompOutletNodeNums, // Component Outlet Node Numbers for each item on Branch + void GetBranchData(std::string const &LoopName, // Loop Name of this Branch + std::string const &BranchName, // Requested Branch Name + int &PressCurveType, // Index of a pressure curve object + int &PressCurveIndex, // Index of a pressure curve object + int &NumComps, // Number of Components on Branch + Array1D_string &CompType, // Component Type for each item on Branch + Array1D_string &CompName, // Component Name for each item on Branch + Array1D_string &CompInletNodeNames, // Component Inlet Node IDs for each item on Branch + Array1D_int &CompInletNodeNums, // Component Inlet Node Numbers for each item on Branch + Array1D_string &CompOutletNodeNames, // Component Outlet Node IDs for each item on Branch + Array1D_int &CompOutletNodeNums, // Component Outlet Node Numbers for each item on Branch bool &ErrorsFound); int NumCompsInBranch(std::string const &BranchName); @@ -238,13 +237,13 @@ namespace BranchInputManager { bool &ErrFound // Set to true if error found, false otherwise ); - void GetInternalBranchData(std::string const &LoopName, // Loop Name for Branch - std::string const &BranchName, // Requested Branch Name - int &PressCurveType, // Index of pressure curve object - int &PressCurveIndex, // Index of pressure curve object - int &NumComps, // Number of Components on Branch - Array1S BComponents, // Component data returned - bool &ErrorsFound // True when Loop Name is already assigned and this not same loop + void GetInternalBranchData(std::string const &LoopName, // Loop Name for Branch + std::string const &BranchName, // Requested Branch Name + int &PressCurveType, // Index of pressure curve object + int &PressCurveIndex, // Index of pressure curve object + int &NumComps, // Number of Components on Branch + Array1D &BComponents, // Component data returned + bool &ErrorsFound // True when Loop Name is already assigned and this not same loop ); void GetNumSplitterMixerInConntrList(std::string const &LoopName, // Loop Name for this Splitter (used in error message) @@ -266,8 +265,8 @@ namespace BranchInputManager { std::string &OutletNodeName, // Outlet Node ID int &OutletNodeNum, // Outlet Node Number int &NumInletNodes, // Number of Inlet Nodes - Array1S_string InletNodeNames, // Inlet Node IDs - Array1S_int InletNodeNums, // Inlet Node Numbers + Array1D_string &InletNodeNames, // Inlet Node IDs + Array1D_int &InletNodeNums, // Inlet Node Numbers bool &ErrorsFound, Optional_int_const ConnectorNumber = _, // number of the current item in connector list Optional_int MixerNumber = _ // Mixer number for this specific splitter @@ -280,8 +279,8 @@ namespace BranchInputManager { std::string &InletNodeName, // Inlet Node ID int &InletNodeNum, // Inlet Node Number int &NumOutletNodes, // Number of Outlet Nodes - Array1S_string OutletNodeNames, // Outlet Node IDs - Array1S_int OutletNodeNums, // Outlet Node Numbers + Array1D_string &OutletNodeNames, // Outlet Node IDs + Array1D_int &OutletNodeNums, // Outlet Node Numbers bool &ErrorsFound, Optional_int_const ConnectorNumber = _, // number of the current item in connector list Optional_int SplitterNumber = _ // splitter number for this specific splitter diff --git a/src/EnergyPlus/BranchNodeConnections.cc b/src/EnergyPlus/BranchNodeConnections.cc index a644f40f447..155c5572265 100644 --- a/src/EnergyPlus/BranchNodeConnections.cc +++ b/src/EnergyPlus/BranchNodeConnections.cc @@ -1193,12 +1193,12 @@ namespace BranchNodeConnections { void GetChildrenData(std::string const &ComponentType, std::string const &ComponentName, int &NumChildren, - Array1S_string ChildrenCType, - Array1S_string ChildrenCName, - Array1S_string InletNodeName, - Array1S_int InletNodeNum, - Array1S_string OutletNodeName, - Array1S_int OutletNodeNum, + Array1D_string &ChildrenCType, + Array1D_string &ChildrenCName, + Array1D_string &InletNodeName, + Array1D_int &InletNodeNum, + Array1D_string &OutletNodeName, + Array1D_int &OutletNodeNum, bool &ErrorsFound) { diff --git a/src/EnergyPlus/BranchNodeConnections.hh b/src/EnergyPlus/BranchNodeConnections.hh index bb23b022ba6..e51d6ea90df 100644 --- a/src/EnergyPlus/BranchNodeConnections.hh +++ b/src/EnergyPlus/BranchNodeConnections.hh @@ -51,7 +51,6 @@ // ObjexxFCL Headers #include #include -#include #include // EnergyPlus Headers @@ -142,12 +141,12 @@ namespace BranchNodeConnections { void GetChildrenData(std::string const &ComponentType, std::string const &ComponentName, int &NumChildren, - Array1S_string ChildrenCType, - Array1S_string ChildrenCName, - Array1S_string InletNodeName, - Array1S_int InletNodeNum, - Array1S_string OutletNodeName, - Array1S_int OutletNodeNum, + Array1D_string &ChildrenCType, + Array1D_string &ChildrenCName, + Array1D_string &InletNodeName, + Array1D_int &InletNodeNum, + Array1D_string &OutletNodeName, + Array1D_int &OutletNodeNum, bool &ErrorsFound); void SetUpCompSets(std::string const &ParentType, // Parent Object Type diff --git a/src/EnergyPlus/ConvectionCoefficients.cc b/src/EnergyPlus/ConvectionCoefficients.cc index f06c7bcf57e..934600590d8 100644 --- a/src/EnergyPlus/ConvectionCoefficients.cc +++ b/src/EnergyPlus/ConvectionCoefficients.cc @@ -243,8 +243,8 @@ namespace ConvectionCoefficients { // Functions - void InitInteriorConvectionCoeffs(Array1S const SurfaceTemperatures, // Temperature of surfaces for evaluation of HcIn - Optional_int_const ZoneToResimulate // if passed in, then only calculate surfaces that have this zone + void InitInteriorConvectionCoeffs(const Array1D &SurfaceTemperatures, // Temperature of surfaces for evaluation of HcIn + Optional_int_const ZoneToResimulate // if passed in, then only calculate surfaces that have this zone ) { @@ -3931,8 +3931,8 @@ namespace ConvectionCoefficients { } void CalcDetailedHcInForDVModel(int const SurfNum, // surface number for which coefficients are being calculated - Array1S const SurfaceTemperatures, // Temperature of surfaces for evaluation of HcIn - Array1S HcIn, // Interior Convection Coeff Array + const Array1D &SurfaceTemperatures, // Temperature of surfaces for evaluation of HcIn + Array1D &HcIn, // Interior Convection Coeff Array Optional const> Vhc // Velocity array for forced convection coeff calculation ) { @@ -4153,7 +4153,7 @@ namespace ConvectionCoefficients { } void CalcCeilingDiffuserIntConvCoeff(int const ZoneNum, - Array1S const SurfaceTemperatures) // zone number for which coefficients are being calculated + const Array1D &SurfaceTemperatures) // zone number for which coefficients are being calculated { Real64 ACH = CalcCeilingDiffuserACH(ZoneNum); @@ -4186,7 +4186,7 @@ namespace ConvectionCoefficients { // ever be made to work correctly with the inlet air temperature. void CalcCeilingDiffuserInletCorr(int const ZoneNum, // Zone number - Array1S const SurfaceTemperatures // For CalcASHRAEDetailed, if called + const Array1S &SurfaceTemperatures // For CalcASHRAEDetailed, if called ) { @@ -4286,8 +4286,8 @@ namespace ConvectionCoefficients { if (ACH > 100.0) ShowWarningError("CeilingDiffuser convection correlation is out of range: ACH > 100"); } - void CalcTrombeWallIntConvCoeff(int const ZoneNum, // Zone number for which coefficients are being calculated - Array1S const SurfaceTemperatures // Temperature of surfaces for evaluation of HcIn + void CalcTrombeWallIntConvCoeff(int const ZoneNum, // Zone number for which coefficients are being calculated + const Array1D &SurfaceTemperatures // Temperature of surfaces for evaluation of HcIn ) { diff --git a/src/EnergyPlus/ConvectionCoefficients.hh b/src/EnergyPlus/ConvectionCoefficients.hh index 2b29f17f281..960516cc62f 100644 --- a/src/EnergyPlus/ConvectionCoefficients.hh +++ b/src/EnergyPlus/ConvectionCoefficients.hh @@ -442,7 +442,7 @@ namespace ConvectionCoefficients { // Functions - void InitInteriorConvectionCoeffs(Array1S const SurfaceTemperatures, // Temperature of surfaces for evaluation of HcIn + void InitInteriorConvectionCoeffs(const Array1D &SurfaceTemperatures, // Temperature of surfaces for evaluation of HcIn Optional_int_const ZoneToResimulate = _ // if passed in, then only calculate surfaces that have this zone ); @@ -493,10 +493,10 @@ namespace ConvectionCoefficients { Real64 const ZoneMeanAirTemperature // Mean Air Temperature of Zone ); - void CalcDetailedHcInForDVModel(int const SurfNum, // surface number for which coefficients are being calculated - Array1S const SurfaceTemperatures, // Temperature of surfaces for evaluation of HcIn - Array1S HcIn, // Interior Convection Coeff Array - Optional const> Vhc = _ // Velocity array for forced convection coeff calculation + void CalcDetailedHcInForDVModel(int const SurfNum, // surface number for which coefficients are being calculated + const Array1D &SurfaceTemperatures, // Temperature of surfaces for evaluation of HcIn + Array1D &HcIn, // Interior Convection Coeff Array + Optional const> Vhc = _ // Velocity array for forced convection coeff calculation ); Real64 CalcZoneSupplyAirTemp(int const ZoneNum); @@ -515,17 +515,17 @@ namespace ConvectionCoefficients { Real64 const height, bool const isWindow=false); - void CalcCeilingDiffuserIntConvCoeff(int const ZoneNum, Array1S const SurfaceTemperatures); // zone number for which coefficients are being calculated + void CalcCeilingDiffuserIntConvCoeff(int const ZoneNum, const Array1D &SurfaceTemperatures); // zone number for which coefficients are being calculated // CalcCeilingDiffuserInletCorr should replace CalcCeilingDiffuser (above), if ZoneTempPredictorCorrector can // ever be made to work correctly with the inlet air temperature. void CalcCeilingDiffuserInletCorr(int const ZoneNum, // Zone number - Array1S const SurfaceTemperatures // For CalcASHRAEDetailed, if called + const Array1D &SurfaceTemperatures // For CalcASHRAEDetailed, if called ); void CalcTrombeWallIntConvCoeff(int const ZoneNum, // Zone number for which coefficients are being calculated - Array1S const SurfaceTemperatures // Temperature of surfaces for evaluation of HcIn + const Array1D &SurfaceTemperatures // Temperature of surfaces for evaluation of HcIn ); void CalcNusselt(int const SurfNum, // Surface number diff --git a/src/EnergyPlus/CurveManager.hh b/src/EnergyPlus/CurveManager.hh index bfa66b40a02..8b68145dec9 100644 --- a/src/EnergyPlus/CurveManager.hh +++ b/src/EnergyPlus/CurveManager.hh @@ -55,7 +55,6 @@ // ObjexxFCL Headers #include #include -#include #include #include #include diff --git a/src/EnergyPlus/DataEnvironment.cc b/src/EnergyPlus/DataEnvironment.cc index 1db46cbdbbf..64d13511ef5 100644 --- a/src/EnergyPlus/DataEnvironment.cc +++ b/src/EnergyPlus/DataEnvironment.cc @@ -599,7 +599,7 @@ namespace DataEnvironment { ShowFatalError("Program terminates due to preceding condition(s)."); } - void SetWindSpeedAt(int const NumItems, Array1S const Heights, Array1S LocalWindSpeed, std::string const &EP_UNUSED(Settings)) + void SetWindSpeedAt(int const NumItems, const Array1D &Heights, Array1D &LocalWindSpeed, std::string const &EP_UNUSED(Settings)) { // SUBROUTINE INFORMATION: diff --git a/src/EnergyPlus/ExternalInterface.cc b/src/EnergyPlus/ExternalInterface.cc index 5654a15dc85..26d4ae9f94f 100644 --- a/src/EnergyPlus/ExternalInterface.cc +++ b/src/EnergyPlus/ExternalInterface.cc @@ -421,7 +421,7 @@ namespace ExternalInterface { } void ParseString(std::string const &str, // The string, with all elements separated by ';' - Array1S_string ele, // The elements + Array1D_string &ele, // The elements int const nEle // The number of elements ) { @@ -2391,11 +2391,11 @@ namespace ExternalInterface { firstCall = false; // bug fix causing external interface to send zero at the beginning of sim, Thierry Nouidui } - void GetReportVariableKey(Array1S_string const varKeys, // Standard variable name + void GetReportVariableKey(const Array1D_string &varKeys, // Standard variable name int const numberOfKeys, // Number of keys=size(varKeys) - Array1S_string const varNames, // Standard variable name - Array1S_int keyVarIndexes, // Array index - Array1S_int varTypes // Types of variables in keyVarIndexes + const Array1D_string &varNames, // Standard variable name + Array1D_int &keyVarIndexes, // Array index + Array1D_int &varTypes // Types of variables in keyVarIndexes ) { // SUBROUTINE INFORMATION: diff --git a/src/EnergyPlus/ExternalInterface.hh b/src/EnergyPlus/ExternalInterface.hh index 7e1d2ea772e..36ff5695ebc 100644 --- a/src/EnergyPlus/ExternalInterface.hh +++ b/src/EnergyPlus/ExternalInterface.hh @@ -330,10 +330,10 @@ namespace ExternalInterface { void CalcExternalInterface(); - void ParseString(std::string const &str, Array1S_string ele, int const nEle); + void ParseString(std::string const &str, Array1D_string &ele, int const nEle); void GetReportVariableKey( - Array1S_string const varKeys, int const numberOfKeys, Array1S_string const varNames, Array1S_int keyVarIndexes, Array1S_int varTypes); + const Array1D_string &varKeys, int const numberOfKeys, const Array1D_string &varNames, Array1D_int &keyVarIndexes, Array1D_int &varTypes); std::vector getCharArrayFromString(std::string const &originalString); diff --git a/src/EnergyPlus/FluidProperties.cc b/src/EnergyPlus/FluidProperties.cc index 4b58fabde81..e13ba5e7f5d 100644 --- a/src/EnergyPlus/FluidProperties.cc +++ b/src/EnergyPlus/FluidProperties.cc @@ -4806,12 +4806,12 @@ namespace FluidProperties { //***************************************************************************** - void InterpDefValuesForGlycolConc(int const NumOfConcs, // number of concentrations (dimension of raw data) - int const NumOfTemps, // number of temperatures (dimension of raw data) - Array1S const RawConcData, // concentrations for raw data - Array2S const RawPropData, // raw property data (concentration, temperature) - Real64 const Concentration, // concentration of actual fluid mix - Array1S InterpData // interpolated output data at proper concentration + void InterpDefValuesForGlycolConc(int const NumOfConcs, // number of concentrations (dimension of raw data) + int const NumOfTemps, // number of temperatures (dimension of raw data) + const Array1D &RawConcData, // concentrations for raw data + Array2S const RawPropData, // raw property data (concentration, temperature) + Real64 const Concentration, // concentration of actual fluid mix + Array1D &InterpData // interpolated output data at proper concentration ) { @@ -4906,12 +4906,12 @@ namespace FluidProperties { //***************************************************************************** - void InterpValuesForGlycolConc(int const NumOfConcs, // number of concentrations (dimension of raw data) - int const NumOfTemps, // number of temperatures (dimension of raw data) - Array1S const RawConcData, // concentrations for raw data - Array2S const RawPropData, // raw property data (temperature,concentration) - Real64 const Concentration, // concentration of actual fluid mix - Array1S InterpData // interpolated output data at proper concentration + void InterpValuesForGlycolConc(int const NumOfConcs, // number of concentrations (dimension of raw data) + int const NumOfTemps, // number of temperatures (dimension of raw data) + const Array1D &RawConcData, // concentrations for raw data + Array2S const RawPropData, // raw property data (temperature,concentration) + Real64 const Concentration, // concentration of actual fluid mix + Array1D &InterpData // interpolated output data at proper concentration ) { diff --git a/src/EnergyPlus/FluidProperties.hh b/src/EnergyPlus/FluidProperties.hh index 7da9b24286c..fa004a8cecc 100644 --- a/src/EnergyPlus/FluidProperties.hh +++ b/src/EnergyPlus/FluidProperties.hh @@ -53,7 +53,6 @@ // ObjexxFCL Headers #include -#include #include #include @@ -387,22 +386,22 @@ namespace FluidProperties { //***************************************************************************** - void InterpDefValuesForGlycolConc(int NumOfConcs, // number of concentrations (dimension of raw data) - int NumOfTemps, // number of temperatures (dimension of raw data) - Array1S RawConcData, // concentrations for raw data - Array2S RawPropData, // raw property data (concentration, temperature) - Real64 Concentration, // concentration of actual fluid mix - Array1S InterpData // interpolated output data at proper concentration + void InterpDefValuesForGlycolConc(int NumOfConcs, // number of concentrations (dimension of raw data) + int NumOfTemps, // number of temperatures (dimension of raw data) + const Array1D &RawConcData, // concentrations for raw data + Array2S RawPropData, // raw property data (concentration, temperature) + Real64 Concentration, // concentration of actual fluid mix + Array1D &InterpData // interpolated output data at proper concentration ); //***************************************************************************** - void InterpValuesForGlycolConc(int NumOfConcs, // number of concentrations (dimension of raw data) - int NumOfTemps, // number of temperatures (dimension of raw data) - Array1S RawConcData, // concentrations for raw data - Array2S RawPropData, // raw property data (temperature,concentration) - Real64 Concentration, // concentration of actual fluid mix - Array1S InterpData // interpolated output data at proper concentration + void InterpValuesForGlycolConc(int NumOfConcs, // number of concentrations (dimension of raw data) + int NumOfTemps, // number of temperatures (dimension of raw data) + const Array1D &RawConcData, // concentrations for raw data + Array2S RawPropData, // raw property data (temperature,concentration) + Real64 Concentration, // concentration of actual fluid mix + Array1D &InterpData // interpolated output data at proper concentration ); //***************************************************************************** diff --git a/src/EnergyPlus/GeneralRoutines.cc b/src/EnergyPlus/GeneralRoutines.cc index 200c65e1277..bed0e425302 100644 --- a/src/EnergyPlus/GeneralRoutines.cc +++ b/src/EnergyPlus/GeneralRoutines.cc @@ -987,7 +987,7 @@ void ValidateComponent(std::string const &CompType, // Component Type (e.g. C } } -void CalcPassiveExteriorBaffleGap(Array1S_int const SurfPtrARR, // Array of indexes pointing to Surface structure in DataSurfaces +void CalcPassiveExteriorBaffleGap(const Array1D_int &SurfPtrARR, // Array of indexes pointing to Surface structure in DataSurfaces Real64 const VentArea, // Area available for venting the gap [m2] Real64 const Cv, // Oriface coefficient for volume-based discharge, wind-driven [--] Real64 const Cd, // oriface coefficient for discharge, bouyancy-driven [--] diff --git a/src/EnergyPlus/GeneralRoutines.hh b/src/EnergyPlus/GeneralRoutines.hh index 55d2215b101..c13f8801b1c 100644 --- a/src/EnergyPlus/GeneralRoutines.hh +++ b/src/EnergyPlus/GeneralRoutines.hh @@ -49,7 +49,6 @@ #define GeneralRoutines_hh_INCLUDED // ObjexxFCL Headers -#include #include #include @@ -108,7 +107,7 @@ void ValidateComponent(std::string const &CompType, // Component Type (e.g. C std::string const &CallString // Context of this pair -- for error message ); -void CalcPassiveExteriorBaffleGap(Array1S_int const SurfPtrARR, // Array of indexes pointing to Surface structure in DataSurfaces +void CalcPassiveExteriorBaffleGap(const Array1D_int &SurfPtrARR, // Array of indexes pointing to Surface structure in DataSurfaces Real64 const VentArea, // Area available for venting the gap [m2] Real64 const Cv, // Oriface coefficient for volume-based discharge, wind-driven [--] Real64 const Cd, // oriface coefficient for discharge, bouyancy-driven [--] diff --git a/src/EnergyPlus/HVACVariableRefrigerantFlow.cc b/src/EnergyPlus/HVACVariableRefrigerantFlow.cc index 910507e3b11..074f9f9e39a 100644 --- a/src/EnergyPlus/HVACVariableRefrigerantFlow.cc +++ b/src/EnergyPlus/HVACVariableRefrigerantFlow.cc @@ -9344,10 +9344,10 @@ namespace HVACVariableRefrigerantFlow { void LimitTUCapacity(int const VRFCond, // Condenser Unit index int const NumTUInList, // Number of terminal units in list Real64 const StartingCapacity, // temporary variable holding condenser capacity [W] - Array1S const CapArray, // Array of coil capacities in either cooling or heating mode [W] + const Array1D &CapArray, // Array of coil capacities in either cooling or heating mode [W] Real64 &MaxLimit, // Maximum terminal unit capacity for coils in same operating mode [W] Real64 const AltCapacity, // temporary variable holding heat recovery capacity [W] - Array1S const AltArray, // Array of coil capacities of heat recovery [W] + const Array1D &AltArray, // Array of coil capacities of heat recovery [W] Real64 &AltLimit // Maximum terminal unit capacity of heat recovery coils [W] ) { @@ -9403,7 +9403,7 @@ namespace HVACVariableRefrigerantFlow { void LimitCoilCapacity(int const NumTUInList, // Number of terminal units in list Real64 const TotalCapacity, // temporary variable holding condenser capacity [W] - Array1S const CapArray, // Array of coil capacities in either cooling or heating mode [W] + const Array1D &CapArray, // Array of coil capacities in either cooling or heating mode [W] Real64 &MaxLimit // Maximum terminal unit capacity for coils in same operating mode [W] ) { diff --git a/src/EnergyPlus/HVACVariableRefrigerantFlow.hh b/src/EnergyPlus/HVACVariableRefrigerantFlow.hh index e3bbdcadbfe..71924090728 100644 --- a/src/EnergyPlus/HVACVariableRefrigerantFlow.hh +++ b/src/EnergyPlus/HVACVariableRefrigerantFlow.hh @@ -50,7 +50,6 @@ // ObjexxFCL Headers #include -#include #include // EnergyPlus Headers @@ -947,16 +946,16 @@ namespace HVACVariableRefrigerantFlow { void LimitTUCapacity(int VRFCond, // Condenser Unit index int NumTUInList, // Number of terminal units in list Real64 StartingCapacity, // temporary variable holding condenser capacity [W] - Array1S CapArray, // Array of coil capacities in either cooling or heating mode [W] + const Array1D &CapArray, // Array of coil capacities in either cooling or heating mode [W] Real64 &MaxLimit, // Maximum terminal unit capacity for coils in same operating mode [W] Real64 AltCapacity, // temporary variable holding heat recovery capacity [W] - Array1S AltArray, // Array of coil capacities of heat recovery [W] + const Array1D &AltArray, // Array of coil capacities of heat recovery [W] Real64 &AltLimit // Maximum terminal unit capacity of heat recovery coils [W] ); void LimitCoilCapacity(int NumTUInList, // Number of terminal units in list Real64 TotalCapacity, // temporary variable holding condenser capacity [W] - Array1S CapArray, // Array of coil capacities in either cooling or heating mode [W] + const Array1D &CapArray, // Array of coil capacities in either cooling or heating mode [W] Real64 &MaxLimit // Maximum terminal unit capacity for coils in same operating mode [W] ); diff --git a/src/EnergyPlus/HeatBalanceSurfaceManager.cc b/src/EnergyPlus/HeatBalanceSurfaceManager.cc index 51aace94c1d..cbce81e9efe 100644 --- a/src/EnergyPlus/HeatBalanceSurfaceManager.cc +++ b/src/EnergyPlus/HeatBalanceSurfaceManager.cc @@ -2220,7 +2220,6 @@ namespace HeatBalanceSurfaceManager { using namespace HeatBalanceMovableInsulation; using General::BlindBeamBeamTrans; using General::InterpBlind; - using General::InterpProfAng; using General::InterpProfSlatAng; using General::InterpSlatAng; using General::InterpSw; diff --git a/src/EnergyPlus/InputProcessing/InputProcessor.cc b/src/EnergyPlus/InputProcessing/InputProcessor.cc index e1d3a0c271c..644f6d14bb1 100644 --- a/src/EnergyPlus/InputProcessing/InputProcessor.cc +++ b/src/EnergyPlus/InputProcessing/InputProcessor.cc @@ -52,7 +52,6 @@ #include #include -// ObjexxFCL Headers #include // EnergyPlus Headers @@ -625,7 +624,7 @@ void InputProcessor::setObjectItemValue(json const &ep_object, bool within_max_fields, Array1S_string Alphas, int &NumAlphas, - Array1S Numbers, + Array1D &Numbers, int &NumNumbers, Optional NumBlank, Optional AlphaBlank, @@ -712,7 +711,7 @@ void InputProcessor::getObjectItem(std::string const &Object, int const Number, Array1S_string Alphas, int &NumAlphas, - Array1S Numbers, + Array1D &Numbers, int &NumNumbers, int &Status, Optional NumBlank, diff --git a/src/EnergyPlus/InputProcessing/InputProcessor.hh b/src/EnergyPlus/InputProcessing/InputProcessor.hh index d5db4f14d47..ef31971bccb 100644 --- a/src/EnergyPlus/InputProcessing/InputProcessor.hh +++ b/src/EnergyPlus/InputProcessing/InputProcessor.hh @@ -132,7 +132,7 @@ public: int const Number, Array1S_string Alphas, int &NumAlphas, - Array1S Numbers, + Array1D &Numbers, int &NumNumbers, int &Status, Optional NumBlank = _, @@ -245,7 +245,7 @@ private: bool within_max_fields, Array1S_string Alphas, int &NumAlphas, - Array1S Numbers, + Array1D &Numbers, int &NumNumbers, Optional NumBlank = _, Optional AlphaBlank = _, diff --git a/src/EnergyPlus/InternalHeatGains.cc b/src/EnergyPlus/InternalHeatGains.cc index dc4e58f5c64..e426afed0f2 100644 --- a/src/EnergyPlus/InternalHeatGains.cc +++ b/src/EnergyPlus/InternalHeatGains.cc @@ -6599,7 +6599,7 @@ namespace InternalHeatGains { } void SumInternalConvectionGainsByTypes(int const ZoneNum, // zone index pointer for which zone to sum gains for - Array1S_int const GainTypeARR, // variable length 1-d array of integer valued gain types + const Array1D_int &GainTypeARR, // variable length 1-d array of integer valued gain types Real64 &SumConvGainRate) { @@ -6695,7 +6695,7 @@ namespace InternalHeatGains { } void SumReturnAirConvectionGainsByTypes(int const ZoneNum, // zone index pointer for which zone to sum gains for - Array1S_int const GainTypeARR, // variable length 1-d array of integer valued gain types + const Array1D_int &GainTypeARR, // variable length 1-d array of integer valued gain types Real64 &SumReturnAirGainRate) { @@ -6810,7 +6810,7 @@ namespace InternalHeatGains { } void SumInternalRadiationGainsByTypes(int const ZoneNum, // zone index pointer for which zone to sum gains for - Array1S_int const GainTypeARR, // variable length 1-d array of integer valued gain types + const Array1D_int &GainTypeARR, // variable length 1-d array of integer valued gain types Real64 &SumRadiationGainRate) { @@ -6940,7 +6940,7 @@ namespace InternalHeatGains { } void SumInternalLatentGainsByTypes(int const ZoneNum, // zone index pointer for which zone to sum gains for - Array1S_int const GainTypeARR, // variable length 1-d array of integer valued gain types + const Array1D_int &GainTypeARR, // variable length 1-d array of integer valued gain types Real64 &SumLatentGainRate) { @@ -7128,7 +7128,7 @@ namespace InternalHeatGains { } void SumInternalCO2GainsByTypes(int const ZoneNum, // zone index pointer for which zone to sum gains for - Array1S_int const GainTypeARR, // variable length 1-d array of integer valued gain types + const Array1D_int &GainTypeARR, // variable length 1-d array of integer valued gain types Real64 &SumCO2GainRate) { @@ -7455,7 +7455,7 @@ namespace InternalHeatGains { void SumInternalConvectionGainsByIndices( int const ZoneNum, // zone index pointer for which zone to sum gains for - Array1S_int const DeviceIndexARR, // variable length 1-d array of integer device index pointers to include in summation + const Array1D_int &DeviceIndexARR, // variable length 1-d array of integer device index pointers to include in summation Array1A const FractionARR, // array of fractional multipliers to apply to devices Real64 &SumConvGainRate) { @@ -7524,7 +7524,7 @@ namespace InternalHeatGains { void SumInternalLatentGainsByIndices( int const ZoneNum, // zone index pointer for which zone to sum gains for - Array1S_int const DeviceIndexARR, // variable length 1-d array of integer device index pointers to include in summation + const Array1D_int &DeviceIndexARR, // variable length 1-d array of integer device index pointers to include in summation Array1A const FractionARR, // array of fractional multipliers to apply to devices Real64 &SumLatentGainRate) { @@ -7593,7 +7593,7 @@ namespace InternalHeatGains { void SumReturnAirConvectionGainsByIndices( int const ZoneNum, // zone index pointer for which zone to sum gains for - Array1S_int const DeviceIndexARR, // variable length 1-d array of integer device index pointers to include in summation + const Array1D_int &DeviceIndexARR, // variable length 1-d array of integer device index pointers to include in summation Array1A const FractionARR, // array of fractional multipliers to apply to devices Real64 &SumReturnAirGainRate) { diff --git a/src/EnergyPlus/InternalHeatGains.hh b/src/EnergyPlus/InternalHeatGains.hh index aadcef33d7c..47b20a3a5db 100644 --- a/src/EnergyPlus/InternalHeatGains.hh +++ b/src/EnergyPlus/InternalHeatGains.hh @@ -50,7 +50,6 @@ // ObjexxFCL Headers #include -#include #include // EnergyPlus Headers @@ -108,7 +107,7 @@ namespace InternalHeatGains { Real64 &SumConvGainRateExceptPeople); void SumInternalConvectionGainsByTypes(int const ZoneNum, // zone index pointer for which zone to sum gains for - Array1S_int const GainTypeARR, // variable length 1-d array of integer valued gain types + const Array1D_int &GainTypeARR, // variable length 1-d array of integer valued gain types Real64 &SumConvGainRate); void GetInternalGainDeviceIndex(int const ZoneNum, // zone index pointer for which zone to sum gains for @@ -119,19 +118,19 @@ namespace InternalHeatGains { void SumInternalConvectionGainsByIndices( int const ZoneNum, // zone index pointer for which zone to sum gains for - Array1S_int const DeviceIndexARR, // variable length 1-d array of integer device index pointers to include in summation + const Array1D_int &DeviceIndexARR, // variable length 1-d array of integer device index pointers to include in summation Array1A const FractionARR, // array of fractional multipliers to apply to devices Real64 &SumConvGainRate); void SumInternalLatentGainsByIndices( int const ZoneNum, // zone index pointer for which zone to sum gains for - Array1S_int const DeviceIndexARR, // variable length 1-d array of integer device index pointers to include in summation + const Array1D_int &DeviceIndexARR, // variable length 1-d array of integer device index pointers to include in summation Array1A const FractionARR, // array of fractional multipliers to apply to devices Real64 &SumLatentGainRate); void SumReturnAirConvectionGainsByIndices( int const ZoneNum, // zone index pointer for which zone to sum gains for - Array1S_int const DeviceIndexARR, // variable length 1-d array of integer device index pointers to include in summation + const Array1D_int &DeviceIndexARR, // variable length 1-d array of integer device index pointers to include in summation Array1A const FractionARR, // array of fractional multipliers to apply to devices Real64 &SumReturnAirGainRate); @@ -141,14 +140,14 @@ namespace InternalHeatGains { ); void SumReturnAirConvectionGainsByTypes(int const ZoneNum, // zone index pointer for which zone to sum gains for - Array1S_int const GainTypeARR, // variable length 1-d array of integer valued gain types + const Array1D_int &GainTypeARR, // variable length 1-d array of integer valued gain types Real64 &SumReturnAirGainRate); void SumAllInternalRadiationGains(int const ZoneNum, // zone index pointer for which zone to sum gains for Real64 &SumRadGainRate); void SumInternalRadiationGainsByTypes(int const ZoneNum, // zone index pointer for which zone to sum gains for - Array1S_int const GainTypeARR, // variable length 1-d array of integer valued gain types + const Array1D_int &GainTypeARR, // variable length 1-d array of integer valued gain types Real64 &SumRadiationGainRate); void SumAllInternalLatentGains(int const ZoneNum, // zone index pointer for which zone to sum gains for @@ -159,7 +158,7 @@ namespace InternalHeatGains { Real64 &SumLatentGainRateExceptPeople); void SumInternalLatentGainsByTypes(int const ZoneNum, // zone index pointer for which zone to sum gains for - Array1S_int const GainTypeARR, // variable length 1-d array of integer valued gain types + const Array1D_int &GainTypeARR, // variable length 1-d array of integer valued gain types Real64 &SumLatentGainRate); void SumAllReturnAirLatentGains(int const ZoneNum, // zone index pointer for which zone to sum gains for @@ -175,7 +174,7 @@ namespace InternalHeatGains { Real64 &SumCO2GainRateExceptPeople); void SumInternalCO2GainsByTypes(int const ZoneNum, // zone index pointer for which zone to sum gains for - Array1S_int const GainTypeARR, // variable length 1-d array of integer valued gain types + const Array1D_int &GainTypeARR, // variable length 1-d array of integer valued gain types Real64 &SumCO2GainRate); void SumAllInternalGenericContamGains(int const ZoneNum, // zone index pointer for which zone to sum gains for diff --git a/src/EnergyPlus/NodeInputManager.cc b/src/EnergyPlus/NodeInputManager.cc index 49fccd7bf7c..43c7a405488 100644 --- a/src/EnergyPlus/NodeInputManager.cc +++ b/src/EnergyPlus/NodeInputManager.cc @@ -158,7 +158,7 @@ namespace NodeInputManager { void GetNodeNums(std::string const &Name, // Name for which to obtain information int &NumNodes, // Number of nodes accompanying this Name - Array1S_int NodeNumbers, // Node Numbers accompanying this Name + Array1D_int &NodeNumbers, // Node Numbers accompanying this Name bool &ErrorsFound, // True when errors are found... int const NodeFluidType, // Fluidtype for checking/setting node FluidType std::string const &NodeObjectType, // Node Object Type (i.e. "Chiller:Electric") diff --git a/src/EnergyPlus/NodeInputManager.hh b/src/EnergyPlus/NodeInputManager.hh index cc4360413bd..90f7104d85a 100644 --- a/src/EnergyPlus/NodeInputManager.hh +++ b/src/EnergyPlus/NodeInputManager.hh @@ -50,7 +50,6 @@ // ObjexxFCL Headers #include -#include #include // EnergyPlus Headers @@ -116,7 +115,7 @@ namespace NodeInputManager { void GetNodeNums(std::string const &Name, // Name for which to obtain information int &NumNodes, // Number of nodes accompanying this Name - Array1S_int NodeNumbers, // Node Numbers accompanying this Name + Array1D_int &NodeNumbers, // Node Numbers accompanying this Name bool &ErrorsFound, // True when errors are found... int const NodeFluidType, // Fluidtype for checking/setting node FluidType std::string const &NodeObjectType, // Node Object Type (i.e. "Chiller:Electric") diff --git a/src/EnergyPlus/OutputProcessor.cc b/src/EnergyPlus/OutputProcessor.cc index 1c23a45f7ca..1121dcfea57 100644 --- a/src/EnergyPlus/OutputProcessor.cc +++ b/src/EnergyPlus/OutputProcessor.cc @@ -2650,16 +2650,73 @@ namespace OutputProcessor { void UpdateMeterValues(Real64 const TimeStepValue, // Value of this variable at the current time step. int const NumOnMeters, // Number of meters this variable is "on". - Array1S_int const OnMeters, // Which meters this variable is on (index values) - Optional_int_const NumOnCustomMeters, // Number of custom meters this variable is "on". - Optional OnCustomMeters // Which custom meters this variable is on (index values) + const Array1D_int &OnMeters // Which meters this variable is on (index values) ) { // SUBROUTINE INFORMATION: // AUTHOR Linda Lawrie // DATE WRITTEN January 2001 - // MODIFIED na + // MODIFIED Jason DeGraw 2/12/2020, de-optionalized + // RE-ENGINEERED na + + // PURPOSE OF THIS SUBROUTINE: + // This subroutine updates all the meter values in the lists with the current + // time step value for this variable. + + // METHODOLOGY EMPLOYED: + // Variables, as they are "setup", may or may not be on one or more meters. + // All "metered" variables are on the "facility meter". Index values will be + // set from the variables to the appropriate meters. Then, the updating of + // the meter values is quite simple -- just add the time step value of the variable + // (which is passed to this routine) to all the values being kept for the meter. + // Reporting of the meters is taken care of in a different routine. During reporting, + // some values will also be reset (for example, after reporting the "hour", the new + // "hour" value of the meter is reset to 0.0, etc. + + // REFERENCES: + // na + + // USE STATEMENTS: + // na + + // Argument array dimensioning + + // Locals + // SUBROUTINE ARGUMENT DEFINITIONS: + + // SUBROUTINE PARAMETER DEFINITIONS: + // na + + // INTERFACE BLOCK SPECIFICATIONS: + // na + + // DERIVED TYPE DEFINITIONS: + // na + + // SUBROUTINE LOCAL VARIABLE DECLARATIONS: + int Meter; // Loop Control + int Which; // Index value for the meter + + for (Meter = 1; Meter <= NumOnMeters; ++Meter) { + Which = OnMeters(Meter); + MeterValue(Which) += TimeStepValue; + } + + } + + void UpdateMeterValues(Real64 const TimeStepValue, // Value of this variable at the current time step. + int const NumOnMeters, // Number of meters this variable is "on". + const Array1D_int &OnMeters, // Which meters this variable is on (index values) + int const NumOnCustomMeters, // Number of custom meters this variable is "on". + const Array1D_int &OnCustomMeters // Which custom meters this variable is on (index values) + ) + { + + // SUBROUTINE INFORMATION: + // AUTHOR Linda Lawrie + // DATE WRITTEN January 2001 + // MODIFIED Jason DeGraw 2/12/2020, de-optionalized // RE-ENGINEERED na // PURPOSE OF THIS SUBROUTINE: @@ -2706,11 +2763,9 @@ namespace OutputProcessor { } // This calculates the basic values for decrement/difference meters -- UpdateMeters then calculates the actual. - if (present(NumOnCustomMeters)) { - for (Meter = 1; Meter <= NumOnCustomMeters; ++Meter) { - Which = OnCustomMeters()(Meter); - MeterValue(Which) += TimeStepValue; - } + for (Meter = 1; Meter <= NumOnCustomMeters; ++Meter) { + Which = OnCustomMeters(Meter); + MeterValue(Which) += TimeStepValue; } } @@ -8253,23 +8308,22 @@ int GetNumMeteredVariables(std::string const &EP_UNUSED(ComponentType), // Given void GetMeteredVariables(std::string const &ComponentType, // Given Component Type std::string const &ComponentName, // Given Component Name (user defined) - Array1S_int VarIndexes, // Variable Numbers - Array1S_int VarTypes, // Variable Types (1=integer, 2=real, 3=meter) + Array1D_int &VarIndexes, // Variable Numbers + Array1D_int &VarTypes, // Variable Types (1=integer, 2=real, 3=meter) Array1A TimeStepTypes, // Variable Index Types (1=Zone,2=HVAC) Array1A unitsForVar, // units from enum for each variable - Array1S_int ResourceTypes, // ResourceTypes for each variable - Optional EndUses, // EndUses for each variable - Optional Groups, // Groups for each variable - Optional Names, // Variable Names for each variable - Optional_int NumFound, // Number Found - Optional VarIDs // Variable Report Numbers + Array1D_int &ResourceTypes, // ResourceTypes for each variable + Array1D_string &EndUses, // EndUses for each variable + Array1D_string &Groups, // Groups for each variable + Array1D_string &Names, // Variable Names for each variable + int &NumFound // Number Found ) { // SUBROUTINE INFORMATION: // AUTHOR Linda Lawrie // DATE WRITTEN May 2005 - // MODIFIED na + // MODIFIED Jason DeGraw 2/12/2020, de-optionalized // RE-ENGINEERED na // PURPOSE OF THIS SUBROUTINE: @@ -8306,46 +8360,122 @@ void GetMeteredVariables(std::string const &ComponentType, / unitsForVar(NumVariables) = RVariableTypes(Loop).units; ResourceTypes(NumVariables) = AssignResourceTypeNum(UtilityRoutines::MakeUPPERCase(EnergyMeters(MeterPtr).ResourceType)); - if (present(Names)) { - Names()(NumVariables) = RVariableTypes(Loop).VarNameUC; - } - if (present(EndUses)) { - for (MeterNum = 1; MeterNum <= NumOnMeterPtr; ++MeterNum) { - MeterPtr = VarMeterArrays(rVar.MeterArrayPtr).OnMeters(MeterNum); - if (!EnergyMeters(MeterPtr).EndUse.empty()) { - EndUses()(NumVariables) = UtilityRoutines::MakeUPPERCase(EnergyMeters(MeterPtr).EndUse); - break; - } + + Names(NumVariables) = RVariableTypes(Loop).VarNameUC; + + for (MeterNum = 1; MeterNum <= NumOnMeterPtr; ++MeterNum) { + MeterPtr = VarMeterArrays(rVar.MeterArrayPtr).OnMeters(MeterNum); + if (!EnergyMeters(MeterPtr).EndUse.empty()) { + EndUses(NumVariables) = UtilityRoutines::MakeUPPERCase(EnergyMeters(MeterPtr).EndUse); + break; } } - if (present(Groups)) { - for (MeterNum = 1; MeterNum <= NumOnMeterPtr; ++MeterNum) { - MeterPtr = VarMeterArrays(rVar.MeterArrayPtr).OnMeters(MeterNum); - if (!EnergyMeters(MeterPtr).Group.empty()) { - Groups()(NumVariables) = UtilityRoutines::MakeUPPERCase(EnergyMeters(MeterPtr).Group); - break; - } + + for (MeterNum = 1; MeterNum <= NumOnMeterPtr; ++MeterNum) { + MeterPtr = VarMeterArrays(rVar.MeterArrayPtr).OnMeters(MeterNum); + if (!EnergyMeters(MeterPtr).Group.empty()) { + Groups(NumVariables) = UtilityRoutines::MakeUPPERCase(EnergyMeters(MeterPtr).Group); + break; } } - if (present(VarIDs)) { - VarIDs()(NumVariables) = rVar.ReportID; - } + } else { ShowWarningError("Referenced variable or meter used in the wrong context \"" + ComponentName + "\" of type \"" + ComponentType + "\""); } } - if (present(NumFound)) { - NumFound = NumVariables; + NumFound = NumVariables; // Should just return this +} + +void GetMeteredVariables(std::string const &ComponentType, // Given Component Type + std::string const &ComponentName, // Given Component Name (user defined) + Array1D_int &VarIndexes, // Variable Numbers + Array1D_int &VarTypes, // Variable Types (1=integer, 2=real, 3=meter) + Array1A TimeStepTypes, // Variable Index Types (1=Zone,2=HVAC) + Array1A unitsForVar, // units from enum for each variable + Array1D_int &ResourceTypes, // ResourceTypes for each variable + Array1D_string &EndUses, // EndUses for each variable + Array1D_string &Groups, // Groups for each variable + Array1D_string &Names, // Variable Names for each variable + Array1D_int &VarIDs // Variable Report Numbers +) +{ + + // SUBROUTINE INFORMATION: + // AUTHOR Linda Lawrie + // DATE WRITTEN May 2005 + // MODIFIED Jason DeGraw 2/12/2020, de-optionalized + // RE-ENGINEERED na + + // PURPOSE OF THIS SUBROUTINE: + // This routine gets the variable names and other associated information + // for metered variables associated with the given ComponentType/Name. + + // Using/Aliasing + using namespace DataPrecisionGlobals; + using namespace DataGlobalConstants; + using namespace OutputProcessor; + + // SUBROUTINE LOCAL VARIABLE DECLARATIONS: + int Loop; + int NumVariables; + int MeterPtr; + int NumOnMeterPtr; + int MeterNum; + + NumVariables = 0; + + for (Loop = 1; Loop <= NumOfRVariable; ++Loop) { + // Pos=INDEX(RVariableTypes(Loop)%VarName,':') + // IF (ComponentName /= RVariableTypes(Loop)%VarNameUC(1:Pos-1)) CYCLE + if (ComponentName != RVariableTypes(Loop).KeyNameOnlyUC) continue; + auto &rVar(RVariableTypes(Loop).VarPtr()); + if (rVar.MeterArrayPtr == 0) continue; + NumOnMeterPtr = VarMeterArrays(rVar.MeterArrayPtr).NumOnMeters; + MeterPtr = VarMeterArrays(rVar.MeterArrayPtr).OnMeters(1); + if (MeterPtr) { + ++NumVariables; + VarIndexes(NumVariables) = Loop; + VarTypes(NumVariables) = 2; + TimeStepTypes(NumVariables) = RVariableTypes(Loop).timeStepType; + unitsForVar(NumVariables) = RVariableTypes(Loop).units; + + ResourceTypes(NumVariables) = AssignResourceTypeNum(UtilityRoutines::MakeUPPERCase(EnergyMeters(MeterPtr).ResourceType)); + Names(NumVariables) = RVariableTypes(Loop).VarNameUC; + + for (MeterNum = 1; MeterNum <= NumOnMeterPtr; ++MeterNum) { + MeterPtr = VarMeterArrays(rVar.MeterArrayPtr).OnMeters(MeterNum); + if (!EnergyMeters(MeterPtr).EndUse.empty()) { + EndUses(NumVariables) = UtilityRoutines::MakeUPPERCase(EnergyMeters(MeterPtr).EndUse); + break; + } + } + + for (MeterNum = 1; MeterNum <= NumOnMeterPtr; ++MeterNum) { + MeterPtr = VarMeterArrays(rVar.MeterArrayPtr).OnMeters(MeterNum); + if (!EnergyMeters(MeterPtr).Group.empty()) { + Groups(NumVariables) = UtilityRoutines::MakeUPPERCase(EnergyMeters(MeterPtr).Group); + break; + } + } + + VarIDs(NumVariables) = rVar.ReportID; + + } else { + ShowWarningError("Referenced variable or meter used in the wrong context \"" + ComponentName + "\" of type \"" + ComponentType + "\""); + } } + } + void GetVariableKeyCountandType(std::string const &varName, // Standard variable name int &numKeys, // Number of keys found int &varType, // 0=not found, 1=integer, 2=real, 3=meter OutputProcessor::StoreType &varAvgSum, // Variable is Averaged=1 or Summed=2 OutputProcessor::TimeStepType &varStepType, // Variable time step is Zone=1 or HVAC=2 OutputProcessor::Unit &varUnits // Units enumeration + ) { @@ -8541,8 +8671,8 @@ void GetVariableKeyCountandType(std::string const &varName, // S void GetVariableKeys(std::string const &varName, // Standard variable name int const varType, // 1=integer, 2=real, 3=meter - Array1S_string keyNames, // Specific key name - Array1S_int keyVarIndexes // Array index for + Array1D_string &keyNames, // Specific key name + Array1D_int &keyVarIndexes // Array index for ) { diff --git a/src/EnergyPlus/OutputProcessor.hh b/src/EnergyPlus/OutputProcessor.hh index 71d54b928de..7ed9a63fb5b 100644 --- a/src/EnergyPlus/OutputProcessor.hh +++ b/src/EnergyPlus/OutputProcessor.hh @@ -54,7 +54,6 @@ // ObjexxFCL Headers #include -#include #include #include #include @@ -701,9 +700,14 @@ namespace OutputProcessor { void UpdateMeterValues(Real64 const TimeStepValue, // Value of this variable at the current time step. int const NumOnMeters, // Number of meters this variable is "on". - Array1S_int const OnMeters, // Which meters this variable is on (index values) - Optional_int_const NumOnCustomMeters = _, // Number of custom meters this variable is "on". - Optional OnCustomMeters = _ // Which custom meters this variable is on (index values) + const Array1D_int &OnMeters // Which meters this variable is on (index values) + ); + + void UpdateMeterValues(Real64 const TimeStepValue, // Value of this variable at the current time step. + int const NumOnMeters, // Number of meters this variable is "on". + const Array1D_int &OnMeters, // Which meters this variable is on (index values) + int const NumOnCustomMeters, // Number of custom meters this variable is "on". + const Array1D_int &OnCustomMeters // Which custom meters this variable is on (index values) ); void UpdateMeters(int const TimeStamp); // Current TimeStamp (for max/min) @@ -1005,18 +1009,30 @@ int GetNumMeteredVariables(std::string const &ComponentType, // Given Component std::string const &ComponentName // Given Component Name (user defined) ); -void GetMeteredVariables(std::string const &ComponentType, // Given Component Type - std::string const &ComponentName, // Given Component Name (user defined) - Array1S_int VarIndexes, // Variable Numbers - Array1S_int VarTypes, // Variable Types (1=integer, 2=real, 3=meter) +void GetMeteredVariables(std::string const &ComponentType, // Given Component Type + std::string const &ComponentName, // Given Component Name (user defined) + Array1D_int &VarIndexes, // Variable Numbers + Array1D_int &VarTypes, // Variable Types (1=integer, 2=real, 3=meter) + Array1A TimeStepTypes, // Variable Index Types (1=Zone,2=HVAC), + Array1A unitsForVar, // units from enum for each variable + Array1D_int &ResourceTypes, // ResourceTypes for each variable + Array1D_string &EndUses, // EndUses for each variable + Array1D_string &Groups, // Groups for each variable + Array1D_string &Names, // Variable Names for each variable + int &NumFound // Number Found +); + +void GetMeteredVariables(std::string const &ComponentType, // Given Component Type + std::string const &ComponentName, // Given Component Name (user defined) + Array1D_int &VarIndexes, // Variable Numbers + Array1D_int &VarTypes, // Variable Types (1=integer, 2=real, 3=meter) Array1A TimeStepTypes, // Variable Index Types (1=Zone,2=HVAC), - Array1A unitsForVar, // units from enum for each variable - Array1S_int ResourceTypes, // ResourceTypes for each variable - Optional EndUses = _, // EndUses for each variable - Optional Groups = _, // Groups for each variable - Optional Names = _, // Variable Names for each variable - Optional_int NumFound = _, // Number Found - Optional VarIDs = _ // Variable Report Numbers + Array1A unitsForVar, // units from enum for each variable + Array1D_int &ResourceTypes, // ResourceTypes for each variable + Array1D_string &EndUses, // EndUses for each variable + Array1D_string &Groups, // Groups for each variable + Array1D_string &Names, // Variable Names for each variable + Array1D_int &VarIDs // Variable Report Numbers ); void GetVariableKeyCountandType(std::string const &varName, // Standard variable name @@ -1029,8 +1045,8 @@ void GetVariableKeyCountandType(std::string const &varName, // Standa void GetVariableKeys(std::string const &varName, // Standard variable name int const varType, // 1=integer, 2=real, 3=meter - Array1S_string keyNames, // Specific key name - Array1S_int keyVarIndexes // Array index for + Array1D_string &keyNames, // Specific key name + Array1D_int &keyVarIndexes // Array index for ); bool ReportingThisVariable(std::string const &RepVarName); diff --git a/src/EnergyPlus/OutputReportData.cc b/src/EnergyPlus/OutputReportData.cc index 114c48a5461..00de1f72e5d 100644 --- a/src/EnergyPlus/OutputReportData.cc +++ b/src/EnergyPlus/OutputReportData.cc @@ -51,7 +51,6 @@ // ObjexxFCL Headers #include -#include #include #include #include diff --git a/src/EnergyPlus/OutputReportData.hh b/src/EnergyPlus/OutputReportData.hh index 2374020a0a6..449c1ca054b 100644 --- a/src/EnergyPlus/OutputReportData.hh +++ b/src/EnergyPlus/OutputReportData.hh @@ -54,7 +54,6 @@ // ObjexxFCL Headers #include -#include #include #include #include diff --git a/src/EnergyPlus/OutputReportTabular.cc b/src/EnergyPlus/OutputReportTabular.cc index ef52772c252..7be67ea4a51 100644 --- a/src/EnergyPlus/OutputReportTabular.cc +++ b/src/EnergyPlus/OutputReportTabular.cc @@ -14388,9 +14388,9 @@ namespace OutputReportTabular { } void WriteTable(Array2S_string const body, // row,column - Array1S_string const rowLabels, - Array1S_string const columnLabels, - Array1S_int widthColumn, + const Array1D_string &rowLabels, + const Array1D_string &columnLabels, + Array1D_int &widthColumn, Optional_bool_const transposeXML, Optional_string_const footnoteText) { diff --git a/src/EnergyPlus/OutputReportTabular.hh b/src/EnergyPlus/OutputReportTabular.hh index 4778f51defe..e7e37a90b7e 100644 --- a/src/EnergyPlus/OutputReportTabular.hh +++ b/src/EnergyPlus/OutputReportTabular.hh @@ -870,9 +870,9 @@ namespace OutputReportTabular { void WriteTextLine(std::string const &lineOfText, Optional_bool_const isBold = _); void WriteTable(Array2S_string const body, // row,column - Array1S_string const rowLabels, - Array1S_string const columnLabels, - Array1S_int widthColumn, + const Array1D_string &rowLabels, + const Array1D_string &columnLabels, + Array1D_int &widthColumn, Optional_bool_const transposeXML = _, Optional_string_const footnoteText = _); diff --git a/src/EnergyPlus/OutputReportTabularAnnual.cc b/src/EnergyPlus/OutputReportTabularAnnual.cc index adb21847fb0..e6c284e098e 100644 --- a/src/EnergyPlus/OutputReportTabularAnnual.cc +++ b/src/EnergyPlus/OutputReportTabularAnnual.cc @@ -54,7 +54,6 @@ // ObjexxFCL Headers #include -#include #include #include #include diff --git a/src/EnergyPlus/OutputReportTabularAnnual.hh b/src/EnergyPlus/OutputReportTabularAnnual.hh index 7db9540603b..1a422caa589 100644 --- a/src/EnergyPlus/OutputReportTabularAnnual.hh +++ b/src/EnergyPlus/OutputReportTabularAnnual.hh @@ -55,7 +55,6 @@ // ObjexxFCL Headers #include -#include #include #include #include diff --git a/src/EnergyPlus/RoomAirModelAirflowNetwork.cc b/src/EnergyPlus/RoomAirModelAirflowNetwork.cc index 214e327f1ad..fe34499b063 100644 --- a/src/EnergyPlus/RoomAirModelAirflowNetwork.cc +++ b/src/EnergyPlus/RoomAirModelAirflowNetwork.cc @@ -871,7 +871,7 @@ namespace RoomAirModelAirflowNetwork { using DataSurfaces::SurfaceWindow; using DataZoneEquipment::ZoneEquipConfig; using InternalHeatGains::SumInternalConvectionGainsByIndices; - using InternalHeatGains::SumInternalConvectionGainsByTypes; + //using InternalHeatGains::SumInternalConvectionGainsByTypes; using InternalHeatGains::SumInternalLatentGainsByIndices; using InternalHeatGains::SumReturnAirConvectionGainsByIndices; using InternalHeatGains::SumReturnAirConvectionGainsByTypes; diff --git a/src/EnergyPlus/RootFinder.cc b/src/EnergyPlus/RootFinder.cc index c7953b1f0c9..bbc6c8c8a72 100644 --- a/src/EnergyPlus/RootFinder.cc +++ b/src/EnergyPlus/RootFinder.cc @@ -1885,8 +1885,8 @@ namespace RootFinder { RootFinderData.CurrentPoint.Y = Y; } - void SortHistory(int const N, // Number of points to sort in history array - Array1S History // Array of PointType variables. At least N of them + void SortHistory(int const N, // Number of points to sort in history array + Array1D &History // Array of PointType variables. At least N of them ) { // SUBROUTINE INFORMATION: diff --git a/src/EnergyPlus/RootFinder.hh b/src/EnergyPlus/RootFinder.hh index 8a3b5a49ba7..295ff178cee 100644 --- a/src/EnergyPlus/RootFinder.hh +++ b/src/EnergyPlus/RootFinder.hh @@ -49,7 +49,6 @@ #define RootFinder_hh_INCLUDED // ObjexxFCL Headers -#include #include // EnergyPlus Headers @@ -156,8 +155,8 @@ namespace RootFinder { Real64 const Y // Y value for current iterate, F(X)=Y ); - void SortHistory(int const N, // Number of points to sort in history array - Array1S History // Array of PointType variables. At least N of them + void SortHistory(int const N, // Number of points to sort in history array + Array1D &History // Array of PointType variables. At least N of them ); void AdvanceRootFinder(RootFinderDataType &RootFinderData); // Data used by root finding algorithm diff --git a/src/EnergyPlus/RuntimeLanguageProcessor.cc b/src/EnergyPlus/RuntimeLanguageProcessor.cc index 3224343a9d3..f6c7de3d9c3 100644 --- a/src/EnergyPlus/RuntimeLanguageProcessor.cc +++ b/src/EnergyPlus/RuntimeLanguageProcessor.cc @@ -1755,7 +1755,7 @@ namespace RuntimeLanguageProcessor { ExpressionNum = ProcessTokens(Token, NumTokens, StackNum, String); } - int ProcessTokens(Array1S const TokenIN, int const NumTokensIN, int const StackNum, std::string const &ParsingString) + int ProcessTokens(const Array1D &TokenIN, int const NumTokensIN, int const StackNum, std::string const &ParsingString) { // SUBROUTINE INFORMATION: diff --git a/src/EnergyPlus/RuntimeLanguageProcessor.hh b/src/EnergyPlus/RuntimeLanguageProcessor.hh index af3f9f33105..6dc5e834a3c 100644 --- a/src/EnergyPlus/RuntimeLanguageProcessor.hh +++ b/src/EnergyPlus/RuntimeLanguageProcessor.hh @@ -50,7 +50,6 @@ // ObjexxFCL Headers #include -#include #include // EnergyPlus Headers @@ -212,7 +211,7 @@ namespace RuntimeLanguageProcessor { std::string const &Line // Actual line from string ); - int ProcessTokens(Array1S const TokenIN, int const NumTokensIN, int const StackNum, std::string const &ParsingString); + int ProcessTokens(const Array1D &TokenIN, int const NumTokensIN, int const StackNum, std::string const &ParsingString); int NewExpression(); diff --git a/src/EnergyPlus/SZVAVModel.hh b/src/EnergyPlus/SZVAVModel.hh index d1d0484d364..6fcf1fb9df5 100644 --- a/src/EnergyPlus/SZVAVModel.hh +++ b/src/EnergyPlus/SZVAVModel.hh @@ -55,7 +55,6 @@ // ObjexxFCL Headers #include #include -#include #include #include diff --git a/src/EnergyPlus/SimulationManager.cc b/src/EnergyPlus/SimulationManager.cc index 716bbe675c5..67e2abb155b 100644 --- a/src/EnergyPlus/SimulationManager.cc +++ b/src/EnergyPlus/SimulationManager.cc @@ -3033,7 +3033,6 @@ namespace SimulationManager { EndUses, Groups, VarNames, - _, VarIDs); for (Loop1 = 1; Loop1 <= NumVariables; ++Loop1) { ObjexxFCL::gio::write(OutputFileDebug, "(1X,'RepVar,',I5,',',I5,',',A,',[',A,'],',A,',',A,',',A,',',I5)") diff --git a/src/EnergyPlus/SolarShading.cc b/src/EnergyPlus/SolarShading.cc index f8f10b3d82f..a347c9185d5 100644 --- a/src/EnergyPlus/SolarShading.cc +++ b/src/EnergyPlus/SolarShading.cc @@ -6493,7 +6493,6 @@ namespace SolarShading { using General::BlindBeamBeamTrans; using General::InterpBlind; - using General::InterpProfAng; using General::InterpProfSlatAng; using General::InterpSlatAng; using General::InterpSw; diff --git a/src/EnergyPlus/SortAndStringUtilities.cc b/src/EnergyPlus/SortAndStringUtilities.cc index efe7cd42848..cbe7c83328f 100644 --- a/src/EnergyPlus/SortAndStringUtilities.cc +++ b/src/EnergyPlus/SortAndStringUtilities.cc @@ -94,8 +94,8 @@ namespace SortAndStringUtilities { // Functions - void SetupAndSort(Array1S_string Alphas, // Alphas to be sorted - Array1S_int iAlphas // Indexes of sorted array + void SetupAndSort(Array1D_string &Alphas, // Alphas to be sorted + Array1D_int &iAlphas // Indexes of sorted array ) { diff --git a/src/EnergyPlus/SortAndStringUtilities.hh b/src/EnergyPlus/SortAndStringUtilities.hh index 60a2911888b..0c51a98522d 100644 --- a/src/EnergyPlus/SortAndStringUtilities.hh +++ b/src/EnergyPlus/SortAndStringUtilities.hh @@ -72,8 +72,8 @@ namespace SortAndStringUtilities { // Functions - void SetupAndSort(Array1S_string Alphas, // Alphas to be sorted - Array1S_int iAlphas // Indexes of sorted array + void SetupAndSort(Array1D_string &Alphas, // Alphas to be sorted + Array1D_int &iAlphas // Indexes of sorted array ); void QsortC(Array1S_string Alphas, // Alphas to be sorted diff --git a/src/EnergyPlus/SurfaceGeometry.cc b/src/EnergyPlus/SurfaceGeometry.cc index 12a4387b93f..d2fcf53a202 100644 --- a/src/EnergyPlus/SurfaceGeometry.cc +++ b/src/EnergyPlus/SurfaceGeometry.cc @@ -2741,9 +2741,10 @@ namespace SurfaceGeometry { int const TotDetailedWalls, // Number of Wall:Detailed items to obtain int const TotDetailedRoofs, // Number of RoofCeiling:Detailed items to obtain int const TotDetailedFloors, // Number of Floor:Detailed items to obtain - Array1S_string const BaseSurfCls, // Valid Classes for Base Surfaces - Array1S_int const BaseSurfIDs, - int &NeedToAddSurfaces) + const Array1D_string &BaseSurfCls, // Valid Classes for Base Surfaces + const Array1D_int &BaseSurfIDs, + int &NeedToAddSurfaces // Number of surfaces to add, based on unentered IZ surfaces + ) { // SUBROUTINE INFORMATION: @@ -3295,7 +3296,7 @@ namespace SurfaceGeometry { int const TotRectGCFloors, // Number of Floors with Ground Contact to obtain int const TotRectIntFloors, // Number of Adiabatic Walls to obtain int const TotRectIZFloors, // Number of Interzone Floors to obtain - Array1S_int const BaseSurfIDs, // ID Assignments for valid surface classes + const Array1D_int &BaseSurfIDs, // ID Assignments for valid surface classes int &NeedToAddSurfaces // Number of surfaces to add, based on unentered IZ surfaces ) { @@ -3772,8 +3773,8 @@ namespace SurfaceGeometry { void GetHTSubSurfaceData(bool &ErrorsFound, // Error flag indicator (true if errors found) int &SurfNum, // Count of Current SurfaceNumber int const TotHTSubs, // Number of Heat Transfer SubSurfaces to obtain - Array1S_string const SubSurfCls, // Valid Classes for Sub Surfaces - Array1S_int const SubSurfIDs, // ID Assignments for valid sub surface classes + const Array1D_string &SubSurfCls, // Valid Classes for Sub Surfaces + const Array1D_int &SubSurfIDs, // ID Assignments for valid sub surface classes int &AddedSubSurfaces, // Subsurfaces added when windows reference Window5 int &NeedToAddSurfaces // Number of surfaces to add, based on unentered IZ surfaces ) @@ -4152,7 +4153,7 @@ namespace SurfaceGeometry { int const TotIZWindows, // Number of Interzone Window SubSurfaces to obtain int const TotIZDoors, // Number of Interzone Door SubSurfaces to obtain int const TotIZGlazedDoors, // Number of Interzone Glass Door SubSurfaces to obtain - Array1S_int const SubSurfIDs, // ID Assignments for valid sub surface classes + const Array1D_int &SubSurfIDs, // ID Assignments for valid sub surface classes int &AddedSubSurfaces, // Subsurfaces added when windows reference Window5 int &NeedToAddSubSurfaces // Number of surfaces to add, based on unentered IZ surfaces ) @@ -9823,7 +9824,7 @@ namespace SurfaceGeometry { } // Calculates the volume (m3) of a zone using the surfaces as possible. - void CalculateZoneVolume(Array1S_bool const CeilingHeightEntered) + void CalculateZoneVolume(const Array1D_bool &CeilingHeightEntered) { // SUBROUTINE INFORMATION: diff --git a/src/EnergyPlus/SurfaceGeometry.hh b/src/EnergyPlus/SurfaceGeometry.hh index adb80956757..31cab0645b1 100644 --- a/src/EnergyPlus/SurfaceGeometry.hh +++ b/src/EnergyPlus/SurfaceGeometry.hh @@ -146,9 +146,10 @@ namespace SurfaceGeometry { int const TotDetailedWalls, // Number of Wall:Detailed items to obtain int const TotDetailedRoofs, // Number of RoofCeiling:Detailed items to obtain int const TotDetailedFloors, // Number of Floor:Detailed items to obtain - Array1S_string const BaseSurfCls, // Valid Classes for Base Surfaces - Array1S_int const BaseSurfIDs, - int &NeedToAddSurfaces); + const Array1D_string &BaseSurfCls, // Valid Classes for Base Surfaces + const Array1D_int &BaseSurfIDs, + int &NeedToAddSurfaces // Number of surfaces to add, based on unentered IZ surfaces + ); void GetRectSurfaces(bool &ErrorsFound, // Error flag indicator (true if errors found) int &SurfNum, // Count of Current SurfaceNumber @@ -162,7 +163,7 @@ namespace SurfaceGeometry { int const TotRectGCFloors, // Number of Floors with Ground Contact to obtain int const TotRectIntFloors, // Number of Adiabatic Walls to obtain int const TotRectIZFloors, // Number of Interzone Floors to obtain - Array1S_int const BaseSurfIDs, // ID Assignments for valid surface classes + const Array1D_int &BaseSurfIDs, // ID Assignments for valid surface classes int &NeedToAddSurfaces // Number of surfaces to add, based on unentered IZ surfaces ); @@ -177,8 +178,8 @@ namespace SurfaceGeometry { void GetHTSubSurfaceData(bool &ErrorsFound, // Error flag indicator (true if errors found) int &SurfNum, // Count of Current SurfaceNumber int const TotHTSubs, // Number of Heat Transfer SubSurfaces to obtain - Array1S_string const SubSurfCls, // Valid Classes for Sub Surfaces - Array1S_int const SubSurfIDs, // ID Assignments for valid sub surface classes + const Array1D_string &SubSurfCls, // Valid Classes for Sub Surfaces + const Array1D_int &SubSurfIDs, // ID Assignments for valid sub surface classes int &AddedSubSurfaces, // Subsurfaces added when windows reference Window5 int &NeedToAddSurfaces // Number of surfaces to add, based on unentered IZ surfaces ); @@ -191,7 +192,7 @@ namespace SurfaceGeometry { int const TotIZWindows, // Number of Interzone Window SubSurfaces to obtain int const TotIZDoors, // Number of Interzone Door SubSurfaces to obtain int const TotIZGlazedDoors, // Number of Interzone Glass Door SubSurfaces to obtain - Array1S_int const SubSurfIDs, // ID Assignments for valid sub surface classes + const Array1D_int &SubSurfIDs, // ID Assignments for valid sub surface classes int &AddedSubSurfaces, // Subsurfaces added when windows reference Window5 int &NeedToAddSubSurfaces // Number of surfaces to add, based on unentered IZ surfaces ); @@ -295,7 +296,7 @@ namespace SurfaceGeometry { void GetMovableInsulationData(bool &ErrorsFound); // If errors found in input - void CalculateZoneVolume(Array1S_bool const CeilingHeightEntered); + void CalculateZoneVolume(const Array1D_bool &CeilingHeightEntered); struct EdgeOfSurf { diff --git a/src/EnergyPlus/Vectors.hh b/src/EnergyPlus/Vectors.hh index fde4fe7cafa..73ab19dae69 100644 --- a/src/EnergyPlus/Vectors.hh +++ b/src/EnergyPlus/Vectors.hh @@ -51,7 +51,6 @@ // ObjexxFCL Headers #include #include -#include // EnergyPlus Headers #include diff --git a/src/EnergyPlus/WeatherManager.cc b/src/EnergyPlus/WeatherManager.cc index b4f29971474..f78cdf350cb 100644 --- a/src/EnergyPlus/WeatherManager.cc +++ b/src/EnergyPlus/WeatherManager.cc @@ -1830,8 +1830,8 @@ namespace WeatherManager { } } - void SetDSTDateRanges(Array1S_int MonWeekDay, // Weekday of each day 1 of month - Array1S_int DSTIndex, // DST Index for each julian day (1:366) + void SetDSTDateRanges(Array1D_int &MonWeekDay, // Weekday of each day 1 of month + Array1D_int &DSTIndex, // DST Index for each julian day (1:366) Optional_int DSTActStMon, Optional_int DSTActStDay, Optional_int DSTActEnMon, @@ -1959,7 +1959,7 @@ namespace WeatherManager { } } - void SetSpecialDayDates(Array1S_int MonWeekDay) // Weekday of each day 1 of month + void SetSpecialDayDates(Array1D_int &MonWeekDay) // Weekday of each day 1 of month { // SUBROUTINE INFORMATION: diff --git a/src/EnergyPlus/WeatherManager.hh b/src/EnergyPlus/WeatherManager.hh index 1e4344c6485..f3dd7c8d6b9 100644 --- a/src/EnergyPlus/WeatherManager.hh +++ b/src/EnergyPlus/WeatherManager.hh @@ -53,7 +53,6 @@ // ObjexxFCL Headers #include -#include #include #include #include @@ -719,14 +718,14 @@ namespace WeatherManager { bool const Rollover, Optional_bool_const MidSimReset = _); - void SetDSTDateRanges(Array1S_int MonWeekDay, // Weekday of each day 1 of month - Array1S_int DSTIndex, // DST Index for each julian day (1:366) + void SetDSTDateRanges(Array1D_int &MonWeekDay, // Weekday of each day 1 of month + Array1D_int &DSTIndex, // DST Index for each julian day (1:366) Optional_int DSTActStMon = _, Optional_int DSTActStDay = _, Optional_int DSTActEnMon = _, Optional_int DSTActEnDay = _); - void SetSpecialDayDates(Array1S_int MonWeekDay); // Weekday of each day 1 of month + void SetSpecialDayDates(Array1D_int &MonWeekDay); // Weekday of each day 1 of month void InitializeWeather(bool &PrintEnvrnStamp); // Set to true when the environment header should be printed diff --git a/src/EnergyPlus/WindowEquivalentLayer.cc b/src/EnergyPlus/WindowEquivalentLayer.cc index 1f06372c3ba..d7c90861e86 100644 --- a/src/EnergyPlus/WindowEquivalentLayer.cc +++ b/src/EnergyPlus/WindowEquivalentLayer.cc @@ -800,7 +800,6 @@ namespace WindowEquivalentLayer { using DataHeatBalSurface::HcExtSurf; using DataLoopNode::Node; using DataZoneEquipment::ZoneEquipConfig; - using General::InterpSlatAng; using General::InterpSw; using Psychrometrics::PsyCpAirFnW; using Psychrometrics::PsyTdpFnWPb; @@ -4889,9 +4888,9 @@ namespace WindowEquivalentLayer { } // END OF CHECK FOR CLOSED BLIND } - void SOLMATS(int const N, // # of active rows in A - Array2S A, // matrix, minimum required dimensions: A( N, N+2) - Array1S XSOL // returned: solution vector, min req dimension: XSOL( N) + void SOLMATS(int const N, // # of active rows in A + Array2S A, // matrix, minimum required dimensions: A( N, N+2) + Array1D &XSOL // returned: solution vector, min req dimension: XSOL( N) ) { // SUBROUTINE INFORMATION: @@ -7535,7 +7534,7 @@ namespace WindowEquivalentLayer { } void - TDMA_R(Array1S X, Array1S const AP, Array1S const AE, Array1S const AW, Array1S const BP, int const N) + TDMA_R(Array1D &X, const Array1D &AP, const Array1D &AE, const Array1D &AW, const Array1D &BP, int const N) { // SUBROUTINE INFORMATION: // AUTHOR JOHN L. WRIGHT @@ -7585,7 +7584,7 @@ namespace WindowEquivalentLayer { } } - void TDMA(Array1S X, Array1S const AP, Array1S const AE, Array1S const AW, Array1S const BP, int const N) + void TDMA(Array1D &X, const Array1D &AP, const Array1D &AE, const Array1D &AW, const Array1D &BP, int const N) { // SUBROUTINE INFORMATION: // AUTHOR JOHN L. WRIGHT @@ -7642,7 +7641,7 @@ namespace WindowEquivalentLayer { } } - void AUTOTDMA(Array1S X, Array1S AP, Array1S const AE, Array1S const AW, Array1S const BP, int &N) + void AUTOTDMA(Array1D &X, Array1D &AP, const Array1D &AE, const Array1D &AW, const Array1D &BP, int &N) { // SUBROUTINE INFORMATION: // AUTHOR JOHN L. WRIGHT diff --git a/src/EnergyPlus/WindowEquivalentLayer.hh b/src/EnergyPlus/WindowEquivalentLayer.hh index 6381aef4113..37d674e747f 100644 --- a/src/EnergyPlus/WindowEquivalentLayer.hh +++ b/src/EnergyPlus/WindowEquivalentLayer.hh @@ -457,9 +457,9 @@ namespace WindowEquivalentLayer { Real64 &TAU_BD // returned: solar beam-to-diffuse transmittance of the venetian blind (front side) ); - void SOLMATS(int const N, // # of active rows in A - Array2S A, // matrix, minimum required dimensions: A( N, N+2) - Array1S XSOL // returned: solution vector, min req dimension: XSOL( N) + void SOLMATS(int const N, // # of active rows in A + Array2S A, // matrix, minimum required dimensions: A( N, N+2) + Array1D &XSOL // returned: solution vector, min req dimension: XSOL( N) ); void ASHWAT_ThermalCalc(CFSTY &FS, // fenestration system @@ -599,11 +599,11 @@ namespace WindowEquivalentLayer { ); void - TDMA_R(Array1S X, Array1S const AP, Array1S const AE, Array1S const AW, Array1S const BP, int const N); + TDMA_R(Array1D &X, const Array1D &AP, const Array1D &AE, const Array1D &AW, const Array1D &BP, int const N); - void TDMA(Array1S X, Array1S const AP, Array1S const AE, Array1S const AW, Array1S const BP, int const N); + void TDMA(Array1D &X, const Array1D &AP, const Array1D &AE, const Array1D &AW, const Array1D &BP, int const N); - void AUTOTDMA(Array1S X, Array1S AP, Array1S const AE, Array1S const AW, Array1S const BP, int &N); + void AUTOTDMA(Array1D &X, Array1D &AP, const Array1D &AE, const Array1D &AW, const Array1D &BP, int &N); void ASHWAT_OffNormalProperties(CFSLAYER const &L, // layer for which to derive off-normal properties Real64 const THETA, // solar beam angle of incidence, from normal, radians