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.

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

Issue3438 d xdehumidifier #3475

Open
wants to merge 110 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
110 commits
Select commit Hold shift + click to select a range
e0e3f0e
Initial commit
karthikeyad-pnnl Jun 20, 2023
2b514f9
Updated formatting and documentation
karthikeyad-pnnl Jun 21, 2023
9397f8e
Added new files for data record with example values
karthikeyad-pnnl Jun 21, 2023
0299468
Updated reference data used for validation
karthikeyad-pnnl Jun 21, 2023
73da0bb
Updated IDF version to 23.1
karthikeyad-pnnl Jun 21, 2023
bb8e3e5
Added tolerance to example and validation models, and validation scripts
karthikeyad-pnnl Jun 21, 2023
82f7a3f
Removed BOM
karthikeyad-pnnl Jun 21, 2023
ab64d2b
Removed BOM
karthikeyad-pnnl Jun 21, 2023
2ef619b
Updated package order files
karthikeyad-pnnl Jun 21, 2023
d0b7513
Updated unit test results
karthikeyad-pnnl Jun 21, 2023
0fbaefa
Updated experiment setup in validation model
karthikeyad-pnnl Jun 21, 2023
1def939
Updated html tags in documentation
karthikeyad-pnnl Jun 21, 2023
de9c52e
Add the unit test results
terrancelu92 Jun 23, 2023
125a17d
Merge pull request #76 from terrancelu92/issue3438_DXdehumidifier
karthikeyad-pnnl Jun 23, 2023
388efa7
Removed BOM
karthikeyad-pnnl Jun 23, 2023
13b529b
Addressed comments on PR
karthikeyad-pnnl Jun 29, 2023
f4fba78
Removed redundant HTML tags in documentation
karthikeyad-pnnl Jun 29, 2023
ce039d1
Addressed inline comments
terrancelu92 Aug 7, 2023
1ed2256
Merge pull request #81 from terrancelu92/issue3438_DXdehumidifier
karthikeyad-pnnl Aug 7, 2023
24cc4b6
Merge pull request #3440 from karthikeyad-pnnl/issue3438_DXdehumidifier
JayHuLBL Aug 17, 2023
e3c015e
merged master
JayHuLBL Aug 18, 2023
99988f6
added release note
JayHuLBL Aug 18, 2023
ca05e58
improved text
JayHuLBL Aug 18, 2023
130b7d8
changed file permission
JayHuLBL Aug 18, 2023
881a45b
Added missing parameter declaration [ci skip]
mwetter Aug 22, 2023
14175b4
reorganized the text
JayHuLBL Aug 22, 2023
06451b2
merged master
JayHuLBL Sep 20, 2023
0c32b32
Merge branch 'master' into issue3438_DXdehumidifier
JayHuLBL Nov 14, 2023
1234e24
Merge branch 'master' into issue3438_DXdehumidifier
JayHuLBL Nov 27, 2023
c3f6d2f
Merge branch 'master' into issue3438_DXdehumidifier
JayHuLBL Nov 30, 2023
ea83cb9
Change the version to v96
terrancelu92 Aug 24, 2023
88800b8
Modify the initialization time for the case
terrancelu92 Aug 28, 2023
afc2c52
Add starttime argument to generate the dat file
terrancelu92 Aug 28, 2023
08cf375
Add open loop validation case
terrancelu92 Aug 29, 2023
c9d8e64
Debug DXDehumidifier open loop testing
terrancelu92 Sep 1, 2023
01bcd15
Backing up debugging exercise for DX dehumidifier
karthikeyad-pnnl Sep 5, 2023
b4608d6
Added the open loop validation case and enhanced the documentation
terrancelu92 Oct 26, 2023
0ef1eaf
Delete the closed loop validation case and add the delay time paramet…
terrancelu92 Oct 27, 2023
af24d82
Add results changed from the unit test
terrancelu92 Oct 27, 2023
d7e96d1
Removed unused models
karthikeyad-pnnl Nov 2, 2023
0caf1ef
Removed unused mos script
karthikeyad-pnnl Nov 2, 2023
fec03e5
Addressed most of comments from Jianjun
terrancelu92 Nov 21, 2023
1c7bc98
Replaced html tags with font info with code tags
karthikeyad-pnnl Nov 28, 2023
a929e99
Removed redundant if-else condition from equation section. Corrected …
karthikeyad-pnnl Nov 28, 2023
7225577
Simplified equations and calculations for water removal rate and powe…
karthikeyad-pnnl Nov 29, 2023
dbf4988
Updated documentation section formatting
karthikeyad-pnnl Nov 29, 2023
a5162bd
Added alternative calculation for power consumption using CDL blocks
karthikeyad-pnnl Nov 29, 2023
baa5651
Removed redundant calculation blocks
karthikeyad-pnnl Nov 30, 2023
1ab66ba
Updated documentation and formatting
karthikeyad-pnnl Nov 30, 2023
074ead5
Removed unnecessary block
karthikeyad-pnnl Dec 5, 2023
db8c336
Merge pull request #3594 from karthikeyad-pnnl/issue3438_DXdehumidifi…
JayHuLBL Dec 5, 2023
4d5897a
corrected html error
JayHuLBL Dec 5, 2023
50ba2b2
improved text documentation
JayHuLBL Dec 5, 2023
6b4b81e
changed the release note
JayHuLBL Dec 5, 2023
bd1aabc
changing the record implementation to avoid OMC error
JayHuLBL Dec 13, 2023
0902e59
fixed error when run in OMC [ci skip]
JayHuLBL Dec 13, 2023
5ebed35
upgraded idf file from version 9.6 to 23.1
JayHuLBL Dec 18, 2023
e6e3202
Merge branch 'master' into issue3438_DXdehumidifier
JayHuLBL Dec 20, 2023
83ca293
updated .dat file
JayHuLBL Dec 21, 2023
067a736
added unit attribute, corrected defaultComponent specification [ci skip]
JayHuLBL Dec 21, 2023
fca9de6
Merge branch 'master' into issue3438_DXdehumidifier
JayHuLBL Dec 22, 2023
a885136
merged master
JayHuLBL Mar 1, 2024
f17e13b
Merge branch 'master' into issue3438_DXdehumidifier
JayHuLBL Mar 28, 2024
9fd1813
updated reference [ci skip]
JayHuLBL Mar 28, 2024
354cf87
Merge pull request #130 from lbl-srg/issue3438_DXdehumidifier
karthikeyad-pnnl Apr 8, 2024
55140dd
Imported only required changes from #120
karthikeyad-pnnl Apr 8, 2024
18d9e3a
Removed unused class from examples package
karthikeyad-pnnl Apr 8, 2024
365c9df
Moved example data record to the validation package
karthikeyad-pnnl Apr 8, 2024
c2d0596
Changed real parameters to SI units. Updated formatting
karthikeyad-pnnl Apr 8, 2024
c5d355c
Reverted unnecessary changes to IDF
karthikeyad-pnnl Apr 8, 2024
6a9ae1e
Hardcoded number of coefficients in biquadratic polynomial
karthikeyad-pnnl Apr 8, 2024
3277600
Updated icon layer on curve modifier
karthikeyad-pnnl Apr 8, 2024
711ac0a
Merge pull request #3786 from karthikeyad-pnnl/issue3438_DXdehumidifi…
JayHuLBL Apr 8, 2024
8f6e791
Merge branch 'master' into issue3438_DXdehumidifier
JayHuLBL Apr 8, 2024
50b037c
fixed html errors
JayHuLBL Apr 8, 2024
4f37623
removed empty lines [ci skip]
JayHuLBL Apr 8, 2024
5a7e58f
Removed unused classes and variables
karthikeyad-pnnl Apr 9, 2024
87df70b
Merge remote-tracking branch 'upstream/issue3438_DXdehumidifier' into…
karthikeyad-pnnl Apr 9, 2024
9e95142
Updated unit test results
karthikeyad-pnnl Apr 9, 2024
df47287
Merge pull request #3788 from karthikeyad-pnnl/issue3438_DXdehumidifi…
JayHuLBL Apr 9, 2024
5759a99
added reference [ci skip]
JayHuLBL Apr 9, 2024
438b2df
solved conflict [ci skip]
JayHuLBL Apr 9, 2024
5343321
merged master [ci skip]
JayHuLBL Apr 12, 2024
23b57c5
Merge pull request #132 from lbl-srg/issue3438_DXdehumidifier
karthikeyad-pnnl Apr 12, 2024
76cc2c8
Updated name and location of example EnergyPlus data record in Humidi…
karthikeyad-pnnl Apr 13, 2024
0481822
Updated formatting
karthikeyad-pnnl Apr 13, 2024
da22a85
Updated formatting
karthikeyad-pnnl Apr 13, 2024
82b7a73
Merge pull request #3799 from karthikeyad-pnnl/issue3438_DXdehumidifi…
JayHuLBL Apr 16, 2024
51fcf0a
Merge branch 'master' into issue3438_DXdehumidifier
JayHuLBL Apr 16, 2024
68d08ac
refactored package order
JayHuLBL Apr 16, 2024
a46d350
Merge branch 'issue3438_DXdehumidifier' of https://github.com/lbl-srg…
JayHuLBL Apr 16, 2024
ba36717
reversed userGuider package order
JayHuLBL Apr 16, 2024
22b2542
deleted not needed reference, and scripts
JayHuLBL Apr 16, 2024
69c456e
updated energyplus data
JayHuLBL Apr 17, 2024
c0836c9
updated reference
JayHuLBL Apr 17, 2024
d01ab09
updated released note
JayHuLBL Nov 20, 2024
f97437e
added baseclass
JayHuLBL Nov 20, 2024
81e42f6
corrected validation
JayHuLBL Nov 20, 2024
b82f20e
corrected package order
JayHuLBL Nov 20, 2024
b410be9
updated reference
JayHuLBL Nov 21, 2024
8ce1dfb
Merge branch 'master' into issue3438_DXdehumidifier
JayHuLBL Dec 18, 2024
10323a2
increasse travis run time
JayHuLBL Dec 18, 2024
3b43a6d
deleted PLRtoPulse and modified validation model
JayHuLBL Dec 19, 2024
3da3de6
updated reference
JayHuLBL Dec 19, 2024
2cfa55c
reverted conf file
JayHuLBL Dec 19, 2024
0147776
updated E+ results in Ubuntu 20.04
JayHuLBL Dec 20, 2024
0e66ebf
updated reference
JayHuLBL Dec 20, 2024
fca4f4d
updated e+ results with the same python version as in travis
JayHuLBL Dec 20, 2024
26b47f4
updated E+ results with right python and OS
JayHuLBL Dec 21, 2024
b7f48af
updated reference
JayHuLBL Dec 21, 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
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
within Buildings.Fluid.Humidifiers.BaseClasses;
block PerformanceCurveModifier
"Block for calculating modifier curves"

parameter Buildings.Fluid.Humidifiers.Data.DXDehumidifier.Generic per
"Data record"
annotation (Placement(transformation(extent={{20,60},{40,80}})));

Modelica.Blocks.Interfaces.RealInput T
"Temperature"
annotation (Placement(transformation(extent={{-140,20},{-100,60}}),
iconTransformation(extent={{-140,20},{-100,60}})));

Modelica.Blocks.Interfaces.RealInput phi
"Relative Humidity"
annotation (Placement(transformation(extent={{-140,-60},{-100,-20}})));

Modelica.Blocks.Interfaces.RealOutput watRemMod
"Water removal modifier value"
annotation (Placement(transformation(extent={{100,30},{120,50}}),
iconTransformation(extent={{100,30},{120,50}})));

Modelica.Blocks.Interfaces.RealOutput eneFacMod
"Energy factor modifier value"
annotation (Placement(transformation(extent={{100,-50},{120,-30}}),
iconTransformation(extent={{100,-50},{120,-30}})));

equation
//-------------------------Part-load performance modifiers----------------------------//
// Compute the water removal and energy factor modifier fractions, using a biquadratic curve.
// Since the regression for capacity can have negative values
// (for unreasonable inputs), we constrain its return value to be
// non-negative.
watRemMod =Buildings.Utilities.Math.Functions.smoothMax(
x1=Buildings.Utilities.Math.Functions.biquadratic(
a=per.watRem,
x1=Modelica.Units.Conversions.to_degC(T),
x2=phi*100),
x2=0.001,
deltaX=0.0001);

eneFacMod =Buildings.Utilities.Math.Functions.smoothMax(
x1=Buildings.Utilities.Math.Functions.biquadratic(
a=per.eneFac,
x1=Modelica.Units.Conversions.to_degC(T),
x2=phi*100),
x2=0.001,
deltaX=0.0001);

annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={
Text(
extent={{-100,140},{100,100}},
textColor={0,0,255},
textString="%name"), Rectangle(extent={{-100,100},{100,-100}},
lineColor={0,0,127}),
Rectangle(
extent={{-100,100},{100,-100}},
lineColor={0,0,0},
fillColor={255,255,255},
fillPattern=FillPattern.Solid)}), Diagram(
coordinateSystem(preserveAspectRatio=false)),
Documentation(info="<html>
<h4>Performance Curve Modifiers</h4>
<p>
This block includes the following performance curve modifiers
</p>
<p>
The water removal modifier curve <code>watRemMod</code> is a biquadratic curve
with two independent variables: dry-bulb temperature and relative humidity of the
air entering the dehumidifier.
</p>
<p align=\"center\"><i>watRemMod(T<sub>in</sub>, phi<sub>in</sub>) = a<sub>1</sub>
+ a<sub>2</sub> T<sub>in</sub> + a<sub>3</sub> T<sub>in</sub><sup>2</sup>
+ a<sub>4</sub> phi<sub>in</sub> + a<sub>5</sub> phi<sub>in</sub><sup>2</sup>
+ a<sub>6</sub> T<sub>in</sub> phi<sub>in</sub></i>
</p>
<p>
The energy factor modifier curve <code>eneFacMod</code> is a biquadratic curve
with two independent variables: dry-bulb temperature and relative humidity of the
air entering the dehumidifier.
</p>
<p align=\"center\"><i>eneFacMod(T<sub>in</sub>, phi<sub>in</sub>) = b<sub>1</sub>
+ b<sub>2</sub> T<sub>in</sub> + b<sub>3</sub> T<sub>in</sub><sup>2</sup>
+ b<sub>4</sub> phi<sub>in</sub> + b<sub>5</sub> phi<sub>in</sub><sup>2</sup>
+ b<sub>6</sub> T<sub>in</sub> phi<sub>in</sub></i>
</p>
</html>", revisions="<html>
<ul>
<li>
Feburary 8, 2024, by Lingzhe Wang, Karthikeya Devaprasad, Xing Lu:<br/>
First implementation.
</li>
</ul>
</html>"));
end PerformanceCurveModifier;
13 changes: 13 additions & 0 deletions Buildings/Fluid/Humidifiers/BaseClasses/package.mo
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
within Buildings.Fluid.Humidifiers;
package BaseClasses "Package with base classes for Buildings.Fluid.Humidifiers"
extends Modelica.Icons.BasesPackage;

annotation (
Documentation(info="<html>
<p>
This package contains base classes that are used to construct the models in
<a href=\"modelica://Buildings.Fluid.Humidifiers\">
Buildings.Fluid.Humidifiers</a>.
</p>
</html>"));
end BaseClasses;
1 change: 1 addition & 0 deletions Buildings/Fluid/Humidifiers/BaseClasses/package.order
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
PerformanceCurveModifier
Loading