Skip to content

Commit

Permalink
convert VentilatedSlab
Browse files Browse the repository at this point in the history
  • Loading branch information
brianlball committed Oct 6, 2020
1 parent 7072843 commit 30e8671
Show file tree
Hide file tree
Showing 11 changed files with 1,132 additions and 1,324 deletions.
1 change: 1 addition & 0 deletions src/EnergyPlus/Data/CommonIncludes.hh
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
#include <EnergyPlus/Fans.hh>
#include <EnergyPlus/Pipes.hh>
#include <EnergyPlus/PlantChillers.hh>
#include <EnergyPlus/VentilatedSlab.hh>
#include <EnergyPlus/WaterCoils.hh>
#include <EnergyPlus/WaterManager.hh>
#include <EnergyPlus/WaterThermalTanks.hh>
Expand Down
2 changes: 2 additions & 0 deletions src/EnergyPlus/Data/EnergyPlusData.cc
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ namespace EnergyPlus {
this->dataGlobal = std::unique_ptr<DataGlobal>(new DataGlobal);
this->dataPipes = std::unique_ptr<PipesData>(new PipesData);
this->dataPlantChillers = std::unique_ptr<PlantChillersData>(new PlantChillersData);
this->dataVentilatedSlab = std::unique_ptr<VentilatedSlabData>(new VentilatedSlabData);
this->dataWaterCoils = std::unique_ptr<WaterCoilsData>(new WaterCoilsData);
this->dataWaterManager = std::unique_ptr<WaterManagerData>(new WaterManagerData);
this->dataWaterThermalTanks = std::unique_ptr<WaterThermalTanksData>(new WaterThermalTanksData);
Expand Down Expand Up @@ -131,6 +132,7 @@ namespace EnergyPlus {
this->dataGlobal->clear_state();
this->dataPipes->clear_state();
this->dataPlantChillers->clear_state();
this->dataVentilatedSlab->clear_state();
this->dataWaterCoils->clear_state();
this->dataWaterManager->clear_state();
this->dataWaterThermalTanks->clear_state();
Expand Down
2 changes: 2 additions & 0 deletions src/EnergyPlus/Data/EnergyPlusData.hh
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ struct ExteriorEnergyUseData;
struct FansData;
struct PipesData;
struct PlantChillersData;
struct VentilatedSlabData;
struct WaterCoilsData;
struct WaterManagerData;
struct WaterThermalTanksData;
Expand Down Expand Up @@ -143,6 +144,7 @@ struct EnergyPlusData : BaseGlobalStruct {
std::unique_ptr<FansData> dataFans;
std::unique_ptr<PipesData> dataPipes;
std::unique_ptr<PlantChillersData> dataPlantChillers;
std::unique_ptr<VentilatedSlabData> dataVentilatedSlab;
std::unique_ptr<WaterCoilsData> dataWaterCoils;
std::unique_ptr<WaterManagerData> dataWaterManager;
std::unique_ptr<WaterThermalTanksData> dataWaterThermalTanks;
Expand Down
52 changes: 8 additions & 44 deletions src/EnergyPlus/OutputReportTabular.cc
Original file line number Diff line number Diff line change
Expand Up @@ -762,28 +762,6 @@ namespace OutputReportTabular {
// loop and updates the arrays of data that will later being put
// into the tabular reports.

// METHODOLOGY EMPLOYED:

// REFERENCES:
// na

// USE STATEMENTS:
// na

// Locals
// SUBROUTINE ARGUMENT DEFINITIONS:

// SUBROUTINE PARAMETER DEFINITIONS:
// na

// INTERFACE BLOCK SPECIFICATIONS:
// na

// DERIVED TYPE DEFINITIONS:
// na

// SUBROUTINE LOCAL VARIABLE DECLARATIONS:

if (t_timeStepType != OutputProcessor::TimeStepType::TimeStepZone && t_timeStepType != OutputProcessor::TimeStepType::TimeStepSystem) {
ShowFatalError("Invalid reporting requested -- UpdateTabularReports");
}
Expand Down Expand Up @@ -817,7 +795,7 @@ namespace OutputReportTabular {
GatherBEPSResultsForTimestep(t_timeStepType);
GatherSourceEnergyEndUseResultsForTimestep(t_timeStepType);
GatherPeakDemandForTimestep(t_timeStepType);
GatherHeatGainReport(t_timeStepType);
GatherHeatGainReport(state, t_timeStepType);
GatherHeatEmissionReport(state, t_timeStepType);
}
}
Expand Down Expand Up @@ -5098,7 +5076,7 @@ namespace OutputReportTabular {
}
}

void GatherHeatGainReport(OutputProcessor::TimeStepType t_timeStepType) // What kind of data to update (Zone, HVAC)
void GatherHeatGainReport(EnergyPlusData &state, OutputProcessor::TimeStepType t_timeStepType) // What kind of data to update (Zone, HVAC)
{
// SUBROUTINE INFORMATION:
// AUTHOR Jason Glazer
Expand Down Expand Up @@ -5185,21 +5163,7 @@ namespace OutputReportTabular {
using LowTempRadiantSystem::NumOfHydrLowTempRadSys;
using OutputReportPredefined::pdrSensibleGain;
using OutputReportPredefined::reportName;
using VentilatedSlab::NumOfVentSlabs;
using VentilatedSlab::VentSlab;

// Locals
// SUBROUTINE ARGUMENT DEFINITIONS:

// SUBROUTINE PARAMETER DEFINITIONS:

// INTERFACE BLOCK SPECIFICATIONS:
// na

// DERIVED TYPE DEFINITIONS:
// na

// SUBROUTINE LOCAL VARIABLE DECLARATIONS:
static int iZone(0);
static int iRadiant(0);
static int iunit(0);
Expand Down Expand Up @@ -5304,14 +5268,14 @@ namespace OutputReportTabular {
curZone = 0;
// HVAC Input Heated Surface Heating
// HVAC Input Cooled Surface Cooling
for (iRadiant = 1; iRadiant <= NumOfVentSlabs; ++iRadiant) {
curZone = VentSlab(iRadiant).ZonePtr;
for (iRadiant = 1; iRadiant <= state.dataVentilatedSlab->NumOfVentSlabs; ++iRadiant) {
curZone = state.dataVentilatedSlab->VentSlab(iRadiant).ZonePtr;
mult = Zone(curZone).Multiplier * Zone(curZone).ListMultiplier;
if ((curZone > 0) && (curZone <= NumOfZones)) {
ZonePreDefRep(curZone).SHGSAnSurfHt += VentSlab(iRadiant).RadHeatingEnergy * mult;
ZonePreDefRep(curZone).SHGSAnSurfCl -= VentSlab(iRadiant).RadCoolingEnergy * mult;
radiantHeat(curZone) = VentSlab(iRadiant).RadHeatingPower * mult;
radiantCool(curZone) = -VentSlab(iRadiant).RadCoolingPower * mult;
ZonePreDefRep(curZone).SHGSAnSurfHt += state.dataVentilatedSlab->VentSlab(iRadiant).RadHeatingEnergy * mult;
ZonePreDefRep(curZone).SHGSAnSurfCl -= state.dataVentilatedSlab->VentSlab(iRadiant).RadCoolingEnergy * mult;
radiantHeat(curZone) = state.dataVentilatedSlab->VentSlab(iRadiant).RadHeatingPower * mult;
radiantCool(curZone) = -state.dataVentilatedSlab->VentSlab(iRadiant).RadCoolingPower * mult;
}
}
for (iRadiant = 1; iRadiant <= NumOfHydrLowTempRadSys; ++iRadiant) {
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/OutputReportTabular.hh
Original file line number Diff line number Diff line change
Expand Up @@ -779,7 +779,7 @@ namespace OutputReportTabular {

void GatherPeakDemandForTimestep(OutputProcessor::TimeStepType t_timeStepType); // What kind of data to update (Zone, HVAC)

void GatherHeatGainReport(OutputProcessor::TimeStepType t_timeStepType); // What kind of data to update (Zone, HVAC)
void GatherHeatGainReport(EnergyPlusData &state, OutputProcessor::TimeStepType t_timeStepType); // What kind of data to update (Zone, HVAC)

void GatherHeatEmissionReport(EnergyPlusData &state, OutputProcessor::TimeStepType t_timeStepType);

Expand Down
9 changes: 0 additions & 9 deletions src/EnergyPlus/StateManagement.cc
Original file line number Diff line number Diff line change
Expand Up @@ -225,14 +225,6 @@
#include <EnergyPlus/UnitarySystem.hh>
#include <EnergyPlus/UserDefinedComponents.hh>
#include <EnergyPlus/VariableSpeedCoils.hh>
#include <EnergyPlus/VentilatedSlab.hh>
#include <EnergyPlus/WaterCoils.hh>
#include <EnergyPlus/WaterManager.hh>
#include <EnergyPlus/WaterThermalTanks.hh>
#include <EnergyPlus/WaterToAirHeatPump.hh>
#include <EnergyPlus/WaterToAirHeatPumpSimple.hh>
#include <EnergyPlus/WeatherManager.hh>
#include <EnergyPlus/WindTurbine.hh>

void EnergyPlus::clearAllStates(EnergyPlusData &state)
{
Expand Down Expand Up @@ -413,7 +405,6 @@ void EnergyPlus::clearAllStates(EnergyPlusData &state)
UserDefinedComponents::clear_state();
UtilityRoutines::clear_state();
VariableSpeedCoils::clear_state();
VentilatedSlab::clear_state();
EIRPlantLoopHeatPumps::EIRPlantLoopHeatPump::clear_state();
ResultsFramework::clear_state();
}
Loading

10 comments on commit 30e8671

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

global_variable_speed_coils (brianlball) - x86_64-MacOS-10.15-clang-11.0.0: OK (2983 of 2984 tests passed, 0 test warnings)

Failures:\n

EnergyPlusFixture Test Summary

  • Passed: 1084
  • Failed: 1

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.

global_variable_speed_coils (brianlball) - x86_64-Linux-Ubuntu-18.04-gcc-7.5-UnitTestsCoverage-Debug: OK (1548 of 1548 tests passed, 0 test warnings)

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

global_variable_speed_coils (brianlball) - x86_64-Linux-Ubuntu-18.04-gcc-7.5: OK (3024 of 3024 tests passed, 0 test warnings)

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

global_vented_slab (brianlball) - x86_64-MacOS-10.15-clang-11.0.0: OK (2984 of 2984 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.

global_vented_slab (brianlball) - x86_64-Linux-Ubuntu-18.04-gcc-7.5: OK (3024 of 3024 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.

global_vented_slab (brianlball) - Win64-Windows-10-VisualStudio-16: OK (2240 of 2240 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.

global_vented_slab (brianlball) - x86_64-Linux-Ubuntu-18.04-gcc-7.5-UnitTestsCoverage-Debug: OK (1548 of 1548 tests passed, 0 test warnings)

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

global_variable_speed_coils (brianlball) - x86_64-Linux-Ubuntu-18.04-gcc-7.5-IntegrationCoverage-Debug: OK (722 of 722 tests passed, 0 test warnings)

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

global_variable_speed_coils (brianlball) - Win64-Windows-10-VisualStudio-16: OK (2240 of 2240 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.

global_vented_slab (brianlball) - x86_64-Linux-Ubuntu-18.04-gcc-7.5-IntegrationCoverage-Debug: OK (722 of 722 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

Please sign in to comment.