refs modelica#194: Rename nue to nu

beutlich · Jun 21, 2019 · 2be3a89 · 2be3a89
1 parent 8752820
commit 2be3a89
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 12 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
@@ -71,7 +71,7 @@ convertElement({"Modelica.Mechanics.Rotational.Components.Brake",
                 "mue0", "mu0");
 
 convertElement("Modelica.Thermal.FluidHeatFlow.Media.Medium",
-                "lamda", "lambda");
+                {"lamda", "nue"}, {"lambda", "nu"});
 convertElement("Modelica.Fluid.Dissipation.Utilities.Records.PressureLoss.Tjunction",
                 "united_converging_crossection", "united_converging_cross_section");
 convertElement("Modelica.Electrical.Spice3.Internal.Functions.junctionParamDepTempSPICE3",

diff --git a/Modelica/Thermal/FluidHeatFlow.mo b/Modelica/Thermal/FluidHeatFlow.mo
@@ -2132,7 +2132,7 @@ Thermodynamic equations are defined in partial models (package Partials).
         "Specific heat capacity at constant volume";
       parameter Modelica.SIunits.ThermalConductivity lambda = 1
         "Thermal conductivity";
-      parameter Modelica.SIunits.KinematicViscosity nue = 1
+      parameter Modelica.SIunits.KinematicViscosity nu = 1
         "Kinematic viscosity";
       annotation (defaultComponentPrefixes="parameter", Documentation(info="<html>
 Record containing (constant) medium properties.
@@ -2145,7 +2145,7 @@ Record containing (constant) medium properties.
       cp=1007,
       cv= 720,
       lambda=0.0264,
-      nue=16.3E-6);
+      nu=16.3E-6);
       annotation (defaultComponentPrefixes="parameter", Documentation(info="<html>
   Medium: properties of air at 30&deg;C and 1 bar
 </html>"));
@@ -2157,7 +2157,7 @@ Record containing (constant) medium properties.
       cp=1010,
       cv= 723,
       lambda=0.0293,
-      nue=20.3E-6);
+      nu=20.3E-6);
       annotation (defaultComponentPrefixes="parameter", Documentation(info="<html>
   Medium: properties of air at 70&deg;C and 1 bar
 </html>"));
@@ -2169,7 +2169,7 @@ Record containing (constant) medium properties.
       cp=4192,
       cv=4192,
       lambda=0.588,
-      nue=1.307E-6);
+      nu=1.307E-6);
       annotation (defaultComponentPrefixes="parameter", Documentation(info="<html>
   Medium: properties of water at 10&deg;C and 1 bar
 </html>"));
@@ -2181,7 +2181,7 @@ Record containing (constant) medium properties.
       cp=4177,
       cv=4177,
       lambda=0.615,
-      nue=0.8E-6);
+      nu=0.8E-6);
       annotation (defaultComponentPrefixes="parameter", Documentation(info="<html>
   Medium: properties of water at 30&deg;C and 1 bar
 </html>"));
@@ -2193,7 +2193,7 @@ Record containing (constant) medium properties.
       cp=4205,
       cv=4205,
       lambda=0.676,
-      nue=0.347E-6);
+      nu=0.347E-6);
       annotation (defaultComponentPrefixes="parameter", Documentation(info="<html>
   Medium: properties of water at 90&deg;C and 1 bar
 </html>"));
@@ -2205,7 +2205,7 @@ Record containing (constant) medium properties.
         cp=3910,
         cv=3910,
         lambda=0.523,
-        nue=1.69E-6);
+        nu=1.69E-6);
       annotation (defaultComponentPrefixes="parameter", Documentation(info="<html>
   Medium: properties of glycol:water 20:80 (anti-freeze -8&deg;C) at 20&deg; and 1 bar
 </html>"));
@@ -2217,7 +2217,7 @@ Record containing (constant) medium properties.
         cp=3300,
         cv=3300,
         lambda=0.405,
-        nue=3.98E-6);
+        nu=3.98E-6);
       annotation (defaultComponentPrefixes="parameter", Documentation(info="<html>
   Medium: properties of glycol:water 50:50 (anti-freeze -40&deg;C) at 20&deg;C and 1 bar
 </html>"));
@@ -2229,7 +2229,7 @@ Record containing (constant) medium properties.
         cp=2010,
         cv=2010,
         lambda=0.14,
-        nue=81.8E-6);
+        nu=81.8E-6);
       annotation (defaultComponentPrefixes="parameter", Documentation(info="<html>
   Medium: properties of mineral oil at 60&deg;C and 1 bar
 </html>"));

diff --git a/ModelicaTest/Fluid/Dissipation.mo b/ModelicaTest/Fluid/Dissipation.mo
@@ -5185,7 +5185,7 @@ extends Modelica.Icons.ExamplesPackage;
 
           parameter Integer n=size(rho, 1)
             "number of different fluid density values";
-          parameter Modelica.SIunits.KinematicViscosity nue=1e-6
+          parameter Modelica.SIunits.KinematicViscosity nu=1e-6
             "kinetic viscosity of fluid";
 
           //general variables
@@ -5211,7 +5211,7 @@ extends Modelica.Icons.ExamplesPackage;
           parameter Modelica.SIunits.SpecificHeatCapacityAtConstantPressure cp=
               4190 "specific heat capacity at constant pressure of fluid"
             annotation (Dialog(group="FluidProperties"));
-          Modelica.SIunits.DynamicViscosity eta[:]={rho[i]*nue for i in 1:n}
+          Modelica.SIunits.DynamicViscosity eta[:]={rho[i]*nu for i in 1:n}
             "dynamic viscosity of fluid" annotation (Dialog(group="FluidProperties"));
           parameter Modelica.SIunits.ThermalConductivity lambda=0.6
             "thermal conductivity of fluid"

diff --git a/ModelicaTestConversion4.mo b/ModelicaTestConversion4.mo
@@ -603,6 +603,21 @@ Conversion test for <a href=\"https://github.com/modelica/ModelicaStandardLibrar
 
     package FluidHeatFlow
       extends Modelica.Icons.ExamplesPackage;
+      model Issue194 "Conversion test for #194"
+        extends Modelica.Icons.Example;
+        parameter Modelica.Thermal.FluidHeatFlow.Media.Medium r1 = Modelica.Thermal.FluidHeatFlow.Media.Medium(nue=2);
+        record R
+          extends Modelica.Thermal.FluidHeatFlow.Media.Medium(nue=3);
+        end R;
+        parameter R r2;
+        Real y[:] = {r1.nue, r2.nue};
+      annotation(experiment(StopTime=1), Documentation(info="<html>
+<p>
+Conversion test for <a href=\"https://github.com/modelica/ModelicaStandardLibrary/issues/194\">#194</a>.
+</p>
+</html>"));
+      end Issue194;
+
       model Issue940 "Conversion test for #940"
         extends Modelica.Icons.Example;
         parameter Modelica.Thermal.FluidHeatFlow.Media.Medium r1 = Modelica.Thermal.FluidHeatFlow.Media.Medium(lamda=2);