Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Wrap Coil:Cooling:DX:SingleSpeed:ThermalStorage #5059

Merged
merged 61 commits into from
Mar 27, 2024
Merged

Wrap Coil:Cooling:DX:SingleSpeed:ThermalStorage #5059

Show file tree
Hide file tree
Changes from 39 commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
158ae72
Add new thermal storage cooling coil object to idd.
joseph-robertson Dec 8, 2023
e2bd5fe
Add src model files from GenerateClass.rb.
joseph-robertson Dec 9, 2023
114364e
Add src ft files from GenerateClass.rb.
joseph-robertson Dec 9, 2023
02246c8
Formatting.
joseph-robertson Dec 9, 2023
610bb1a
Update schedule type registry cpp.
joseph-robertson Dec 11, 2023
91b8a6b
Formatting.
joseph-robertson Dec 11, 2023
07388cc
Update condenser air node fields in idd.
joseph-robertson Dec 11, 2023
abd85d1
Start to update the ctor.
joseph-robertson Dec 11, 2023
bb11cf9
Formatting.
joseph-robertson Dec 11, 2023
863ffa2
Start adding curves to ctor.
joseph-robertson Dec 11, 2023
0686a69
Formatting.
joseph-robertson Dec 11, 2023
778534f
Change all xxxFunctions to Curve.
joseph-robertson Dec 12, 2023
957e301
Stub validity check in FT for required curves with modes.
joseph-robertson Dec 12, 2023
e70af23
Missing required field in idd.
joseph-robertson Dec 13, 2023
5184eac
Add convenience ctor exposing modes available.
joseph-robertson Dec 13, 2023
5543a5e
Clean up ft test.
joseph-robertson Dec 14, 2023
2340337
Merge branch 'develop' into coil-thermal-storage
joseph-robertson Jan 16, 2024
61fcc1b
Merge branch 'develop' into coil-thermal-storage
joseph-robertson Jan 26, 2024
41d8b04
Clean up model files.
joseph-robertson Jan 30, 2024
c198e7f
Clean up ft file.
joseph-robertson Jan 30, 2024
a54dfea
Formatting.
joseph-robertson Jan 30, 2024
69cf4e4
Continue cleaning up model and ft files.
joseph-robertson Jan 30, 2024
da394f3
Start to clean up model and ft test files.
joseph-robertson Jan 30, 2024
2579778
Split ft into with and without unitary.
joseph-robertson Jan 30, 2024
d662b91
Include thermal storage in cmakelists, model files, etc.
joseph-robertson Jan 30, 2024
d74423a
Formatting.
joseph-robertson Jan 30, 2024
9e3448a
Update idd and methods for storage types.
joseph-robertson Jan 30, 2024
1a8054c
Stub out virtual methods.
joseph-robertson Jan 30, 2024
6776402
Comment out all methods related to water storage tanks.
joseph-robertson Jan 30, 2024
63d0f84
Missed one.
joseph-robertson Jan 30, 2024
008a933
Change nodes to alphas.
joseph-robertson Jan 30, 2024
7a04dd1
Update model cpp so it builds.
joseph-robertson Jan 31, 2024
2fc2cf2
Update model and ft tests, and get things building.
joseph-robertson Jan 31, 2024
5f49797
Formatting.
joseph-robertson Jan 31, 2024
621e58c
Update ft of new coil parent objects.
joseph-robertson Jan 31, 2024
4f49388
Update ft and tests; currently passing.
joseph-robertson Jan 31, 2024
027f7e9
Remove extra assert.
joseph-robertson Jan 31, 2024
0e7b34d
Change all autocalculated to autosized.
joseph-robertson Feb 2, 2024
a286a32
Merge branch 'develop' into coil-thermal-storage
joseph-robertson Feb 7, 2024
ec02646
Respond to review with idd updates and ft fixes.
joseph-robertson Feb 14, 2024
4a0569f
Set to ScheduledModes in ctor.
joseph-robertson Feb 14, 2024
da9da35
Update ft includes.
joseph-robertson Feb 14, 2024
049c99c
Update model and ft tests.
joseph-robertson Feb 14, 2024
2aac063
Typo.
joseph-robertson Feb 14, 2024
25d6de8
Another typo.
joseph-robertson Feb 14, 2024
6f2fd81
Another include.
joseph-robertson Feb 14, 2024
4b454b8
Update methods around glycol concentration.
joseph-robertson Feb 14, 2024
728566e
More required fields in idd and reset method removals.
joseph-robertson Feb 15, 2024
3f71ca7
Fix cpp and start adding ft parent system tests.
joseph-robertson Feb 15, 2024
545e093
Updates and fixes for containing hvac.
joseph-robertson Feb 15, 2024
13cfe58
Update addToNode.
joseph-robertson Feb 15, 2024
aab11b6
Fix a couple typos in ft test.
joseph-robertson Feb 15, 2024
df48009
Avoid overriding availability schedule in an ft test.
joseph-robertson Feb 15, 2024
5d5171d
Revert ft changes on components that cannot have the new coil.
joseph-robertson Feb 16, 2024
662edba
Format the list of output variables.
joseph-robertson Feb 16, 2024
060f040
Update idd, remove overrides, extra clone and remove model tests.
joseph-robertson Feb 16, 2024
69274c5
Fix up new model tests.
joseph-robertson Feb 17, 2024
8d78cd8
Merge branch 'develop' into coil-thermal-storage
jmarrec Mar 8, 2024
9eaa096
Merge branch 'develop' into coil-thermal-storage
joseph-robertson Mar 11, 2024
0123337
Update model test expects for remove.
joseph-robertson Mar 12, 2024
faffcfd
Override children with all curves.
joseph-robertson Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
764 changes: 763 additions & 1 deletion resources/model/OpenStudio.idd
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions src/energyplus/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ set(${target_name}_src
ForwardTranslator/ForwardTranslateCoilCoolingDXCurveFitSpeed.cpp
ForwardTranslator/ForwardTranslateCoilCoolingDXMultiSpeed.cpp
ForwardTranslator/ForwardTranslateCoilCoolingDXSingleSpeed.cpp
ForwardTranslator/ForwardTranslateCoilCoolingDXSingleSpeedThermalStorage.cpp
ForwardTranslator/ForwardTranslateCoilCoolingDXTwoSpeed.cpp
ForwardTranslator/ForwardTranslateCoilCoolingDXTwoStageWithHumidityControlMode.cpp
ForwardTranslator/ForwardTranslateCoilCoolingDXVariableRefrigerantFlow.cpp
Expand Down Expand Up @@ -692,6 +693,7 @@ set(${target_name}_test_src
Test/CoilCoolingDXCurveFitOperatingMode_GTest.cpp
Test/CoilCoolingDXCurveFitSpeed_GTest.cpp
Test/CoilCoolingDXSingleSpeed_GTest.cpp
Test/CoilCoolingDXSingleSpeedThermalStorage_GTest.cpp
Test/CoilCoolingDXMultiSpeed_GTest.cpp
Test/CoilCoolingDXTwoSpeed_GTest.cpp
Test/CoilCoolingDXTwoStageWithHumidityControlMode_GTest.cpp
Expand Down
10 changes: 10 additions & 0 deletions src/energyplus/ForwardTranslator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1003,6 +1003,15 @@ namespace energyplus {
}
break;
}
case openstudio::IddObjectType::OS_Coil_Cooling_DX_SingleSpeed_ThermalStorage: {
auto coil = modelObject.cast<CoilCoolingDXSingleSpeedThermalStorage>();
if (isHVACComponentWithinUnitary(coil)) {
retVal = translateCoilCoolingDXSingleSpeedThermalStorageWithoutUnitary(coil);
} else {
retVal = translateCoilCoolingDXSingleSpeedThermalStorage(coil);
}
break;
}
case openstudio::IddObjectType::OS_Coil_Cooling_DX_MultiSpeed: {
auto coil = modelObject.cast<CoilCoolingDXMultiSpeed>();
retVal = translateCoilCoolingDXMultiSpeed(coil);
Expand Down Expand Up @@ -3459,6 +3468,7 @@ namespace energyplus {
// IddObjectType::OS_Coil_Cooling_DX_CurveFit_Speed,

IddObjectType::OS_Coil_Cooling_DX_SingleSpeed,
IddObjectType::OS_Coil_Cooling_DX_SingleSpeed_ThermalStorage,
joseph-robertson marked this conversation as resolved.
Show resolved Hide resolved
IddObjectType::OS_Coil_Cooling_DX_TwoSpeed,
IddObjectType::OS_Coil_Cooling_Water,
IddObjectType::OS_Coil_Cooling_WaterToAirHeatPump_EquationFit,
Expand Down
6 changes: 6 additions & 0 deletions src/energyplus/ForwardTranslator.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ namespace model {
class CoilCoolingDXCurveFitSpeed;
class CoilCoolingDXMultiSpeed;
class CoilCoolingDXSingleSpeed;
class CoilCoolingDXSingleSpeedThermalStorage;
class CoilCoolingDXTwoSpeed;
class CoilCoolingDXTwoStageWithHumidityControlMode;
class CoilCoolingDXVariableRefrigerantFlow;
Expand Down Expand Up @@ -759,6 +760,11 @@ namespace energyplus {

boost::optional<IdfObject> translateCoilCoolingDXSingleSpeedWithoutUnitary(model::CoilCoolingDXSingleSpeed& modelObject);

boost::optional<IdfObject> translateCoilCoolingDXSingleSpeedThermalStorage(model::CoilCoolingDXSingleSpeedThermalStorage& modelObject);

boost::optional<IdfObject>
translateCoilCoolingDXSingleSpeedThermalStorageWithoutUnitary(model::CoilCoolingDXSingleSpeedThermalStorage& modelObject);

boost::optional<IdfObject> translateCoilCoolingDX(model::CoilCoolingDX& modelObject);

boost::optional<IdfObject> translateCoilCoolingDXWithoutUnitary(model::CoilCoolingDX& modelObject);
Expand Down
4 changes: 4 additions & 0 deletions ...yplus/ForwardTranslator/ForwardTranslateAirLoopHVACUnitaryHeatCoolVAVChangeoverBypass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
#include "../../model/Mixer.hpp"
#include <utilities/idd/AirLoopHVAC_UnitaryHeatCool_VAVChangeoverBypass_FieldEnums.hxx>
#include <utilities/idd/Coil_Cooling_DX_SingleSpeed_FieldEnums.hxx>
#include <utilities/idd/Coil_Cooling_DX_SingleSpeed_ThermalStorage_FieldEnums.hxx>
#include <utilities/idd/Coil_Cooling_DX_VariableSpeed_FieldEnums.hxx>
#include <utilities/idd/Coil_Cooling_DX_TwoStageWithHumidityControlMode_FieldEnums.hxx>
#include <utilities/idd/Coil_Heating_DX_SingleSpeed_FieldEnums.hxx>
Expand Down Expand Up @@ -317,6 +318,9 @@ namespace energyplus {
if (_coolingCoil->iddObject().type() == IddObjectType::Coil_Cooling_DX_SingleSpeed) {
_coolingCoil->setString(Coil_Cooling_DX_SingleSpeedFields::AirInletNodeName, coolInletNodeName);
_coolingCoil->setString(Coil_Cooling_DX_SingleSpeedFields::AirOutletNodeName, coolOutletNodeName);
} else if (_coolingCoil->iddObject().type() == IddObjectType::Coil_Cooling_DX_SingleSpeed_ThermalStorage) {
_coolingCoil->setString(Coil_Cooling_DX_SingleSpeed_ThermalStorageFields::EvaporatorAirInletNodeName, coolInletNodeName);
_coolingCoil->setString(Coil_Cooling_DX_SingleSpeed_ThermalStorageFields::EvaporatorAirOutletNodeName, coolOutletNodeName);
joseph-robertson marked this conversation as resolved.
Show resolved Hide resolved
} else if (_coolingCoil->iddObject().type() == IddObjectType::Coil_Cooling_DX_VariableSpeed) {
_coolingCoil->setString(Coil_Cooling_DX_VariableSpeedFields::IndoorAirInletNodeName, coolInletNodeName);
_coolingCoil->setString(Coil_Cooling_DX_VariableSpeedFields::IndoorAirOutletNodeName, coolOutletNodeName);
Expand Down
5 changes: 5 additions & 0 deletions src/energyplus/ForwardTranslator/ForwardTranslateAirLoopHVACUnitaryHeatPumpAirToAir.cpp
View file
Open in desktop
joseph-robertson marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#include <utilities/idd/Coil_Heating_Fuel_FieldEnums.hxx>
#include <utilities/idd/Coil_Heating_Electric_FieldEnums.hxx>
#include <utilities/idd/Coil_Cooling_DX_SingleSpeed_FieldEnums.hxx>
#include <utilities/idd/Coil_Cooling_DX_SingleSpeed_ThermalStorage_FieldEnums.hxx>
#include <utilities/idd/Coil_Cooling_DX_VariableSpeed_FieldEnums.hxx>
#include <utilities/idd/Coil_WaterHeating_AirToWaterHeatPump_VariableSpeed_FieldEnums.hxx>
#include "../../utilities/idd/IddEnums.hpp"
Expand Down Expand Up @@ -264,6 +265,8 @@ namespace energyplus {

if (_coolingCoil->iddObject().type() == IddObjectType::Coil_Cooling_DX_SingleSpeed) {
_coolingCoil->setString(Coil_Cooling_DX_SingleSpeedFields::AirInletNodeName, nodeName);
} else if (_coolingCoil->iddObject().type() == IddObjectType::Coil_Cooling_DX_SingleSpeed_ThermalStorage) {
_coolingCoil->setString(Coil_Cooling_DX_SingleSpeed_ThermalStorageFields::EvaporatorAirInletNodeName, nodeName);
joseph-robertson marked this conversation as resolved.
Show resolved Hide resolved
} else if (_coolingCoil->iddObject().type() == IddObjectType::Coil_Cooling_DX_VariableSpeed) {
_coolingCoil->setString(Coil_Cooling_DX_VariableSpeedFields::IndoorAirInletNodeName, nodeName);
} else if (_coolingCoil->iddObject().type() == IddObjectType::CoilSystem_IntegratedHeatPump_AirSource) {
Expand Down Expand Up @@ -294,6 +297,8 @@ namespace energyplus {

if (_coolingCoil->iddObject().type() == IddObjectType::Coil_Cooling_DX_SingleSpeed) {
_coolingCoil->setString(Coil_Cooling_DX_SingleSpeedFields::AirOutletNodeName, nodeName);
} else if (_coolingCoil->iddObject().type() == IddObjectType::Coil_Cooling_DX_SingleSpeed_ThermalStorage) {
_coolingCoil->setString(Coil_Cooling_DX_SingleSpeed_ThermalStorageFields::EvaporatorAirOutletNodeName, nodeName);
} else if (_coolingCoil->iddObject().type() == IddObjectType::Coil_Cooling_DX_VariableSpeed) {
_coolingCoil->setString(Coil_Cooling_DX_VariableSpeedFields::IndoorAirOutletNodeName, nodeName);
} else if (_coolingCoil->iddObject().type() == IddObjectType::CoilSystem_IntegratedHeatPump_AirSource) {
Expand Down
4 changes: 4 additions & 0 deletions src/energyplus/ForwardTranslator/ForwardTranslateAirLoopHVACUnitarySystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
#include "../../model/UnitarySystemPerformanceMultispeed_Impl.hpp"
#include <utilities/idd/AirLoopHVAC_UnitarySystem_FieldEnums.hxx>
#include <utilities/idd/Coil_Cooling_DX_SingleSpeed_FieldEnums.hxx>
#include <utilities/idd/Coil_Cooling_DX_SingleSpeed_ThermalStorage_FieldEnums.hxx>
#include <utilities/idd/Coil_Cooling_DX_TwoSpeed_FieldEnums.hxx>
#include <utilities/idd/Coil_Cooling_DX_TwoStageWithHumidityControlMode_FieldEnums.hxx>
#include <utilities/idd/Coil_Cooling_DX_MultiSpeed_FieldEnums.hxx>
Expand Down Expand Up @@ -676,6 +677,9 @@ namespace energyplus {
if (_coolingCoil->iddObject().type() == IddObjectType::Coil_Cooling_DX_SingleSpeed) {
_coolingCoil->setString(Coil_Cooling_DX_SingleSpeedFields::AirInletNodeName, inletNodeName);
_coolingCoil->setString(Coil_Cooling_DX_SingleSpeedFields::AirOutletNodeName, outletNodeName);
} else if (_coolingCoil->iddObject().type() == IddObjectType::Coil_Cooling_DX_SingleSpeed_ThermalStorage) {
_coolingCoil->setString(Coil_Cooling_DX_SingleSpeed_ThermalStorageFields::EvaporatorAirInletNodeName, inletNodeName);
_coolingCoil->setString(Coil_Cooling_DX_SingleSpeed_ThermalStorageFields::EvaporatorAirOutletNodeName, outletNodeName);
joseph-robertson marked this conversation as resolved.
Show resolved Hide resolved
} else if (_coolingCoil->iddObject().type() == IddObjectType::Coil_Cooling_DX_TwoSpeed) {
_coolingCoil->setString(Coil_Cooling_DX_TwoSpeedFields::AirInletNodeName, inletNodeName);
_coolingCoil->setString(Coil_Cooling_DX_TwoSpeedFields::AirOutletNodeName, outletNodeName);
Expand Down
Loading
Loading