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 index f9f3173281..511aca89d8 100644 --- 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 @@ -48,6 +48,10 @@ convertElement({"Modelica.Mechanics.Rotational.Sources.SignTorque"}, convertElement("Modelica.Electrical.QuasiStationary.MultiPhase.Basic.VariableConductor", "variableResistor", "variableConductor"); +convertModifiers({"Modelica.Thermal.HeatTransfer.Rankine.ToKelvin", + "Modelica.Thermal.HeatTransfer.Rankine.FromKelvin", + "Modelica.Thermal.HeatTransfer.Fahrenheit.FromKelvin"}, + {"n"}, fill("", 0), true); convertModifiers({"Modelica.Blocks.Nonlinear.Limiter", "Modelica.Blocks.Nonlinear.VariableLimiter", "Modelica.Blocks.Continuous.LimPID"}, diff --git a/Modelica/Thermal/HeatTransfer.mo b/Modelica/Thermal/HeatTransfer.mo index 00d20b2bb6..afcd6059fb 100644 --- a/Modelica/Thermal/HeatTransfer.mo +++ b/Modelica/Thermal/HeatTransfer.mo @@ -2368,7 +2368,6 @@ and provides is as output signal. end ToKelvin; model FromKelvin "Conversion from Kelvin to degFahrenheit" - parameter Integer n=1 "Only kept for backwards compatibility (parameter is not used in the model and will be removed in a future version)" annotation(Dialog(enable=false)); Modelica.Blocks.Interfaces.RealInput Kelvin(unit="K") annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); Modelica.Blocks.Interfaces.RealOutput Fahrenheit(unit="degF") @@ -2652,7 +2651,6 @@ Example: extends Modelica.Icons.VariantsPackage; model ToKelvin "Conversion block from degRankine to Kelvin" - parameter Integer n=1 "Only kept for backwards compatibility (parameter is not used in the model and will be removed in a future version)" annotation(Dialog(enable=false)); Modelica.Blocks.Interfaces.RealInput Rankine(unit="degRk") annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); Modelica.Blocks.Interfaces.RealOutput Kelvin(unit="K") @@ -2702,7 +2700,6 @@ and provides them as output signals. end ToKelvin; model FromKelvin "Conversion from Kelvin to degRankine" - parameter Integer n=1 "Only kept for backwards compatibility (parameter is not used in the model and will be removed in a future version)" annotation(Dialog(enable=false)); Modelica.Blocks.Interfaces.RealInput Kelvin(unit="K") annotation (Placement(transformation(extent={{-140,-20},{-100,20}}))); Modelica.Blocks.Interfaces.RealOutput Rankine(unit="degRk") diff --git a/ModelicaTestConversion4.mo b/ModelicaTestConversion4.mo index e31af7a8e0..f7362bd637 100644 --- a/ModelicaTestConversion4.mo +++ b/ModelicaTestConversion4.mo @@ -324,6 +324,29 @@ Conversion test for #1202. +

+")); + end Issue1202; + end HeatTransfer; + end Thermal; + package SIunits extends Modelica.Icons.ExamplesPackage; model Issue385 "Conversion test for #385"