Add explicit conversion rules

* Add explicit conversion rules for Modelica.Media.Interfaces.PartialCondensingGases.gasConstant and Modelica.Media.Interfaces.PartialRealCondensingGases.gasConstant * Add conversion test medium packages As reported by https://trac.openmodelica.org/OpenModelica/ticket/5297#comment:13
wischhusen · Sep 25, 2021 · bbb75a5 · bbb75a5
1 parent f095aa0
commit bbb75a5
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 0 deletions.
diff --git a/Modelica/Resources/Scripts/Conversion/ConvertModelica_from_3.2.3_to_4.0.0.mos b/Modelica/Resources/Scripts/Conversion/ConvertModelica_from_3.2.3_to_4.0.0.mos
@@ -1948,3 +1948,7 @@ convertElement("Modelica.Media.Interfaces.PartialSimpleMedium.BaseProperties", "
 convertElement("Modelica.Media.Interfaces.PartialTwoPhaseMedium.BaseProperties", "R", "R_s")
 convertElement("Modelica.Media.R134a.R134a_ph.BaseProperties", "R", "R_s")
 convertElement("Modelica.Media.Water.WaterIF97_base.BaseProperties", "R", "R_s")
+
+// Reported by https://trac.openmodelica.org/OpenModelica/ticket/5297#comment:13
+convertElement("Modelica.Media.Interfaces.PartialCondensingGases.gasConstant", "R", "R_s");
+convertElement("Modelica.Media.Interfaces.PartialRealCondensingGases.gasConstant", "R", "R_s");
diff --git a/ModelicaTestConversion4.mo b/ModelicaTestConversion4.mo
@@ -2837,6 +2837,46 @@ Conversion test for <a href=\"https://github.com/modelica/ModelicaStandardLibrar
 </p>
 </html>"));
     end Issue3205;
+
+    package Issue3767_PartialCondensingGases
+      extends Modelica.Media.Interfaces.PartialCondensingGases(
+        mediumName="Test",
+        substanceNames={"water", "air"});
+
+      redeclare function setState_pTX
+        extends Modelica.Media.Air.MoistAir.setState_pTX;
+      end setState_pTX;
+
+      redeclare function extends gasConstant "Gas constant"
+      algorithm
+        R := 23;
+      end gasConstant;
+      annotation(Documentation(info="<html>
+<p>
+Conversion test for <a href=\"https://github.com/modelica/ModelicaStandardLibrary/issues/3767\">#3767</a>.
+</p>
+</html>"));
+    end Issue3767_PartialCondensingGases;
+
+    package Issue3767_PartialRealCondensingGases
+      extends Modelica.Media.Interfaces.PartialRealCondensingGases(
+        mediumName="Test",
+        substanceNames={"water", "air"});
+
+      redeclare function setState_pTX
+        extends Modelica.Media.Air.MoistAir.setState_pTX;
+      end setState_pTX;
+
+      redeclare function extends gasConstant "Gas constant"
+      algorithm
+        R := 23;
+      end gasConstant;
+      annotation(Documentation(info="<html>
+<p>
+Conversion test for <a href=\"https://github.com/modelica/ModelicaStandardLibrary/issues/3767\">#3767</a>.
+</p>
+</html>"));
+    end Issue3767_PartialRealCondensingGases;
   end Media;
 
   package Thermal