Skip to content

Commit

Permalink
Solve merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@lgu1234
lgu1234 committed Apr 1, 2021
1 parent 3f8dcdd commit 8689baa
Showing 1 changed file with 0 additions and 45 deletions.
45 changes: 0 additions & 45 deletions src/EnergyPlus/ZoneTempPredictorCorrector.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1348,16 +1348,6 @@ void GetZoneAirSetPoints(EnergyPlusData &state)
cCurrentModuleObject + "=\"" + state.dataIPShortCut->cAlphaArgs(1) + "\" invalid range " +
state.dataIPShortCut->cAlphaFieldNames(5) + "=\"" + state.dataIPShortCut->cAlphaArgs(5) + "\"");
ShowContinueError(state, "..contains values outside of range [0,4].");
ErrorsFound = true;
} else {
// Check validity of control types.
ValidScheduleControlType = CheckScheduleValueMinMax(
state, state.dataZoneCtrls->ComfortControlledZone(ComfortControlledZoneNum).ComfortSchedIndex, ">=", 0.0, "<=", 4.0);
if (!ValidScheduleControlType) {
ShowSevereError(state,
cCurrentModuleObject + "=\"" + cAlphaArgs(1) + "\" invalid range " + cAlphaFieldNames(5) + "=\"" +
cAlphaArgs(5) + "\"");
ShowContinueError(state, "..contains values outside of range [0,4].");
ErrorsFound = true;
}
}
Expand Down Expand Up @@ -2285,7 +2275,6 @@ void GetZoneAirSetPoints(EnergyPlusData &state)
} // found thermostat referene
} // loop over NumOpTempControlledZones
} // NumOpTempControlledZones > 0
}

// Overcool dehumidificaton GetInput starts here
cCurrentModuleObject = cZControlTypes(static_cast<int>(ZControlTypes::TandHStat));
Expand Down Expand Up @@ -2388,40 +2377,6 @@ void GetZoneAirSetPoints(EnergyPlusData &state)
cCurrentModuleObject + '=' + state.dataIPShortCut->cAlphaArgs(1) + " invalid values " +
state.dataIPShortCut->cAlphaFieldNames(5) + "=[" + state.dataIPShortCut->cAlphaArgs(5) + "\".");
ShowContinueError(state, "..Values outside of range [0.0,3.0].");
ErrorsFound = true;
}

// check validity of zone Overcool constant range
if ((state.dataZoneCtrls->TempControlledZone(TempControlledZoneNum).ZoneOvercoolConstRange < 0.0) &&
(!(state.dataZoneCtrls->TempControlledZone(TempControlledZoneNum).OvercoolCntrlModeScheduled))) {
ShowSevereError(state,
format("{}={} invalid {}=[{:.2T}\" cannot be negative.",
cCurrentModuleObject,
cAlphaArgs(1),
cNumericFieldNames(1),
rNumericArgs(1)));
ErrorsFound = true;
}
if ((state.dataZoneCtrls->TempControlledZone(TempControlledZoneNum).ZoneOvercoolConstRange > 3.0) &&
(!(state.dataZoneCtrls->TempControlledZone(TempControlledZoneNum).OvercoolCntrlModeScheduled))) {
ShowSevereError(state,
format("{}={} invalid {}=[{:.2T}\" cannot be > 3.0",
cCurrentModuleObject,
cAlphaArgs(1),
cNumericFieldNames(1),
rNumericArgs(1)));
ErrorsFound = true;
}

// check zone Overcool range schedule min/max values.
if (state.dataZoneCtrls->TempControlledZone(TempControlledZoneNum).OvercoolCntrlModeScheduled) {
ValidZoneOvercoolRangeSched = CheckScheduleValueMinMax(
state, state.dataZoneCtrls->TempControlledZone(TempControlledZoneNum).ZoneOvercoolRangeSchedIndex, ">=", 0.0, "<=", 3.0);
if (!ValidZoneOvercoolRangeSched) {
ShowSevereError(state,
cCurrentModuleObject + '=' + cAlphaArgs(1) + " invalid values " + cAlphaFieldNames(5) + "=[" +
cAlphaArgs(5) + "\".");
ShowContinueError(state, "..Values outside of range [0.0,3.0].");
ErrorsFound = true;
}
}
Expand Down

5 comments on commit 8689baa

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

8475-Separate-AFN-infiltration-from-natural-ventilation (lgu1234) - x86_64-MacOS-10.15-clang-11.0.0: OK (3068 of 3080 tests passed, 21 test warnings)

Messages:\n

  • 33 tests had: AUD diffs.
  • 31 tests had: RDD diffs.
  • 13 tests had: ESO small diffs.
  • 3 tests had: ESO big diffs.
  • 11 tests had: EIO diffs.
  • 2 tests had: Table small diffs.
  • 10 tests had: MTR small diffs.
  • 10 tests had: Table big diffs.

Failures:\n

regression Test Summary

  • Passed: 710
  • Failed: 12

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.

8475-Separate-AFN-infiltration-from-natural-ventilation (lgu1234) - x86_64-Linux-Ubuntu-18.04-gcc-7.5-UnitTestsCoverage-Debug: OK (1633 of 1634 tests passed, 0 test warnings)

Failures:\n

FileSystem Test Summary

  • Passed: 6
  • Failed: 1

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.

8475-Separate-AFN-infiltration-from-natural-ventilation (lgu1234) - x86_64-Linux-Ubuntu-18.04-gcc-7.5: OK (3108 of 3120 tests passed, 21 test warnings)

Messages:\n

  • 33 tests had: AUD diffs.
  • 31 tests had: RDD diffs.
  • 3 tests had: ESO big diffs.
  • 12 tests had: ESO small diffs.
  • 10 tests had: Table big diffs.
  • 10 tests had: MTR small diffs.
  • 8 tests had: EIO diffs.
  • 1 test had: Table small diffs.

Failures:\n

regression Test Summary

  • Passed: 730
  • Failed: 12

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.

8475-Separate-AFN-infiltration-from-natural-ventilation (lgu1234) - x86_64-Linux-Ubuntu-18.04-gcc-7.5-IntegrationCoverage-Debug: Coverage Too Low

Failures:\n

integration Test Summary

  • Passed: 726
  • Timeout: 1

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.

8475-Separate-AFN-infiltration-from-natural-ventilation (lgu1234) - Win64-Windows-10-VisualStudio-16: OK (2329 of 2329 tests passed, 0 test warnings)

Build Badge Test Badge

Please sign in to comment.