Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cmake/CompilerFlags.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ elseif(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" O
target_compile_options(project_options INTERFACE $<$<CONFIG:RelWithDebInfo>:-UNDEBUG>)
target_compile_options(project_fp_options INTERFACE -ffp-contract=off) # Disable fused-floating point operations (default is fast)
elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
target_compile_options(project_warnings INTERFACE -Wshadow-field) # Equivalent to MSVC's C4458 (declaration of 'identifier' hides class member); narrower than -Wshadow

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

New flag on clang. Like I said, -Wshadow is way too noisy

if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13.0)
# Suppress unused-but-set warnings until more serious ones are addressed
target_compile_options(project_warnings INTERFACE -Wno-unused-but-set-parameter -Wno-unused-but-set-variable)
Expand Down
1 change: 0 additions & 1 deletion src/EnergyPlus/ChillerElectricASHRAE205.hh
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ namespace ChillerElectricASHRAE205 {
Real64 AmbientTemp{0};
Real64 AmbientZoneGain{0}; // Internal gain to zone from losses (W)
Real64 AmbientZoneGainEnergy{0}; // Internal gain to zone from losses (J)
std::string EndUseSubcategory; // identifier use for the end use subcategory

// Default Constructor
ASHRAE205ChillerSpecs() = default;
Expand Down
2 changes: 0 additions & 2 deletions src/EnergyPlus/Coils/CoilCoolingDXCurveFitPerformance.hh
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ struct CoilCoolingDXCurveFitPerformanceInputSpecification
struct CoilCoolingDXCurveFitPerformance : public CoilCoolingDXPerformanceBase
{
static constexpr std::string_view object_name = "Coil:Cooling:DX:CurveFit:Performance";
std::string parentName;

void instantiateFromInputSpec(EnergyPlusData &state, const CoilCoolingDXCurveFitPerformanceInputSpecification &input_data);

Expand Down Expand Up @@ -248,7 +247,6 @@ struct CoilCoolingDXCurveFitPerformance : public CoilCoolingDXPerformanceBase
Real64 evapCondBasinHeatSetpoint = 0.0;
Sched::Schedule *evapCondBasinHeatSched = nullptr;
bool oneTimeEIOHeaderWrite = true;
Real64 wasteHeatRate = 0.0;

CoilCoolingDXCurveFitOperatingMode normalMode;
CoilCoolingDXCurveFitOperatingMode alternateMode; // enhanced dehumidifcation or Subcool mode
Expand Down
6 changes: 3 additions & 3 deletions src/EnergyPlus/FluidCoolers.hh
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ namespace FluidCoolers {
int WMFRGreaterThanMaxAvailErrCount; // Counter when water mass flow rate is greater than minimum available
int WMFRGreaterThanMaxAvailErrIndex; // Index for water mass flow rate > minavail recurring message
PlantLocation plantLoc; // loop topology variables
bool oneTimeInitFlag;
// bool oneTimeInitFlag; // Defined in PlantComponent.hh
bool beginEnvrnInit;

// Report vars
Expand Down Expand Up @@ -155,8 +155,8 @@ namespace FluidCoolers {
OutdoorAirInletNodeNum(0), HighMassFlowErrorCount(0), HighMassFlowErrorIndex(0), OutletWaterTempErrorCount(0),
OutletWaterTempErrorIndex(0), SmallWaterMassFlowErrorCount(0), SmallWaterMassFlowErrorIndex(0), WMFRLessThanMinAvailErrCount(0),
WMFRLessThanMinAvailErrIndex(0), WMFRGreaterThanMaxAvailErrCount(0), WMFRGreaterThanMaxAvailErrIndex(0), plantLoc{},
oneTimeInitFlag(true), beginEnvrnInit(true), InletWaterTemp(0.0), OutletWaterTemp(0.0), WaterMassFlowRate(0.0), Qactual(0.0),
FanPower(0.0), FanEnergy(0.0), WaterTemp(0.0), AirTemp(0.0), AirHumRat(0.0), AirPress(0.0), AirWetBulb(0.0), indexInArray(0)
beginEnvrnInit(true), InletWaterTemp(0.0), OutletWaterTemp(0.0), WaterMassFlowRate(0.0), Qactual(0.0), FanPower(0.0), FanEnergy(0.0),
WaterTemp(0.0), AirTemp(0.0), AirHumRat(0.0), AirPress(0.0), AirWetBulb(0.0), indexInArray(0)
{
}

Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/HWBaseboardRadiator.hh
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ namespace HWBaseboardRadiator {
Real64 LastQBBRadSrc = 0.0; // Need to keep the last value in case we are still iterating
};

struct HWBaseboardDesignData : HWBaseboardParams
struct HWBaseboardDesignData

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Same issue as the Steam counterpart

{
// Members
std::string designName;
Expand Down
11 changes: 7 additions & 4 deletions src/EnergyPlus/LowTempRadiantSystem.hh
Original file line number Diff line number Diff line change
Expand Up @@ -401,9 +401,7 @@ namespace LowTempRadiantSystem {
{
// Members
// This data could be shared between multiple constant flow LowTempRad Systems
std::string designName; // name of the design object
Real64 runningMeanOutdoorAirTemperatureWeightingFactor =
0.8; // Weighting factor for running mean outdoor air temperature equation (user input)
std::string designName; // name of the design object
CtrlType ConstFlowControlType = CtrlType::MAT; // Control type for the system (MAT, MRT, Op temp, ODB, OWB,
// Surface Face Temp, Surface Interior Temp, Running Mean Temp
// for Constant Flow systems only)
Expand All @@ -419,7 +417,12 @@ namespace LowTempRadiantSystem {
CondCtrlType condCtrlType = CondCtrlType::SimpleOff; // Condensation control type (initialize to simple off)
Real64 CondDewPtDeltaT = 1.0; // Diff between surface temperature and dew point for cond. shut-off

ConstantFlowRadDesignData() = default;
ConstantFlowRadDesignData() : ConstantFlowRadiantSystemData()
{
// Weighting factor for running mean outdoor air temperature equation (user input): different default than base than doesn't use it (0.0)
// IDD default is 0.8, so this is set here for clarity (Could let the GetInput routine set it...)
runningMeanOutdoorAirTemperatureWeightingFactor = 0.8;
}
~ConstantFlowRadDesignData() = default;
};

Expand Down
Loading
Loading