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

Merge changes for ORC model from IBPSA #4020

Merged
merged 5 commits into from
Oct 27, 2024
Merged

Merge changes for ORC model from IBPSA #4020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d169b5e
Merged IBPSA, issue1921_organicRankineCycle
mwetter Oct 17, 2024
199e6a7
Replaced use_inputFilter with use_strokeTime
mwetter Oct 17, 2024
dfeaf9d
Merge branch 'master' into IBPSASync_issue1921_organicRankineCycle
mwetter Oct 20, 2024
c77e097
Merge branch 'master' into IBPSASync_issue1921_organicRankineCycle
mwetter Oct 25, 2024
8f96282
Merged changes of ORC model from IBPSA
mwetter Oct 25, 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
48 changes: 48 additions & 0 deletions Buildings/.copiedFiles.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -850,6 +850,40 @@ Buildings/Fluid/BaseClasses/Validation/package.mo
Buildings/Fluid/BaseClasses/Validation/package.order
Buildings/Fluid/BaseClasses/package.mo
Buildings/Fluid/BaseClasses/package.order
Buildings/Fluid/CHPs/OrganicRankine/BaseClasses/FixedEvaporating.mo
Buildings/Fluid/CHPs/OrganicRankine/BaseClasses/InterpolateStates.mo
Buildings/Fluid/CHPs/OrganicRankine/BaseClasses/Validation/DryFluid.mo
Buildings/Fluid/CHPs/OrganicRankine/BaseClasses/Validation/WetFluid.mo
Buildings/Fluid/CHPs/OrganicRankine/BaseClasses/Validation/package.mo
Buildings/Fluid/CHPs/OrganicRankine/BaseClasses/Validation/package.order
Buildings/Fluid/CHPs/OrganicRankine/BaseClasses/package.mo
Buildings/Fluid/CHPs/OrganicRankine/BaseClasses/package.order
Buildings/Fluid/CHPs/OrganicRankine/ConstantEvaporation.mo
Buildings/Fluid/CHPs/OrganicRankine/Data/Generic.mo
Buildings/Fluid/CHPs/OrganicRankine/Data/WorkingFluids/Acetone.mo
Buildings/Fluid/CHPs/OrganicRankine/Data/WorkingFluids/Ethanol.mo
Buildings/Fluid/CHPs/OrganicRankine/Data/WorkingFluids/Heptane.mo
Buildings/Fluid/CHPs/OrganicRankine/Data/WorkingFluids/Pentane.mo
Buildings/Fluid/CHPs/OrganicRankine/Data/WorkingFluids/Propane.mo
Buildings/Fluid/CHPs/OrganicRankine/Data/WorkingFluids/R123.mo
Buildings/Fluid/CHPs/OrganicRankine/Data/WorkingFluids/R134a.mo
Buildings/Fluid/CHPs/OrganicRankine/Data/WorkingFluids/R245fa.mo
Buildings/Fluid/CHPs/OrganicRankine/Data/WorkingFluids/R32.mo
Buildings/Fluid/CHPs/OrganicRankine/Data/WorkingFluids/Toluene.mo
Buildings/Fluid/CHPs/OrganicRankine/Data/WorkingFluids/package.mo
Buildings/Fluid/CHPs/OrganicRankine/Data/WorkingFluids/package.order
Buildings/Fluid/CHPs/OrganicRankine/Data/package.mo
Buildings/Fluid/CHPs/OrganicRankine/Data/package.order
Buildings/Fluid/CHPs/OrganicRankine/Examples/ORCHotWater.mo
Buildings/Fluid/CHPs/OrganicRankine/Examples/package.mo
Buildings/Fluid/CHPs/OrganicRankine/Examples/package.order
Buildings/Fluid/CHPs/OrganicRankine/Validation/VariableSource.mo
Buildings/Fluid/CHPs/OrganicRankine/Validation/package.mo
Buildings/Fluid/CHPs/OrganicRankine/Validation/package.order
Buildings/Fluid/CHPs/OrganicRankine/package.mo
Buildings/Fluid/CHPs/OrganicRankine/package.order
Buildings/Fluid/CHPs/package.mo
Buildings/Fluid/CHPs/package.order
Buildings/Fluid/Chillers/BaseClasses/Carnot.mo
Buildings/Fluid/Chillers/BaseClasses/PartialCarnot_T.mo
Buildings/Fluid/Chillers/BaseClasses/PartialCarnot_y.mo
Expand Down Expand Up @@ -2295,6 +2329,15 @@ Buildings/Resources/Images/Fluid/Actuators/valvePressureDropSeries.png
Buildings/Resources/Images/Fluid/Actuators/valveResponse.png
Buildings/Resources/Images/Fluid/Actuators/valveResponse.svg
Buildings/Resources/Images/Fluid/Actuators/valveSchematic.png
Buildings/Resources/Images/Fluid/CHPs/OrganicRankine/ComputationPaths.pdf
Buildings/Resources/Images/Fluid/CHPs/OrganicRankine/ComputationPaths.png
Buildings/Resources/Images/Fluid/CHPs/OrganicRankine/ComputationPaths.svg
Buildings/Resources/Images/Fluid/CHPs/OrganicRankine/CycleArchitecture.pdf
Buildings/Resources/Images/Fluid/CHPs/OrganicRankine/CycleArchitecture.png
Buildings/Resources/Images/Fluid/CHPs/OrganicRankine/CycleArchitecture.svg
Buildings/Resources/Images/Fluid/CHPs/OrganicRankine/SupportCurves.pdf
Buildings/Resources/Images/Fluid/CHPs/OrganicRankine/SupportCurves.png
Buildings/Resources/Images/Fluid/CHPs/OrganicRankine/SupportCurves.svg
Buildings/Resources/Images/Fluid/FMI/ExportContainers/Validation/RoomConvectiveHVACConvective.pdf
Buildings/Resources/Images/Fluid/FMI/ExportContainers/Validation/RoomConvectiveHVACConvective.png
Buildings/Resources/Images/Fluid/FMI/ExportContainers/Validation/RoomConvectiveHVACConvective.svg
Expand Down Expand Up @@ -2424,6 +2467,7 @@ Buildings/Resources/Images/Utilities/Math/Functions/Examples/cubicHermite.png
Buildings/Resources/Images/Utilities/Math/Functions/SmoothExponentialXPower.png
Buildings/Resources/Images/Utilities/Math/int.pdf
Buildings/Resources/Images/Utilities/Math/int.png
Buildings/Resources/Python-Sources/MakeORCFluidRecord.py
Buildings/Resources/Scripts/Dymola/Airflow/Multizone/BaseClasses/Examples/PowerLaw.mos
Buildings/Resources/Scripts/Dymola/Airflow/Multizone/BaseClasses/Examples/PowerLawFixedM.mos
Buildings/Resources/Scripts/Dymola/Airflow/Multizone/BaseClasses/Examples/WindPressureLowRise.mos
Expand Down Expand Up @@ -2645,6 +2689,10 @@ Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/FlowModels/Validation/Inver
Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_m_flow.mos
Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/Validation/ActuatorFilter.mos
Buildings/Resources/Scripts/Dymola/Fluid/BaseClasses/Validation/MassFlowRateMultiplier.mos
Buildings/Resources/Scripts/Dymola/Fluid/CHPs/OrganicRankine/BaseClasses/Validation/DryFluid.mos
Buildings/Resources/Scripts/Dymola/Fluid/CHPs/OrganicRankine/BaseClasses/Validation/WetFluid.mos
Buildings/Resources/Scripts/Dymola/Fluid/CHPs/OrganicRankine/Examples/ORCHotWater.mos
Buildings/Resources/Scripts/Dymola/Fluid/CHPs/OrganicRankine/Validation/VariableSource.mos
Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Examples/Carnot_TEva.mos
Buildings/Resources/Scripts/Dymola/Fluid/Chillers/Examples/Carnot_y.mos
Buildings/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Examples/CarnotWithLosses.mos
Expand Down
7 changes: 4 additions & 3 deletions Buildings/Fluid/CHPs/OrganicRankine/BaseClasses/FixedEvaporating.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,8 @@ model FixedEvaporating
Modelica.Blocks.Logical.Hysteresis hys(
uLow = mWor_flow_min,
uHigh = mWor_flow_min + mWor_flow_hysteresis,
u = mWor_flow_internal)
u = mWor_flow_internal,
y(start = false))
"Hysteresis for turning off cycle when working fluid flow too low";

protected
Expand Down Expand Up @@ -190,8 +191,8 @@ This model computes the pinch points and the energy exchange,
and interfaces with the input and output variables.
The evaporating temperature is fixed as a parameter.
See the documentation of
<a href=\"Modelica://Buildings.Fluid.CHPs.OrganicRankine.Cycle\">
Buildings.Fluid.CHPs.OrganicRankine.Cycle</a>
<a href=\"Modelica://Buildings.Fluid.CHPs.OrganicRankine.ConstantEvaporation\">
Buildings.Fluid.CHPs.OrganicRankine.ConstantEvaporation</a>
for more details.
</html>", revisions="<html>
<ul>
Expand Down
4 changes: 2 additions & 2 deletions Buildings/Fluid/CHPs/OrganicRankine/BaseClasses/InterpolateStates.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,8 +307,8 @@ protected
<p>
This model performs the property interpolations of a given working fluid.
See the documentation of
<a href=\"Modelica://Buildings.Fluid.CHPs.OrganicRankine.Cycle\">
Buildings.Fluid.CHPs.OrganicRankine.Cycle</a>
<a href=\"Modelica://Buildings.Fluid.CHPs.OrganicRankine.ConstantEvaporation\">
Buildings.Fluid.CHPs.OrganicRankine.ConstantEvaporation</a>
for more details.
</html>", revisions="<html>
<ul>
Expand Down
4 changes: 2 additions & 2 deletions Buildings/Fluid/CHPs/OrganicRankine/BaseClasses/Validation/WetFluid.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ except that it validates the handling of wet working fluids.
As a result, a superheating temperature is computed that ensures
the expansion does not land under the dome.
How this superheating temperature is found is explained in the documentation of
<a href=\"Modelica://Buildings.Fluid.CHPs.OrganicRankine.Cycle\">
Buildings.Fluid.CHPs.OrganicRankine.Cycle</a>.
<a href=\"Modelica://Buildings.Fluid.CHPs.OrganicRankine.ConstantEvaporation\">
Buildings.Fluid.CHPs.OrganicRankine.ConstantEvaporation</a>.
</p>
</html>",revisions="<html>
<ul>
Expand Down
Loading
Loading