Skip to content

Commit

Permalink
add state to more ShowError functions
Browse files Browse the repository at this point in the history
  • Loading branch information
@mitchute
mitchute committed Oct 21, 2020
1 parent a1aef23 commit a7dee5a
Show file tree
Hide file tree
Showing 56 changed files with 1,440 additions and 1,430 deletions.
18 changes: 9 additions & 9 deletions src/EnergyPlus/AirflowNetwork/src/Elements.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1119,15 +1119,15 @@ namespace AirflowNetwork {
k = 5 * (j - 1) + 1;
BX = Coeff(k);
BY = Coeff(k + 1) + BX * (Coeff(k + 2) + BX * (Coeff(k + 3) + BX * Coeff(k + 4))) - PRISE;
if (BY < 0.0) ShowFatalError(state, state, "Out of range, too low in an AirflowNetwork detailed Fan");
if (BY < 0.0) ShowFatalError(state, "Out of range, too low in an AirflowNetwork detailed Fan");

while (true) {
DX = Coeff(k + 5);
DY = Coeff(k + 1) + DX * (Coeff(k + 2) + DX * (Coeff(k + 3) + DX * Coeff(k + 5))) - PRISE;
// if (LIST >= 4) gio::write(Unit21, Format_901) << " fp0:" << j << BX << BY << DX << DY;
if (BY * DY <= 0.0) break;
++j;
if (j > NumCur) ShowFatalError(state, state, "Out of range, too high (FAN) in ADS simulation");
if (j > NumCur) ShowFatalError(state, "Out of range, too high (FAN) in ADS simulation");
k += 5;
BX = DX;
BY = DY;
Expand All @@ -1137,7 +1137,7 @@ namespace AirflowNetwork {
CY = 0.0;
Label40:;
++L;
if (L > 100) ShowFatalError(state, state, "Too many iterations (FAN) in AirflowNtework simulation");
if (L > 100) ShowFatalError(state, "Too many iterations (FAN) in AirflowNtework simulation");
CCY = CY;
CX = BX - BY * ((DX - BX) / (DY - BY));
CY = Coeff(k + 1) + CX * (Coeff(k + 2) + CX * (Coeff(k + 3) + CX * Coeff(k + 4))) - PRISE;
Expand Down Expand Up @@ -1247,15 +1247,15 @@ namespace AirflowNetwork {
k = 5 * (j - 1) + 1;
BX = Coeff(k);
BY = Coeff(k + 1) + BX * (Coeff(k + 2) + BX * (Coeff(k + 3) + BX * Coeff(k + 4))) - PRISE;
if (BY < 0.0) ShowFatalError(state, state, "Out of range, too low in an AirflowNetwork detailed Fan");
if (BY < 0.0) ShowFatalError(state, "Out of range, too low in an AirflowNetwork detailed Fan");

while (true) {
DX = Coeff(k + 5);
DY = Coeff(k + 1) + DX * (Coeff(k + 2) + DX * (Coeff(k + 3) + DX * Coeff(k + 5))) - PRISE;
// if (LIST >= 4) gio::write(Unit21, Format_901) << " fp0:" << j << BX << BY << DX << DY;
if (BY * DY <= 0.0) break;
++j;
if (j > NumCur) ShowFatalError(state, state, "Out of range, too high (FAN) in ADS simulation");
if (j > NumCur) ShowFatalError(state, "Out of range, too high (FAN) in ADS simulation");
k += 5;
BX = DX;
BY = DY;
Expand All @@ -1265,7 +1265,7 @@ namespace AirflowNetwork {
CY = 0.0;
Label40:;
++L;
if (L > 100) ShowFatalError(state, state, "Too many iterations (FAN) in AirflowNtework simulation");
if (L > 100) ShowFatalError(state, "Too many iterations (FAN) in AirflowNtework simulation");
CCY = CY;
CX = BX - BY * ((DX - BX) / (DY - BY));
CY = Coeff(k + 1) + CX * (Coeff(k + 2) + CX * (Coeff(k + 3) + CX * Coeff(k + 4))) - PRISE;
Expand Down Expand Up @@ -1723,7 +1723,7 @@ namespace AirflowNetwork {
HFact = HeightFac1 + (Fact - OpenFac1) / (OpenFac2 - OpenFac1) * (HeightFac2 - HeightFac1);
Cfact = DischCoeff1 + (Fact - OpenFac1) / (OpenFac2 - OpenFac1) * (DischCoeff2 - DischCoeff1);
} else {
ShowFatalError(state, state,
ShowFatalError(state,
"Open Factor is above the maximum input range for opening factors in AirflowNetwork:MultiZone:Component:DetailedOpening = " +
name);
}
Expand All @@ -1739,7 +1739,7 @@ namespace AirflowNetwork {
HFact = HeightFac2 + (Fact - OpenFac2) / (OpenFac3 - OpenFac2) * (HeightFac3 - HeightFac2);
Cfact = DischCoeff2 + (Fact - OpenFac2) / (OpenFac3 - OpenFac2) * (DischCoeff3 - DischCoeff2);
} else {
ShowFatalError(state, state,
ShowFatalError(state,
"Open Factor is above the maximum input range for opening factors in AirflowNetwork:MultiZone:Component:DetailedOpening = " +
name);
}
Expand All @@ -1759,7 +1759,7 @@ namespace AirflowNetwork {
HFact = HeightFac3 + (Fact - OpenFac3) / (OpenFac4 - OpenFac3) * (HeightFac4 - HeightFac3);
Cfact = DischCoeff3 + (Fact - OpenFac3) / (OpenFac4 - OpenFac3) * (DischCoeff4 - DischCoeff3);
} else {
ShowFatalError(state, state,
ShowFatalError(state,
"Open Factor is above the maximum input range for opening factors in AirflowNetwork:MultiZone:Component:DetailedOpening = " +
name);
}
Expand Down
16 changes: 8 additions & 8 deletions src/EnergyPlus/AirflowNetworkBalanceManager.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4958,7 +4958,7 @@ namespace AirflowNetworkBalanceManager {
AirflowNetworkBalanceManager::AirflowNetworkNodeSimu(i).TZ = AirflowNetworkBalanceManager::Node(AirflowNetworkBalanceManager::AirflowNetworkNodeData(i).OutAirNodeNum).OutAirDryBulb;
AirflowNetworkBalanceManager::AirflowNetworkNodeSimu(i).WZ = AirflowNetworkBalanceManager::Node(AirflowNetworkBalanceManager::AirflowNetworkNodeData(i).OutAirNodeNum).HumRat;
} else {
AirflowNetworkBalanceManager::AirflowNetworkNodeSimu(i).TZ = AirflowNetworkBalanceManager::OutDryBulbTempAt(AirflowNetworkBalanceManager::AirflowNetworkNodeData(i).NodeHeight);
AirflowNetworkBalanceManager::AirflowNetworkNodeSimu(i).TZ = AirflowNetworkBalanceManager::OutDryBulbTempAt(state, AirflowNetworkBalanceManager::AirflowNetworkNodeData(i).NodeHeight);
AirflowNetworkBalanceManager::AirflowNetworkNodeSimu(i).WZ = AirflowNetworkBalanceManager::OutHumRat;
}

Expand Down Expand Up @@ -5763,12 +5763,12 @@ namespace AirflowNetworkBalanceManager {
// Assigning ambient conditions to external nodes
i = AirflowNetworkNodeData(n).ExtNodeNum;
if (i > 0) {
AirflowNetworkNodeSimu(n).TZ = OutDryBulbTempAt(AirflowNetworkNodeData(n).NodeHeight);
AirflowNetworkNodeSimu(n).TZ = OutDryBulbTempAt(state, AirflowNetworkNodeData(n).NodeHeight);
AirflowNetworkNodeSimu(n).WZ = OutHumRat;
if (i <= state.dataAirflowNetworkBalanceManager->AirflowNetworkNumOfExtNode) {
if (MultizoneExternalNodeData(i).OutAirNodeNum == 0) {
LocalWindSpeed = WindSpeedAt(MultizoneExternalNodeData(i).height);
LocalDryBulb = OutDryBulbTempAt(AirflowNetworkNodeData(n).NodeHeight);
LocalDryBulb = OutDryBulbTempAt(state, AirflowNetworkNodeData(n).NodeHeight);
LocalAzimuth = MultizoneExternalNodeData(i).azimuth;
AirflowNetworkNodeSimu(n).PZ = CalcWindPressure(state,
MultizoneExternalNodeData(i).curve,
Expand Down Expand Up @@ -6747,7 +6747,7 @@ namespace AirflowNetworkBalanceManager {
Tamb = Node(AirflowNetworkNodeData(ExtNodeNum).OutAirNodeNum).OutAirDryBulb;
Wamb = Node(AirflowNetworkNodeData(ExtNodeNum).OutAirNodeNum).HumRat;
} else {
Tamb = OutDryBulbTempAt(AirflowNetworkNodeData(ExtNodeNum).NodeHeight);
Tamb = OutDryBulbTempAt(state, AirflowNetworkNodeData(ExtNodeNum).NodeHeight);
Wamb = OutHumRat;
}
} else if (AirflowNetworkLinkageData(i).ZoneNum == 0) {
Expand Down Expand Up @@ -7096,7 +7096,7 @@ namespace AirflowNetworkBalanceManager {
if (AirflowNetworkNodeData(i).OutAirNodeNum > 0) {
state.dataAirflowNetworkBalanceManager->MV(i) = Node(AirflowNetworkNodeData(i).OutAirNodeNum).OutAirDryBulb * 1.0e10;
} else {
state.dataAirflowNetworkBalanceManager->MV(i) = OutDryBulbTempAt(AirflowNetworkNodeData(i).NodeHeight) * 1.0e10;
state.dataAirflowNetworkBalanceManager->MV(i) = OutDryBulbTempAt(state, AirflowNetworkNodeData(i).NodeHeight) * 1.0e10;
}
}
if (AirflowNetworkNodeData(i).RAFNNodeNum > 0 && state.dataAirflowNetworkBalanceManager->MA((i - 1) * AirflowNetworkNumOfNodes + i) < 0.9e10) {
Expand Down Expand Up @@ -8566,7 +8566,7 @@ namespace AirflowNetworkBalanceManager {
for (i = 1; i <= NumOfLinksMultiZone; ++i) {
if (onceSurfFlag(i)) continue;
if (DisSysCompCVFData(FanNum).AirLoopNum == AirLoopNum) {
Tamb = OutDryBulbTempAt(AirflowNetworkLinkageData(i).NodeHeights[0]);
Tamb = OutDryBulbTempAt(state, AirflowNetworkLinkageData(i).NodeHeights[0]);
AirDensity = PsyRhoAirFnPbTdbW(OutBaroPress, Tamb, OutHumRat);
if (DisSysCompCVFData(FanNum).FanTypeNum == FanType_SimpleOnOff && state.dataAirflowNetworkBalanceManager->LoopOnOffFanRunTimeFraction(AirLoopNum) < 1.0 &&
state.dataAirflowNetworkBalanceManager->LoopOnOffFanRunTimeFraction(AirLoopNum) > 0.0) {
Expand Down Expand Up @@ -8749,7 +8749,7 @@ namespace AirflowNetworkBalanceManager {

// Rewrite AirflowNetwork airflow rate
for (i = 1; i <= NumOfLinksMultiZone; ++i) {
Tamb = OutDryBulbTempAt(AirflowNetworkLinkageData(i).NodeHeights[0]);
Tamb = OutDryBulbTempAt(state, AirflowNetworkLinkageData(i).NodeHeights[0]);
AirDensity = PsyRhoAirFnPbTdbW(OutBaroPress, Tamb, OutHumRat);
AirflowNetworkLinkSimu(i).VolFLOW = AirflowNetworkLinkSimu(i).FLOW / AirDensity;
AirflowNetworkLinkSimu(i).VolFLOW2 = AirflowNetworkLinkSimu(i).FLOW2 / AirDensity;
Expand Down Expand Up @@ -11272,7 +11272,7 @@ namespace AirflowNetworkBalanceManager {
if (Zone(ZoneNum).HasLinkedOutAirNode) {
OutDryBulb = Zone(ZoneNum).OutDryBulbTemp;
} else {
OutDryBulb = OutDryBulbTempAt(Zone(ZoneNum).Centroid.z);
OutDryBulb = OutDryBulbTempAt(state, Zone(ZoneNum).Centroid.z);
}

if (OutDryBulb < ComfortBouPoint) {
Expand Down
8 changes: 4 additions & 4 deletions src/EnergyPlus/BaseboardElectric.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,18 +116,18 @@ namespace BaseboardElectric {
if (CompIndex == 0) {
BaseboardNum = UtilityRoutines::FindItemInList(EquipName, baseboard->Baseboard, &BaseboardParams::EquipName);
if (BaseboardNum == 0) {
ShowFatalError(state, state, "SimElectricBaseboard: Unit not found=" + EquipName);
ShowFatalError(state, "SimElectricBaseboard: Unit not found=" + EquipName);
}
CompIndex = BaseboardNum;
} else {
BaseboardNum = CompIndex;
if (BaseboardNum > baseboard->NumBaseboards || BaseboardNum < 1) {
ShowFatalError(state, state, "SimElectricBaseboard: Invalid CompIndex passed=" + TrimSigDigits(BaseboardNum) +
ShowFatalError(state, "SimElectricBaseboard: Invalid CompIndex passed=" + TrimSigDigits(BaseboardNum) +
", Number of Units=" + TrimSigDigits(baseboard->NumBaseboards) + ", Entered Unit name=" + EquipName);
}
if (baseboard->Baseboard(BaseboardNum).CheckEquipName) {
if (EquipName != baseboard->Baseboard(BaseboardNum).EquipName) {
ShowFatalError(state, state, "SimElectricBaseboard: Invalid CompIndex passed=" + TrimSigDigits(BaseboardNum) + ", Unit name=" + EquipName +
ShowFatalError(state, "SimElectricBaseboard: Invalid CompIndex passed=" + TrimSigDigits(BaseboardNum) + ", Unit name=" + EquipName +
", stored Unit Name for that index=" + baseboard->Baseboard(BaseboardNum).EquipName);
}
baseboard->Baseboard(BaseboardNum).CheckEquipName = false;
Expand Down Expand Up @@ -324,7 +324,7 @@ namespace BaseboardElectric {
}

if (ErrorsFound) {
ShowFatalError(state, state, RoutineName + "Errors found in getting input. Preceding condition(s) cause termination.");
ShowFatalError(state, RoutineName + "Errors found in getting input. Preceding condition(s) cause termination.");
}
}

Expand Down
Loading

5 comments on commit a7dee5a

@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_utility_routines (mitchute) - x86_64-Linux-Ubuntu-18.04-gcc-7.5-UnitTestsCoverage-Debug: Build Failed

Failures:\n

API Test Summary

  • Failed: 6
  • notrun: 3

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_utility_routines (mitchute) - x86_64-Linux-Ubuntu-18.04-gcc-7.5-IntegrationCoverage-Debug: Build Failed

Failures:\n

integration Test Summary

  • Passed: 2
  • Failed: 720

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.

global_utility_routines (mitchute) - x86_64-Linux-Ubuntu-18.04-gcc-7.5: Build Failed

Failures:\n

API Test Summary

  • Failed: 6
  • notrun: 3

integration Test Summary

  • Passed: 2
  • Failed: 720

regression Test Summary

  • Passed: 735
  • Failed: 2

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_utility_routines (mitchute) - Win64-Windows-10-VisualStudio-16: Build Failed

Failures:\n

API Test Summary

  • Failed: 1
  • notrun: 3

integration Test Summary

  • Passed: 2
  • Failed: 717

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_utility_routines (mitchute) - x86_64-MacOS-10.15-clang-11.0.0: Build Failed

Failures:\n

API Test Summary

  • Failed: 6
  • notrun: 3

integration Test Summary

  • Passed: 2
  • Failed: 717

regression Test Summary

  • Passed: 715
  • Failed: 2

Build Badge Test Badge

Please sign in to comment.