Skip to content

Commit

Permalink
Get updates from the develop branch. Merge remote-tracking branch 'or…
Browse files Browse the repository at this point in the history 
…igin/develop' into enhanceRainfallHandling
  • Loading branch information
@yujiex
yujiex committed Nov 8, 2021
2 parents b159e0a + 00d968c commit 79758d8
Show file tree
Hide file tree
Showing 328 changed files with 8,285 additions and 7,819 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,5 @@ If you are interested in contributing, please start there, but feel free to reac

## Building EnergyPlus

A detailed description of compiling EnergyPlus on multiple platforms is available on the [wiki](https://github.com/NREL/EnergyPlus/wiki/BuildingEnergyPlus).
A detailed description of compiling EnergyPlus on multiple platforms is available on the [wiki](https://github.com/NREL/EnergyPlus/wiki/Building-EnergyPlus).
Also, as we are adapting to using Github Actions, the recipes for building EnergyPlus can be found in our [workflow files](https://github.com/NREL/EnergyPlus/tree/develop/.github/workflows).
4 changes: 2 additions & 2 deletions doc/module-developer/src/hvac-network/interfacing-with-plant.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,9 @@ \subsection{Central Routine Modifications}\label{central-routine-modifications}

a.~~~~Parameter NumSimPlantEquipTypes. Increment up to include new component.

b.~~~Array SimPlantEquipTypes.~ Add array element with new object's class name in upper case.
b.~~~Array PlantEquipTypeNamesUC.~ Add array element with new object's class name in upper case.

c.~~~~Array ccSimPlantEquipTypes.Add array element with new object's class name in camel case.
c.~~~~Array PlantEquipTypeNames.Add array element with new object's class name in camel case.

d.~~~Array ValidLoopEquipTypes.~ Add array element with classification for what type of loop this component is intended for, primarily with respect to the type of loop it is intended to meet loads.

Expand Down
2 changes: 0 additions & 2 deletions idd/Energy+.idd.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5129,10 +5129,8 @@ WindowMaterial:SimpleGlazingSystem,
N1 , \field U-Factor
\required-field
\note Enter U-Factor including film coefficients
\note Note that the effective upper limit for U-factor is 5.8 W/m2-K
\units W/m2-K
\minimum> 0
\maximum 7
N2 , \field Solar Heat Gain Coefficient
\required-field
\note SHGC at Normal Incidence
Expand Down
10 changes: 5 additions & 5 deletions src/EnergyPlus/AirLoopHVACDOAS.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,7 @@ namespace AirLoopHVACDOAS {
}
PlantUtilities::ScanPlantLoopsForObject(state,
CompName,
DataPlant::TypeOf_CoilWaterCooling,
DataPlant::PlantEquipmentType::CoilWaterCooling,
thisDOAS.CWLoopNum,
thisDOAS.CWLoopSide,
thisDOAS.CWBranchNum,
Expand Down Expand Up @@ -536,7 +536,7 @@ namespace AirLoopHVACDOAS {
}
PlantUtilities::ScanPlantLoopsForObject(state,
CompName,
DataPlant::TypeOf_CoilWaterSimpleHeating,
DataPlant::PlantEquipmentType::CoilWaterSimpleHeating,
thisDOAS.HWLoopNum,
thisDOAS.HWLoopSide,
thisDOAS.HWBranchNum,
Expand Down Expand Up @@ -576,7 +576,7 @@ namespace AirLoopHVACDOAS {
}
PlantUtilities::ScanPlantLoopsForObject(state,
CompName,
DataPlant::TypeOf_CoilWaterDetailedFlatCooling,
DataPlant::PlantEquipmentType::CoilWaterDetailedFlatCooling,
thisDOAS.CWLoopNum,
thisDOAS.CWLoopSide,
thisDOAS.CWBranchNum,
Expand Down Expand Up @@ -1056,8 +1056,8 @@ namespace AirLoopHVACDOAS {
void AirLoopDOAS::GetDesignDayConditions(EnergyPlusData &state)
{

int const summerDesignDayTypeIndex(9);
int const winterDesignDayTypeIndex(10);
int constexpr summerDesignDayTypeIndex(9);
int constexpr winterDesignDayTypeIndex(10);

for (size_t i = 1; i <= state.dataWeatherManager->DesDayInput.size(); i++) {
// Summer design day
Expand Down
86 changes: 43 additions & 43 deletions src/EnergyPlus/AirflowNetwork/src/Elements.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@ namespace AirflowNetwork {
// na

// SUBROUTINE PARAMETER DEFINITIONS:
Real64 const C(0.868589);
Real64 const EPS(0.001);
Real64 constexpr C(0.868589);
Real64 constexpr EPS(0.001);

// SUBROUTINE LOCAL VARIABLE DECLARATIONS:
Real64 A0;
Expand Down Expand Up @@ -279,8 +279,8 @@ namespace AirflowNetwork {
// na

// SUBROUTINE PARAMETER DEFINITIONS:
Real64 const C(0.868589);
Real64 const EPS(0.001);
Real64 constexpr C(0.868589);
Real64 constexpr EPS(0.001);

// SUBROUTINE LOCAL VARIABLE DECLARATIONS:
Real64 A0;
Expand Down Expand Up @@ -767,7 +767,7 @@ namespace AirflowNetwork {
// SUBROUTINE ARGUMENT DEFINITIONS:

// SUBROUTINE PARAMETER DEFINITIONS:
int const CycFanCycComp(1); // fan cycles with compressor operation
int constexpr CycFanCycComp(1); // fan cycles with compressor operation

// SUBROUTINE LOCAL VARIABLE DECLARATIONS:
int k;
Expand Down Expand Up @@ -879,7 +879,7 @@ namespace AirflowNetwork {
// na

// SUBROUTINE PARAMETER DEFINITIONS:
Real64 const TOL(0.00001);
Real64 constexpr TOL(0.00001);

// SUBROUTINE LOCAL VARIABLE DECLARATIONS:
int j;
Expand Down Expand Up @@ -1008,7 +1008,7 @@ namespace AirflowNetwork {
// na

// SUBROUTINE PARAMETER DEFINITIONS:
Real64 const TOL(0.00001);
Real64 constexpr TOL(0.00001);

// SUBROUTINE LOCAL VARIABLE DECLARATIONS:
int j;
Expand Down Expand Up @@ -1897,7 +1897,7 @@ namespace AirflowNetwork {
// na

// SUBROUTINE PARAMETER DEFINITIONS:
Real64 const SQRT2(1.414213562373095);
Real64 constexpr SQRT2(1.414213562373095);

// SUBROUTINE LOCAL VARIABLE DECLARATIONS:
Real64 DPMID; // pressure drop at mid-height of doorway.
Expand Down Expand Up @@ -2273,13 +2273,13 @@ namespace AirflowNetwork {
// na

// SUBROUTINE PARAMETER DEFINITIONS:
Real64 const C(0.868589);
Real64 const EPS(0.001);
Real64 const Rough(0.0001);
Real64 const InitLamCoef(128.0);
Real64 const LamDynCoef(64.0);
Real64 const LamFriCoef(0.0001);
Real64 const TurDynCoef(0.0001);
Real64 constexpr C(0.868589);
Real64 constexpr EPS(0.001);
Real64 constexpr Rough(0.0001);
Real64 constexpr InitLamCoef(128.0);
Real64 constexpr LamDynCoef(64.0);
Real64 constexpr LamFriCoef(0.0001);
Real64 constexpr TurDynCoef(0.0001);

// SUBROUTINE LOCAL VARIABLE DECLARATIONS:
Real64 A0;
Expand Down Expand Up @@ -2432,12 +2432,12 @@ namespace AirflowNetwork {
// na

// SUBROUTINE PARAMETER DEFINITIONS:
Real64 const C(0.868589);
Real64 const EPS(0.001);
Real64 const Rough(0.0001);
Real64 const LamDynCoef(64.0);
Real64 const LamFriCoef(0.0001);
Real64 const TurDynCoef(0.0001);
Real64 constexpr C(0.868589);
Real64 constexpr EPS(0.001);
Real64 constexpr Rough(0.0001);
Real64 constexpr LamDynCoef(64.0);
Real64 constexpr LamFriCoef(0.0001);
Real64 constexpr TurDynCoef(0.0001);

// SUBROUTINE LOCAL VARIABLE DECLARATIONS:
Real64 A0;
Expand Down Expand Up @@ -2575,13 +2575,13 @@ namespace AirflowNetwork {
// This subroutine solves airflow for a terminal unit component

// SUBROUTINE PARAMETER DEFINITIONS:
Real64 const C(0.868589);
Real64 const EPS(0.001);
Real64 const Rough(0.0001);
Real64 const InitLamCoef(128.0);
Real64 const LamDynCoef(64.0);
Real64 const LamFriCoef(0.0001);
Real64 const TurDynCoef(0.0001);
Real64 constexpr C(0.868589);
Real64 constexpr EPS(0.001);
Real64 constexpr Rough(0.0001);
Real64 constexpr InitLamCoef(128.0);
Real64 constexpr LamDynCoef(64.0);
Real64 constexpr LamFriCoef(0.0001);
Real64 constexpr TurDynCoef(0.0001);

// SUBROUTINE LOCAL VARIABLE DECLARATIONS:
Real64 A0;
Expand Down Expand Up @@ -2742,13 +2742,13 @@ namespace AirflowNetwork {
// na

// SUBROUTINE PARAMETER DEFINITIONS:
Real64 const C(0.868589);
Real64 const EPS(0.001);
Real64 const Rough(0.0001);
Real64 const InitLamCoef(128.0);
Real64 const LamDynCoef(64.0);
Real64 const LamFriCoef(0.0001);
Real64 const TurDynCoef(0.0001);
Real64 constexpr C(0.868589);
Real64 constexpr EPS(0.001);
Real64 constexpr Rough(0.0001);
Real64 constexpr InitLamCoef(128.0);
Real64 constexpr LamDynCoef(64.0);
Real64 constexpr LamFriCoef(0.0001);
Real64 constexpr TurDynCoef(0.0001);

// SUBROUTINE LOCAL VARIABLE DECLARATIONS:
Real64 A0;
Expand Down Expand Up @@ -2889,12 +2889,12 @@ namespace AirflowNetwork {
// na

// SUBROUTINE PARAMETER DEFINITIONS:
Real64 const C(0.868589);
Real64 const EPS(0.001);
Real64 const Rough(0.0001);
Real64 const LamDynCoef(64.0);
Real64 const LamFriCoef(0.0001);
Real64 const TurDynCoef(0.0001);
Real64 constexpr C(0.868589);
Real64 constexpr EPS(0.001);
Real64 constexpr Rough(0.0001);
Real64 constexpr LamDynCoef(64.0);
Real64 constexpr LamFriCoef(0.0001);
Real64 constexpr TurDynCoef(0.0001);

// SUBROUTINE LOCAL VARIABLE DECLARATIONS:
Real64 A0;
Expand Down Expand Up @@ -3471,7 +3471,7 @@ namespace AirflowNetwork {
using DataHVACGlobals::VerySmallMassFlow;

// SUBROUTINE PARAMETER DEFINITIONS:
int const CycFanCycComp(1); // fan cycles with compressor operation
int constexpr CycFanCycComp(1); // fan cycles with compressor operation

// SUBROUTINE LOCAL VARIABLE DECLARATIONS:
Real64 expn;
Expand Down Expand Up @@ -3589,7 +3589,7 @@ namespace AirflowNetwork {
using DataHVACGlobals::VerySmallMassFlow;

// SUBROUTINE PARAMETER DEFINITIONS:
int const CycFanCycComp(1); // fan cycles with compressor operation
int constexpr CycFanCycComp(1); // fan cycles with compressor operation

// SUBROUTINE LOCAL VARIABLE DECLARATIONS:
Real64 expn;
Expand Down
16 changes: 8 additions & 8 deletions src/EnergyPlus/AirflowNetwork/src/Solver.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1118,13 +1118,13 @@ namespace AirflowNetwork {
// SUBROUTINE ARGUMENT DEFINITIONS:

// SUBROUTINE PARAMETER DEFINITIONS:
Real64 const C(0.868589);
Real64 const EPS(0.001);
Real64 const Rough(0.0001);
Real64 const InitLamCoef(128.0);
Real64 const LamDynCoef(64.0);
Real64 const LamFriCoef(0.0001);
Real64 const TurDynCoef(0.0001);
Real64 constexpr C(0.868589);
Real64 constexpr EPS(0.001);
Real64 constexpr Rough(0.0001);
Real64 constexpr InitLamCoef(128.0);
Real64 constexpr LamDynCoef(64.0);
Real64 constexpr LamFriCoef(0.0001);
Real64 constexpr TurDynCoef(0.0001);

// INTERFACE BLOCK SPECIFICATIONS
// na
Expand Down Expand Up @@ -1920,7 +1920,7 @@ namespace AirflowNetwork {
// na

// SUBROUTINE PARAMETER DEFINITIONS:
Real64 const PSea(101325.0);
Real64 constexpr PSea(101325.0);

// INTERFACE BLOCK SPECIFICATIONS
// na
Expand Down
14 changes: 7 additions & 7 deletions src/EnergyPlus/AirflowNetworkBalanceManager.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6696,7 +6696,7 @@ namespace AirflowNetworkBalanceManager {
using General::SolveRoot;

// SUBROUTINE PARAMETER DEFINITIONS:
int const CycFanCycComp(1); // fan cycles with compressor operation
int constexpr CycFanCycComp(1); // fan cycles with compressor operation

// SUBROUTINE LOCAL VARIABLE DECLARATIONS:
int i;
Expand All @@ -6713,8 +6713,8 @@ namespace AirflowNetworkBalanceManager {
Real64 LocalHumRat;
Real64 LocalDryBulb;
Array1D<Real64> Par; // Pressure setpoint
Real64 const ErrorToler(0.00001);
int const MaxIte(20);
Real64 constexpr ErrorToler(0.00001);
int constexpr MaxIte(20);
int SolFla;
Real64 MinExhaustMassFlowrate;
Real64 MaxExhaustMassFlowrate;
Expand Down Expand Up @@ -7806,7 +7806,7 @@ namespace AirflowNetworkBalanceManager {

Pamb = state.dataEnvrn->OutBaroPress;

Real64 const tolerance = 0.001;
Real64 constexpr tolerance = 0.001;
Real64 UThermal(10); // Initialize. This will get updated.
Real64 UThermal_iter = 0;
Real64 Tsurr = Tamb;
Expand Down Expand Up @@ -12476,9 +12476,9 @@ namespace AirflowNetworkBalanceManager {
auto &NumHybridVentSysAvailMgrs = state.dataHVACGlobal->NumHybridVentSysAvailMgrs;

// SUBROUTINE PARAMETER DEFINITIONS:
int const HybridVentCtrl_Close(2); // Open windows or doors
int const IndividualCtrlType(0); // Individual window or door control
int const GlobalCtrlType(1); // Global window or door control
int constexpr HybridVentCtrl_Close(2); // Open windows or doors
int constexpr IndividualCtrlType(0); // Individual window or door control
int constexpr GlobalCtrlType(1); // Global window or door control
static constexpr std::string_view RoutineName("HybridVentilationControl: "); // include trailing blank space

// SUBROUTINE LOCAL VARIABLE DECLARATIONS:
Expand Down
4 changes: 2 additions & 2 deletions src/EnergyPlus/Autosizing/CoolingSHRSizing.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ namespace EnergyPlus {

Real64 CoolingSHRSizer::size(EnergyPlusData &state, Real64 _originalValue, bool &errorsFound)
{
Real64 const RatedInletAirTemp(26.6667); // 26.6667C or 80F
Real64 const RatedInletAirHumRat(0.0111847); // Humidity ratio corresponding to 80F dry bulb/67F wet bulb
Real64 constexpr RatedInletAirTemp(26.6667); // 26.6667C or 80F
Real64 constexpr RatedInletAirHumRat(0.0111847); // Humidity ratio corresponding to 80F dry bulb/67F wet bulb

if (!this->checkInitialized(state, errorsFound)) {
return 0.0;
Expand Down
6 changes: 3 additions & 3 deletions src/EnergyPlus/Autosizing/WaterHeatingCoilUASizing.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ Real64 WaterHeatingCoilUASizer::size(EnergyPlusData &state, Real64 _originalValu
return 0.0;
}
Array1D<Real64> Par(4);
Real64 const Acc(0.0001); // Accuracy of result
int const MaxIte(500); // Maximum number of iterations
int SolFla = 0; // Flag of solver
Real64 constexpr Acc(0.0001); // Accuracy of result
int constexpr MaxIte(500); // Maximum number of iterations
int SolFla = 0; // Flag of solver

this->preSize(state, _originalValue);
if (this->curZoneEqNum > 0) {
Expand Down
6 changes: 3 additions & 3 deletions src/EnergyPlus/BaseboardElectric.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,9 @@ namespace BaseboardElectric {

// SUBROUTINE PARAMETER DEFINITIONS:
static constexpr std::string_view RoutineName("GetBaseboardInput: "); // include trailing blank space
int const iHeatCAPMAlphaNum(3); // get input index to baseboard heating capacity sizing method
int const iHeatDesignCapacityNumericNum(1); // get input index to baseboard heating capacity
int const iHeatCapacityPerFloorAreaNumericNum(2); // get input index to baseboard heating capacity per floor area sizing
int constexpr iHeatCAPMAlphaNum(3); // get input index to baseboard heating capacity sizing method
int constexpr iHeatDesignCapacityNumericNum(1); // get input index to baseboard heating capacity
int constexpr iHeatCapacityPerFloorAreaNumericNum(2); // get input index to baseboard heating capacity per floor area sizing
int const iHeatFracOfAutosizedCapacityNumericNum(
3); // get input index to baseboard heating capacity sizing as fraction of autozized heating capacity

Expand Down
11 changes: 5 additions & 6 deletions src/EnergyPlus/BaseboardRadiator.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ namespace BaseboardRadiator {

// Using/Aliasing
using DataHVACGlobals::SmallLoad;
using DataPlant::TypeOf_Baseboard_Conv_Water;

// Use statements for access to subroutines in other modules
using namespace ScheduleManager;
Expand Down Expand Up @@ -262,8 +261,8 @@ namespace BaseboardRadiator {

// SUBROUTINE PARAMETER DEFINITIONS:
static constexpr std::string_view RoutineName("GetBaseboardInput: "); // include trailing blank space
int const iHeatCAPMAlphaNum(5); // get input index to water baseboard Radiator system heating capacity sizing method
int const iHeatDesignCapacityNumericNum(1); // get input index to water baseboard Radiator system electric heating capacity
int constexpr iHeatCAPMAlphaNum(5); // get input index to water baseboard Radiator system heating capacity sizing method
int constexpr iHeatDesignCapacityNumericNum(1); // get input index to water baseboard Radiator system electric heating capacity
int const iHeatCapacityPerFloorAreaNumericNum(
2); // get input index to water baseboard Radiator system electric heating capacity per floor area sizing
int const iHeatFracOfAutosizedCapacityNumericNum(
Expand Down Expand Up @@ -322,7 +321,7 @@ namespace BaseboardRadiator {

++BaseboardNum;
baseboard->Baseboard(BaseboardNum).EquipID = state.dataIPShortCut->cAlphaArgs(1); // name of this baseboard
baseboard->Baseboard(BaseboardNum).EquipType = TypeOf_Baseboard_Conv_Water;
baseboard->Baseboard(BaseboardNum).EquipType = DataPlant::PlantEquipmentType::Baseboard_Conv_Water;
baseboard->Baseboard(BaseboardNum).Schedule = state.dataIPShortCut->cAlphaArgs(2);
if (state.dataIPShortCut->lAlphaFieldBlanks(2)) {
baseboard->Baseboard(BaseboardNum).SchedPtr = DataGlobalConstants::ScheduleAlwaysOn;
Expand Down Expand Up @@ -699,8 +698,8 @@ namespace BaseboardRadiator {
using PlantUtilities::RegisterPlantCompDesignFlow;

// SUBROUTINE PARAMETER DEFINITIONS:
Real64 const Acc(0.0001); // Accuracy of result
int const MaxIte(500); // Maximum number of iterations
Real64 constexpr Acc(0.0001); // Accuracy of result
int constexpr MaxIte(500); // Maximum number of iterations
static std::string const RoutineName(cCMO_BBRadiator_Water + ":SizeBaseboard");

// SUBROUTINE LOCAL VARIABLE DECLARATIONS:
Expand Down
Loading

5 comments on commit 79758d8

@nrel-bot-2b
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

enhanceRainfallHandling (yujiex) - x86_64-Linux-Ubuntu-18.04-gcc-7.5: OK (3222 of 3222 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

enhanceRainfallHandling (yujiex) - x86_64-Linux-Ubuntu-18.04-gcc-7.5-UnitTestsCoverage-Debug: OK (1714 of 1714 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

@nrel-bot-3
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

enhanceRainfallHandling (yujiex) - x86_64-MacOS-10.15-clang-11.0.0: OK (3181 of 3181 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

enhanceRainfallHandling (yujiex) - Win64-Windows-10-VisualStudio-16: OK (2427 of 2427 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot-2b
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

enhanceRainfallHandling (yujiex) - x86_64-Linux-Ubuntu-18.04-gcc-7.5-IntegrationCoverage-Debug: OK (737 of 737 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

Please sign in to comment.