Merge pull request #97 from UdK-VPT/rerun_IBPSA_merge

merge IBPSA
UdK-VPT · Oct 25, 2017 · 67a91f3 · 67a91f3
2 parents 4088c2e + da5def8
commit 67a91f3
Show file tree

Hide file tree

Showing 380 changed files with 4,826 additions and 2,697 deletions.
diff --git a/BuildingSystems/.copiedFiles.txt b/BuildingSystems/.copiedFiles.txt
diff --git a/BuildingSystems/Fluid/FMI/Conversion/Validation/InletToAirDryAir.mo b/BuildingSystems/Fluid/FMI/Conversion/Validation/InletToAirDryAir.mo
@@ -2,7 +2,7 @@ within BuildingSystems.Fluid.FMI.Conversion.Validation;
 model InletToAirDryAir
   "Validation model for inlet to air with dry air medium"
   extends BuildingSystems.Fluid.FMI.Conversion.Validation.InletToAirMoistAir(
-    redeclare package Medium = Modelica.Media.Air.SimpleAir);
+    redeclare replaceable package Medium = Modelica.Media.Air.SimpleAir);
   annotation (Documentation(info="<html>
 <p>
 This validation test is identical to

diff --git a/BuildingSystems/Fluid/FMI/Conversion/Validation/InletToAirDryAirCO2.mo b/BuildingSystems/Fluid/FMI/Conversion/Validation/InletToAirDryAirCO2.mo
@@ -2,7 +2,7 @@ within BuildingSystems.Fluid.FMI.Conversion.Validation;
 model InletToAirDryAirCO2
   "Validation model for inlet to air with dry air medium and CO2"
   extends BuildingSystems.Fluid.FMI.Conversion.Validation.InletToAirMoistAirCO2(
-    redeclare package Medium = Modelica.Media.Air.SimpleAir(extraPropertiesNames={"CO2"}));
+    redeclare replaceable package Medium = Modelica.Media.Air.SimpleAir(extraPropertiesNames={"CO2"}));
   annotation (Documentation(info="<html>
 <p>
 This validation test is identical to

diff --git a/BuildingSystems/Fluid/FMI/Conversion/Validation/InletToAirMoistAirCO2.mo b/BuildingSystems/Fluid/FMI/Conversion/Validation/InletToAirMoistAirCO2.mo
@@ -2,7 +2,7 @@ within BuildingSystems.Fluid.FMI.Conversion.Validation;
 model InletToAirMoistAirCO2
   "Validation model for inlet to BuildingSystems.Media.Air conversion with C02 trace substances"
   extends BuildingSystems.Fluid.FMI.Conversion.Validation.InletToAirDryAir(
-    redeclare package Medium = BuildingSystems.Media.Air(extraPropertiesNames={"CO2"}));
+    redeclare replaceable package Medium = BuildingSystems.Media.Air(extraPropertiesNames={"CO2"}));
   Modelica.Blocks.Sources.Constant CRev[Medium.nC](each k=0.8)
               "Trace substance for reverse flow"
     annotation (Placement(transformation(extent={{92,-80},{72,-60}})));

diff --git a/BuildingSystems/Fluid/Sensors/TemperatureTwoPort.mo b/BuildingSystems/Fluid/Sensors/TemperatureTwoPort.mo
@@ -28,7 +28,9 @@ model TemperatureTwoPort "Ideal two port temperature sensor"
 protected
   parameter Real tauHeaTraInv(final unit = "1/s")=
     if tauHeaTra<1E-10 then 0 else 1/tauHeaTra
-    "Dummy parameter to avoid division by tauLoss";
+    "Dummy parameter to avoid division by tauHeaTra";
+  parameter Real ratTau = if dynamic then tauHeaTra/tau else 1
+    "Ratio of tau";
   Medium.Temperature TMed(start=T_start)
     "Medium temperature to which the sensor is exposed";
   Medium.Temperature T_a_inflow "Temperature of inflowing fluid at port_a";
@@ -63,7 +65,7 @@ equation
   // Output signal of sensor
   if dynamic then
     if transferHeat then
-      der(T) = (TMed-T)*k*tauInv + (TAmb-T)*tauHeaTraInv;
+      der(T) = (TMed-T)*k*tauInv + (TAmb-T)*tauHeaTraInv/(ratTau*k+1);
     else
       der(T) = (TMed-T)*k*tauInv;
     end if;
@@ -134,7 +136,8 @@ BuildingSystems.Fluid.Sensors.UsersGuide</a> for an explanation.
 If <code>transferHeat = true</code>, then heat transfer with the ambient is
 approximated and <i>T</i> converges towards the fixed ambient
 temperature <i>T<sub>Amb</sub></i> using a first order approximation
-with a time constant of <code>tauHeaTra</code>.
+with a time constant of <code>tauHeaTra</code>
+when the flow rate is small.
 Note that no energy is exchanged with the fluid as the
 sensor does not influence the fluid temperature.
 </p>
@@ -153,6 +156,12 @@ the mass flow rate on should set <code>transferHeat=false</code>.
 </html>", revisions="<html>
 <ul>
 <li>
+October 23, 2017 by Filip Jorissen:<br/>
+Revised implementation of equations 
+when <code>transferHeat=true</code>.
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/840\">#840</a>.
+</li>
+<li>
 January 12, 2016 by Filip Jorissen:<br/>
 Removed parameter <code>tauInv</code>
 since this now exists in

diff --git a/...ferenceResults/Dymola/BuildingSystems_Airflow_Multizone_BaseClasses_Examples_PowerLaw.txt b/...ferenceResults/Dymola/BuildingSystems_Airflow_Multizone_BaseClasses_Examples_PowerLaw.txt
diff --git a/...eResults/Dymola/BuildingSystems_Airflow_Multizone_BaseClasses_Examples_PowerLawFixedM.txt b/...eResults/Dymola/BuildingSystems_Airflow_Multizone_BaseClasses_Examples_PowerLawFixedM.txt
diff --git a/...lts/Dymola/BuildingSystems_Airflow_Multizone_BaseClasses_Examples_WindPressureLowRise.txt b/...lts/Dymola/BuildingSystems_Airflow_Multizone_BaseClasses_Examples_WindPressureLowRise.txt
diff --git a/...s/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_Examples_CO2TransportStep.txt b/...s/ReferenceResults/Dymola/BuildingSystems_Airflow_Multizone_Examples_CO2TransportStep.txt