Merge pull request #3799 from karthikeyad-pnnl/issue3438_DXdehumidifi…

…er_mergeFix Issue3438 d xdehumidifier merge fix
lbl-srg · Apr 16, 2024 · 82b7a73 · 82b7a73
2 parents 5343321 + da22a85
commit 82b7a73
Show file tree

Hide file tree

Showing 13 changed files with 57 additions and 53 deletions.
diff --git a/Buildings/Fluid/Humidifiers/BaseClasses/PerformanceCurveModifier.mo b/Buildings/Fluid/Humidifiers/BaseClasses/PerformanceCurveModifier.mo
@@ -2,7 +2,7 @@ within Buildings.Fluid.Humidifiers.BaseClasses;
 block PerformanceCurveModifier
   "Block for calculating modifier curves"
 
-  parameter Buildings.Fluid.Humidifiers.Data.Generic per
+  parameter Buildings.Fluid.Humidifiers.Data.DXDehumidifier.Generic per
     "Data record"
     annotation (Placement(transformation(extent={{22,64},{42,84}})));
 

diff --git a/Buildings/Fluid/Humidifiers/DXDehumidifier.mo b/Buildings/Fluid/Humidifiers/DXDehumidifier.mo
@@ -5,7 +5,7 @@ model DXDehumidifier "DX dehumidifier"
   parameter Boolean addPowerToMedium = true
     "Transfer power and heat to the fluid medium";
 
-  parameter Buildings.Fluid.Humidifiers.Data.Generic per
+  parameter Buildings.Fluid.Humidifiers.Data.DXDehumidifier.Generic per
     "Performance data"
     annotation (choicesAllMatching=true,
       Placement(transformation(extent={{60,80},{80,100}})));
@@ -116,6 +116,7 @@ model DXDehumidifier "DX dehumidifier"
   Buildings.Fluid.Humidifiers.BaseClasses.PerformanceCurveModifier perCurMod(per=per)
     "Block for calculating modifier curves"
     annotation (Placement(transformation(extent={{-50,-110},{-30,-90}})));
+
 protected
   constant Modelica.Units.SI.SpecificEnthalpy h_fg= Buildings.Utilities.Psychrometrics.Constants.h_fg
     "Latent heat of water vapor";

diff --git a/Buildings/Fluid/Humidifiers/Data/DXDehumidifier/EnergyPlus.mo b/Buildings/Fluid/Humidifiers/Data/DXDehumidifier/EnergyPlus.mo
@@ -0,0 +1,35 @@
+within Buildings.Fluid.Humidifiers.Data.DXDehumidifier;
+record EnergyPlus
+  "Example data record for DX dehumidifier model from EnergyPlus"
+
+  extends Buildings.Fluid.Humidifiers.Data.DXDehumidifier.Generic(watRem={-2.72487866408,
+        0.100711983591,-9.90538285E-04,0.050053043874,-2.03629282E-04,-3.41750531E-04},
+      eneFac={-2.38831907E+00,0.093047739452,-1.36970033E-03,0.066533716758,-3.43198063E-04,
+        -5.62490295E-04});
+
+  annotation (preferredView="info",
+  Documentation(info="<html>
+  <p>This is an example data record for the DX dehumidifier that uses parameters 
+  from an EnergyPlus v23.1.0 Example model <code>SingleFamilyHouse_HP_Slab_Dehumidification.idf</code>.
+  </p>
+</html>",
+revisions="<html>
+<ul>
+<li>
+June 20, 2023, by Xing Lu and Karthik Devaprasad:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(graphics={
+        Text(
+          extent={{-91,1},{-8,-54}},
+          textColor={0,0,255},
+          fontSize=16,
+          textString="watRem"),
+        Text(
+          extent={{2,-16},{94,-38}},
+          textColor={0,0,255},
+          textString="eneFac",
+          fontSize=16)}));
+end EnergyPlus;
diff --git a/Buildings/Fluid/Humidifiers/Data/Generic.mo → ...umidifiers/Data/DXDehumidifier/Generic.mo b/Buildings/Fluid/Humidifiers/Data/Generic.mo → ...umidifiers/Data/DXDehumidifier/Generic.mo
@@ -1,4 +1,4 @@
-within Buildings.Fluid.Humidifiers.Data;
+within Buildings.Fluid.Humidifiers.Data.DXDehumidifier;
 record Generic
   "Base data record for DX dehumidifier model"
 

diff --git a/Buildings/Fluid/Humidifiers/Data/DXDehumidifier/package.mo b/Buildings/Fluid/Humidifiers/Data/DXDehumidifier/package.mo
@@ -0,0 +1,11 @@
+within Buildings.Fluid.Humidifiers.Data;
+package DXDehumidifier
+  "Package with data record for DX dehumidifier"
+  extends Modelica.Icons.MaterialPropertiesPackage;
+
+annotation (Documentation(info="<html>
+<p>
+This package contains data records for the zone air DX dehumidifier.
+</p>
+</html>"));
+end DXDehumidifier;
diff --git a/Buildings/Fluid/Humidifiers/Data/DXDehumidifier/package.order b/Buildings/Fluid/Humidifiers/Data/DXDehumidifier/package.order
@@ -0,0 +1,2 @@
+EnergyPlus
+Generic
diff --git a/Buildings/Fluid/Humidifiers/Data/package.mo b/Buildings/Fluid/Humidifiers/Data/package.mo
@@ -1,10 +1,11 @@
 within Buildings.Fluid.Humidifiers;
-package Data "Package with data record for DX dehumidifier"
+package Data
+  "Package with data records for classes in Humidifiers package"
   extends Modelica.Icons.MaterialPropertiesPackage;
 
 annotation (Documentation(info="<html>
 <p>
-This package contains a data record baseclass for the zone air DX dehumidifier.
+This package contains data records for the classes in the Humidifiers package.
 </p>
 </html>"));
 end Data;
diff --git a/Buildings/Fluid/Humidifiers/Data/package.order b/Buildings/Fluid/Humidifiers/Data/package.order
@@ -1 +1 @@
-Generic
+DXDehumidifier
diff --git a/Buildings/Fluid/Humidifiers/Validation/DXDehumidifier.mo b/Buildings/Fluid/Humidifiers/Validation/DXDehumidifier.mo
@@ -10,7 +10,7 @@ model DXDehumidifier "Validation model for DX dehumidifier"
   parameter Modelica.Units.SI.Time tStepAve = 3600
     "Time-step used to average out Modelica results for comparison with EPlus results";
 
-  parameter Buildings.Fluid.Humidifiers.Validation.Data.DXDehumidifier per
+  parameter Buildings.Fluid.Humidifiers.Data.DXDehumidifier.EnergyPlus per
     "Zone air DX dehumidifier curve"
     annotation (Placement(transformation(extent={{-40,66},{-20,86}})));
 

diff --git a/Buildings/Fluid/Humidifiers/Validation/Data/DXDehumidifier.mo b/Buildings/Fluid/Humidifiers/Validation/Data/DXDehumidifier.mo
diff --git a/Buildings/Fluid/Humidifiers/Validation/Data/package.mo b/Buildings/Fluid/Humidifiers/Validation/Data/package.mo
diff --git a/Buildings/Fluid/Humidifiers/Validation/Data/package.order b/Buildings/Fluid/Humidifiers/Validation/Data/package.order
diff --git a/Buildings/Fluid/Humidifiers/Validation/package.order b/Buildings/Fluid/Humidifiers/Validation/package.order
@@ -3,4 +3,3 @@ SprayAirWasher_X
 SprayAirWasher_X_dynamic
 SteamHumidifier_X
 SteamHumidifier_X_dynamic
-Data