Skip to content

Commit

Permalink
constexpr NumDaysInYear - remove state in getGroundTemp
Browse files Browse the repository at this point in the history
  • Loading branch information
@mjwitte
mjwitte committed Nov 15, 2023
1 parent 3421777 commit 807ac0f
Show file tree
Hide file tree
Showing 15 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion src/EnergyPlus/GroundTemperatureModeling/BaseGroundTemperatureModel.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public:
}

// Virtual method for retrieving the ground temp
virtual Real64 getGroundTemp(EnergyPlusData &state) = 0;
virtual Real64 getGroundTemp() = 0;

virtual Real64 getGroundTempAtTimeInSeconds(EnergyPlusData &state, Real64 const, Real64 const) = 0;

Expand Down
6 changes: 3 additions & 3 deletions src/EnergyPlus/GroundTemperatureModeling/FiniteDifferenceGroundTemperatureModel.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -896,7 +896,7 @@ Real64 FiniteDiffGroundTempsModel::interpolate(Real64 const x, Real64 const x_hi

//******************************************************************************

Real64 FiniteDiffGroundTempsModel::getGroundTemp(EnergyPlusData &state)
Real64 FiniteDiffGroundTempsModel::getGroundTemp()
{

// SUBROUTINE INFORMATION:
Expand Down Expand Up @@ -1029,7 +1029,7 @@ Real64 FiniteDiffGroundTempsModel::getGroundTempAtTimeInSeconds(EnergyPlusData &
simTimeInDays = remainder(simTimeInDays, Weather::NumDaysInYear);
}

return getGroundTemp(state);
return getGroundTemp();
}

//******************************************************************************
Expand All @@ -1056,7 +1056,7 @@ Real64 FiniteDiffGroundTempsModel::getGroundTempAtTimeInMonths(EnergyPlusData &s
}

// Get and return ground temperature
return getGroundTemp(state);
return getGroundTemp();
}

//******************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/GroundTemperatureModeling/FiniteDifferenceGroundTemperatureModel.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ public:

void doStartOfTimeStepInits();

Real64 getGroundTemp(EnergyPlusData &state) override;
Real64 getGroundTemp() override;

Real64 getGroundTempAtTimeInSeconds(EnergyPlusData &state, Real64 const depth, Real64 const timeInSecondsOfSim) override;

Expand Down
6 changes: 3 additions & 3 deletions src/EnergyPlus/GroundTemperatureModeling/KusudaAchenbachGroundTemperatureModel.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ std::shared_ptr<KusudaGroundTempsModel> KusudaGroundTempsModel::KusudaGTMFactory

//******************************************************************************

Real64 KusudaGroundTempsModel::getGroundTemp(EnergyPlusData &state)
Real64 KusudaGroundTempsModel::getGroundTemp()
{
// AUTHOR Matt Mitchell
// DATE WRITTEN June 2015
Expand Down Expand Up @@ -217,7 +217,7 @@ Real64 KusudaGroundTempsModel::getGroundTempAtTimeInSeconds(EnergyPlusData &stat
}

// Get and return ground temperature
return getGroundTemp(state);
return getGroundTemp();
}

//******************************************************************************
Expand All @@ -244,7 +244,7 @@ Real64 KusudaGroundTempsModel::getGroundTempAtTimeInMonths(EnergyPlusData &state
}

// Get and return ground temperature
return getGroundTemp(state);
return getGroundTemp();
}

//******************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/GroundTemperatureModeling/KusudaAchenbachGroundTemperatureModel.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public:

static std::shared_ptr<KusudaGroundTempsModel> KusudaGTMFactory(EnergyPlusData &state, std::string objectName);

Real64 getGroundTemp(EnergyPlusData &state) override;
Real64 getGroundTemp() override;

Real64 getGroundTempAtTimeInSeconds(EnergyPlusData &state, Real64 const depth, Real64 const timeInSecondsOfSim) override;

Expand Down
6 changes: 3 additions & 3 deletions src/EnergyPlus/GroundTemperatureModeling/SiteBuildingSurfaceGroundTemperatures.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ std::shared_ptr<SiteBuildingSurfaceGroundTemps> SiteBuildingSurfaceGroundTemps::

//******************************************************************************

Real64 SiteBuildingSurfaceGroundTemps::getGroundTemp([[maybe_unused]] EnergyPlusData &state)
Real64 SiteBuildingSurfaceGroundTemps::getGroundTemp()
{
// SUBROUTINE INFORMATION:
// AUTHOR Matt Mitchell
Expand Down Expand Up @@ -183,7 +183,7 @@ SiteBuildingSurfaceGroundTemps::getGroundTempAtTimeInSeconds(EnergyPlusData &sta
}

// Get and return ground temp
return getGroundTemp(state);
return getGroundTemp();
}

//******************************************************************************
Expand All @@ -205,7 +205,7 @@ Real64 SiteBuildingSurfaceGroundTemps::getGroundTempAtTimeInMonths(EnergyPlusDat
}

// Get and return ground temp
return getGroundTemp(state);
return getGroundTemp();
}

//******************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/GroundTemperatureModeling/SiteBuildingSurfaceGroundTemperatures.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public:

static std::shared_ptr<SiteBuildingSurfaceGroundTemps> BuildingSurfaceGTMFactory(EnergyPlusData &state, std::string objectName);

Real64 getGroundTemp(EnergyPlusData &state) override;
Real64 getGroundTemp() override;

Real64 getGroundTempAtTimeInSeconds(EnergyPlusData &state, Real64 const depth, Real64 const timeInSecondsOfSim) override;

Expand Down
6 changes: 3 additions & 3 deletions src/EnergyPlus/GroundTemperatureModeling/SiteDeepGroundTemperatures.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ std::shared_ptr<SiteDeepGroundTemps> SiteDeepGroundTemps::DeepGTMFactory(EnergyP

//******************************************************************************

Real64 SiteDeepGroundTemps::getGroundTemp([[maybe_unused]] EnergyPlusData &state)
Real64 SiteDeepGroundTemps::getGroundTemp()
{
// SUBROUTINE INFORMATION:
// AUTHOR Matt Mitchell
Expand Down Expand Up @@ -172,7 +172,7 @@ Real64 SiteDeepGroundTemps::getGroundTempAtTimeInSeconds(EnergyPlusData &state,
}

// Get and return ground temp
return getGroundTemp(state);
return getGroundTemp();
}

//******************************************************************************
Expand All @@ -194,7 +194,7 @@ Real64 SiteDeepGroundTemps::getGroundTempAtTimeInMonths(EnergyPlusData &state, [
}

// Get and return ground temp
return getGroundTemp(state);
return getGroundTemp();
}

//******************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/GroundTemperatureModeling/SiteDeepGroundTemperatures.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public:

static std::shared_ptr<SiteDeepGroundTemps> DeepGTMFactory(EnergyPlusData &state, std::string objectName);

Real64 getGroundTemp([[maybe_unused]] EnergyPlusData &state) override;
Real64 getGroundTemp() override;

Real64 getGroundTempAtTimeInSeconds(EnergyPlusData &state, Real64 const depth, Real64 const timeInSecondsOfSim) override;

Expand Down
6 changes: 3 additions & 3 deletions src/EnergyPlus/GroundTemperatureModeling/SiteFCFactorMethodGroundTemperatures.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ std::shared_ptr<SiteFCFactorMethodGroundTemps> SiteFCFactorMethodGroundTemps::FC

//******************************************************************************

Real64 SiteFCFactorMethodGroundTemps::getGroundTemp([[maybe_unused]] EnergyPlusData &state)
Real64 SiteFCFactorMethodGroundTemps::getGroundTemp()
{
// SUBROUTINE INFORMATION:
// AUTHOR Matt Mitchell
Expand Down Expand Up @@ -186,7 +186,7 @@ Real64 SiteFCFactorMethodGroundTemps::getGroundTempAtTimeInSeconds(EnergyPlusDat
}

// Get and return ground temp
return getGroundTemp(state);
return getGroundTemp();
}

//******************************************************************************
Expand All @@ -208,7 +208,7 @@ Real64 SiteFCFactorMethodGroundTemps::getGroundTempAtTimeInMonths(EnergyPlusData
}

// Get and return ground temp
return getGroundTemp(state);
return getGroundTemp();
}

//******************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/GroundTemperatureModeling/SiteFCFactorMethodGroundTemperatures.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public:

static std::shared_ptr<SiteFCFactorMethodGroundTemps> FCFactorGTMFactory(EnergyPlusData &state, std::string objectName);

Real64 getGroundTemp([[maybe_unused]] EnergyPlusData &state) override;
Real64 getGroundTemp() override;

Real64 getGroundTempAtTimeInSeconds(EnergyPlusData &state, Real64 const depth, Real64 const timeInSecondsOfSim) override;

Expand Down
6 changes: 3 additions & 3 deletions src/EnergyPlus/GroundTemperatureModeling/SiteShallowGroundTemperatures.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ std::shared_ptr<SiteShallowGroundTemps> SiteShallowGroundTemps::ShallowGTMFactor

//******************************************************************************

Real64 SiteShallowGroundTemps::getGroundTemp([[maybe_unused]] EnergyPlusData &state)
Real64 SiteShallowGroundTemps::getGroundTemp()
{
// SUBROUTINE INFORMATION:
// AUTHOR Matt Mitchell
Expand Down Expand Up @@ -172,7 +172,7 @@ Real64 SiteShallowGroundTemps::getGroundTempAtTimeInSeconds(EnergyPlusData &stat
}

// Get and return ground temp
return getGroundTemp(state);
return getGroundTemp();
}

//******************************************************************************
Expand All @@ -194,7 +194,7 @@ Real64 SiteShallowGroundTemps::getGroundTempAtTimeInMonths(EnergyPlusData &state
}

// Get and return ground temp
return getGroundTemp(state);
return getGroundTemp();
}

//******************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/GroundTemperatureModeling/SiteShallowGroundTemperatures.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public:

static std::shared_ptr<SiteShallowGroundTemps> ShallowGTMFactory(EnergyPlusData &state, std::string objectName);

Real64 getGroundTemp([[maybe_unused]] EnergyPlusData &state) override;
Real64 getGroundTemp() override;

Real64 getGroundTempAtTimeInSeconds(EnergyPlusData &state, Real64 const depth, Real64 const timeInSecondsOfSim) override;

Expand Down
6 changes: 3 additions & 3 deletions src/EnergyPlus/GroundTemperatureModeling/XingGroundTemperatureModel.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ std::shared_ptr<XingGroundTempsModel> XingGroundTempsModel::XingGTMFactory(Energ

//******************************************************************************

Real64 XingGroundTempsModel::getGroundTemp(EnergyPlusData &state)
Real64 XingGroundTempsModel::getGroundTemp()
{
// SUBROUTINE INFORMATION:
// AUTHOR Matt Mitchell
Expand Down Expand Up @@ -182,7 +182,7 @@ Real64 XingGroundTempsModel::getGroundTempAtTimeInMonths(EnergyPlusData &state,
}

// Get and return ground temp
return getGroundTemp(state);
return getGroundTemp();
}

//******************************************************************************
Expand All @@ -204,7 +204,7 @@ Real64 XingGroundTempsModel::getGroundTempAtTimeInSeconds(EnergyPlusData &state,
simTimeInDays = remainder(simTimeInDays, Weather::NumDaysInYear);
}

return getGroundTemp(state);
return getGroundTemp();
}

//******************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/GroundTemperatureModeling/XingGroundTemperatureModel.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public:

static std::shared_ptr<XingGroundTempsModel> XingGTMFactory(EnergyPlusData &state, std::string objectName);

Real64 getGroundTemp(EnergyPlusData &state) override;
Real64 getGroundTemp() override;

Real64 getGroundTempAtTimeInSeconds(EnergyPlusData &state, Real64 const depth, Real64 const timeInSecondsOfSim) override;

Expand Down

5 comments on commit 807ac0f

@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.

HeatEmissionsDiffs10300 (mjwitte) - x86_64-MacOS-10.17-clang-14.0.0: OK (3540 of 3540 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.

HeatEmissionsDiffs10300 (mjwitte) - Win64-Windows-10-VisualStudio-16: OK (2753 of 2753 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.

HeatEmissionsDiffs10300 (mjwitte) - x86_64-Linux-Ubuntu-22.04-gcc-11.4: OK (3581 of 3581 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot-2c
Copy link

Choose a reason for hiding this comment

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

HeatEmissionsDiffs10300 (mjwitte) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-UnitTestsCoverage-Debug: OK (1966 of 1966 tests passed, 0 test warnings)

Build Badge Test Badge Coverage 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.

HeatEmissionsDiffs10300 (mjwitte) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-IntegrationCoverage-Debug: OK (790 of 790 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

Please sign in to comment.