Skip to content

Refactor array-based input code to use key-based input (problem cases) #11536

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
jasondegraw wants to merge 20 commits into
base: develop
Choose a base branch
from
Draft

Refactor array-based input code to use key-based input (problem cases) #11536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
ef22e9e
Work on boilers
jasondegraw Apr 14, 2026
7648c1e
Transition zone dehumidifiers
jasondegraw Apr 14, 2026
4b0c164
Initial pass on two more files
jasondegraw Apr 14, 2026
fd7cdde
Correct format and behavior
jasondegraw Apr 14, 2026
809688e
A couple more refactors, this one may need further cleanup
jasondegraw Apr 14, 2026
e614b8a
Correct some issues in the refactor
jasondegraw Apr 15, 2026
45e903d
Two more refactors
jasondegraw Apr 15, 2026
a166b6a
Merge remote-tracking branch 'upstream/develop' into no-array-input-p…
jasondegraw Apr 16, 2026
8c189e8
Remove unused variable
jasondegraw Apr 16, 2026
d8a45a1
Initial unchecked refactor of two more files
jasondegraw Apr 15, 2026
394925e
Remove more unused variables
jasondegraw Apr 16, 2026
7452bc2
Another set of unchecked refactors
jasondegraw Apr 15, 2026
d8a7100
Minor cleanup
jasondegraw Apr 17, 2026
5786244
Two more files and formatting
jasondegraw Apr 17, 2026
e66c091
Repair an issue not found by MSVC
jasondegraw Apr 17, 2026
1d2bf2d
One last file
jasondegraw Apr 17, 2026
31b9459
One (hopefully) final fix
jasondegraw Apr 17, 2026
46e8d62
Attempt another fix
jasondegraw Apr 17, 2026
f3e7492
Revert CostEstimateManager input refactor
jasondegraw Apr 17, 2026
7448d56
Re-impose ordering
jasondegraw Apr 22, 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
236 changes: 118 additions & 118 deletions src/EnergyPlus/BaseboardElectric.cc
View file
Open in desktop

Large diffs are not rendered by default.

296 changes: 147 additions & 149 deletions src/EnergyPlus/BaseboardRadiator.cc
View file
Open in desktop

Large diffs are not rendered by default.

214 changes: 99 additions & 115 deletions src/EnergyPlus/BoilerSteam.cc
View file
Open in desktop

Large diffs are not rendered by default.

203 changes: 112 additions & 91 deletions src/EnergyPlus/Boilers.cc
View file
Open in desktop

Large diffs are not rendered by default.

374 changes: 208 additions & 166 deletions src/EnergyPlus/CTElectricGenerator.cc
View file
Open in desktop

Large diffs are not rendered by default.

284 changes: 134 additions & 150 deletions src/EnergyPlus/CoolTower.cc
View file
Open in desktop

Large diffs are not rendered by default.

106 changes: 50 additions & 56 deletions src/EnergyPlus/DataSurfaceColors.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,66 +137,60 @@ void SetUpSchemeColors(EnergyPlusData &state, std::string const &SchemeName, std

state.dataSurfColor->DXFcolorno = DataSurfaceColors::defaultcolorno;

// first see if there is a scheme name
int numptr = state.dataInputProcessing->inputProcessor->getObjectItemNum(state, CurrentModuleObject, SchemeName);
if (numptr > 0) {

int NumAlphas;
int numNumbers;
int numargs;
int status;
Array1D_string cAlphas;
Array1D_string cAlphaFields;
Array1D_string cNumericFields;
Array1D_bool lAlphaBlanks;
Array1D_bool lNumericBlanks;
Array1D<Real64> rNumerics;
state.dataInputProcessing->inputProcessor->getObjectDefMaxArgs(state, CurrentModuleObject, numargs, NumAlphas, numNumbers);

cAlphas.allocate(NumAlphas);
cAlphaFields.allocate(NumAlphas);
lAlphaBlanks.allocate(NumAlphas);
rNumerics.allocate(numNumbers);
cNumericFields.allocate(numNumbers);
lNumericBlanks.allocate(numNumbers);

cAlphas({1, NumAlphas}) = "";
rNumerics({1, numNumbers}) = 0.0;

state.dataInputProcessing->inputProcessor->getObjectItem(state,
CurrentModuleObject,
numptr,
cAlphas,
NumAlphas,
rNumerics,
numNumbers,
status,
lNumericBlanks,
lAlphaBlanks,
cAlphaFields,
cNumericFields);
for (numargs = 1; numargs <= numNumbers; ++numargs) {
numptr = rNumerics(numargs); // set to integer
if (lNumericBlanks(numargs)) {
if (!lAlphaBlanks(numargs + 1)) {
auto *inputProcessor = state.dataInputProcessing->inputProcessor.get();
auto const surfaceColorSchemes = inputProcessor->epJSON.find(std::string(CurrentModuleObject));
if (surfaceColorSchemes != inputProcessor->epJSON.end()) {
auto matchedScheme = surfaceColorSchemes.value().end();
for (auto it = surfaceColorSchemes.value().begin(); it != surfaceColorSchemes.value().end(); ++it) {
if (Util::SameString(it.key(), SchemeName)) {
matchedScheme = it;
break;
}
}

if (matchedScheme != surfaceColorSchemes.value().end()) {
auto const &schemeFields = matchedScheme.value();
inputProcessor->markObjectAsUsed(std::string(CurrentModuleObject), matchedScheme.key());

for (int numargs = 1;; ++numargs) {
auto const drawingElementKey = EnergyPlus::format("drawing_element_{}_type", numargs);
auto const colorKey = EnergyPlus::format("color_for_drawing_element_{}", numargs);
auto const drawingElementIt = schemeFields.find(drawingElementKey);
auto const colorIt = schemeFields.find(colorKey);

if (drawingElementIt == schemeFields.end() && colorIt == schemeFields.end()) {
break;
}

std::string const drawingElementFieldName = EnergyPlus::format("Drawing Element {} Type", numargs);
std::string const colorFieldName = EnergyPlus::format("Color for Drawing Element {}", numargs);
std::string const drawingElement = (drawingElementIt != schemeFields.end()) ? drawingElementIt->get<std::string>() : "";

if (colorIt == schemeFields.end()) {
if (!drawingElement.empty()) {
ShowWarningError(state,
EnergyPlus::format("SetUpSchemeColors: {}={}, {}={}, {} was blank. Default color retained.",
"Name",
SchemeName,
drawingElementFieldName,
drawingElement,
colorFieldName));
}
continue;
}

int const numptr = colorIt->get<int>();
if (!MatchAndSetColorTextString(state, drawingElement, numptr, ColorType)) {
ShowWarningError(state,
EnergyPlus::format("SetUpSchemeColors: {}={}, {}={}, {} was blank. Default color retained.",
cAlphaFields(1),
EnergyPlus::format("SetUpSchemeColors: {}={}, {}={}, is invalid. No color set.",
"Name",
SchemeName,
cAlphaFields(numargs + 1),
cAlphas(numargs + 1),
cNumericFields(numargs)));
drawingElementFieldName,
drawingElement));
}
continue;
}
if (!MatchAndSetColorTextString(state, cAlphas(numargs + 1), numptr, ColorType)) {
ShowWarningError(state,
EnergyPlus::format("SetUpSchemeColors: {}={}, {}={}, is invalid. No color set.",
cAlphaFields(1),
SchemeName,
cAlphaFields(numargs + 1),
cAlphas(numargs + 1)));
}
} else {
ShowWarningError(state, EnergyPlus::format("SetUpSchemeColors: Name={} not on input file. Default colors will be used.", SchemeName));
}
} else {
ShowWarningError(state, EnergyPlus::format("SetUpSchemeColors: Name={} not on input file. Default colors will be used.", SchemeName));
Expand Down
Loading
Loading