Merge pull request #2997 from christiankral/FluidHeatFlow_Partials

Move FluidHeatFlow models of Interfaces.Partials to Interfaces

Author: AHaumer

Modelica/Resources/Scripts/Conversion/ConvertModelica_from_3.2.3_to_4.0.0.mos

@@ -61,12 +61,6 @@ convertClass("Modelica.Electrical.Machines.BasicMachines.QuasiStationaryDCMachin
               "Modelica.Electrical.Machines.BasicMachines.QuasiStaticDCMachines");
 convertClass("Modelica.Electrical.Machines.BasicMachines.Components.BasicTransformer",
               "Modelica.Electrical.Machines.Interfaces.PartialBasicTransformer");
-convertClass("Modelica.Thermal.FluidHeatFlow.Components.IsolatedPipe",
-              "Modelica.Thermal.FluidHeatFlow.Components.Pipe");
-convertClass("Modelica.Thermal.FluidHeatFlow.Components.HeatedPipe",
-              "Modelica.Thermal.FluidHeatFlow.Components.Pipe");
-convertClass("Modelica.Thermal.FluidHeatFlow.Interfaces.Partials.Ambient",
-              "Modelica.Thermal.FluidHeatFlow.Interfaces.Partials.SinglePortLeft");
 convertClass("Modelica.Blocks.Sources.Clock",
               "Modelica.Blocks.Sources.ContinuousClock")
 convertClass("Modelica.Electrical.Digital.Sources.Clock",
@@ -219,7 +213,6 @@ convertClass("Modelica.Magnetic.QuasiStatic.FluxTubes.Interfaces.PartialFixedSha
               "Modelica.Magnetic.QuasiStatic.FluxTubes.BaseClasses.FixedShape");
 convertClass("Modelica.Magnetic.QuasiStatic.FluxTubes.Interfaces.PartialLeakage",
               "Modelica.Magnetic.QuasiStatic.FluxTubes.BaseClasses.Leakage");
-// Issue #496
 convertClass("Modelica.Magnetic.FluxTubes.Interfaces.PartialTwoPortsElementary",
               "Modelica.Magnetic.FluxTubes.Interfaces.TwoPortsElementary")
 convertClass("Modelica.Magnetic.FluxTubes.Interfaces.PartialTwoPorts",
@@ -236,6 +229,26 @@ convertClass("Modelica.Magnetic.FluxTubes.Interfaces.PartialGenericHysteresis",
               "Modelica.Magnetic.FluxTubes.BaseClasses.GenericHysteresis")
 convertClass("Modelica.Magnetic.FluxTubes.Interfaces.PartialGenericHysteresisTellinen",
               "Modelica.Magnetic.FluxTubes.BaseClasses.GenericHysteresisTellinen")
+convertClass("Modelica.Thermal.FluidHeatFlow.Components.IsolatedPipe",
+              "Modelica.Thermal.FluidHeatFlow.Components.Pipe");
+convertClass("Modelica.Thermal.FluidHeatFlow.Components.HeatedPipe",
+              "Modelica.Thermal.FluidHeatFlow.Components.Pipe");
+convertClass("Modelica.Thermal.FluidHeatFlow.Interfaces.Partials.Ambient",
+              "Modelica.Thermal.FluidHeatFlow.BaseClasses.SinglePortLeft");
+convertClass("Modelica.Thermal.FluidHeatFlow.Interfaces.Partials.TwoPort",
+              "Modelica.Thermal.FluidHeatFlow.BaseClasses.TwoPort");
+convertClass("Modelica.Thermal.FluidHeatFlow.Interfaces.Partials.SinglePortLeft",
+              "Modelica.Thermal.FluidHeatFlow.BaseClasses.SinglePortLeft");
+convertClass("Modelica.Thermal.FluidHeatFlow.Interfaces.Partials.SinglePortBottom",
+              "Modelica.Thermal.FluidHeatFlow.BaseClasses.SinglePortBottom");
+convertClass("Modelica.Thermal.FluidHeatFlow.Interfaces.Partials.SimpleFriction",
+              "Modelica.Thermal.FluidHeatFlow.BaseClasses.SimpleFriction");
+convertClass("Modelica.Thermal.FluidHeatFlow.Interfaces.Partials.AbsoluteSensor",
+              "Modelica.Thermal.FluidHeatFlow.Interfaces.AbsoluteSensor");
+convertClass("Modelica.Thermal.FluidHeatFlow.Interfaces.Partials.RelativeSensor",
+              "Modelica.Thermal.FluidHeatFlow.Interfaces.RelativeSensor");
+convertClass("Modelica.Thermal.FluidHeatFlow.Interfaces.Partials.FlowSensor",
+              "Modelica.Thermal.FluidHeatFlow.Interfaces.FlowSensor");
 
 // Change renamed elements of classes
 // mue -> mu