Skip to content

Commit

Permalink
fix errors, clang format
Browse files Browse the repository at this point in the history
  • Loading branch information
@dareumnam
dareumnam committed Aug 2, 2023
1 parent f6e9a26 commit 9904341
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 60 deletions.
5 changes: 3 additions & 2 deletions src/EnergyPlus/PlantHeatExchangerFluidToFluid.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1049,7 +1049,8 @@ void HeatExchangerStruct::size(EnergyPlusData &state)
Constant::InitConvTemp,
state.dataPlnt->PlantLoop(this->SupplySideLoop.loopNum).FluidIndex,
RoutineName);
Real64 tmpDesCap = rhoWater * tmpSupSideDesignVolFlowRate * CpWater * state.dataSize->PlantSizData(PltSizNumSupSide).DeltaT; // TODO: Debug and check the real value of DelT
Real64 tmpDesCap = rhoWater * tmpSupSideDesignVolFlowRate * CpWater *
state.dataSize->PlantSizData(PltSizNumSupSide).DeltaT; // TODO: Debug and check the real value of DelT

Real64 TempSteamIn = FluidProperties::GetSatTemperatureRefrig(state,
state.dataPlnt->PlantLoop(this->DemandSideLoop.loopNum).FluidName,
Expand Down Expand Up @@ -2569,7 +2570,7 @@ void HeatExchangerStruct::findSteamLoopFlow(EnergyPlusData &state, Real64 Target
this->calculateSteamToWaterHX(state, WaterMdot);
TargetWaterLoopLeavingTemp = this->SupplySideLoop.OutletTemp;
Real64 TargetSteamMdot = this->DemandSideLoop.InletMassFlowRate;

// mass flow rate of steam
PlantUtilities::SetComponentFlowRate(
state, TargetSteamMdot, this->DemandSideLoop.inletNodeNum, this->DemandSideLoop.outletNodeNum, this->DemandSideLoop);
Expand Down
14 changes: 0 additions & 14 deletions src/EnergyPlus/PollutionModule.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6496,20 +6496,6 @@ void GetFuelFactorInfo(EnergyPlusData &state,
fuelSourceFactor = 1.084 / Pollution.PurchHeatWaterEffic;
}
} break;
case Constant::eFuel::DistrictHeatingWater: {
if (Pollution.NatGasCoef.FuelFactorUsed) {
fuelFactorUsed = true;
fuelSourceFactor = Pollution.NatGasCoef.Source / Pollution.PurchHeatWaterEffic;
if (Pollution.NatGasCoef.SourceSched == 0) {
fuelFactorScheduleUsed = false;
} else {
fuelFactorScheduleUsed = true;
ffScheduleIndex = Pollution.NatGasCoef.SourceSched;
}
} else {
fuelSourceFactor = 1.084 / Pollution.PurchHeatWaterEffic;
}
} break;
case Constant::eFuel::DistrictCooling: {
if (Pollution.ElecCoef.FuelFactorUsed) {
fuelFactorUsed = true;
Expand Down
4 changes: 2 additions & 2 deletions src/EnergyPlus/PollutionModule.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -400,11 +400,11 @@ namespace PollutionModule {
Coal(0.0), Gasoline(0.0), Propane(0.0), Diesel(0.0), OtherFuel1(0.0), OtherFuel2(0.0), ElecPurch(0.0), ElecSold(0.0),
ElecFacilityIndex(0), DieselFacilityIndex(0), PurchCoolFacilityIndex(0), PurchHeatWaterFacilityIndex(0), PurchHeatSteamFacilityIndex(0),
NatGasFacilityIndex(0), GasolineFacilityIndex(0), CoalFacilityIndex(0), FuelOil1FacilityIndex(0), FuelOil2FacilityIndex(0),
PropaneFacilityIndex(0), OtherFuel1FacilityIndex(0), OtherFuel2FacilityIndex(0), ElecProducedFacilityIndex(0), SteamFacilityIndex(0),
PropaneFacilityIndex(0), OtherFuel1FacilityIndex(0), OtherFuel2FacilityIndex(0), ElecProducedFacilityIndex(0),
ElecPurchasedFacilityIndex(0), ElecSurplusSoldFacilityIndex(0), ElecFacility(0.0), DieselFacility(0.0), PurchCoolFacility(0.0),
PurchHeatWaterFacility(0.0), PurchHeatSteamFacility(0.0), NatGasFacility(0.0), GasolineFacility(0.0), CoalFacility(0.0),
FuelOil1Facility(0.0), FuelOil2Facility(0.0), PropaneFacility(0.0), OtherFuel1Facility(0.0), OtherFuel2Facility(0.0),
ElecProducedFacility(0.0), SteamFacility(0.0), ElecPurchasedFacility(0.0), ElecSurplusSoldFacility(0.0)
ElecProducedFacility(0.0), ElecPurchasedFacility(0.0), ElecSurplusSoldFacility(0.0)
{
}
};
Expand Down
42 changes: 0 additions & 42 deletions testfiles/SteamSystemAutoSize_DistrictHeatingSteam.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3465,48 +3465,6 @@

Output:Variable,VAV SYS 1 Mixed Air Outlet,System Node Temperature,hourly;

Output:Variable,SPACE1-1 Supply Inlet,System Node Temperature,hourly;

Output:Variable,SPACE2-1 Supply Inlet,System Node Temperature,hourly;

Output:Variable,SPACE3-1 Supply Inlet,System Node Temperature,hourly;

Output:Variable,SPACE4-1 Supply Inlet,System Node Temperature,hourly;

Output:Variable,SPACE5-1 Supply Inlet,System Node Temperature,hourly;

Output:Variable,VAV SYS 1 Heating Coil Outlet, System Node Temperature,hourly;

Output:Variable,SPACE1-1 Reheat Coil Steam Inlet, System Node Temperature,hourly;

Output:Variable,SPACE1-1 Reheat Coil Steam Outlet, System Node Temperature,hourly;

Output:Variable,SPACE2-1 Reheat Coil Steam Inlet, System Node Temperature,hourly;

Output:Variable,SPACE2-1 Reheat Coil Steam Outlet, System Node Temperature,hourly;

Output:Variable,SPACE3-1 Reheat Coil Steam Inlet, System Node Temperature,hourly;

Output:Variable,SPACE3-1 Reheat Coil Steam Outlet, System Node Temperature,hourly;

Output:Variable,SPACE4-1 Reheat Coil Steam Inlet, System Node Temperature,hourly;

Output:Variable,SPACE4-1 Reheat Coil Steam Outlet, System Node Temperature,hourly;

Output:Variable,SPACE5-1 Reheat Coil Steam Inlet, System Node Temperature,hourly;

Output:Variable,SPACE5-1 Reheat Coil Steam Outlet, System Node Temperature,hourly;

Output:Variable,DistrictHeating Steam Plant,Plant Supply Side Heating Demand Rate,hourly;

Output:Variable,DistrictHeating Steam Plant,Plant Supply Side Unmet Demand Rate,hourly;

Output:Variable,DistrictHeating Steam Plant,Plant Supply Side Inlet Mass Flow Rate,hourly;

Output:Variable,DistrictHeating Steam Plant,Plant Supply Side Inlet Temperature,hourly;

Output:Variable,DistrictHeating Steam Plant,Plant Supply Side Outlet Temperature,hourly;

Output:Meter,Fans:Electricity,Hourly;

Output:Meter,Electricity:HVAC,Hourly;
Expand Down

4 comments on commit 9904341

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

AddThreeSteamModulesWithNTUMethod (dareumnam) - x86_64-MacOS-10.17-clang-13.0.0: OK (3404 of 3455 tests passed, 723 test warnings)

Messages:\n

  • 743 tests had: AUD diffs.
  • 70 tests had: ERR diffs.
  • 213 tests had: MDD diffs.
  • 233 tests had: MTD diffs.
  • 138 tests had: EIO diffs.
  • 156 tests had: RDD diffs.
  • 20 tests had: Table big diffs.
  • 138 tests had: BND diffs.
  • 2 tests had: PERF_LOG diffs.
  • 2 tests had: EDD diffs.
  • 4 tests had: ESO small diffs.

Failures:\n

EnergyPlusFixture Test Summary

  • Passed: 1441
  • Failed: 1

integration Test Summary

  • Passed: 749
  • Failed: 30

regression Test Summary

  • Passed: 756
  • Failed: 20

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.

AddThreeSteamModulesWithNTUMethod (dareumnam) - x86_64-Linux-Ubuntu-22.04-gcc-11.4: OK (3445 of 3496 tests passed, 727 test warnings)

Messages:\n

  • 747 tests had: AUD diffs.
  • 70 tests had: ERR diffs.
  • 215 tests had: MDD diffs.
  • 235 tests had: MTD diffs.
  • 138 tests had: EIO diffs.
  • 156 tests had: RDD diffs.
  • 20 tests had: Table big diffs.
  • 138 tests had: BND diffs.
  • 2 tests had: PERF_LOG diffs.
  • 2 tests had: EDD diffs.
  • 4 tests had: ESO small diffs.

Failures:\n

EnergyPlusFixture Test Summary

  • Passed: 1441
  • Failed: 1

integration Test Summary

  • Passed: 752
  • Failed: 30

regression Test Summary

  • Passed: 776
  • Failed: 20

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.

AddThreeSteamModulesWithNTUMethod (dareumnam) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-UnitTestsCoverage-Debug: OK (1900 of 1901 tests passed, 0 test warnings)

Failures:\n

EnergyPlusFixture Test Summary

  • Passed: 1441
  • Failed: 1

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.

AddThreeSteamModulesWithNTUMethod (dareumnam) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-IntegrationCoverage-Debug: OK (750 of 780 tests passed, 0 test warnings)

Failures:\n

integration Test Summary

  • Passed: 750
  • Failed: 30

Build Badge Test Badge Coverage Badge

Please sign in to comment.