Skip to content

Optimize TableEntry Handling #11469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
amirroth wants to merge 6 commits into
base: develop
Choose a base branch
from
Draft

Optimize TableEntry Handling #11469

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
71841c7
Initial commit
Mar 15, 2026
4388e7d
SI/IP fix
Mar 15, 2026
c553c89
Fix unit test
Mar 16, 2026
4f46561
Merge branch 'develop' into TableEntry
mitchute Apr 15, 2026
15a8ac6
format
mitchute Apr 15, 2026
23c9362
fix missing standard 62.1 tables
mitchute Apr 16, 2026
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
4 changes: 2 additions & 2 deletions src/EnergyPlus/Data/EnergyPlusData.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,6 +591,7 @@ void EnergyPlusData::init_constant_state(EnergyPlusData &state)
this->dataFluid->init_constant_state(state);
this->dataSched->init_constant_state(state);
this->dataCurveManager->init_constant_state(state);
this->dataOutRptPredefined->init_constant_state(state);

this->dataAirLoop->init_constant_state(state);
this->dataAirLoopHVACDOAS->init_constant_state(state);
Expand Down Expand Up @@ -721,7 +722,6 @@ void EnergyPlusData::init_constant_state(EnergyPlusData &state)
this->dataMundtSimMgr->init_constant_state(state);
this->dataNodeInputMgr->init_constant_state(state);
this->dataOutAirNodeMgr->init_constant_state(state);
this->dataOutRptPredefined->init_constant_state(state);
this->dataOutRptTab->init_constant_state(state);
this->dataOutdoorAirUnit->init_constant_state(state);
this->dataOutput->init_constant_state(state);
Expand Down Expand Up @@ -855,6 +855,7 @@ void EnergyPlusData::init_state(EnergyPlusData &state)
this->dataFluid->init_state(state); // GetFluidPropertiesData
this->dataSched->init_state(state); // GetScheduleData
this->dataCurveManager->init_state(state); // GetCurveInput
this->dataOutRptPredefined->init_state(state);

this->dataAirLoop->init_state(state);
this->dataAirLoopHVACDOAS->init_state(state);
Expand Down Expand Up @@ -985,7 +986,6 @@ void EnergyPlusData::init_state(EnergyPlusData &state)
this->dataMundtSimMgr->init_state(state);
this->dataNodeInputMgr->init_state(state);
this->dataOutAirNodeMgr->init_state(state);
this->dataOutRptPredefined->init_state(state);
this->dataOutRptTab->init_state(state);
this->dataOutdoorAirUnit->init_state(state);
this->dataOutput->init_state(state);
Expand Down
417 changes: 179 additions & 238 deletions src/EnergyPlus/OutputReportPredefined.cc
View file
Open in desktop

Large diffs are not rendered by default.

41 changes: 21 additions & 20 deletions src/EnergyPlus/OutputReportPredefined.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,19 +90,6 @@ namespace OutputReportPredefined {
}
};

struct SubTableType
{
// Members
std::string name;
int indexReportName;
std::string footnote;

// Default Constructor
SubTableType() : indexReportName(0)
{
}
};

struct ColumnTagType
{
// Members
Expand All @@ -121,14 +108,31 @@ namespace OutputReportPredefined {
std::string charEntry;
std::string objectName;
int indexColumn;
int subTableIndex;
int indexTable;
int uniqueObjName;
Real64 origRealEntry;
int significantDigits;
bool origEntryIsReal;

// Default Constructor
TableEntryType() : indexColumn(0), subTableIndex(0), uniqueObjName(0), origRealEntry(0.0), significantDigits(0), origEntryIsReal(false)
TableEntryType() : indexColumn(0), indexTable(0), uniqueObjName(0), origRealEntry(0.0), significantDigits(0), origEntryIsReal(false)
{
}
};

struct SubTableType
{
// Members
std::string name;
int indexReportName;
std::string footnote;

int numEntries;
int sizeEntries;

Array1D<TableEntryType> entries;
Copy link
Copy Markdown
Collaborator Author

@amirroth amirroth Mar 15, 2026

Choose a reason for hiding this comment

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

Table-specific entry lists.

// Default Constructor
SubTableType() : indexReportName(0), numEntries(0), sizeEntries(0)
{
}
};
Expand Down Expand Up @@ -175,7 +179,7 @@ namespace OutputReportPredefined {

std::string RetrievePreDefTableEntry(EnergyPlusData &state, int const columnIndex, std::string_view objName);

void incrementTableEntry(EnergyPlusData &state);
void incrementTableEntry(EnergyPlusData &state, int subTableNum);

void AddCompSizeTableEntry(
EnergyPlusData &state, std::string_view FieldType, std::string_view FieldName, std::string_view FieldDescription, Real64 const FieldValue);
Expand Down Expand Up @@ -1672,9 +1676,6 @@ struct OutputReportPredefinedData : BaseGlobalStruct
int sizeColumnTag = 0;
int numColumnTag = 0;

int sizeTableEntry = 0;
int numTableEntry = 0;

int sizeCompSizeTableEntry = 0;
int numCompSizeTableEntry = 0;

Expand Down Expand Up @@ -1708,12 +1709,12 @@ struct OutputReportPredefinedData : BaseGlobalStruct
Array1D<OutputReportPredefined::reportNameType> reportName;
Array1D<OutputReportPredefined::SubTableType> subTable;
Array1D<OutputReportPredefined::ColumnTagType> columnTag;
Array1D<OutputReportPredefined::TableEntryType> tableEntry;
Array1D<OutputReportPredefined::CompSizeTableEntryType> CompSizeTableEntry;
Array1D<OutputReportPredefined::ShadowRelateType> ShadowRelate;

void init_constant_state([[maybe_unused]] EnergyPlusData &state) override
{
OutputReportPredefined::SetPredefinedTables(state);
Copy link
Copy Markdown
Collaborator Author

@amirroth amirroth Mar 15, 2026

Choose a reason for hiding this comment

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

Call SetPredefinedTables() here.

}

void init_state([[maybe_unused]] EnergyPlusData &state) override
Expand Down
Loading
Loading