diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ThermoPower 3.1.0-master/Examples.mo" "converted-libraries/.openmodelica/libraries/ThermoPower 3.1.0-master/Examples.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ThermoPower 3.1.0-master/Examples.mo" 2022-03-10 09:57:37.952144121 +0000 +++ "converted-libraries/.openmodelica/libraries/ThermoPower 3.1.0-master/Examples.mo" 2022-03-10 09:59:05.900155259 +0000 @@ -859,7 +859,7 @@ Models.CISEPlant Plant annotation (Placement(transformation(extent={{120,-40},{180,20}}))); initial equation - // Additional equations to determine the non-fixed parameters +// Additional equations to determine the non-fixed parameters Plant.Drum.y = InitialDrumLevel; Plant.Drum.p = InitialDrumPressure; @@ -1029,7 +1029,7 @@ connect(sum_1.y, wfeed.u3) annotation (Line(points={{-59,-20},{-46,-20},{ -46,2},{-22,2}}, color={0,0,127})); initial equation - // Additional equations to determine the non-fixed parameters +// Additional equations to determine the non-fixed parameters Plant.DrumLevel = InitialDrumLevel; Plant.DrumPressure = InitialDrumPressure; @@ -1351,7 +1351,7 @@ extends Modelica.Icons.ExamplesPackage; package Models - extends Modelica.Icons.Library; + extends Modelica.Icons.Package; model HeatExchanger "Base class for heat exchanger fluid - gas" constant Real pi=Modelica.Constants.pi; replaceable package GasMedium = @@ -1517,7 +1517,7 @@ parameter Integer N=2 "Number of node of the gas side"; - //Nominal parameter +//Nominal parameter parameter SI.MassFlowRate gasNomFlowRate "Nominal flow rate through the gas side"; parameter SI.MassFlowRate fluidNomFlowRate @@ -1527,7 +1527,7 @@ parameter SI.Pressure fluidNomPressure "Nominal pressure in the fluid side inlet"; - //Physical Parameter +//Physical Parameter parameter SI.Area exchSurface "Exchange surface between gas - metal tube"; parameter SI.Volume gasVol "Gas volume"; @@ -1537,7 +1537,7 @@ parameter SI.SpecificHeatCapacity cm "Specific heat capacity of the metal"; - //Start value +//Start value parameter SI.Temperature Tstart "Average gas temperature start value" annotation (Dialog(tab="Initialization")); parameter SI.CoefficientOfHeatTransfer gamma @@ -1849,7 +1849,7 @@ model DigitalPI extends Modelica.Blocks.Interfaces.DiscreteBlock; parameter Real Kp "Gain"; - parameter Modelica.SIunits.Time Ti(min=0) "Integral time"; + parameter Modelica.Units.SI.Time Ti(min=0) "Integral time"; parameter Real b(min=0) = 1 "Set-point weight (proportional action)"; parameter Real CSmax "Control signal saturation upper bound"; parameter Real CSmin "Control signal saturation lower bound"; @@ -2029,9 +2029,9 @@ model OpenLoopSimulatorHtc "Open-loop plant simulator with parameter computation" extends OpenLoopSimulatorSS(Plant(Boiler(gamma_nom = gamma_unknown))); - parameter Modelica.SIunits.CoefficientOfHeatTransfer gamma_unknown(fixed = false, start = 150); + parameter Modelica.Units.SI.CoefficientOfHeatTransfer gamma_unknown(fixed = false, start = 150); initial equation - Plant.GasOut.T = Modelica.SIunits.Conversions.from_degC(130); + Plant.GasOut.T = Modelica.Units.Conversions.from_degC(130); annotation (Documentation(revisions="