Skip to content

Commit

Permalink
Clang format again
Browse files Browse the repository at this point in the history
@Myoldmopar
Myoldmopar committed Jan 2, 2024
1 parent a29329d commit 88237b4
Showing 1 changed file with 30 additions and 19 deletions.
49 changes: 30 additions & 19 deletions src/EnergyPlus/OutputProcessor.cc
View file
Original file line number Diff line number Diff line change
@@ -793,8 +793,12 @@ namespace OutputProcessor {
units = srcMeter->units;
itemsAssigned = true;
} else if (units != srcMeter->units) {
ShowWarningCustomMessage(
state, eoh, format(R"(Meter:Custom="{}", differing units in {}="{}".)", ipsc->cAlphaArgs(1), ipsc->cAlphaFieldNames(fldIndex + 1), meterOrVarNameUC));
ShowWarningCustomMessage(state,
eoh,
format(R"(Meter:Custom="{}", differing units in {}="{}".)",
ipsc->cAlphaArgs(1),
ipsc->cAlphaFieldNames(fldIndex + 1),
meterOrVarNameUC));
ShowContinueError(state,
format("...will not be shown with the Meter results; units for meter={}, units for this variable={}.",
Constant::unitNames[(int)units],
@@ -810,10 +814,12 @@ namespace OutputProcessor {

// Has to be a summed variable
if (srcDDVar->storeType != StoreType::Summed) {
ShowWarningCustomMessage(
state,
eoh,
format(R"(Meter:Custom="{}", variable not summed variable {}="{}".)", ipsc->cAlphaArgs(1), ipsc->cAlphaFieldNames(fldIndex + 1), meterOrVarNameUC));
ShowWarningCustomMessage(state,
eoh,
format(R"(Meter:Custom="{}", variable not summed variable {}="{}".)",
ipsc->cAlphaArgs(1),
ipsc->cAlphaFieldNames(fldIndex + 1),
meterOrVarNameUC));
ShowContinueError(state,
format("...will not be shown with the Meter results; units for meter={}, units for this variable={}.",
Constant::unitNames[(int)units],
@@ -1109,8 +1115,12 @@ namespace OutputProcessor {
units = srcMeter->units;
itemsAssigned = true;
} else if (units != srcMeter->units) {
ShowWarningCustomMessage(
state, eoh, format(R"(Meter:Custom="{}", differing units in {}="{}".)", ipsc->cAlphaArgs(1), ipsc->cAlphaFieldNames(fldIndex + 1), meterOrVarNameUC));
ShowWarningCustomMessage(state,
eoh,
format(R"(Meter:Custom="{}", differing units in {}="{}".)",
ipsc->cAlphaArgs(1),
ipsc->cAlphaFieldNames(fldIndex + 1),
meterOrVarNameUC));
ShowContinueError(state,
format("...will not be shown with the Meter results; units for meter={}, units for this variable={}.",
Constant::unitNames[(int)units],
@@ -1126,10 +1136,12 @@ namespace OutputProcessor {

// Has to be a summed variable
if (srcDDVar->storeType != StoreType::Summed) {
ShowWarningCustomMessage(
state,
eoh,
format(R"(Meter:Custom="{}", variable not summed variable {}="{}".)", ipsc->cAlphaArgs(1), ipsc->cAlphaFieldNames(fldIndex + 1), meterOrVarNameUC));
ShowWarningCustomMessage(state,
eoh,
format(R"(Meter:Custom="{}", variable not summed variable {}="{}".)",
ipsc->cAlphaArgs(1),
ipsc->cAlphaFieldNames(fldIndex + 1),
meterOrVarNameUC));
ShowContinueError(state,
format("...will not be shown with the Meter results; units for meter={}, units for this variable={}.",
Constant::unitNames[(int)units],
@@ -4336,13 +4348,12 @@ void SetInitialMeterReportingAndOutputNames(EnergyPlusData &state,
auto &period = meter->periods[(freq == ReportFreq::EachCall) ? (int)ReportFreq::TimeStep : (int)freq];
if (!CumulativeIndicator) {
if (MeterFileOnlyIndicator && period.Rpt) {
ShowWarningError(
state,
format(R"(Output:Meter:MeterFileOnly requested for "{}" ({}), already on "Output:Meter". Will report to both {} and {})",
meter->Name,
reportFreqNames[(freq == ReportFreq::EachCall) ? (int)ReportFreq::TimeStep : (int)freq],
state.files.eso.filePath.filename().string(),
state.files.mtr.filePath.filename().string()));
ShowWarningError(state,
format(R"(Output:Meter:MeterFileOnly requested for "{}" ({}), already on "Output:Meter". Will report to both {} and {})",
meter->Name,
reportFreqNames[(freq == ReportFreq::EachCall) ? (int)ReportFreq::TimeStep : (int)freq],
state.files.eso.filePath.filename().string(),
state.files.mtr.filePath.filename().string()));
}
if (!period.Rpt) {
period.Rpt = true;

4 comments on commit 88237b4

@nrel-bot
Copy link

Choose a reason for hiding this comment

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

Qsort (Myoldmopar) - Win64-Windows-10-VisualStudio-16: OK (2756 of 2756 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.

Qsort (Myoldmopar) - x86_64-Linux-Ubuntu-22.04-gcc-11.4: OK (3584 of 3584 tests passed, 790 test warnings)

Messages:\n

  • 789 tests had: AUD diffs.
  • 52 tests had: ESO small diffs.
  • 71 tests had: MTR small diffs.
  • 25 tests had: MTD diffs.
  • 10 tests had: MDD diffs.

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.

Qsort (Myoldmopar) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-UnitTestsCoverage-Debug: OK (1969 of 1969 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.

Qsort (Myoldmopar) - 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.