Skip to content

Commit

Permalink
Merge branch 'develop' into Improved-Duct-Model
Browse files Browse the repository at this point in the history
  • Loading branch information
@lgu1234
lgu1234 committed Jan 3, 2025
2 parents 2333756 + ea846c6 commit e1106ef
Show file tree
Hide file tree
Showing 7 changed files with 269 additions and 207 deletions.
6 changes: 3 additions & 3 deletions .decent_ci-Linux.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
compilers:
- name: "gcc"
version: "13.2"
version: "13.3"
cmake_extra_flags: -DLINK_WITH_PYTHON:BOOL=ON -DPYTHON_CLI:BOOL=OFF -DPython_REQUIRED_VERSION:STRING=3.12.2 -DPython_ROOT_DIR:PATH=~/.pyenv/versions/3.12.2/ -DBUILD_FORTRAN:BOOL=ON -DBUILD_TESTING:BOOL=ON -DENABLE_GTEST_DEBUG_MODE:BOOL=OFF -DBUILD_PERFORMANCE_TESTS:BOOL=ON -DVALGRIND_ANALYZE_PERFORMANCE_TESTS:BOOL=ON -DENABLE_PCH:BOOL=OFF
collect_performance_results: true
skip_regression: true
s3_upload_bucket: energyplus
num_parallel_builds: 16

- name: "gcc"
version: "13.2"
version: "13.3"
build_type: RelWithDebInfo
cmake_extra_flags: -DLINK_WITH_PYTHON:BOOL=ON -DPYTHON_CLI:BOOL=OFF -DPython_REQUIRED_VERSION:STRING=3.12.2 -DPython_ROOT_DIR:PATH=~/.pyenv/versions/3.12.2/ -DBUILD_FORTRAN:BOOL=ON -DBUILD_TESTING:BOOL=ON -DENABLE_REGRESSION_TESTING:BOOL=OFF -DCOMMIT_SHA:STRING=$COMMIT_SHA -DENABLE_COVERAGE:BOOL=ON -DENABLE_GTEST_DEBUG_MODE:BOOL=OFF -DENABLE_PCH:BOOL=OFF
coverage_enabled: true
Expand All @@ -23,7 +23,7 @@ compilers:
num_parallel_builds: 16

- name: "gcc"
version: "13.2"
version: "13.3"
build_type: RelWithDebInfo
cmake_extra_flags: -DLINK_WITH_PYTHON:BOOL=ON -DPYTHON_CLI:BOOL=OFF -DPython_REQUIRED_VERSION:STRING=3.12.2 -DPython_ROOT_DIR:PATH=~/.pyenv/versions/3.12.2/ -DBUILD_FORTRAN:BOOL=ON -DBUILD_TESTING:BOOL=ON -DENABLE_REGRESSION_TESTING:BOOL=OFF -DCOMMIT_SHA:STRING=$COMMIT_SHA -DENABLE_COVERAGE:BOOL=ON -DENABLE_GTEST_DEBUG_MODE:BOOL=OFF -DENABLE_PCH:BOOL=OFF
coverage_enabled: true
Expand Down
2 changes: 2 additions & 0 deletions idd/Energy+.idd.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73653,6 +73653,7 @@ Chiller:Electric:EIR,
\note Name" input.
\note Use "ConstantFlow" when modeling a constant flow condenser plant loop, choose one of the other inputs
\note when modeling a variable flow condenser plant loop.
\type choice
\key ConstantFlow
\key ModulatedChillerPLR
\key ModulatedLoopPLR
Expand Down Expand Up @@ -73904,6 +73905,7 @@ Chiller:Electric:ReformulatedEIR,
\note Name" input.
\note Use "ConstantFlow" when modeling a constant flow condenser plant loop, choose one of the other inputs
\note when modeling a variable flow condenser plant loop.
\type choice
\key ConstantFlow
\key ModulatedChillerPLR
\key ModulatedLoopPLR
Expand Down
349 changes: 166 additions & 183 deletions src/EnergyPlus/CondenserLoopTowers.cc
View file

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion src/EnergyPlus/CondenserLoopTowers.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,6 @@ namespace CondenserLoopTowers {
int WaterOutletNodeNum = 0; // Node number on the water outlet side of the tower
int OutdoorAirInletNodeNum = 0; // Node number of outdoor air inlet for the tower
ModelType TowerModelType = ModelType::Invalid; // Type of empirical model (1=CoolTools)
int VSTower = 0; // Index to a variable speed tower (otherwise = 0)
int FanPowerfAirFlowCurve = 0; // Index to fan power correlation curve for VS Towers
int BlowDownSchedulePtr = 0; // Pointer to blow down schedule
int BasinHeaterSchedulePtr = 0; // Pointer to basin heater schedule
Expand Down
15 changes: 5 additions & 10 deletions testfiles/DOAToPTHP.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2185,36 +2185,31 @@
SPACE1-1 Contaminant Controller, !- Name
SPACE1-1, !- Zone Name
HVACTemplate-Always 1, !- Carbon Dioxide Control Availability Schedule Name
Zone Setpoint CO2 Concentration, !- Carbon Dioxide Setpoint Schedule Name
Zone Minimum CO2 Concentration; !- Minimum Carbon Dioxide Concentration Schedule Name
Zone Setpoint CO2 Concentration; !- Carbon Dioxide Setpoint Schedule Name

ZoneControl:ContaminantController,
SPACE2-1 Contaminant Controller, !- Name
SPACE2-1, !- Zone Name
HVACTemplate-Always 1, !- Carbon Dioxide Control Availability Schedule Name
Zone Setpoint CO2 Concentration, !- Carbon Dioxide Setpoint Schedule Name
Zone Minimum CO2 Concentration; !- Minimum Carbon Dioxide Concentration Schedule Name
Zone Setpoint CO2 Concentration; !- Carbon Dioxide Setpoint Schedule Name

ZoneControl:ContaminantController,
SPACE3-1 Contaminant Controller, !- Name
SPACE3-1, !- Zone Name
HVACTemplate-Always 1, !- Carbon Dioxide Control Availability Schedule Name
Zone Setpoint CO2 Concentration, !- Carbon Dioxide Setpoint Schedule Name
Zone Minimum CO2 Concentration; !- Minimum Carbon Dioxide Concentration Schedule Name
Zone Setpoint CO2 Concentration; !- Carbon Dioxide Setpoint Schedule Name

ZoneControl:ContaminantController,
SPACE4-1 Contaminant Controller, !- Name
SPACE4-1, !- Zone Name
HVACTemplate-Always 1, !- Carbon Dioxide Control Availability Schedule Name
Zone Setpoint CO2 Concentration, !- Carbon Dioxide Setpoint Schedule Name
Zone Minimum CO2 Concentration; !- Minimum Carbon Dioxide Concentration Schedule Name
Zone Setpoint CO2 Concentration; !- Carbon Dioxide Setpoint Schedule Name

ZoneControl:ContaminantController,
SPACE5-1 Contaminant Controller, !- Name
SPACE5-1, !- Zone Name
HVACTemplate-Always 1, !- Carbon Dioxide Control Availability Schedule Name
Zone Setpoint CO2 Concentration, !- Carbon Dioxide Setpoint Schedule Name
Zone Minimum CO2 Concentration; !- Minimum Carbon Dioxide Concentration Schedule Name
Zone Setpoint CO2 Concentration; !- Carbon Dioxide Setpoint Schedule Name

!- =========== ALL OBJECTS IN CLASS: THERMOSTATSETPOINT:DUALSETPOINT ===========

Expand Down
15 changes: 5 additions & 10 deletions testfiles/DOAToUnitarySystem.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2257,36 +2257,31 @@
SPACE1-1 Contaminant Controller, !- Name
SPACE1-1, !- Zone Name
HVACTemplate-Always 1, !- Carbon Dioxide Control Availability Schedule Name
Zone Setpoint CO2 Concentration, !- Carbon Dioxide Setpoint Schedule Name
Zone Minimum CO2 Concentration; !- Minimum Carbon Dioxide Concentration Schedule Name
Zone Setpoint CO2 Concentration; !- Carbon Dioxide Setpoint Schedule Name

ZoneControl:ContaminantController,
SPACE2-1 Contaminant Controller, !- Name
SPACE2-1, !- Zone Name
HVACTemplate-Always 1, !- Carbon Dioxide Control Availability Schedule Name
Zone Setpoint CO2 Concentration, !- Carbon Dioxide Setpoint Schedule Name
Zone Minimum CO2 Concentration; !- Minimum Carbon Dioxide Concentration Schedule Name
Zone Setpoint CO2 Concentration; !- Carbon Dioxide Setpoint Schedule Name

ZoneControl:ContaminantController,
SPACE3-1 Contaminant Controller, !- Name
SPACE3-1, !- Zone Name
HVACTemplate-Always 1, !- Carbon Dioxide Control Availability Schedule Name
Zone Setpoint CO2 Concentration, !- Carbon Dioxide Setpoint Schedule Name
Zone Minimum CO2 Concentration; !- Minimum Carbon Dioxide Concentration Schedule Name
Zone Setpoint CO2 Concentration; !- Carbon Dioxide Setpoint Schedule Name

ZoneControl:ContaminantController,
SPACE4-1 Contaminant Controller, !- Name
SPACE4-1, !- Zone Name
HVACTemplate-Always 1, !- Carbon Dioxide Control Availability Schedule Name
Zone Setpoint CO2 Concentration, !- Carbon Dioxide Setpoint Schedule Name
Zone Minimum CO2 Concentration; !- Minimum Carbon Dioxide Concentration Schedule Name
Zone Setpoint CO2 Concentration; !- Carbon Dioxide Setpoint Schedule Name

ZoneControl:ContaminantController,
SPACE5-1 Contaminant Controller, !- Name
SPACE5-1, !- Zone Name
HVACTemplate-Always 1, !- Carbon Dioxide Control Availability Schedule Name
Zone Setpoint CO2 Concentration, !- Carbon Dioxide Setpoint Schedule Name
Zone Minimum CO2 Concentration; !- Minimum Carbon Dioxide Concentration Schedule Name
Zone Setpoint CO2 Concentration; !- Carbon Dioxide Setpoint Schedule Name

!- =========== ALL OBJECTS IN CLASS: THERMOSTATSETPOINT:DUALSETPOINT ===========

Expand Down
88 changes: 88 additions & 0 deletions tst/EnergyPlus/unit/CondenserLoopTowers.unit.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4386,4 +4386,92 @@ TEST_F(EnergyPlusFixture, CondenserLoopTowers_checkMassFlowAndLoadTest)
EXPECT_NEAR(expectedPower, tower.BasinHeaterPower, allowedTolerance);
}

TEST_F(EnergyPlusFixture, CondenserLoopTowers_checkTowerIndices)
{
std::string const idf_objects = delimited_string({
" CoolingTower:VariableSpeed,",
" CoolingTower-plant_loops-170, !- Name",
" Node 40, !- Water Inlet Node Name",
" Node 41, !- Water Outlet Node Name",
" YorkCalc, !- Model Type",
" , !- Model Coefficient Name",
" 25, !- Design Inlet Air Wet-Bulb Temperature {C}",
" 4.44, !- Design Approach Temperature {deltaC}",
" 5.56, !- Design Range Temperature {deltaC}",
" autosize, !- Design Water Flow Rate {m3/s}",
" Autosize, !- Design Air Flow Rate {m3/s}",
" 3544.15691546004, !- Design Fan Power {W}",
" Variable Speed Cooling Tower Fan Power Ratio Function of Air Flow Rate, !- Fan Power Ratio Function of Air Flow Rate Ratio Curve Name",
" 0.25, !- Minimum Air Flow Rate Ratio",
" 0.125, !- Fraction of Tower Capacity in Free Convection Regime",
" 0, !- Basin Heater Capacity {W/K}",
" 2, !- Basin Heater Setpoint Temperature {C}",
" , !- Basin Heater Operating Schedule Name",
" LossFactor, !- Evaporation Loss Mode",
" 0.2, !- Evaporation Loss Factor {percent/K}",
" 0.008, !- Drift Loss Percent {percent}",
" ConcentrationRatio, !- Blowdown Calculation Mode",
" 3, !- Blowdown Concentration Ratio",
" , !- Blowdown Makeup Water Usage Schedule Name",
" , !- Supply Water Storage Tank Name",
" , !- Outdoor Air Inlet Node Name",
" 2, !- Number of Cells",
" MaximalCell, !- Cell Control",
" 0.25, !- Cell Minimum Water Flow Rate Fraction",
" 2.5, !- Cell Maximum Water Flow Rate Fraction",
" 1, !- Sizing Factor",
" General; !- End-Use Subcategory",
" CoolingTower:TwoSpeed,",
" TowerWaterSys CoolTower1,!- Name",
" TowerWaterSys Pump-TowerWaterSys CoolTowerNode, !- Water Inlet Node Name",
" TowerWaterSys Supply Equipment Outlet Node, !- Water Outlet Node Name",
" , !- Design Water Flow Rate {m3/s}",
" AUTOSIZE, !- High Fan Speed Air Flow Rate {m3/s}",
" AUTOSIZE, !- High Fan Speed Fan Power {W}",
" , !- High Fan Speed U-Factor Times Area Value {W/K}",
" autocalculate, !- Low Fan Speed Air Flow Rate {m3/s}",
" , !- Low Fan Speed Air Flow Rate Sizing Factor",
" AUTOSIZE, !- Low Fan Speed Fan Power {W}",
" , !- Low Fan Speed Fan Power Sizing Factor",
" AUTOSIZE, !- Low Fan Speed U-Factor Times Area Value {W/K}",
" , !- Low Fan Speed U-Factor Times Area Sizing Factor",
" 0.9, !- Free Convection Regime Air Flow Rate {m3/s}",
" , !- Free Convection Regime Air Flow Rate Sizing Factor",
" autocalculate, !- Free Convection Regime U-Factor Times Area Value {W/K}",
" , !- Free Convection U-Factor Times Area Value Sizing Factor",
" NominalCapacity, !- Performance Input Method",
" , !- Heat Rejection Capacity and Nominal Capacity Sizing Ratio",
" 1E+5, !- High Speed Nominal Capacity {W}",
" 1E+4, !- Low Speed Nominal Capacity {W}",
" , !- Low Speed Nominal Capacity Sizing Factor",
" 5E+3, !- Free Convection Nominal Capacity {W}",
" , !- Free Convection Nominal Capacity Sizing Factor",
" 35.0, !- Design Inlet Air Dry-Bulb Temperature",
" 25.6, !- Design Inlet Air Wet-Bulb Temperature",
" 3.9, !- Design Approach Temperature",
" 5.5, !- Design Range Temperature",
" , !- Basin Heater Capacity {W/K}",
" , !- Basin Heater Setpoint Temperature {C}",
" , !- Basin Heater Operating Schedule Name",
" , !- Evaporation Loss Mode",
" , !- Evaporation Loss Factor {percent/K}",
" , !- Drift Loss Percent {percent}",
" , !- Blowdown Calculation Mode",
" , !- Blowdown Concentration Ratio",
" , !- Blowdown Makeup Water Usage Schedule Name",
" , !- Supply Water Storage Tank Name",
" ; !- Outdoor Air Inlet Node Name",
});

ASSERT_TRUE(process_idf(idf_objects));
// cooling tower get input
CondenserLoopTowers::GetTowerInput(*state);
int index;
index = Util::FindItemInList("COOLINGTOWER-PLANT_LOOPS-170", state->dataCondenserLoopTowers->towers);
EXPECT_TRUE(index == 2);

index = Util::FindItemInList("TOWERWATERSYS COOLTOWER1", state->dataCondenserLoopTowers->towers);
EXPECT_TRUE(index == 1);
}

} // namespace EnergyPlus

3 comments on commit e1106ef

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

Improved-Duct-Model (lgu1234) - x86_64-Linux-Ubuntu-24.04-gcc-13.3: OK (2919 of 2919 tests passed, 0 test warnings)

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.

Improved-Duct-Model (lgu1234) - x86_64-Linux-Ubuntu-24.04-gcc-13.3-UnitTestsCoverage-RelWithDebInfo: OK (2101 of 2101 tests passed, 0 test warnings)

Build Badge Test Badge Coverage 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.

Improved-Duct-Model (lgu1234) - x86_64-Linux-Ubuntu-24.04-gcc-13.3-IntegrationCoverage-RelWithDebInfo: OK (801 of 801 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

Please sign in to comment.