Skip to content

Commit

Permalink
Merge develop and cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
nigusse committed Jun 28, 2020
2 parents 8f300ba + 413141d commit 963a71f
Show file tree
Hide file tree
Showing 25 changed files with 1,217 additions and 1,371 deletions.
9 changes: 4 additions & 5 deletions src/EnergyPlus/AirflowNetworkBalanceManager.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7930,7 +7930,7 @@ namespace AirflowNetworkBalanceManager {
Real64 AirDensity;
Real64 CpAir;
Real64 Tamb;
Real64 hg;
Real64 hg; // latent heat of vaporization
Real64 ReportingConstant;
Real64 ReportingFraction;
int AirLoopNum;
Expand Down Expand Up @@ -8024,7 +8024,7 @@ namespace AirflowNetworkBalanceManager {
Tamb = Zone(ZN1).OutDryBulbTemp;
CpAir = PsyCpAirFnW(OutHumRat);
}
hg = Psychrometrics::PsyHgAirFnWTdb(ZoneAirHumRat(ZN1), (MAT(ZN1) + Tamb) / 2.0);
hg = Psychrometrics::PsyHgAirFnWTdb(ZoneAirHumRat(ZN1), MAT(ZN1));

if (AirflowNetworkCompData(AirflowNetworkLinkageData(i).CompNum).CompTypeNum == CompTypeNum_SCR ||
AirflowNetworkCompData(AirflowNetworkLinkageData(i).CompNum).CompTypeNum == CompTypeNum_SEL) {
Expand Down Expand Up @@ -8080,7 +8080,7 @@ namespace AirflowNetworkBalanceManager {
Tamb = Zone(ZN2).OutDryBulbTemp;
CpAir = PsyCpAirFnW(OutHumRat);
}
hg = Psychrometrics::PsyHgAirFnWTdb(ZoneAirHumRat(ZN2), (MAT(ZN2) + Tamb) / 2.0);
hg = Psychrometrics::PsyHgAirFnWTdb(ZoneAirHumRat(ZN2), MAT(ZN2));

if (AirflowNetworkCompData(AirflowNetworkLinkageData(i).CompNum).CompTypeNum == CompTypeNum_SCR ||
AirflowNetworkCompData(AirflowNetworkLinkageData(i).CompNum).CompTypeNum == CompTypeNum_SEL) {
Expand Down Expand Up @@ -8129,7 +8129,7 @@ namespace AirflowNetworkBalanceManager {
}

if (ZN1 > 0 && ZN2 > 0) {
CpAir = PsyCpAirFnW(ZoneAirHumRat(ZN1));
CpAir = PsyCpAirFnW((ZoneAirHumRat(ZN1) + ZoneAirHumRat(ZN2))/2.0);
hg = Psychrometrics::PsyHgAirFnWTdb((ZoneAirHumRat(ZN1) + ZoneAirHumRat(ZN2)) / 2.0, (MAT(ZN1) + MAT(ZN2)) / 2.0);
if (MAT(ZN1) > MAT(ZN2)) {
AirflowNetworkReportData(ZN2).MultiZoneMixSenGainW += (AirflowNetworkLinkSimu(i).FLOW * CpAir * (MAT(ZN1) - MAT(ZN2)));
Expand All @@ -8151,7 +8151,6 @@ namespace AirflowNetworkBalanceManager {
AirflowNetworkReportData(ZN2).MultiZoneMixLatLossJ +=
(AirflowNetworkLinkSimu(i).FLOW * (ZoneAirHumRat(ZN2) - ZoneAirHumRat(ZN1))) * hg * ReportingConstant;
}
CpAir = PsyCpAirFnW(ZoneAirHumRat(ZN2));
if (MAT(ZN2) > MAT(ZN1)) {
AirflowNetworkReportData(ZN1).MultiZoneMixSenGainW += (AirflowNetworkLinkSimu(i).FLOW2 * CpAir * (MAT(ZN2) - MAT(ZN1)));
AirflowNetworkReportData(ZN1).MultiZoneMixSenGainJ +=
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyPlus/Coils/CoilCoolingDXCurveFitOperatingMode.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ void CoilCoolingDXCurveFitOperatingMode::size(EnergyPlusData &state)
ReportSizingManager::RequestSizing(state, CompType, CompName, SizingMethod, SizingString, TempSize, PrintFlag, RoutineName);
this->ratedEvapAirFlowRate = TempSize;
Real64 const ratedInletAirTemp(26.6667); // 26.6667C or 80F
Real64 const ratedInletAirHumRat(0.01125); // Humidity ratio corresponding to 80F dry bulb/67F wet bulb
Real64 const ratedInletAirHumRat(0.0111847); // Humidity ratio corresponding to 80F dry bulb/67F wet bulb
this->ratedEvapAirMassFlowRate = this->ratedEvapAirFlowRate * Psychrometrics::PsyRhoAirFnPbTdbW(
DataEnvironment::StdBaroPress, ratedInletAirTemp, ratedInletAirHumRat, RoutineName);

Expand Down
4 changes: 2 additions & 2 deletions src/EnergyPlus/Coils/CoilCoolingDXCurveFitSpeed.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,8 +265,8 @@ CoilCoolingDXCurveFitSpeed::CoilCoolingDXCurveFitSpeed(const std::string& name_t

// rating data
RatedInletAirTemp(26.6667), // 26.6667C or 80F
RatedInletWetBulbTemp(19.44), // 19.44 or 67F
RatedInletAirHumRat(0.01125), // Humidity ratio corresponding to 80F dry bulb/67F wet bulb
RatedInletWetBulbTemp(19.4444), // 19.44 or 67F
RatedInletAirHumRat(0.0111847), // Humidity ratio corresponding to 80F dry bulb/67F wet bulb
RatedOutdoorAirTemp(35.0), // 35 C or 95F
DryCoilOutletHumRatioMin(0.00001) // dry coil outlet minimum hum ratio kgH2O/kgdry air

Expand Down
4 changes: 2 additions & 2 deletions src/EnergyPlus/Coils/CoilCoolingDXCurveFitSpeed.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@ struct CoilCoolingDXCurveFitSpeed

// rating data
Real64 RatedInletAirTemp = 26.6667; // 26.6667C or 80F
Real64 RatedInletWetBulbTemp = 19.44; // 19.44 or 67F
Real64 RatedInletAirHumRat = 0.01125; // Humidity ratio corresponding to 80F dry bulb/67F wet bulb
Real64 RatedInletWetBulbTemp = 19.4444; // 19.44 or 67F
Real64 RatedInletAirHumRat = 0.0111847; // Humidity ratio corresponding to 80F dry bulb/67F wet bulb
Real64 RatedOutdoorAirTemp = 35.0; // 35 C or 95F
Real64 DryCoilOutletHumRatioMin = 0.00001; // dry coil outlet minimum hum ratio kgH2O/kgdry air

Expand Down
Loading

6 comments on commit 963a71f

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

173517788_Issue8107 (Unknown) - x86_64-Linux-Ubuntu-18.04-cppcheck: OK (0 of 0 tests passed, 0 test warnings)

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

173517788_Issue8107 (Unknown) - x86_64-Linux-Ubuntu-18.04-custom_check: OK (13 of 13 tests passed, 0 test warnings)

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

173517788_Issue8107 (Unknown) - x86_64-Linux-Ubuntu-18.04-gcc-7.5: OK (2904 of 2906 tests passed, 0 test warnings)

Messages:\n

  • 2 tests had: ESO big diffs.

Failures:\n

regression Test Summary

  • Passed: 726
  • Failed: 2

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.

173517788_Issue8107 (Unknown) - x86_64-Linux-Ubuntu-18.04-gcc-7.5-UnitTestsCoverage-Debug: OK (1448 of 1448 tests passed, 0 test warnings)

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.

173517788_Issue8107 (Unknown) - Win64-Windows-10-VisualStudio-16: OK (2131 of 2134 tests passed, 0 test warnings)

Failures:\n

integration Test Summary

  • Passed: 707
  • Failed: 3

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.

173517788_Issue8107 (Unknown) - x86_64-Linux-Ubuntu-18.04-gcc-7.5-IntegrationCoverage-Debug: OK (713 of 713 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

Please # to comment.