diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Blocks/ESC.mo" "converted-libraries/.openmodelica/libraries/LibRAS master/Blocks/ESC.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Blocks/ESC.mo" 2022-03-10 09:57:37.004143999 +0000 +++ "converted-libraries/.openmodelica/libraries/LibRAS master/Blocks/ESC.mo" 2022-03-10 09:57:51.388145822 +0000 @@ -4,13 +4,13 @@ extends Modelica.Blocks.Interfaces.SISO; parameter Real preamp = 1 "Preamplifier gain"; parameter Real k = 1 "Integrator Gain"; - parameter Modelica.SIunits.Frequency f = 1 "Perturbation frequency"; + parameter Modelica.Units.SI.Frequency f = 1 "Perturbation frequency"; parameter Real a = 1 "Perturbation amplitude"; parameter Real Tf = 1 "Highpass time constant"; parameter Real m = 0 "Base level of output"; - parameter Modelica.SIunits.Time startTime = 1 "Activate when time >= startTime"; + parameter Modelica.Units.SI.Time startTime = 1 "Activate when time >= startTime"; - Modelica.Blocks.Sources.Sine sine1(amplitude = a, freqHz = f, startTime = startTime) annotation( + Modelica.Blocks.Sources.Sine sine1(amplitude = a, f = f, startTime = startTime) annotation( Placement(visible = true, transformation(origin = {-58, -36}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); Modelica.Blocks.Continuous.Integrator integrator1(k = k) annotation( Placement(visible = true, transformation(origin = {8, -30}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Culture/Fish.mo" "converted-libraries/.openmodelica/libraries/LibRAS master/Culture/Fish.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Culture/Fish.mo" 2022-03-10 09:57:37.004143999 +0000 +++ "converted-libraries/.openmodelica/libraries/LibRAS master/Culture/Fish.mo" 2022-03-10 09:57:51.304145812 +0000 @@ -3,8 +3,8 @@ package Fish record FishData parameter Real TGC (min=0) "Temperature growth coefficient"; - parameter Modelica.SIunits.MassFlowRate O2rate (min=0) "Respiration rate in kgO2/kg fish/s"; - parameter Modelica.SIunits.MassFlowRate CO2rate (min=0) = O2rate*44/32 "CO2 production rate in gCO2/kg fish/s"; + parameter Modelica.Units.SI.MassFlowRate O2rate (min=0) "Respiration rate in kgO2/kg fish/s"; + parameter Modelica.Units.SI.MassFlowRate CO2rate (min=0) = O2rate*44/32 "CO2 production rate in gCO2/kg fish/s"; parameter Real mortality (min=0) "Mortality rate, percent dead per production cycle"; parameter Real[2] T1 (each unit="h"); parameter Real[2] T2 (each unit="h"); @@ -22,7 +22,7 @@ parameter Real COD = (0.528*protein+0.4*carbohydrate+0.78*fat)*(32/12)-inert; parameter Real inert (min=0) "Inert"; - parameter Modelica.SIunits.Density bodyDensity = 1e3 "Fish body density"; + parameter Modelica.Units.SI.Density bodyDensity = 1e3 "Fish body density"; end FishData; record RainbowTrout = FishData( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Culture/PartialCulture.mo" "converted-libraries/.openmodelica/libraries/LibRAS master/Culture/PartialCulture.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Culture/PartialCulture.mo" 2022-03-10 09:57:37.004143999 +0000 +++ "converted-libraries/.openmodelica/libraries/LibRAS master/Culture/PartialCulture.mo" 2022-03-10 09:57:51.296145811 +0000 @@ -1,10 +1,10 @@ within LibRAS.Culture; partial model PartialCulture - import SI = Modelica.SIunits; - import Modelica.SIunits.Conversions.from_day; - import Modelica.SIunits.Conversions.from_hour; - import Modelica.SIunits.Conversions.from_minute; + import Modelica.Units.SI; + import Modelica.Units.Conversions.from_day; + import Modelica.Units.Conversions.from_hour; + import Modelica.Units.Conversions.from_minute; import LibRAS.Types.Species.S; import LibRAS.Types.Species.X; @@ -18,7 +18,7 @@ parameter SI.Volume[nTanks] tankVolumes = fill(1, nTanks) "Vector of fish basin volumes"; // GROWTH AND FEEDING - parameter SI.Temp_C T = 15 "Farming temperature"; + parameter Modelica.Units.NonSI.Temperature_degC T = 15 "Farming temperature"; // OUTPUTS output SI.Volume[nTanks] Vw "Tank water volume (tank volume - fish displacement) in m3"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Culture/SSCulture_V.mo" "converted-libraries/.openmodelica/libraries/LibRAS master/Culture/SSCulture_V.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Culture/SSCulture_V.mo" 2022-03-10 09:57:37.004143999 +0000 +++ "converted-libraries/.openmodelica/libraries/LibRAS master/Culture/SSCulture_V.mo" 2022-03-10 09:57:51.260145806 +0000 @@ -3,10 +3,10 @@ model SSCulture_V "Steady-state fish culture specified by tank volumes and maximum stocking density" extends Culture.PartialCulture; - import SI = Modelica.SIunits; - import Modelica.SIunits.Conversions.from_day; - import Modelica.SIunits.Conversions.from_hour; - import Modelica.SIunits.Conversions.from_minute; + import Modelica.Units.SI; + import Modelica.Units.Conversions.from_day; + import Modelica.Units.Conversions.from_hour; + import Modelica.Units.Conversions.from_minute; import LibRAS.Types.Species.S; import LibRAS.Types.Species.X; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Culture/SSCulture_V_noEvent.mo" "converted-libraries/.openmodelica/libraries/LibRAS master/Culture/SSCulture_V_noEvent.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Culture/SSCulture_V_noEvent.mo" 2022-03-10 09:57:37.004143999 +0000 +++ "converted-libraries/.openmodelica/libraries/LibRAS master/Culture/SSCulture_V_noEvent.mo" 2022-03-10 09:57:51.232145803 +0000 @@ -3,10 +3,10 @@ model SSCulture_V_noEvent extends Culture.PartialCulture; - import SI = Modelica.SIunits; - import Modelica.SIunits.Conversions.from_day; - import Modelica.SIunits.Conversions.from_hour; - import Modelica.SIunits.Conversions.from_minute; + import Modelica.Units.SI; + import Modelica.Units.Conversions.from_day; + import Modelica.Units.Conversions.from_hour; + import Modelica.Units.Conversions.from_minute; import LibRAS.Types.Species.S; import LibRAS.Types.Species.X; @@ -59,9 +59,8 @@ // Sampled variables //Clock clk = Clock(86400); //SI.Mass [nTanks] sampled_m (start = {fishDensity*tankVolumes[nTanks] *BW0[i]/BW0[i+1] * (1-fish.mortality)^((i-1)/nTanks-1) for i in 1:nTanks}) "Sampled fish mass" annotation(HideResult = true); - //SI.Time lastGrading (start=0) "Time since last grading"; - - protected + //SI.Time lastGrading (start=0) "Time since last grading"; +protected Real [nTanks] F_scaled (each start=0.0) "Scaled added feed mass in kg"; Real [nTanks] F_digested_scaled (each start=0.0) "Scaled digested feed mass in kg"; Real [nTanks] feedSignal_scaled (each start=0.0) "Scaled digested feed signal"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Culture/Waste.mo" "converted-libraries/.openmodelica/libraries/LibRAS master/Culture/Waste.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Culture/Waste.mo" 2022-03-10 09:57:37.004143999 +0000 +++ "converted-libraries/.openmodelica/libraries/LibRAS master/Culture/Waste.mo" 2022-03-10 09:57:51.196145798 +0000 @@ -2,59 +2,52 @@ package Waste record WasteData -// Returns data for the production of the modelled compounds. -// The order of the rows in Waste.Prod are given by ASM1, i.e. -// -// S_I, S_S, X_I, X_S, X_BH, X_BA, X_P, -// S_O, S_NO, S_NH, S_ND, X_ND, S_ALK -// -// in units corresponding to ASM1 (see Henze et al., 1987). -// The last three rows added are S_CO2, c_Phosphorus (all kinds) -// and TSS (production not calculated here - set to 0) -// -// Column 1: Food lost in water (per kg feed/day) -// Column 2: Steady state excretion from fish (per kg feed/day) -// Column 3: Correction for fish growth (per kg fish/day) -// Column 4: Correction for respiration (per kg fish) -//------------------------------------------------------------- -// -// Fraction of food not consumed by fish -// Waste.Loss = 0.1; -// -// Waste production rate matrix (Note TSS production not calculated here) -// Coefficients for COD and N in columns 3 and 4 should agree with column 2! -// The sum of each component (COD,N,P) in columns 1-3 should add up to -// 1.0 times the corresponding content (for example Food.COD) - + // Returns data for the production of the modelled compounds. + // The order of the rows in Waste.Prod are given by ASM1, i.e. + // + // S_I, S_S, X_I, X_S, X_BH, X_BA, X_P, + // S_O, S_NO, S_NH, S_ND, X_ND, S_ALK + // + // in units corresponding to ASM1 (see Henze et al., 1987). + // The last three rows added are S_CO2, c_Phosphorus (all kinds) + // and TSS (production not calculated here - set to 0) + // + // Column 1: Food lost in water (per kg feed/day) + // Column 2: Steady state excretion from fish (per kg feed/day) + // Column 3: Correction for fish growth (per kg fish/day) + // Column 4: Correction for respiration (per kg fish) + //------------------------------------------------------------- + // + // Fraction of food not consumed by fish + // Waste.Loss = 0.1; + // + // Waste production rate matrix (Note TSS production not calculated here) + // Coefficients for COD and N in columns 3 and 4 should agree with column 2! + // The sum of each component (COD,N,P) in columns 1-3 should add up to + // 1.0 times the corresponding content (for example Food.COD) Feed.FeedData feed = Feed.DefaultFeed() "FeedData record"; Fish.FishData fish "FishData record"; - parameter Real loss = 0.1 "Feed loss factor"; - - Real[Types.Species.S, 4] S_waste = { - // Food spillage Excrement Fish growth Respiration - {0.5*feed.inert, 0.5*feed.inert, -0.5*fish.inert, 0}, // I - {0.3*feed.COD, 0.30*feed.COD, -0.30*fish.COD, -0.30*fish.O2rate}, // S - {0, 0, 0, -fish.O2rate}, // O - {0, 0, 0, 0}, // NO2 - {0, 0, 0, 0}, // NO3 - {0, 0.7*feed.N, -0.7*fish.N, 0}, // NH - {0.5*feed.N, 0.15*feed.N, -0.15*fish.N, 0}, // ND - {0, 0, 0, 0}, // Alk - {0, 0, 0, fish.CO2rate}, // CO2 - {0, 0, 0, 0} // N2 - }*diagonal({loss, 1-loss, 1, 1}) "Waste production of S species"; - - Real[Types.Species.X, 4] X_waste = { - // Food spillage Excrement Fish growth Respiration - {0.5*feed.inert, 0.5*feed.inert, -0.5*fish.inert, 0}, // I - {0.7*feed.COD, 0.30*feed.COD, -0.30*fish.COD, -0.30*fish.O2rate}, // S - {0, 0.3*feed.COD, -0.3*fish.COD, -0.3*fish.O2rate}, // BH??? - {0, 0, 0, 0}, // AOB - {0, 0, 0, 0}, // NOB - {0, 0.1*feed.COD, -0.1*fish.COD, -0.1*fish.O2rate}, // p - {0.5*feed.N, 0.15*feed.N, -0.15*fish.N, 0} // ND - }*diagonal({loss, 1-loss, 1, 1}) "Waste production of X species"; - + Real[Types.Species.S, 4] S_waste = {{0.5 * feed.inert, 0.5 * feed.inert, -0.5 * fish.inert, 0}, {0.3 * feed.COD, 0.30 * feed.COD, -0.30 * fish.COD, -0.30 * fish.O2rate}, {0, 0, 0, -fish.O2rate}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0.7 * feed.N, -0.7 * fish.N, 0}, {0.5 * feed.N, 0.15 * feed.N, -0.15 * fish.N, 0}, {0, 0, 0, 0}, {0, 0, 0, fish.CO2rate}, {0, 0, 0, 0}} * diagonal({loss, 1 - loss, 1, 1}) "Waste production of S species"; + // Food spillage Excrement Fish growth Respiration + // I + // S + // O + // NO2 + // NO3 + // NH + // ND + // Alk + // CO2 + // N2 + Real[Types.Species.X, 4] X_waste = {{0.5 * feed.inert, 0.5 * feed.inert, -0.5 * fish.inert, 0}, {0.7 * feed.COD, 0.30 * feed.COD, -0.30 * fish.COD, -0.30 * fish.O2rate}, {0, 0.3 * feed.COD, -0.3 * fish.COD, -0.3 * fish.O2rate}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0.1 * feed.COD, -0.1 * fish.COD, -0.1 * fish.O2rate}, {0.5 * feed.N, 0.15 * feed.N, -0.15 * fish.N, 0}} * diagonal({loss, 1 - loss, 1, 1}) "Waste production of X species"; + // Food spillage Excrement Fish growth Respiration + // I + // S + // BH??? + // AOB + // NOB + // p + // ND end WasteData; -end Waste; +end Waste; \ No newline at end of file Only in converted-libraries/.openmodelica/libraries/LibRAS master/Culture: Waste.mo.after Only in converted-libraries/.openmodelica/libraries/LibRAS master/Culture: Waste.mo.before diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Culture/simpleCulture.mo" "converted-libraries/.openmodelica/libraries/LibRAS master/Culture/simpleCulture.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Culture/simpleCulture.mo" 2022-03-10 09:57:37.004143999 +0000 +++ "converted-libraries/.openmodelica/libraries/LibRAS master/Culture/simpleCulture.mo" 2022-03-10 09:57:51.152145792 +0000 @@ -3,10 +3,10 @@ model simpleCulture extends Culture.PartialCulture(fish=Culture.Fish.AtlanticSalmon(), nTanks=100, tankVolumes=0.25 * cat(1, {0.125 for i in 1:25}, {0.25 for i in 26:50}, {0.50 for i in 51:75}, {1 for i in 76:100})); - import SI = Modelica.SIunits; - import Modelica.SIunits.Conversions.from_day; - import Modelica.SIunits.Conversions.from_hour; - import Modelica.SIunits.Conversions.from_minute; + import Modelica.Units.SI; + import Modelica.Units.Conversions.from_day; + import Modelica.Units.Conversions.from_hour; + import Modelica.Units.Conversions.from_minute; import LibRAS.Types.Species.S; import LibRAS.Types.Species.X; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Examples/Bypass.mo" "converted-libraries/.openmodelica/libraries/LibRAS master/Examples/Bypass.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Examples/Bypass.mo" 2022-03-10 09:57:37.004143999 +0000 +++ "converted-libraries/.openmodelica/libraries/LibRAS master/Examples/Bypass.mo" 2022-03-10 09:57:51.116145788 +0000 @@ -2,13 +2,13 @@ model Bypass extends Modelica.Icons.Example; - import Modelica.SIunits.Conversions.from_bar; - type MassFlowRate = Modelica.SIunits.MassFlowRate(displayUnit = "g/d"); + import Modelica.Units.Conversions.from_bar; + type MassFlowRate = Modelica.Units.SI.MassFlowRate(displayUnit = "g/d"); import LibRAS.Types.Species.S; import LibRAS.Types.Species.X; replaceable package Medium = LibRAS.Media.WasteWater "Medium in the component"; - parameter Modelica.SIunits.Volume V_system = aerob1.V + aerob2.V + nitri1.V + nitri2.V + nitri3.V + degas1.V + sum(fishTank1.tankVolumes) "System volume - used to set controller gains"; - parameter Modelica.SIunits.Volume[:] tankSizes = 0.25 * cat(1, {0.125 for i in 1:25}, {0.25 for i in 26:50}, {0.50 for i in 51:75}, {1 for i in 76:100}) annotation( + parameter Modelica.Units.SI.Volume V_system = aerob1.V + aerob2.V + nitri1.V + nitri2.V + nitri3.V + degas1.V + sum(fishTank1.tankVolumes) "System volume - used to set controller gains"; + parameter Modelica.Units.SI.Volume[:] tankSizes = 0.25 * cat(1, {0.125 for i in 1:25}, {0.25 for i in 26:50}, {0.50 for i in 51:75}, {1 for i in 76:100}) annotation( HideResult = true); parameter Real dailyExchange = 0.100; inner LibRAS.System system(T_ambient = 288.15, T_start = 288.15) annotation( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Examples/Inline.mo" "converted-libraries/.openmodelica/libraries/LibRAS master/Examples/Inline.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Examples/Inline.mo" 2022-03-10 09:57:37.004143999 +0000 +++ "converted-libraries/.openmodelica/libraries/LibRAS master/Examples/Inline.mo" 2022-03-10 09:57:51.084145784 +0000 @@ -2,13 +2,13 @@ model Inline extends Modelica.Icons.Example; - import Modelica.SIunits.Conversions.from_bar; - type MassFlowRate = Modelica.SIunits.MassFlowRate(displayUnit = "g/d"); + import Modelica.Units.Conversions.from_bar; + type MassFlowRate = Modelica.Units.SI.MassFlowRate(displayUnit = "g/d"); import LibRAS.Types.Species.S; import LibRAS.Types.Species.X; replaceable package Medium = LibRAS.Media.WasteWater "Medium in the component"; - parameter Modelica.SIunits.Volume V_system = aerob1.V + aerob2.V + nitri1.V + nitri2.V + nitri3.V + degas1.V + sum(fishTank1.tankVolumes) "System volume - used to set controller gains"; - parameter Modelica.SIunits.Volume[:] tankSizes = 0.25 * cat(1, {0.125 for i in 1:25}, {0.25 for i in 26:50}, {0.50 for i in 51:75}, {1 for i in 76:100}) annotation( + parameter Modelica.Units.SI.Volume V_system = aerob1.V + aerob2.V + nitri1.V + nitri2.V + nitri3.V + degas1.V + sum(fishTank1.tankVolumes) "System volume - used to set controller gains"; + parameter Modelica.Units.SI.Volume[:] tankSizes = 0.25 * cat(1, {0.125 for i in 1:25}, {0.25 for i in 26:50}, {0.50 for i in 51:75}, {1 for i in 76:100}) annotation( HideResult = true); parameter Real dailyExchange = 0.100; inner LibRAS.System system(T_ambient = 288.15, T_start = 288.15) annotation( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Examples/ReactorTest.mo" "converted-libraries/.openmodelica/libraries/LibRAS master/Examples/ReactorTest.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Examples/ReactorTest.mo" 2022-03-10 09:57:37.004143999 +0000 +++ "converted-libraries/.openmodelica/libraries/LibRAS master/Examples/ReactorTest.mo" 2022-03-10 09:57:51.040145778 +0000 @@ -2,15 +2,15 @@ model ReactorTest extends Modelica.Icons.Example; - import Modelica.SIunits.Conversions.from_bar; - type MassFlowRate = Modelica.SIunits.MassFlowRate(displayUnit = "g/d"); + import Modelica.Units.Conversions.from_bar; + type MassFlowRate = Modelica.Units.SI.MassFlowRate(displayUnit = "g/d"); import LibRAS.Types.Species.S; import LibRAS.Types.Species.X; - parameter Modelica.SIunits.Volume V_aerob = 5.0 "Treatment tank volume"; + parameter Modelica.Units.SI.Volume V_aerob = 5.0 "Treatment tank volume"; parameter Real C_NH = 5.0; replaceable package Medium = LibRAS.Media.WasteWater "Medium in the component"; - inner LibRAS.System system(T_ambient = Modelica.SIunits.Conversions.from_degC(20)) annotation( + inner LibRAS.System system(T_ambient = Modelica.Units.Conversions.from_degC(20)) annotation( Placement(visible = true, transformation(extent = {{138, 44}, {158, 64}}, rotation = 0))); LibRAS.Machines.ControlledPump pump(redeclare package Medium = Medium, m_flow_nominal = 10, p_a_nominal = system.p_ambient, p_b_nominal = system.p_ambient + 0.5e5) annotation( Placement(visible = true, transformation(origin = {60, 82}, extent = {{10, -10}, {-10, 10}}, rotation = 0))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Examples/Recycle.mo" "converted-libraries/.openmodelica/libraries/LibRAS master/Examples/Recycle.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Examples/Recycle.mo" 2022-03-10 09:57:37.004143999 +0000 +++ "converted-libraries/.openmodelica/libraries/LibRAS master/Examples/Recycle.mo" 2022-03-10 09:57:51.008145774 +0000 @@ -2,10 +2,10 @@ model Recycle extends Modelica.Icons.Example; - import Modelica.SIunits.Conversions.from_bar; + import Modelica.Units.Conversions.from_bar; replaceable package Medium = LibRAS.Media.WasteWater "Medium in the component"; - parameter Modelica.SIunits.Volume V_system = aerob1.V + aerob2.V + nitri1.V + nitri2.V + nitri3.V + degas1.V + sum(fishTank1.tankVolumes) "System volume"; - parameter Modelica.SIunits.Volume[:] tankSizes = 0.25 * cat(1, {0.125 for i in 1:25}, {0.25 for i in 26:50}, {0.50 for i in 51:75}, {1 for i in 76:100}) annotation( + parameter Modelica.Units.SI.Volume V_system = aerob1.V + aerob2.V + nitri1.V + nitri2.V + nitri3.V + degas1.V + sum(fishTank1.tankVolumes) "System volume"; + parameter Modelica.Units.SI.Volume[:] tankSizes = 0.25 * cat(1, {0.125 for i in 1:25}, {0.25 for i in 26:50}, {0.50 for i in 51:75}, {1 for i in 76:100}) annotation( HideResult = true); parameter Real dailyExchange = 0.10; inner LibRAS.System system(T_ambient = 288.15, T_start = 288.15) annotation( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Examples/TinyRAS.mo" "converted-libraries/.openmodelica/libraries/LibRAS master/Examples/TinyRAS.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Examples/TinyRAS.mo" 2022-03-10 09:57:37.004143999 +0000 +++ "converted-libraries/.openmodelica/libraries/LibRAS master/Examples/TinyRAS.mo" 2022-03-10 09:57:50.928145765 +0000 @@ -2,14 +2,14 @@ model TinyRAS extends Modelica.Icons.Example; - import convert = Modelica.SIunits.Conversions; - import Modelica.SIunits.Conversions.from_bar; - type MassFlowRate = Modelica.SIunits.MassFlowRate(displayUnit = "g/d"); + import convert = Modelica.Units.Conversions; + import Modelica.Units.Conversions.from_bar; + type MassFlowRate = Modelica.Units.SI.MassFlowRate(displayUnit = "g/d"); import LibRAS.Types.Species.S; import LibRAS.Types.Species.X; replaceable package Medium = LibRAS.Media.WasteWater "Medium in the component"; - parameter Modelica.SIunits.Time HRT (displayUnit = "min") = 1200 "Fish tank HRT in seconds"; - parameter Modelica.SIunits.Volume V_system = MBBR1.V + MBBR2.V + sum(fishTank1.tankVolumes) "System volume - used to set controller gains and calculate water exchange"; + parameter Modelica.Units.SI.Time HRT (displayUnit = "min") = 1200 "Fish tank HRT in seconds"; + parameter Modelica.Units.SI.Volume V_system = MBBR1.V + MBBR2.V + sum(fishTank1.tankVolumes) "System volume - used to set controller gains and calculate water exchange"; parameter Real dailyExchange = 0.100; inner LibRAS.System system(T_ambient = 288.15, T_start = 288.15) annotation( Placement(visible = true, transformation(extent = {{138, 44}, {158, 64}}, rotation = 0))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Interfaces/PartialLumpedVolume.mo" "converted-libraries/.openmodelica/libraries/LibRAS master/Interfaces/PartialLumpedVolume.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Interfaces/PartialLumpedVolume.mo" 2022-03-10 09:57:37.004143999 +0000 +++ "converted-libraries/.openmodelica/libraries/LibRAS master/Interfaces/PartialLumpedVolume.mo" 2022-03-10 09:57:50.880145758 +0000 @@ -1,6 +1,6 @@ within LibRAS.Interfaces; partial model PartialLumpedVolume "Lumped volume with mass and energy balance" - import SI = Modelica.SIunits; + import Modelica.Units.SI; import Modelica.Fluid.Types; import Modelica.Fluid.Types.Dynamics; import Modelica.Media.Interfaces.Choices.IndependentVariables; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Interfaces/PartialTwoPortTransport.mo" "converted-libraries/.openmodelica/libraries/LibRAS master/Interfaces/PartialTwoPortTransport.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Interfaces/PartialTwoPortTransport.mo" 2022-03-10 09:57:37.004143999 +0000 +++ "converted-libraries/.openmodelica/libraries/LibRAS master/Interfaces/PartialTwoPortTransport.mo" 2022-03-10 09:57:50.836145752 +0000 @@ -32,10 +32,10 @@ Medium.MassFlowRate m_flow( min=if allowFlowReversal then -Modelica.Constants.inf else 0, start = m_flow_start) "Mass flow rate in design flow direction"; - Modelica.SIunits.Pressure dp(start=dp_start) + Modelica.Units.SI.Pressure dp(start=dp_start) "Pressure difference between port_a and port_b (= port_a.p - port_b.p)"; - Modelica.SIunits.VolumeFlowRate V_flow= + Modelica.Units.SI.VolumeFlowRate V_flow= m_flow/Modelica.Fluid.Utilities.regStep(m_flow, Medium.density(state_a), Medium.density(state_b), diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Machines/ControlledPump.mo" "converted-libraries/.openmodelica/libraries/LibRAS master/Machines/ControlledPump.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Machines/ControlledPump.mo" 2022-03-10 09:57:37.004143999 +0000 +++ "converted-libraries/.openmodelica/libraries/LibRAS master/Machines/ControlledPump.mo" 2022-03-10 09:57:50.656145731 +0000 @@ -2,8 +2,8 @@ model ControlledPump "Centrifugal pump with ideally controlled mass flow rate" - import SI = Modelica.SIunits; - import Modelica.SIunits.Conversions.NonSIunits.AngularVelocity_rpm; + import Modelica.Units.SI; + import Modelica.Units.NonSI.AngularVelocity_rpm; extends LibRAS.Machines.PartialPump( N_nominal=1500, N(start=N_nominal), diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Machines/PartialPump.mo" "converted-libraries/.openmodelica/libraries/LibRAS master/Machines/PartialPump.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Machines/PartialPump.mo" 2022-03-10 09:57:37.004143999 +0000 +++ "converted-libraries/.openmodelica/libraries/LibRAS master/Machines/PartialPump.mo" 2022-03-10 09:57:50.636145727 +0000 @@ -1,8 +1,8 @@ within LibRAS.Machines; partial model PartialPump "Base model for centrifugal pumps" - import SI = Modelica.SIunits; - import NonSI = Modelica.SIunits.Conversions.NonSIunits; + import Modelica.Units.SI; + import Modelica.Units.NonSI; import Modelica.Constants; import Modelica.Fluid.Machines.BaseClasses.PumpCharacteristics; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Pipes/OxygenAdder.mo" "converted-libraries/.openmodelica/libraries/LibRAS master/Pipes/OxygenAdder.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Pipes/OxygenAdder.mo" 2022-03-10 09:57:37.004143999 +0000 +++ "converted-libraries/.openmodelica/libraries/LibRAS master/Pipes/OxygenAdder.mo" 2022-03-10 09:57:50.508145711 +0000 @@ -2,7 +2,7 @@ model OxygenAdder "Addition of oxygen to (small) stirred volume" extends LibRAS.Interfaces.PartialTwoPort; - parameter Modelica.SIunits.Volume V = 1e-3 "Internal volume" annotation(Dialog(tab = "General")); + parameter Modelica.Units.SI.Volume V = 1e-3 "Internal volume" annotation(Dialog(tab = "General")); replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium model within the device" annotation(choicesAllMatching = true); Tanks.CST cst(V=V, KLa = 0, nPorts = 2, use_portsData = false, redeclare package Medium = Medium, use_m_S_in = true) annotation(Placement(visible = true, transformation(origin = {0, 10}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); Modelica.Blocks.Interfaces.RealInput O2_in (quantity="MassFlowRate", unit="kg/s", displayUnit="g/s") annotation(Placement(visible = true, transformation(origin = {-5, 63}, extent = {{-11, -11}, {11, 11}}, rotation = -90), iconTransformation(origin = {0, 102}, extent = {{-20, -20}, {20, 20}}, rotation = -90))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Pipes/PartialStraightPipe.mo" "converted-libraries/.openmodelica/libraries/LibRAS master/Pipes/PartialStraightPipe.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Pipes/PartialStraightPipe.mo" 2022-03-10 09:57:37.004143999 +0000 +++ "converted-libraries/.openmodelica/libraries/LibRAS master/Pipes/PartialStraightPipe.mo" 2022-03-10 09:57:50.496145709 +0000 @@ -1,7 +1,7 @@ within LibRAS.Pipes; partial model PartialStraightPipe "Base class for straight pipe models" extends LibRAS.Interfaces.PartialTwoPort; - import SI = Modelica.SIunits; + import Modelica.Units.SI; // Geometry // Note: define nParallel as Real to support inverse calculations parameter Real nParallel(min = 1) = 1 "Number of identical parallel pipes" annotation(Dialog(group = "Geometry")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Sensors/MassFlowRate.mo" "converted-libraries/.openmodelica/libraries/LibRAS master/Sensors/MassFlowRate.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Sensors/MassFlowRate.mo" 2022-03-10 09:57:37.004143999 +0000 +++ "converted-libraries/.openmodelica/libraries/LibRAS master/Sensors/MassFlowRate.mo" 2022-03-10 09:57:50.432145701 +0000 @@ -1,7 +1,7 @@ within LibRAS.Sensors; model MassFlowRate "Ideal sensor for mass flow rate" extends Sensors.PartialFlowSensor; - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; Modelica.Blocks.Interfaces.RealOutput m_flow(quantity = "MassFlowRate", final unit = "kg/s") "Mass flow rate from port_a to port_b" annotation(Placement(transformation(origin = {0, 110}, extent = {{10, -10}, {-10, 10}}, rotation = 270))); equation m_flow = port_a.m_flow; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Sensors/SoluteSensor.mo" "converted-libraries/.openmodelica/libraries/LibRAS master/Sensors/SoluteSensor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Sensors/SoluteSensor.mo" 2022-03-10 09:57:37.004143999 +0000 +++ "converted-libraries/.openmodelica/libraries/LibRAS master/Sensors/SoluteSensor.mo" 2022-03-10 09:57:50.356145692 +0000 @@ -1,7 +1,7 @@ within LibRAS.Sensors; model SoluteSensor extends LibRAS.Sensors.PartialAbsoluteSensor; - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; parameter String substanceName = "O" "Name of sensed substance (Not used)"; parameter Integer substanceIndex = Integer(LibRAS.Types.Species.S.O) "Species to sense"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Sensors/StateSensor.mo" "converted-libraries/.openmodelica/libraries/LibRAS master/Sensors/StateSensor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Sensors/StateSensor.mo" 2022-03-10 09:57:37.004143999 +0000 +++ "converted-libraries/.openmodelica/libraries/LibRAS master/Sensors/StateSensor.mo" 2022-03-10 09:57:50.340145691 +0000 @@ -1,7 +1,7 @@ within LibRAS.Sensors; model StateSensor extends LibRAS.Sensors.PartialFlowSensor; - extends Modelica.Icons.RotationalSensor; + extends Modelica.Icons.RoundSensor; import LibRAS.Types.Species.S; import LibRAS.Types.Species.X; // Modelica.Blocks.Interfaces.RealOutput states[31] "States at port"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Sources/WaterExchange.mo" "converted-libraries/.openmodelica/libraries/LibRAS master/Sources/WaterExchange.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Sources/WaterExchange.mo" 2022-03-10 09:57:37.004143999 +0000 +++ "converted-libraries/.openmodelica/libraries/LibRAS master/Sources/WaterExchange.mo" 2022-03-10 09:57:50.168145668 +0000 @@ -3,7 +3,7 @@ model WaterExchange "Water make-up and let-down." extends LibRAS.Interfaces.PartialTwoPort; // parameter Real makeupRate (min=0) = 0.1 "Water exchange factor" annotation(Dialog(tab = "General")); - parameter Modelica.SIunits.Temperature T_makeup = system.T_ambient "Make-up water temperature" annotation(Dialog(tab = "General")); + parameter Modelica.Units.SI.Temperature T_makeup = system.T_ambient "Make-up water temperature" annotation(Dialog(tab = "General")); replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium model within the source" annotation(choicesAllMatching = true); LibRAS.Sources.MassFlowSource_T source(redeclare package Medium = Medium, T = T_makeup, nPorts = 1, use_m_flow_in = true) annotation(Placement(visible = true, transformation(origin = {-8, 30}, extent = {{10, -10}, {-10, 10}}, rotation = 90))); LibRAS.Pipes.Tee tee(redeclare package Medium = Medium) annotation(Placement(visible = true, transformation(origin = {-8, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/System.mo" "converted-libraries/.openmodelica/libraries/LibRAS master/System.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/System.mo" 2022-03-10 09:57:37.004143999 +0000 +++ "converted-libraries/.openmodelica/libraries/LibRAS master/System.mo" 2022-03-10 09:57:50.108145661 +0000 @@ -4,7 +4,7 @@ import U = LibRAS.Units; import Modelica.Constants.eps; - parameter Modelica.SIunits.PartialPressure pCO2 = 320 "Atmospheric CO2 partial pressure" annotation(Dialog(tab="General", group="Environment")); + parameter Modelica.Units.SI.PartialPressure pCO2 = 320 "Atmospheric CO2 partial pressure" annotation(Dialog(tab="General", group="Environment")); parameter U.GrowthRate[2] mu_H = {3.00, 6.00} "Heterotrophs - Growth constant" annotation(Dialog(tab="Biofilm", group="Growth and conversion (at 10 and 20 degC)")); parameter Real[2] K_S = {10.0, 10.0} "Heterotrophs - Organic substrate" annotation(Dialog(tab="Biofilm", group="Growth and conversion (at 10 and 20 degC)")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Tanks/CSBR.mo" "converted-libraries/.openmodelica/libraries/LibRAS master/Tanks/CSBR.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Tanks/CSBR.mo" 2022-03-10 09:57:37.004143999 +0000 +++ "converted-libraries/.openmodelica/libraries/LibRAS master/Tanks/CSBR.mo" 2022-03-10 09:57:50.048145652 +0000 @@ -2,7 +2,7 @@ model CSBR "Volume of fixed size, closed to the ambient, with inlet/outlet ports" import Modelica.Constants.pi; - import SI = Modelica.SIunits; + import Modelica.Units.SI; // Mass and energy balance, ports extends Tanks.PartialTank; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Tanks/CST.mo" "converted-libraries/.openmodelica/libraries/LibRAS master/Tanks/CST.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Tanks/CST.mo" 2022-03-10 09:57:37.004143999 +0000 +++ "converted-libraries/.openmodelica/libraries/LibRAS master/Tanks/CST.mo" 2022-03-10 09:57:50.036145651 +0000 @@ -2,7 +2,7 @@ model CST "Ideally stirred spherical volume with inlet/outlet ports and addition of species. Any reactions are neglected." import Modelica.Constants.pi; - import SI = Modelica.SIunits; + import Modelica.Units.SI; import LibRAS.Types.Species.S; import LibRAS.Types.Species.X; // Mass and energy balance, ports diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Tanks/FishTank.mo" "converted-libraries/.openmodelica/libraries/LibRAS master/Tanks/FishTank.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Tanks/FishTank.mo" 2022-03-10 09:57:37.004143999 +0000 +++ "converted-libraries/.openmodelica/libraries/LibRAS master/Tanks/FishTank.mo" 2022-03-10 09:57:50.020145650 +0000 @@ -2,12 +2,12 @@ model FishTank replaceable package Medium = LibRAS.Media.WasteWater "Medium in the component"; - import SI = Modelica.SIunits; + import Modelica.Units.SI; import LibRAS.Types.Species.S; import LibRAS.Culture.*; - import Modelica.SIunits.Conversions.from_day; - import Modelica.SIunits.Conversions.from_hour; - import Modelica.SIunits.Conversions.from_minute; + import Modelica.Units.Conversions.from_day; + import Modelica.Units.Conversions.from_hour; + import Modelica.Units.Conversions.from_minute; // DESIGN VARIABLES // parameter SI.Volume V = 9 "Fish tank volume" annotation(Evaluate=true, Dialog(tab="General", group="Design")); parameter Integer nTanks = 9 annotation( @@ -28,7 +28,7 @@ parameter SI.Density fishDensity(displayUnit = "kg/m3") = 70 "Maximum fish density in kg/m3" annotation( Dialog(tab = "General", group = "Culture")); // GROWTH AND FEEDING - parameter SI.Temp_C T = 15 "Farming temperature" annotation( + parameter Modelica.Units.NonSI.Temperature_degC T = 15 "Farming temperature" annotation( Dialog(tab = "General", group = "Culture")); parameter SI.Time[:] feedingTimes = from_hour({6, 18}) "Feeding times in seconds after beginning of each day (00:00)" annotation( Dialog(tab = "General", group = "Culture")); @@ -42,10 +42,10 @@ parameter Real oxygenControl_Q "Throughflow setpoint for controller tuning" annotation( Evaluate = true, Dialog(tab = "General", group = "Oxygen control")); - parameter Real oxygenControl_K = 10 * 0.1 * oxygenControl_Q / ((Utilities.oxygenSaturation(SI.Conversions.from_degC(T)) - 8e-3) * sum(tankVolumes)) "Proportional gain of oxygen PI controller" annotation( + parameter Real oxygenControl_K = 10 * 0.1 * oxygenControl_Q / ((Utilities.oxygenSaturation(Modelica.Units.Conversions.from_degC(T)) - 8e-3) * sum(tankVolumes)) "Proportional gain of oxygen PI controller" annotation( Evaluate = true, Dialog(tab = "General", group = "Oxygen control")); - parameter Real oxygenControl_Ti = oxygenControl_K * sum(tankVolumes) ^ 2 * (Utilities.oxygenSaturation(SI.Conversions.from_degC(T)) - 8e-3) / oxygenControl_Q ^ 2 "Integral time for oyxgen PI controller" annotation( + parameter Real oxygenControl_Ti = oxygenControl_K * sum(tankVolumes) ^ 2 * (Utilities.oxygenSaturation(Modelica.Units.Conversions.from_degC(T)) - 8e-3) / oxygenControl_Q ^ 2 "Integral time for oyxgen PI controller" annotation( Evaluate = true, Dialog(tab = "General", group = "Oxygen control")); parameter Real oxygenControl_maxKLa = 0.20 "Maximum KLa value in 1/s" annotation( @@ -63,7 +63,7 @@ Placement(visible = true, transformation(origin = {48, 42}, extent = {{-40, -10}, {40, 10}}, rotation = -90), iconTransformation(extent = {{-40, -110}, {40, -90}}, rotation = 0))); LibRAS.Tanks.CST fishtank(redeclare package Medium = Medium, V = sum(tankVolumes), fluidVolume = sum(culture.Vw), energyDynamics = Modelica.Fluid.Types.Dynamics.SteadyState, massDynamics = Modelica.Fluid.Types.Dynamics.FixedInitial, nPorts = nPorts, use_KLa_in = true, use_m_S_in = true, use_m_X_in = true, use_portsData = false, use_HeatTransfer = true) annotation( Placement(visible = true, transformation(origin = {0, 44}, extent = {{-10, 10}, {10, -10}}, rotation = -90))); - Modelica.Blocks.Continuous.LimPID oxygenPI(Ti(displayUnit = "s") = oxygenControl_Ti, controllerType = Modelica.Blocks.Types.SimpleController.PI, k = oxygenControl_K, limitsAtInit = false, yMax = oxygenControl_maxKLa, yMin = oxygenControl_minKLa) annotation( + Modelica.Blocks.Continuous.LimPID oxygenPI(Ti(displayUnit = "s") = oxygenControl_Ti, controllerType = Modelica.Blocks.Types.SimpleController.PI, k = oxygenControl_K, yMax = oxygenControl_maxKLa, yMin = oxygenControl_minKLa) annotation( Placement(visible = true, transformation(origin = {-24, 20}, extent = {{-6, -6}, {6, 6}}, rotation = 0))); Modelica.Blocks.Interfaces.RealInput oxygenSetpoint annotation( Placement(visible = true, transformation(origin = {-100, 20}, extent = {{-8, -8}, {8, 8}}, rotation = 0), iconTransformation(origin = {-120, 0}, extent = {{-20, -20}, {20, 20}}, rotation = 0))); @@ -72,9 +72,9 @@ output SI.Mass mFish "Total mass of fish"; output SI.Mass meanBW "Mean fish body weight"; output SI.Density avgDensity = mFish/sum(tankVolumes); - Modelica.Thermal.HeatTransfer.Sources.FixedTemperature fixedTemperature1(T = SI.Conversions.from_degC(T)) annotation( - Placement(visible = true, transformation(origin = {-20, 80}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); + Modelica.Thermal.HeatTransfer.Sources.FixedTemperature fixedTemperature1(T = Modelica.Units.Conversions.from_degC(T)) annotation( + Placement(visible = true, transformation(origin = {-20, 80}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); equation connect(fixedTemperature1.port, fishtank.heatPort) annotation( Line(points = {{-10, 80}, {0, 80}, {0, 54}, {0, 54}}, color = {191, 0, 0})); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Tanks/OpenCSBR.mo" "converted-libraries/.openmodelica/libraries/LibRAS master/Tanks/OpenCSBR.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Tanks/OpenCSBR.mo" 2022-03-10 09:57:37.004143999 +0000 +++ "converted-libraries/.openmodelica/libraries/LibRAS master/Tanks/OpenCSBR.mo" 2022-03-10 09:57:49.968145643 +0000 @@ -1,6 +1,6 @@ within LibRAS.Tanks; model OpenCSBR - import SI = Modelica.SIunits; + import Modelica.Units.SI; replaceable package Medium = LibRAS.Media.WasteWater "Medium in the component"; extends OpenTank; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Tanks/OpenTank.mo" "converted-libraries/.openmodelica/libraries/LibRAS master/Tanks/OpenTank.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Tanks/OpenTank.mo" 2022-03-10 09:57:37.004143999 +0000 +++ "converted-libraries/.openmodelica/libraries/LibRAS master/Tanks/OpenTank.mo" 2022-03-10 09:57:49.952145640 +0000 @@ -1,6 +1,6 @@ within LibRAS.Tanks; model OpenTank "Tank with inlet/outlet ports and with inlet ports at the top" - import SI = Modelica.SIunits; + import Modelica.Units.SI; import Modelica.Constants; import Modelica.Fluid.Fittings.BaseClasses.lossConstant_D_zeta; import Modelica.Fluid.Utilities.regRoot2; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Tanks/PartialCSBR.mo" "converted-libraries/.openmodelica/libraries/LibRAS master/Tanks/PartialCSBR.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Tanks/PartialCSBR.mo" 2022-03-10 09:57:37.004143999 +0000 +++ "converted-libraries/.openmodelica/libraries/LibRAS master/Tanks/PartialCSBR.mo" 2022-03-10 09:57:49.904145634 +0000 @@ -2,7 +2,7 @@ partial model PartialCSBR extends PartialCST; - import SI = Modelica.SIunits; + import Modelica.Units.SI; import LibRAS.Types.Species.S; import LibRAS.Types.Species.X; @@ -12,7 +12,7 @@ "Start value of particulates in film" annotation (Dialog(tab="Initialization", enable=Medium.nC_X > 0), HideResult = true); parameter SI.Thickness L_start (displayUnit="mm") = 1.0e-4 "Initial biofilm thickness" annotation(Dialog(tab="General", group="CSBR"), HideResult = true); - parameter SI.Temp_C T_bio = SI.Conversions.to_degC(system.T_start) "Biofilm parameter evaluation temperature" annotation(Dialog(tab="General", group="CSBR")); + parameter Modelica.Units.NonSI.Temperature_degC T_bio = Modelica.Units.Conversions.to_degC(system.T_start) "Biofilm parameter evaluation temperature" annotation(Dialog(tab="General", group="CSBR")); parameter Real carrier_packing(min=0.0) = 0.70 "Biocarrier packing" annotation(Dialog(tab="General", group="CSBR")); parameter Real carrier_displacement(min=0.0) = 0.18 "Biocarrier displacement" annotation(Dialog(tab="General", group="CSBR")); parameter SI.Area A = V*carrier_packing*system.As "Biocarrier surface" annotation(Dialog(tab="General", group="CSBR")); @@ -31,8 +31,7 @@ Real K_d (unit="1/(m.s)", displayUnit="1/(m.d)") "Variable detachment coefficient"; Real filmPorosity "Variable biofilm porosity"; - Types.ProcessData.ProcessMatrix bioparam ( // Pass ALL the parameters! - _mu_H = system.mu_H, + Types.ProcessData.ProcessMatrix bioparam (_mu_H = system.mu_H, _K_S = system.K_S, _K_OH = system.K_OH, _K_NO = system.K_NO, @@ -65,6 +64,7 @@ T = T_bio ); +// Pass ALL the parameters! SI.Thickness L (displayUnit="mm"); output Real nitrificationRate_Apparent (unit="kg/(m2.s)", displayUnit="g/(m2.d)") = -R_S[6]/A; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Tanks/PartialCST.mo" "converted-libraries/.openmodelica/libraries/LibRAS master/Tanks/PartialCST.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Tanks/PartialCST.mo" 2022-03-10 09:57:37.004143999 +0000 +++ "converted-libraries/.openmodelica/libraries/LibRAS master/Tanks/PartialCST.mo" 2022-03-10 09:57:49.840145626 +0000 @@ -1,9 +1,9 @@ within LibRAS.Tanks; partial model PartialCST "Reactionless stirred tank with optional input of species and bubbling of air" - import SI = Modelica.SIunits; + import Modelica.Units.SI; import LibRAS.Types.Species.S; import LibRAS.Types.Species.X; - import to_degC = Modelica.SIunits.Conversions.to_degC; + import Modelica.Units.Conversions.to_degC; replaceable package Medium = LibRAS.Media.WasteWater "Medium in the component"; parameter Medium.ExtraProperty C_S_start[Medium.nC_S](quantity = Medium.solublesNames, each unit = "kg/m3", each displayUnit = "g/m3") = system.C_S_start "Start value of solubles" annotation(Dialog(tab = "Initialization", enable = Medium.nC_S > 0)); parameter Medium.ExtraProperty C_X_start[Medium.nC_X](quantity = Medium.particulatesNames, each unit = "kg/m3", each displayUnit = "g/m3") = system.C_X_start "Start value of particulates" annotation(Dialog(tab = "Initialization", enable = Medium.nC_X > 0)); @@ -64,7 +64,7 @@ if i == S.O then J_gas[Integer(i)] = Vf * KLa_in_internal * ((14.53 - 0.411 * to_degC(medium.T) + 9.6e-3 * to_degC(medium.T) ^ 2 - 1.2e-4 * to_degC(medium.T) ^ 3) / 1000 - C_S[Integer(i)]); elseif i == S.CO2 then - J_gas[Integer(i)] = Vf * KLa_in_internal * KLa_ratio * (44*Modelica.SIunits.Conversions.to_bar(system.pCO2)*(75.14-2.605*to_degC(medium.T)+0.038*to_degC(medium.T)^2) / 1000 - C_S[Integer(i)]); // Remember the ugly /1000 here + J_gas[Integer(i)] = Vf * KLa_in_internal * KLa_ratio * (44*Modelica.Units.Conversions.to_bar(system.pCO2)*(75.14-2.605*to_degC(medium.T)+0.038*to_degC(medium.T)^2) / 1000 - C_S[Integer(i)]); // Remember the ugly /1000 here else J_gas[Integer(i)] = 0; end if; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Tanks/PartialLumpedVessel.mo" "converted-libraries/.openmodelica/libraries/LibRAS master/Tanks/PartialLumpedVessel.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Tanks/PartialLumpedVessel.mo" 2022-03-10 09:57:37.004143999 +0000 +++ "converted-libraries/.openmodelica/libraries/LibRAS master/Tanks/PartialLumpedVessel.mo" 2022-03-10 09:57:49.792145621 +0000 @@ -2,7 +2,7 @@ partial model PartialLumpedVessel "Lumped volume with a vector of fluid ports and replaceable heat transfer model" extends Modelica.Fluid.Interfaces.PartialLumpedVolume; - import SI = Modelica.SIunits; + import Modelica.Units.SI; // Port definitions parameter Integer nPorts=0 "Number of ports" annotation(Evaluate=true, Dialog(connectorSizing=true, tab="General",group="Ports")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Tanks/PartialTank.mo" "converted-libraries/.openmodelica/libraries/LibRAS master/Tanks/PartialTank.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Tanks/PartialTank.mo" 2022-03-10 09:57:37.004143999 +0000 +++ "converted-libraries/.openmodelica/libraries/LibRAS master/Tanks/PartialTank.mo" 2022-03-10 09:57:49.752145615 +0000 @@ -2,7 +2,7 @@ partial model PartialTank "Volume of fixed size, closed to the ambient, with inlet/outlet ports" import Modelica.Constants.pi; - import SI = Modelica.SIunits; + import Modelica.Units.SI; // Mass and energy balance, ports // extends Tanks.PartialLumpedVessel(final fluidVolume = V, vesselArea = pi * (3 / 4 * V) ^ (2 / 3), heatTransfer(surfaceAreas = {4 * pi * (3 / 4 * V / pi) ^ (2 / 3)})); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Types/ProcessData.mo" "converted-libraries/.openmodelica/libraries/LibRAS master/Types/ProcessData.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Types/ProcessData.mo" 2022-03-10 09:57:37.004143999 +0000 +++ "converted-libraries/.openmodelica/libraries/LibRAS master/Types/ProcessData.mo" 2022-03-10 09:57:49.708145609 +0000 @@ -32,79 +32,75 @@ parameter Real[2] _K_Alk; parameter Real[2] _K_NHH; parameter Real[2] _K_NHI; - constant Modelica.SIunits.Conversions.NonSIunits.Temperature_degC T0[2] = {10.0, 20.0}; - parameter Modelica.SIunits.Conversions.NonSIunits.Temperature_degC T = 15 "Operating temperature"; - + constant Modelica.Units.NonSI.Temperature_degC T0[2] = {10.0, 20.0}; + parameter Modelica.Units.NonSI.Temperature_degC T = 15 "Operating temperature"; // Correlate biofilm parameters to temperature. Adapt units from "standard ASM" to SI. - parameter Real mu_H = _mu_H [2]*((_mu_H [2]/_mu_H [1])^0.1)^(T-T0[2]) /(24*3600); - parameter Real K_S = _K_S [2]*((_K_S [2]/_K_S [1])^0.1)^(T-T0[2]) * 1e-3; - parameter Real K_OH = _K_OH [2]*((_K_OH [2]/_K_OH [1])^0.1)^(T-T0[2]) * 1e-3; - parameter Real K_NO = _K_NO [2]*((_K_NO [2]/_K_NO [1])^0.1)^(T-T0[2]) * 1e-3; - parameter Real b_H = _b_H [2]*((_b_H [2]/_b_H [1])^0.1)^(T-T0[2]) /(24*3600); - parameter Real mu_A = _mu_A [2]*((_mu_A [2]/_mu_A [1])^0.1)^(T-T0[2]) /(24*3600); - parameter Real mu_AOB= _mu_AOB[2]*((_mu_AOB[2]/_mu_AOB[1])^0.1)^(T-T0[2]) /(24*3600); - parameter Real mu_NOB= _mu_NOB[2]*((_mu_NOB[2]/_mu_NOB[1])^0.1)^(T-T0[2]) /(24*3600); - parameter Real K_NH = _K_NH [2]*((_K_NH [2]/_K_NH [1])^0.1)^(T-T0[2]) * 1e-3; - parameter Real K_OA = _K_OA [2]*((_K_OA [2]/_K_OA [1])^0.1)^(T-T0[2]) * 1e-3; - parameter Real b_A = _b_A [2]*((_b_A [2]/_b_A [1])^0.1)^(T-T0[2]) /(24*3600); - parameter Real b_AOB = _b_AOB[2]*((_b_AOB[2]/_b_AOB[1])^0.1)^(T-T0[2]) /(24*3600); - parameter Real b_NOB = _b_NOB[2]*((_b_NOB[2]/_b_NOB[1])^0.1)^(T-T0[2]) /(24*3600); - parameter Real nu_g = _nu_g [2]*((_nu_g [2]/_nu_g [1])^0.1)^(T-T0[2]); - parameter Real nu_NO2= _nu_NO2[2]*((_nu_NO2[2]/_nu_NO2[1])^0.1)^(T-T0[2]); - parameter Real nu_NO3= _nu_NO3[2]*((_nu_NO3[2]/_nu_NO3[1])^0.1)^(T-T0[2]); - parameter Real k_a = _k_a [2]*((_k_a [2]/_k_a [1])^0.1)^(T-T0[2]) /(24*3600) * 1000; - parameter Real k_h = _k_h [2]*((_k_h [2]/_k_h [1])^0.1)^(T-T0[2]) /(24*3600); - parameter Real K_X = _K_X [2]*((_K_X [2]/_K_X [1])^0.1)^(T-T0[2]); - parameter Real nu_h = _nu_h [2]*((_nu_h [2]/_nu_h [1])^0.1)^(T-T0[2]); - parameter Real Y_H = _Y_H [2]*((_Y_H [2]/_Y_H [1])^0.1)^(T-T0[2]); - parameter Real Y_A = _Y_A [2]*((_Y_A [2]/_Y_A [1])^0.1)^(T-T0[2]); - parameter Real Y_AOB = _Y_AOB[2]*((_Y_AOB[2]/_Y_AOB[1])^0.1)^(T-T0[2]); - parameter Real Y_NOB = _Y_NOB[2]*((_Y_NOB[2]/_Y_NOB[1])^0.1)^(T-T0[2]); - parameter Real f_p = _f_p [2]*((_f_p [2]/_f_p [1])^0.1)^(T-T0[2]); - parameter Real i_XB = _i_XB [2]*((_i_XB [2]/_i_XB [1])^0.1)^(T-T0[2]); - parameter Real i_XP = _i_XP [2]*((_i_XP [2]/_i_XP [1])^0.1)^(T-T0[2]); - parameter Real K_Alk = _K_Alk[2]*((_K_Alk[2]/_K_Alk[1])^0.1)^(T-T0[2]) * 1e-3; - parameter Real K_NHH = _K_NHH[2]*((_K_NHH[2]/_K_NHH[1])^0.1)^(T-T0[2]) * 1e-3; // Heterotrophs ammonia monod constant - parameter Real K_NHI = _K_NHI[2]*((_K_NHI[2]/_K_NHI[1])^0.1)^(T-T0[2]) * 1e-3; - - /* R - 1 Aerobic growth of heterotrophs - 2 Anoxic growth of heterotrophs on NO2 - 3 Anoxic growth of heterotrophs on NO3 - 4 Aerobic growth of AOB - 5 Aerobic growth of NOB - 6 Decay of heterotrophs - 7 Decay of AOB - 8 Decay of NOB - 9 Ammonification of SND - 10 Hydrolysis of XS - 11 Hydrolysis of XND - */ - - parameter Real SoluteReactions[Species.S, :] = { // Make sure we keep the order defined in Types.Species.S - // r1 DN-NO2 DN-NO3 N-AOB N-NOB r6 r7 r8 r9 r10 r11 - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, // I - { -1/Y_H, -1/Y_H, -1/Y_H, 0, 0, 0, 0, 0, 0, 1, 0}, // S - { 1-(1/Y_H), 0, 0, (Y_AOB-3.43)/Y_AOB, (Y_NOB-1.14)/Y_NOB, 0, 0, 0, 0, 0, 0}, // O - { 0, -(1-Y_H)/(1.72*Y_H), 0, 1/Y_AOB, -1/Y_NOB, 0, 0, 0, 0, 0, 0}, // NO2 - { 0, 0, -(1-Y_H)/(2.86*Y_H), 0, 1/Y_NOB, 0, 0, 0, 0, 0, 0}, // NO3 - { -i_XB, -i_XB, -i_XB, -i_XB - 1/Y_AOB, -i_XB, 0, 0, 0, 1, 0, 0}, // NH - { 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 1}, // ND - { -i_XB/14, (1-Y_H)/(14*1.72*Y_H)-i_XB/14, (1-Y_H)/(14*2.86*Y_H)-i_XB/14, -i_XB/14-1/(7*Y_AOB), -i_XB/14, 0, 0, 0, 1/14, 0, 0}, // Alk - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, // CO2 - { 0, (1-Y_H)/(1.72*Y_H), (1-Y_H)/(2.86*Y_H), 0, 0, 0, 0, 0, 0, 0, 0} // N2 - }; - - parameter Real ParticulateReactions[Species.X, :] = { // Make sure we keep the order defined in Types.Species.X - // r1 DN-NO2 DN-NO3 N-AOB N-NOB r6 r7 r8 r9 r10 r11 - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, // I - { 0, 0, 0, 0, 0, 1-f_p, 1-f_p, 1-f_p, 0, -1, 0}, // S - { 1, 1, 1, 0, 0, -1, 0, 0, 0, 0, 0}, // BH - { 0, 0, 0, 1, 0, 0, -1, 0, 0, 0, 0}, // AOB - { 0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 0}, // NOB - { 0, 0, 0, 0, 0, f_p, f_p, f_p, 0, 0, 0}, // p - { 0, 0, 0, 0, 0, i_XB-f_p*i_XP, i_XB-f_p*i_XP, i_XB-f_p*i_XP, 0, 0, -1} // ND - }; - + parameter Real mu_H = _mu_H[2] * ((_mu_H[2] / _mu_H[1]) ^ 0.1) ^ (T - T0[2]) / (24 * 3600); + parameter Real K_S = _K_S[2] * ((_K_S[2] / _K_S[1]) ^ 0.1) ^ (T - T0[2]) * 1e-3; + parameter Real K_OH = _K_OH[2] * ((_K_OH[2] / _K_OH[1]) ^ 0.1) ^ (T - T0[2]) * 1e-3; + parameter Real K_NO = _K_NO[2] * ((_K_NO[2] / _K_NO[1]) ^ 0.1) ^ (T - T0[2]) * 1e-3; + parameter Real b_H = _b_H[2] * ((_b_H[2] / _b_H[1]) ^ 0.1) ^ (T - T0[2]) / (24 * 3600); + parameter Real mu_A = _mu_A[2] * ((_mu_A[2] / _mu_A[1]) ^ 0.1) ^ (T - T0[2]) / (24 * 3600); + parameter Real mu_AOB = _mu_AOB[2] * ((_mu_AOB[2] / _mu_AOB[1]) ^ 0.1) ^ (T - T0[2]) / (24 * 3600); + parameter Real mu_NOB = _mu_NOB[2] * ((_mu_NOB[2] / _mu_NOB[1]) ^ 0.1) ^ (T - T0[2]) / (24 * 3600); + parameter Real K_NH = _K_NH[2] * ((_K_NH[2] / _K_NH[1]) ^ 0.1) ^ (T - T0[2]) * 1e-3; + parameter Real K_OA = _K_OA[2] * ((_K_OA[2] / _K_OA[1]) ^ 0.1) ^ (T - T0[2]) * 1e-3; + parameter Real b_A = _b_A[2] * ((_b_A[2] / _b_A[1]) ^ 0.1) ^ (T - T0[2]) / (24 * 3600); + parameter Real b_AOB = _b_AOB[2] * ((_b_AOB[2] / _b_AOB[1]) ^ 0.1) ^ (T - T0[2]) / (24 * 3600); + parameter Real b_NOB = _b_NOB[2] * ((_b_NOB[2] / _b_NOB[1]) ^ 0.1) ^ (T - T0[2]) / (24 * 3600); + parameter Real nu_g = _nu_g[2] * ((_nu_g[2] / _nu_g[1]) ^ 0.1) ^ (T - T0[2]); + parameter Real nu_NO2 = _nu_NO2[2] * ((_nu_NO2[2] / _nu_NO2[1]) ^ 0.1) ^ (T - T0[2]); + parameter Real nu_NO3 = _nu_NO3[2] * ((_nu_NO3[2] / _nu_NO3[1]) ^ 0.1) ^ (T - T0[2]); + parameter Real k_a = _k_a[2] * ((_k_a[2] / _k_a[1]) ^ 0.1) ^ (T - T0[2]) / (24 * 3600) * 1000; + parameter Real k_h = _k_h[2] * ((_k_h[2] / _k_h[1]) ^ 0.1) ^ (T - T0[2]) / (24 * 3600); + parameter Real K_X = _K_X[2] * ((_K_X[2] / _K_X[1]) ^ 0.1) ^ (T - T0[2]); + parameter Real nu_h = _nu_h[2] * ((_nu_h[2] / _nu_h[1]) ^ 0.1) ^ (T - T0[2]); + parameter Real Y_H = _Y_H[2] * ((_Y_H[2] / _Y_H[1]) ^ 0.1) ^ (T - T0[2]); + parameter Real Y_A = _Y_A[2] * ((_Y_A[2] / _Y_A[1]) ^ 0.1) ^ (T - T0[2]); + parameter Real Y_AOB = _Y_AOB[2] * ((_Y_AOB[2] / _Y_AOB[1]) ^ 0.1) ^ (T - T0[2]); + parameter Real Y_NOB = _Y_NOB[2] * ((_Y_NOB[2] / _Y_NOB[1]) ^ 0.1) ^ (T - T0[2]); + parameter Real f_p = _f_p[2] * ((_f_p[2] / _f_p[1]) ^ 0.1) ^ (T - T0[2]); + parameter Real i_XB = _i_XB[2] * ((_i_XB[2] / _i_XB[1]) ^ 0.1) ^ (T - T0[2]); + parameter Real i_XP = _i_XP[2] * ((_i_XP[2] / _i_XP[1]) ^ 0.1) ^ (T - T0[2]); + parameter Real K_Alk = _K_Alk[2] * ((_K_Alk[2] / _K_Alk[1]) ^ 0.1) ^ (T - T0[2]) * 1e-3; + parameter Real K_NHH = _K_NHH[2] * ((_K_NHH[2] / _K_NHH[1]) ^ 0.1) ^ (T - T0[2]) * 1e-3; + // Heterotrophs ammonia monod constant + parameter Real K_NHI = _K_NHI[2] * ((_K_NHI[2] / _K_NHI[1]) ^ 0.1) ^ (T - T0[2]) * 1e-3; + /* R + 1 Aerobic growth of heterotrophs + 2 Anoxic growth of heterotrophs on NO2 + 3 Anoxic growth of heterotrophs on NO3 + 4 Aerobic growth of AOB + 5 Aerobic growth of NOB + 6 Decay of heterotrophs + 7 Decay of AOB + 8 Decay of NOB + 9 Ammonification of SND + 10 Hydrolysis of XS + 11 Hydrolysis of XND + */ + parameter Real SoluteReactions[Species.S, :] = {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {-1 / Y_H, -1 / Y_H, -1 / Y_H, 0, 0, 0, 0, 0, 0, 1, 0}, {1 - 1 / Y_H, 0, 0, (Y_AOB - 3.43) / Y_AOB, (Y_NOB - 1.14) / Y_NOB, 0, 0, 0, 0, 0, 0}, {0, -(1 - Y_H) / (1.72 * Y_H), 0, 1 / Y_AOB, -1 / Y_NOB, 0, 0, 0, 0, 0, 0}, {0, 0, -(1 - Y_H) / (2.86 * Y_H), 0, 1 / Y_NOB, 0, 0, 0, 0, 0, 0}, {-i_XB, -i_XB, -i_XB, (-i_XB) - 1 / Y_AOB, -i_XB, 0, 0, 0, 1, 0, 0}, {0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 1}, {-i_XB / 14, (1 - Y_H) / (14 * 1.72 * Y_H) - i_XB / 14, (1 - Y_H) / (14 * 2.86 * Y_H) - i_XB / 14, (-i_XB / 14) - 1 / (7 * Y_AOB), -i_XB / 14, 0, 0, 0, 1 / 14, 0, 0}, {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {0, (1 - Y_H) / (1.72 * Y_H), (1 - Y_H) / (2.86 * Y_H), 0, 0, 0, 0, 0, 0, 0, 0}}; + // Make sure we keep the order defined in Types.Species.S + // r1 DN-NO2 DN-NO3 N-AOB N-NOB r6 r7 r8 r9 r10 r11 + // I + // S + // O + // NO2 + // NO3 + // NH + // ND + // Alk + // CO2 + // N2 + parameter Real ParticulateReactions[Species.X, :] = {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 1 - f_p, 1 - f_p, 1 - f_p, 0, -1, 0}, {1, 1, 1, 0, 0, -1, 0, 0, 0, 0, 0}, {0, 0, 0, 1, 0, 0, -1, 0, 0, 0, 0}, {0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 0}, {0, 0, 0, 0, 0, f_p, f_p, f_p, 0, 0, 0}, {0, 0, 0, 0, 0, i_XB - f_p * i_XP, i_XB - f_p * i_XP, i_XB - f_p * i_XP, 0, 0, -1}}; + // Make sure we keep the order defined in Types.Species.X + // r1 DN-NO2 DN-NO3 N-AOB N-NOB r6 r7 r8 r9 r10 r11 + // I + // S + // BH + // AOB + // NOB + // p + // ND end ProcessMatrix; -end ProcessData; +end ProcessData; \ No newline at end of file Only in converted-libraries/.openmodelica/libraries/LibRAS master/Types: ProcessData.mo.after Only in converted-libraries/.openmodelica/libraries/LibRAS master/Types: ProcessData.mo.before diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Utilities/oxygenSaturation.mo" "converted-libraries/.openmodelica/libraries/LibRAS master/Utilities/oxygenSaturation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Utilities/oxygenSaturation.mo" 2022-03-10 09:57:37.004143999 +0000 +++ "converted-libraries/.openmodelica/libraries/LibRAS master/Utilities/oxygenSaturation.mo" 2022-03-10 09:57:49.580145593 +0000 @@ -1,9 +1,9 @@ within LibRAS.Utilities; function oxygenSaturation - import to_degC = Modelica.SIunits.Conversions.to_degC; - input Modelica.SIunits.Temperature T; - output Modelica.SIunits.MassConcentration C_O2_sat; - algorithm + + import Modelica.Units.Conversions.to_degC; + input Modelica.Units.SI.Temperature T; + output Modelica.Units.SI.MassConcentration C_O2_sat; algorithm C_O2_sat := ((14.53 - 0.411 * to_degC(T) + 9.6e-3 * to_degC(T) ^ 2 - 1.2e-4 * to_degC(T) ^ 3) / 1000); end oxygenSaturation; \ No newline at end of file diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Valves/ValveLinear.mo" "converted-libraries/.openmodelica/libraries/LibRAS master/Valves/ValveLinear.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/Valves/ValveLinear.mo" 2022-03-10 09:57:37.004143999 +0000 +++ "converted-libraries/.openmodelica/libraries/LibRAS master/Valves/ValveLinear.mo" 2022-03-10 09:57:49.560145591 +0000 @@ -2,7 +2,7 @@ model ValveLinear "Valve for water/steam flows with linear pressure drop" extends LibRAS.Interfaces.PartialTwoPortTransport; - parameter Modelica.SIunits.AbsolutePressure dp_nominal + parameter Modelica.Units.SI.AbsolutePressure dp_nominal "Nominal pressure drop at full opening" annotation(Dialog(group="Nominal operating point")); parameter Medium.MassFlowRate m_flow_nominal diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/openmodelica.metadata.json" "converted-libraries/.openmodelica/libraries/LibRAS master/openmodelica.metadata.json" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/openmodelica.metadata.json" 2022-03-10 09:57:37.004143999 +0000 +++ "converted-libraries/.openmodelica/libraries/LibRAS master/openmodelica.metadata.json" 2022-03-10 09:57:51.460145832 +0000 @@ -1 +1 @@ -{"path":"LibRAS", "sha":"fca9de50a484a2213f3ca1b39e275c237c471688", "support":"noSupport", "uses":{"Modelica":"3.2.2"}, "version":"master", "zipfile":"https://github.com/FishSim/LibRAS/archive/fca9de50a484a2213f3ca1b39e275c237c471688.zip"} +{"path": "LibRAS", "sha": "fca9de50a484a2213f3ca1b39e275c237c471688", "support": "noSupport", "uses": {"Modelica": "4.0.0"}, "version": "master", "zipfile": "https://github.com/FishSim/LibRAS/archive/fca9de50a484a2213f3ca1b39e275c237c471688.zip", "extraInfo": "Conversion script /home/hudson/saved_omc/libraries/.openmodelica/libraries/Modelica 4.0.0+maint.om//Resources/Scripts/Conversion/ConvertModelica_from_3.2.3_to_4.0.0.mos was applied"} \ No newline at end of file diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/package.mo" "converted-libraries/.openmodelica/libraries/LibRAS master/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/LibRAS master/package.mo" 2022-03-10 09:57:37.004143999 +0000 +++ "converted-libraries/.openmodelica/libraries/LibRAS master/package.mo" 2022-03-10 09:57:51.456145831 +0000 @@ -1,5 +1,34 @@ within; package LibRAS - extends Modelica.Icons.Library; - annotation(uses(Modelica(version="3.2.2"))); + extends Modelica.Icons.Package; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + annotation(uses(Modelica(version= "4.0.0"))); end LibRAS;