diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Electrical/BreakerCircuits.mo" "converted-libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Electrical/BreakerCircuits.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Electrical/BreakerCircuits.mo" 2022-03-10 09:57:37.620144078 +0000
+++ "converted-libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Electrical/BreakerCircuits.mo" 2022-03-10 09:59:13.956156279 +0000
@@ -3,17 +3,17 @@
package Models
model Breaker "Circuit breaker, immediate action"
extends Modelica.Electrical.Analog.Interfaces.OnePort;
- parameter Modelica.SIunits.Current Imax;
+ parameter Modelica.Units.SI.Current Imax;
parameter String name = "";
- parameter Modelica.SIunits.Conductance Gopen = 1e-6
+ parameter Modelica.Units.SI.Conductance Gopen = 1e-6
"Conductance when open";
- parameter Modelica.SIunits.Conductance Gclosed = 1e6
+ parameter Modelica.Units.SI.Conductance Gclosed = 1e6
"Conductance when closed";
Boolean open(start = false, fixed = true) "State of the breaker";
- discrete Modelica.SIunits.Conductance G(start = Gclosed, fixed = true)
- "Conductance";
+ discrete Modelica.Units.SI.Conductance G(start = Gclosed, fixed = true)
+ "Conductance";
equation
i = G*v;
when i > Imax then
@@ -49,22 +49,22 @@
model BreakerDelayed "Circuit Breaker, delayed action"
extends Modelica.Electrical.Analog.Interfaces.OnePort;
- parameter Modelica.SIunits.Current Imax;
+ parameter Modelica.Units.SI.Current Imax;
parameter String name = "";
- parameter Modelica.SIunits.Time delayTime = 1e-3
+ parameter Modelica.Units.SI.Time delayTime = 1e-3
"Delay between the threshold crossing and the breaker opening";
- parameter Modelica.SIunits.Conductance Gopen = 1e-6
+ parameter Modelica.Units.SI.Conductance Gopen = 1e-6
"Conductance when open";
- parameter Modelica.SIunits.Conductance Gclosed = 1e6
+ parameter Modelica.Units.SI.Conductance Gclosed = 1e6
"Conductance when closed";
Boolean open(start = false, fixed = true) "State of the breaker";
Boolean triggered(start = false, fixed = true)
"The current threshold has been crossed";
- discrete Modelica.SIunits.Conductance G(start = Gclosed, fixed = true)
- "Conductance";
- discrete Modelica.SIunits.Time timeClose(start = 1e9, fixed = true);
+ discrete Modelica.Units.SI.Conductance G(start = Gclosed, fixed = true)
+ "Conductance";
+ discrete Modelica.Units.SI.Time timeClose(start = 1e9, fixed = true);
equation
i = G*v;
when triggered and time > timeClose then
@@ -108,7 +108,7 @@
model BreakerNetwork "Network with N breakers and M event iterations"
parameter Integer N = 3 "Number of breakers";
parameter Integer M = 2 "Number of event iterations";
- parameter Modelica.SIunits.Current Imax[N](each fixed = false);
+ parameter Modelica.Units.SI.Current Imax[N](each fixed = false);
Modelica.Electrical.Analog.Sources.SignalCurrent source;
Modelica.Electrical.Analog.Basic.Conductor G[N+1](each G=1);
Models.Breaker B[N](name={String(i) for i in 1:N}, Imax=Imax);
@@ -155,7 +155,7 @@
model BreakerNetworkDelayed "Network with N delayed breakers"
parameter Integer N = 3 "Number of delayed breakers";
parameter Integer M = 2 "Number of events to be triggered";
- parameter Modelica.SIunits.Current Imax[N](each fixed = false);
+ parameter Modelica.Units.SI.Current Imax[N](each fixed = false);
Modelica.Electrical.Analog.Sources.SignalCurrent source;
Modelica.Electrical.Analog.Basic.Conductor G[N+1](each G=1);
Models.BreakerDelayed B[N](name={String(i) for i in 1:N}, Imax=Imax);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Electrical/DistributionSystemAC.mo" "converted-libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Electrical/DistributionSystemAC.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Electrical/DistributionSystemAC.mo" 2022-03-10 09:57:37.624144079 +0000
+++ "converted-libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Electrical/DistributionSystemAC.mo" 2022-03-10 09:59:13.892156271 +0000
@@ -1,6 +1,6 @@
within ScalableTestSuite.Electrical;
package DistributionSystemAC
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
package Models
package Internals
@@ -54,7 +54,7 @@
end VoltageSource;
model ActivePowerSensor
- extends Modelica.Icons.RotationalSensor;
+ extends Modelica.Icons.RoundSensor;
PositivePin s "Connect to the power source" annotation(Placement(visible = true, transformation(origin = {-100, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {-100, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
PositivePin p "Connect to the load positive pin" annotation(Placement(visible = true, transformation(origin = {100, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {100, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
NegativePin n "Connect to the load negative pin" annotation(Placement(visible = true, transformation(origin = {0, 100}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {0, 100}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
@@ -156,7 +156,7 @@
parameter SI.Resistance R_l = 100 "Resistance of a single load";
parameter SI.Resistance R_d2 = R_l / (M ^ 2 * alpha) "Resistance of a secondary distribution segment";
parameter SI.Resistance R_d1 = R_l / (M ^ 2 * N ^ 2 * alpha) "Resistance of a primary distribution segment";
- parameter Modelica.SIunits.Voltage V_ref = 600 "Reference source voltage";
+ parameter Modelica.Units.SI.Voltage V_ref = 600 "Reference source voltage";
Internals.Impedance primary[N](each Z(re = R_d1, im = R_d1 * beta)) "Primary distribution line segments";
Internals.Impedance secondary[N, M](each Z(re = R_d2, im = R_d2 * beta)) "Secondary distribution line segments";
Internals.LinearControlledLoad load[N, M](each V_nom = V_ref, each P_nom = V_ref ^ 2 / R_l) "Individual load resistors";
@@ -197,7 +197,7 @@
Integer M = N "Number of segments of each secondary distribution line";
Real alpha = 10 "Distribution line oversizing factor";
Real beta = 2 "Ratio between line inductance and line resistance";
- Modelica.SIunits.Resistance R_l = 100 "Resistance of a single load";
+ Modelica.Units.SI.Resistance R_l = 100 "Resistance of a single load";
algorithm
Modelica.Utilities.Files.removeFile("code.mo");
print("model DistributionSystemLinearIndividual_N_" + String(N) + "_M_" + String(M));
@@ -259,10 +259,10 @@
parameter Integer M = 2 "Number of segments of each secondary distribution line";
parameter Real alpha = 10 "Distribution line oversizing factor";
parameter Real beta = 2 "Ratio between line inductance and line resistance";
- parameter Modelica.SIunits.Resistance R_l = 100 "Resistance of a single load";
- parameter Modelica.SIunits.Resistance R_d2 = R_l/(M^2*alpha) "Resistance of a secondary distribution segment";
- parameter Modelica.SIunits.Resistance R_d1 = R_l/(M^2*N^2*alpha) "Resistance of a primary distribution segment";
- parameter Modelica.SIunits.Voltage V_ref = 600 "Reference source voltage";
+ parameter Modelica.Units.SI.Resistance R_l = 100 "Resistance of a single load";
+ parameter Modelica.Units.SI.Resistance R_d2 = R_l/(M^2*alpha) "Resistance of a secondary distribution segment";
+ parameter Modelica.Units.SI.Resistance R_d1 = R_l/(M^2*N^2*alpha) "Resistance of a primary distribution segment";
+ parameter Modelica.Units.SI.Voltage V_ref = 600 "Reference source voltage";
Models.Internals.Impedance primary_1(Z(re = R_d1, im = R_d1 * beta)) "Primary distribution line segment";
Models.Internals.Impedance secondary_1_1(Z(re = R_d2, im = R_d2 * beta)) "Secondary distribution line segment";
@@ -372,10 +372,10 @@
parameter Integer M = 10 "Number of segments of each secondary distribution line";
parameter Real alpha = 10 "Distribution line oversizing factor";
parameter Real beta = 2 "Ratio between line inductance and line resistance";
- parameter Modelica.SIunits.Resistance R_l = 100 "Resistance of a single load";
- parameter Modelica.SIunits.Resistance R_d2 = R_l / (M ^ 2 * alpha) "Resistance of a secondary distribution segment";
- parameter Modelica.SIunits.Resistance R_d1 = R_l / (M ^ 2 * N ^ 2 * alpha) "Resistance of a primary distribution segment";
- parameter Modelica.SIunits.Voltage V_ref = 600 "Reference source voltage";
+ parameter Modelica.Units.SI.Resistance R_l = 100 "Resistance of a single load";
+ parameter Modelica.Units.SI.Resistance R_d2 = R_l / (M ^ 2 * alpha) "Resistance of a secondary distribution segment";
+ parameter Modelica.Units.SI.Resistance R_d1 = R_l / (M ^ 2 * N ^ 2 * alpha) "Resistance of a primary distribution segment";
+ parameter Modelica.Units.SI.Voltage V_ref = 600 "Reference source voltage";
Models.Internals.Impedance primary_1(Z(re = R_d1, im = R_d1 * beta)) "Primary distribution line segment";
Models.Internals.Impedance secondary_1_1(Z(re = R_d2, im = R_d2 * beta)) "Secondary distribution line segment";
Models.Internals.LinearControlledLoad load_1_1(V_nom = V_ref, P_nom = V_ref ^ 2 / R_l) "Individual load resistor";
@@ -808,10 +808,10 @@
parameter Integer M = 14 "Number of segments of each secondary distribution line";
parameter Real alpha = 10 "Distribution line oversizing factor";
parameter Real beta = 2 "Ratio between line inductance and line resistance";
- parameter Modelica.SIunits.Resistance R_l = 100 "Resistance of a single load";
- parameter Modelica.SIunits.Resistance R_d2 = R_l / (M ^ 2 * alpha) "Resistance of a secondary distribution segment";
- parameter Modelica.SIunits.Resistance R_d1 = R_l / (M ^ 2 * N ^ 2 * alpha) "Resistance of a primary distribution segment";
- parameter Modelica.SIunits.Voltage V_ref = 600 "Reference source voltage";
+ parameter Modelica.Units.SI.Resistance R_l = 100 "Resistance of a single load";
+ parameter Modelica.Units.SI.Resistance R_d2 = R_l / (M ^ 2 * alpha) "Resistance of a secondary distribution segment";
+ parameter Modelica.Units.SI.Resistance R_d1 = R_l / (M ^ 2 * N ^ 2 * alpha) "Resistance of a primary distribution segment";
+ parameter Modelica.Units.SI.Voltage V_ref = 600 "Reference source voltage";
Models.Internals.Impedance primary_1(Z(re = R_d1, im = R_d1 * beta)) "Primary distribution line segment";
Models.Internals.Impedance secondary_1_1(Z(re = R_d2, im = R_d2 * beta)) "Secondary distribution line segment";
Models.Internals.LinearControlledLoad load_1_1(V_nom = V_ref, P_nom = V_ref ^ 2 / R_l) "Individual load resistor";
@@ -1636,10 +1636,10 @@
parameter Integer M = 20 "Number of segments of each secondary distribution line";
parameter Real alpha = 10 "Distribution line oversizing factor";
parameter Real beta = 2 "Ratio between line inductance and line resistance";
- parameter Modelica.SIunits.Resistance R_l = 100 "Resistance of a single load";
- parameter Modelica.SIunits.Resistance R_d2 = R_l / (M ^ 2 * alpha) "Resistance of a secondary distribution segment";
- parameter Modelica.SIunits.Resistance R_d1 = R_l / (M ^ 2 * N ^ 2 * alpha) "Resistance of a primary distribution segment";
- parameter Modelica.SIunits.Voltage V_ref = 600 "Reference source voltage";
+ parameter Modelica.Units.SI.Resistance R_l = 100 "Resistance of a single load";
+ parameter Modelica.Units.SI.Resistance R_d2 = R_l / (M ^ 2 * alpha) "Resistance of a secondary distribution segment";
+ parameter Modelica.Units.SI.Resistance R_d1 = R_l / (M ^ 2 * N ^ 2 * alpha) "Resistance of a primary distribution segment";
+ parameter Modelica.Units.SI.Voltage V_ref = 600 "Reference source voltage";
Models.Internals.Impedance primary_1(Z(re = R_d1, im = R_d1 * beta)) "Primary distribution line segment";
Models.Internals.Impedance secondary_1_1(Z(re = R_d2, im = R_d2 * beta)) "Secondary distribution line segment";
Models.Internals.LinearControlledLoad load_1_1(V_nom = V_ref, P_nom = V_ref ^ 2 / R_l) "Individual load resistor";
@@ -3292,10 +3292,10 @@
parameter Integer M = 28 "Number of segments of each secondary distribution line";
parameter Real alpha = 10 "Distribution line oversizing factor";
parameter Real beta = 2 "Ratio between line inductance and line resistance";
- parameter Modelica.SIunits.Resistance R_l = 100 "Resistance of a single load";
- parameter Modelica.SIunits.Resistance R_d2 = R_l / (M ^ 2 * alpha) "Resistance of a secondary distribution segment";
- parameter Modelica.SIunits.Resistance R_d1 = R_l / (M ^ 2 * N ^ 2 * alpha) "Resistance of a primary distribution segment";
- parameter Modelica.SIunits.Voltage V_ref = 600 "Reference source voltage";
+ parameter Modelica.Units.SI.Resistance R_l = 100 "Resistance of a single load";
+ parameter Modelica.Units.SI.Resistance R_d2 = R_l / (M ^ 2 * alpha) "Resistance of a secondary distribution segment";
+ parameter Modelica.Units.SI.Resistance R_d1 = R_l / (M ^ 2 * N ^ 2 * alpha) "Resistance of a primary distribution segment";
+ parameter Modelica.Units.SI.Voltage V_ref = 600 "Reference source voltage";
Models.Internals.Impedance primary_1(Z(re = R_d1, im = R_d1 * beta)) "Primary distribution line segment";
Models.Internals.Impedance secondary_1_1(Z(re = R_d2, im = R_d2 * beta)) "Secondary distribution line segment";
Models.Internals.LinearControlledLoad load_1_1(V_nom = V_ref, P_nom = V_ref ^ 2 / R_l) "Individual load resistor";
@@ -6500,10 +6500,10 @@
parameter Integer M = 40 "Number of segments of each secondary distribution line";
parameter Real alpha = 10 "Distribution line oversizing factor";
parameter Real beta = 2 "Ratio between line inductance and line resistance";
- parameter Modelica.SIunits.Resistance R_l = 100 "Resistance of a single load";
- parameter Modelica.SIunits.Resistance R_d2 = R_l/(M^2*alpha) "Resistance of a secondary distribution segment";
- parameter Modelica.SIunits.Resistance R_d1 = R_l/(M^2*N^2*alpha) "Resistance of a primary distribution segment";
- parameter Modelica.SIunits.Voltage V_ref = 600 "Reference source voltage";
+ parameter Modelica.Units.SI.Resistance R_l = 100 "Resistance of a single load";
+ parameter Modelica.Units.SI.Resistance R_d2 = R_l/(M^2*alpha) "Resistance of a secondary distribution segment";
+ parameter Modelica.Units.SI.Resistance R_d1 = R_l/(M^2*N^2*alpha) "Resistance of a primary distribution segment";
+ parameter Modelica.Units.SI.Voltage V_ref = 600 "Reference source voltage";
Models.Internals.Impedance primary_1(Z(re = R_d1, im = R_d1 * beta)) "Primary distribution line segment";
Models.Internals.Impedance secondary_1_1(Z(re = R_d2, im = R_d2 * beta)) "Secondary distribution line segment";
@@ -12997,10 +12997,10 @@
parameter Integer M = 56 "Number of segments of each secondary distribution line";
parameter Real alpha = 10 "Distribution line oversizing factor";
parameter Real beta = 2 "Ratio between line inductance and line resistance";
- parameter Modelica.SIunits.Resistance R_l = 100 "Resistance of a single load";
- parameter Modelica.SIunits.Resistance R_d2 = R_l/(M^2*alpha) "Resistance of a secondary distribution segment";
- parameter Modelica.SIunits.Resistance R_d1 = R_l/(M^2*N^2*alpha) "Resistance of a primary distribution segment";
- parameter Modelica.SIunits.Voltage V_ref = 600 "Reference source voltage";
+ parameter Modelica.Units.SI.Resistance R_l = 100 "Resistance of a single load";
+ parameter Modelica.Units.SI.Resistance R_d2 = R_l/(M^2*alpha) "Resistance of a secondary distribution segment";
+ parameter Modelica.Units.SI.Resistance R_d1 = R_l/(M^2*N^2*alpha) "Resistance of a primary distribution segment";
+ parameter Modelica.Units.SI.Voltage V_ref = 600 "Reference source voltage";
Models.Internals.Impedance primary_1(Z(re = R_d1, im = R_d1 * beta)) "Primary distribution line segment";
Models.Internals.Impedance secondary_1_1(Z(re = R_d2, im = R_d2 * beta)) "Secondary distribution line segment";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Electrical/DistributionSystemDC.mo" "converted-libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Electrical/DistributionSystemDC.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Electrical/DistributionSystemDC.mo" 2022-03-10 09:57:37.628144078 +0000
+++ "converted-libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Electrical/DistributionSystemDC.mo" 2022-03-10 09:58:52.624153579 +0000
@@ -7,13 +7,13 @@
parameter Integer M = N
"Number of segments of each secondary distribution line";
parameter Real alpha = 2 "Distribution line oversizing factor";
- parameter Modelica.SIunits.Resistance R_l = 1
+ parameter Modelica.Units.SI.Resistance R_l = 1
"Resistance of a single load";
- parameter Modelica.SIunits.Resistance R_d2 = R_l/(M^2*alpha)
+ parameter Modelica.Units.SI.Resistance R_d2 = R_l/(M^2*alpha)
"Resistance of a secondary distribution segment";
- parameter Modelica.SIunits.Resistance R_d1 = R_l/(M^2*N^2*alpha)
+ parameter Modelica.Units.SI.Resistance R_d1 = R_l/(M^2*N^2*alpha)
"Resistance of a primary distribution segment";
- parameter Modelica.SIunits.Voltage V_ref = 600 "Reference source voltage";
+ parameter Modelica.Units.SI.Voltage V_ref = 600 "Reference source voltage";
Modelica.Electrical.Analog.Basic.Resistor primary[N](each R = R_d1)
"Primary distribution line segments";
@@ -58,7 +58,7 @@
parameter Integer M = N
"Number of segments of each secondary distribution line";
parameter Real alpha = 2 "Distribution line oversizing factor";
- parameter Modelica.SIunits.Resistance R_l = 1
+ parameter Modelica.Units.SI.Resistance R_l = 1
"Resistance of a single load";
function print = Modelica.Utilities.Streams.print;
algorithm
@@ -162,8 +162,8 @@
model ActiveLoad
"Model of an active load, with ramp-shaped current consumption"
- parameter Modelica.SIunits.Current I_max;
- parameter Modelica.SIunits.Time T = 0.1;
+ parameter Modelica.Units.SI.Current I_max;
+ parameter Modelica.Units.SI.Time T = 0.1;
Modelica.Electrical.Analog.Basic.Ground ground
annotation (Placement(transformation(extent={{54,-26},{74,-6}})));
@@ -265,13 +265,13 @@
parameter Integer M = 10
" Number of segments of each secondary distribution line";
parameter Real alpha = 2 "Distribution line oversizing factor";
- parameter Modelica.SIunits.Resistance R_l = 1
+ parameter Modelica.Units.SI.Resistance R_l = 1
"Resistance of a single load";
- parameter Modelica.SIunits.Resistance R_d2 = R_l/(M^2*alpha)
+ parameter Modelica.Units.SI.Resistance R_d2 = R_l/(M^2*alpha)
"Resistance of a secondary distribution segment";
- parameter Modelica.SIunits.Resistance R_d1 = R_l/(M^2*N^2*alpha)
+ parameter Modelica.Units.SI.Resistance R_d1 = R_l/(M^2*N^2*alpha)
"Resistance of a primary distribution segment";
- parameter Modelica.SIunits.Voltage V_ref = 600 "Reference source voltage";
+ parameter Modelica.Units.SI.Voltage V_ref = 600 "Reference source voltage";
Modelica.Electrical.Analog.Basic.Resistor primary_1(R = R_d1)
"Primary distribution line segment";
@@ -1217,13 +1217,13 @@
parameter Integer M = 20
" Number of segments of each secondary distribution line";
parameter Real alpha = 2 "Distribution line oversizing factor";
- parameter Modelica.SIunits.Resistance R_l = 1
+ parameter Modelica.Units.SI.Resistance R_l = 1
"Resistance of a single load";
- parameter Modelica.SIunits.Resistance R_d2 = R_l/(M^2*alpha)
+ parameter Modelica.Units.SI.Resistance R_d2 = R_l/(M^2*alpha)
"Resistance of a secondary distribution segment";
- parameter Modelica.SIunits.Resistance R_d1 = R_l/(M^2*N^2*alpha)
+ parameter Modelica.Units.SI.Resistance R_d1 = R_l/(M^2*N^2*alpha)
"Resistance of a primary distribution segment";
- parameter Modelica.SIunits.Voltage V_ref = 600 "Reference source voltage";
+ parameter Modelica.Units.SI.Voltage V_ref = 600 "Reference source voltage";
Modelica.Electrical.Analog.Basic.Resistor primary_1(R = R_d1)
"Primary distribution line segment";
@@ -4899,13 +4899,13 @@
parameter Integer M = 40
" Number of segments of each secondary distribution line";
parameter Real alpha = 2 "Distribution line oversizing factor";
- parameter Modelica.SIunits.Resistance R_l = 1
+ parameter Modelica.Units.SI.Resistance R_l = 1
"Resistance of a single load";
- parameter Modelica.SIunits.Resistance R_d2 = R_l/(M^2*alpha)
+ parameter Modelica.Units.SI.Resistance R_d2 = R_l/(M^2*alpha)
"Resistance of a secondary distribution segment";
- parameter Modelica.SIunits.Resistance R_d1 = R_l/(M^2*N^2*alpha)
+ parameter Modelica.Units.SI.Resistance R_d1 = R_l/(M^2*N^2*alpha)
"Resistance of a primary distribution segment";
- parameter Modelica.SIunits.Voltage V_ref = 600 "Reference source voltage";
+ parameter Modelica.Units.SI.Voltage V_ref = 600 "Reference source voltage";
Modelica.Electrical.Analog.Basic.Resistor primary_1(R = R_d1)
"Primary distribution line segment";
@@ -19441,13 +19441,13 @@
parameter Integer M = 80
" Number of segments of each secondary distribution line";
parameter Real alpha = 2 "Distribution line oversizing factor";
- parameter Modelica.SIunits.Resistance R_l = 1
+ parameter Modelica.Units.SI.Resistance R_l = 1
"Resistance of a single load";
- parameter Modelica.SIunits.Resistance R_d2 = R_l/(M^2*alpha)
+ parameter Modelica.Units.SI.Resistance R_d2 = R_l/(M^2*alpha)
"Resistance of a secondary distribution segment";
- parameter Modelica.SIunits.Resistance R_d1 = R_l/(M^2*N^2*alpha)
+ parameter Modelica.Units.SI.Resistance R_d1 = R_l/(M^2*N^2*alpha)
"Resistance of a primary distribution segment";
- parameter Modelica.SIunits.Voltage V_ref = 600 "Reference source voltage";
+ parameter Modelica.Units.SI.Voltage V_ref = 600 "Reference source voltage";
Modelica.Electrical.Analog.Basic.Resistor primary_1(R = R_d1)
"Primary distribution line segment";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Electrical/TransmissionLine.mo" "converted-libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Electrical/TransmissionLine.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Electrical/TransmissionLine.mo" 2022-03-10 09:57:37.628144078 +0000
+++ "converted-libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Electrical/TransmissionLine.mo" 2022-03-10 09:58:04.912147537 +0000
@@ -2,13 +2,13 @@
package TransmissionLine "Models of transmission lines"
package Models
model TransmissionLine "Modular model of an electrical transmission line"
- import Modelica.SIunits;
+ import Modelica.Units.SI;
import Modelica.Electrical.Analog;
- SIunits.Voltage vpg "voltage of pin p of the transmission line";
- SIunits.Voltage vng "voltage of pin n of the transmission line";
- SIunits.Current ipin_p
+ SI.Voltage vpg "voltage of pin p of the transmission line";
+ SI.Voltage vng "voltage of pin n of the transmission line";
+ SI.Current ipin_p
"current flows through pin p of the transmission line";
- SIunits.Current ipin_n
+ SI.Current ipin_n
"current flows through pin n of the transmission line";
Analog.Interfaces.Pin pin_p annotation(Placement(transformation(origin = {-100, 0}, extent = {{-10, -10}, {10, 10}}), iconTransformation(origin = {-100, 0}, extent = {{-10, -10}, {10, 10}})));
Analog.Interfaces.Pin pin_n annotation(Placement(transformation(origin = {100, 0}, extent = {{-10, -10}, {10, 10}}), iconTransformation(origin = {100, 0}, extent = {{-10, -10}, {10, 10}})));
@@ -75,24 +75,24 @@
model TransmissionLineEquations
"Transmission line circuit - Direct implementation by equations"
- import Modelica.SIunits;
+ import Modelica.Units.SI;
parameter Integer N = 1 "number of segments";
- parameter SIunits.Length L "length of the transmission line";
- final parameter SIunits.Length l = L / N "length of the each segment";
- parameter SIunits.Resistance res "resistance per meter";
- parameter SIunits.Capacitance cap "capacitance per meter";
- parameter SIunits.Inductance ind "inductance per meter";
- final parameter SIunits.Resistance RL = (ind / cap) ^ (1 / 2)
+ parameter SI.Length L "length of the transmission line";
+ final parameter SI.Length l = L / N "length of the each segment";
+ parameter SI.Resistance res "resistance per meter";
+ parameter SI.Capacitance cap "capacitance per meter";
+ parameter SI.Inductance ind "inductance per meter";
+ final parameter SI.Resistance RL = (ind / cap) ^ (1 / 2)
"load resistance";
- parameter SIunits.AngularFrequency w;
- final parameter SIunits.Time TD = L / v
+ parameter SI.AngularFrequency w;
+ final parameter SI.Time TD = L / v
"time delay of the transmission line";
- final parameter SIunits.Velocity v = 1 / (ind * cap) ^ (1 / 2)
+ final parameter SI.Velocity v = 1 / (ind * cap) ^ (1 / 2)
"velocity of the signal";
- SIunits.Voltage Vstep = if time > 0 then 1 else 0 "input step voltage";
- SIunits.Current cur[N](each start = 0)
+ SI.Voltage Vstep = if time > 0 then 1 else 0 "input step voltage";
+ SI.Current cur[N](each start = 0)
"current values at the nodes of the transmission line";
- SIunits.Voltage vol[N](each start = 0)
+ SI.Voltage vol[N](each start = 0)
"voltage values at the nodes of the transmission line";
Real vvol "derivative of input voltage";
equation
@@ -159,18 +159,18 @@
model TransmissionLineModelica
"Transmission line circuit - Implementation using the Modelica Standard Library"
- import Modelica.SIunits;
+ import Modelica.Units.SI;
parameter Integer N = 1 "number of segments of the transmission line";
- parameter SIunits.Resistance r "resistance per meter";
- parameter SIunits.Inductance l "inductance per meter";
- parameter SIunits.Capacitance c "capacitance per meter";
- parameter SIunits.Length length "length of the transmission line";
- parameter SIunits.AngularFrequency w "cut-off frequency";
- final parameter SIunits.Resistance RL = (l / c) ^ (1 / 2)
+ parameter SI.Resistance r "resistance per meter";
+ parameter SI.Inductance l "inductance per meter";
+ parameter SI.Capacitance c "capacitance per meter";
+ parameter SI.Length length "length of the transmission line";
+ parameter SI.AngularFrequency w "cut-off frequency";
+ final parameter SI.Resistance RL = (l / c) ^ (1 / 2)
"load resistance";
- final parameter SIunits.Time TD = length / v
+ final parameter SI.Time TD = length / v
"time delay of the transmission line";
- final parameter SIunits.Velocity v = 1 / (l * c) ^ (1 / 2)
+ final parameter SI.Velocity v = 1 / (l * c) ^ (1 / 2)
"velocity of the signal";
Modelica.Electrical.Analog.Sources.SignalVoltage signalvoltage annotation(Placement(transformation(origin = {-34, 54}, extent = {{-10, -10}, {10, 10}}, rotation = 180)));
Modelica.Electrical.Analog.Basic.Ground ground1 annotation(Placement(transformation(origin = {-56, 40}, extent = {{-10, -10}, {10, 10}})));
@@ -236,23 +236,23 @@
package Verification
model TransmissionLineCheck
"Verification of the transmission line circuits by using time delay"
- import Modelica.SIunits;
+ import Modelica.Units.SI;
parameter Integer N = 30 "number of segments";
- parameter SIunits.Length L = 100 "length of the transmission line";
- parameter SIunits.Resistance res = 48e-6 "resistance per meter";
- parameter SIunits.Capacitance cap = 101e-12 "capacitance per meter";
- parameter SIunits.Inductance ind = 253e-9 "inductance per meter";
- parameter SIunits.Resistance RL = (ind / cap) ^ (1 / 2) "load resistance";
- parameter SIunits.AngularFrequency w = 5e6 "cut-off frequency";
- parameter SIunits.Time TD = L / v "time delay of the transmission line";
- parameter SIunits.Velocity v = 1 / (ind * cap) ^ (1 / 2)
+ parameter SI.Length L = 100 "length of the transmission line";
+ parameter SI.Resistance res = 48e-6 "resistance per meter";
+ parameter SI.Capacitance cap = 101e-12 "capacitance per meter";
+ parameter SI.Inductance ind = 253e-9 "inductance per meter";
+ parameter SI.Resistance RL = (ind / cap) ^ (1 / 2) "load resistance";
+ parameter SI.AngularFrequency w = 5e6 "cut-off frequency";
+ parameter SI.Time TD = L / v "time delay of the transmission line";
+ parameter SI.Velocity v = 1 / (ind * cap) ^ (1 / 2)
"velocity of the signal";
Models.TransmissionLineEquations tlm2(N = N, L = L, res = res, cap = cap, ind = ind, w = w);
Models.TransmissionLineModelica tlm1(N = N, r = res, l = ind, c = cap, length = L, w = w);
- SIunits.Voltage voltage_modelica;
- SIunits.Voltage voltage_equations;
- SIunits.Voltage voltage_modelica_delayed;
- SIunits.Voltage voltage_equations_delayed;
+ SI.Voltage voltage_modelica;
+ SI.Voltage voltage_equations;
+ SI.Voltage voltage_modelica_delayed;
+ SI.Voltage voltage_equations_delayed;
equation
voltage_modelica = tlm1.resistor.p.v;
voltage_equations = tlm2.vol[N];
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Elementary/SimpleODE.mo" "converted-libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Elementary/SimpleODE.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Elementary/SimpleODE.mo" 2022-03-10 09:57:37.628144078 +0000
+++ "converted-libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Elementary/SimpleODE.mo" 2022-03-10 09:58:04.788147520 +0000
@@ -4,8 +4,8 @@
model CascadedFirstOrder
"N cascaded first order systems, approximating a pure delay"
parameter Integer N = 10 "Order of the system";
- parameter Modelica.SIunits.Time T = 1 "System delay";
- final parameter Modelica.SIunits.Time tau = T/N "Individual time constant";
+ parameter Modelica.Units.SI.Time T = 1 "System delay";
+ final parameter Modelica.Units.SI.Time tau = T/N "Individual time constant";
Real x[N] (each start = 0, each fixed = true);
equation
tau*der(x[1]) = 1 - x[1];
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Mechanical/FlexibleBeam.mo" "converted-libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Mechanical/FlexibleBeam.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Mechanical/FlexibleBeam.mo" 2022-03-10 09:57:37.628144078 +0000
+++ "converted-libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Mechanical/FlexibleBeam.mo" 2022-03-10 09:58:04.676147506 +0000
@@ -3,22 +3,22 @@
package Models
model FlexibleBeamModelica
"Cantilever beam implementation by the Modelica Standard Library"
- import Modelica.SIunits;
+ import Modelica.Units.SI;
inner Modelica.Mechanics.MultiBody.World world(gravityType = Modelica.Mechanics.MultiBody.Types.GravityTypes.NoGravity);
parameter Integer N = 1 "number of elements";
- parameter SIunits.Length L "length of the beam";
- final parameter SIunits.Length l = L / N "length of the each BodyBox";
- parameter SIunits.Length W "width of the beam";
- parameter SIunits.Height H "height of the beam";
- parameter SIunits.Density D "density of the material";
- parameter SIunits.ModulusOfElasticity E "young's modulus of the material";
- final parameter SIunits.SecondMomentOfArea J = W * H ^ 3 / 12
+ parameter SI.Length L "length of the beam";
+ final parameter SI.Length l = L / N "length of the each BodyBox";
+ parameter SI.Length W "width of the beam";
+ parameter SI.Height H "height of the beam";
+ parameter SI.Density D "density of the material";
+ parameter SI.ModulusOfElasticity E "young's modulus of the material";
+ final parameter SI.SecondMomentOfArea J = W * H ^ 3 / 12
"area moment of inertia";
- parameter SIunits.RotationalDampingConstant DampCoeff
+ parameter SI.RotationalDampingConstant DampCoeff
"damping coefficient";
- final parameter SIunits.RotationalSpringConstant SpringCoeff = E * J / l
+ final parameter SI.RotationalSpringConstant SpringCoeff = E * J / l
"spring coefficient";
- parameter SIunits.PerUnit F "force component at y-axis";
+ parameter SI.PerUnit F "force component at y-axis";
Modelica.Mechanics.MultiBody.Joints.Revolute revolute[N](each useAxisFlange = true, phi(each fixed = true), w(each fixed = true))
"N revolute joint";
Modelica.Mechanics.Rotational.Components.SpringDamper springdamper[N](each c = SpringCoeff, each d = DampCoeff)
@@ -104,18 +104,18 @@
package Verification
model FlexibleBeamCheck "cantilever beam analytical solution"
- import Modelica.SIunits;
+ import Modelica.Units.SI;
parameter Integer N = 10 "number of elements";
- parameter SIunits.Length L = 0.5 "length of the beam";
- parameter SIunits.Length W = 0.05 "width of the beam";
- parameter SIunits.Height H = 0.02 "height of the beam";
- parameter SIunits.Density D = 2700 "density of the material";
- parameter SIunits.ModulusOfElasticity E = 6.9e10
+ parameter SI.Length L = 0.5 "length of the beam";
+ parameter SI.Length W = 0.05 "width of the beam";
+ parameter SI.Height H = 0.02 "height of the beam";
+ parameter SI.Density D = 2700 "density of the material";
+ parameter SI.ModulusOfElasticity E = 6.9e10
"young's modulus of the material";
- parameter SIunits.RotationalDampingConstant DampCoeff = 0.00001
+ parameter SI.RotationalDampingConstant DampCoeff = 0.00001
"damping coefficient";
- parameter SIunits.PerUnit F = -100 "Force component at y-axis";
- parameter SIunits.SecondMomentOfArea J = W * H ^ 3 / 12
+ parameter SI.PerUnit F = -100 "Force component at y-axis";
+ parameter SI.SecondMomentOfArea J = W * H ^ 3 / 12
"area moment of inertia";
function f
@@ -143,31 +143,31 @@
input Real beta4 = beta4L / length "fourth beta";
input Real beta5 = beta5L / length "fifth beta";
input Real beta6 = beta6L / length "sixth beta";
- input SIunits.PerUnit A1 = 4 * force * length / (EE * JJ * (m / length) * beta1 ^ 4 * (sin(beta1L) * exp(beta1L) + exp(2 * beta1L) - 1)) * (3 * sin(beta1L) * (exp(2 * beta1L) + 1) - 2 * beta1L ^ 3 * exp(beta1L) + cos(beta1L) * (3 - beta1L ^ 3 * (exp(2 * beta1L) + 1) - 3 * exp(2 * beta1L)))
+ input SI.PerUnit A1 = 4 * force * length / (EE * JJ * (m / length) * beta1 ^ 4 * (sin(beta1L) * exp(beta1L) + exp(2 * beta1L) - 1)) * (3 * sin(beta1L) * (exp(2 * beta1L) + 1) - 2 * beta1L ^ 3 * exp(beta1L) + cos(beta1L) * (3 - beta1L ^ 3 * (exp(2 * beta1L) + 1) - 3 * exp(2 * beta1L)))
"amplitude of first cos function";
- input SIunits.PerUnit A2 = 4 * force * length / (EE * JJ * (m / length) * beta2 ^ 4 * (sin(beta2L) * exp(beta2L) + exp(2 * beta2L) - 1)) * (3 * sin(beta2L) * (exp(2 * beta2L) + 1) - 2 * beta2L ^ 3 * exp(beta2L) + cos(beta2L) * (3 - beta2L ^ 3 * (exp(2 * beta2L) + 1) - 3 * exp(2 * beta2L)))
+ input SI.PerUnit A2 = 4 * force * length / (EE * JJ * (m / length) * beta2 ^ 4 * (sin(beta2L) * exp(beta2L) + exp(2 * beta2L) - 1)) * (3 * sin(beta2L) * (exp(2 * beta2L) + 1) - 2 * beta2L ^ 3 * exp(beta2L) + cos(beta2L) * (3 - beta2L ^ 3 * (exp(2 * beta2L) + 1) - 3 * exp(2 * beta2L)))
"amplitude of second cos function";
- input SIunits.PerUnit A3 = 4 * force * length / (EE * JJ * (m / length) * beta3 ^ 4 * (sin(beta3L) * exp(beta3L) + exp(2 * beta3L) - 1)) * (3 * sin(beta3L) * (exp(2 * beta3L) + 1) - 2 * beta3L ^ 3 * exp(beta3L) + cos(beta3L) * (3 - beta3L ^ 3 * (exp(2 * beta3L) + 1) - 3 * exp(2 * beta3L)))
+ input SI.PerUnit A3 = 4 * force * length / (EE * JJ * (m / length) * beta3 ^ 4 * (sin(beta3L) * exp(beta3L) + exp(2 * beta3L) - 1)) * (3 * sin(beta3L) * (exp(2 * beta3L) + 1) - 2 * beta3L ^ 3 * exp(beta3L) + cos(beta3L) * (3 - beta3L ^ 3 * (exp(2 * beta3L) + 1) - 3 * exp(2 * beta3L)))
"amplitude of third function";
- input SIunits.PerUnit A4 = 4 * force * length / (EE * JJ * (m / length) * beta4 ^ 4 * (sin(beta4L) * exp(beta4L) + exp(2 * beta4L) - 1)) * (3 * sin(beta4L) * (exp(2 * beta4L) + 1) - 2 * beta4L ^ 3 * exp(beta4L) + cos(beta4L) * (3 - beta4L ^ 3 * (exp(2 * beta4L) + 1) - 3 * exp(2 * beta4L)))
+ input SI.PerUnit A4 = 4 * force * length / (EE * JJ * (m / length) * beta4 ^ 4 * (sin(beta4L) * exp(beta4L) + exp(2 * beta4L) - 1)) * (3 * sin(beta4L) * (exp(2 * beta4L) + 1) - 2 * beta4L ^ 3 * exp(beta4L) + cos(beta4L) * (3 - beta4L ^ 3 * (exp(2 * beta4L) + 1) - 3 * exp(2 * beta4L)))
"amplitude of fourth function";
- input SIunits.PerUnit A5 = 4 * force * length / (EE * JJ * (m / length) * beta5 ^ 4 * (sin(beta5L) * exp(beta5L) + exp(2 * beta5L) - 1)) * (3 * sin(beta5L) * (exp(2 * beta5L) + 1) - 2 * beta5L ^ 3 * exp(beta5L) + cos(beta5L) * (3 - beta5L ^ 3 * (exp(2 * beta5L) + 1) - 3 * exp(2 * beta5L)))
+ input SI.PerUnit A5 = 4 * force * length / (EE * JJ * (m / length) * beta5 ^ 4 * (sin(beta5L) * exp(beta5L) + exp(2 * beta5L) - 1)) * (3 * sin(beta5L) * (exp(2 * beta5L) + 1) - 2 * beta5L ^ 3 * exp(beta5L) + cos(beta5L) * (3 - beta5L ^ 3 * (exp(2 * beta5L) + 1) - 3 * exp(2 * beta5L)))
"amplitude of fifth cos function";
- input SIunits.PerUnit A6 = 4 * force * length / (EE * JJ * (m / length) * beta6 ^ 4 * (sin(beta6L) * exp(beta6L) + exp(2 * beta6L) - 1)) * (3 * sin(beta6L) * (exp(2 * beta6L) + 1) - 2 * beta6L ^ 3 * exp(beta6L) + cos(beta6L) * (3 - beta6L ^ 3 * (exp(2 * beta6L) + 1) - 3 * exp(2 * beta6L)))
+ input SI.PerUnit A6 = 4 * force * length / (EE * JJ * (m / length) * beta6 ^ 4 * (sin(beta6L) * exp(beta6L) + exp(2 * beta6L) - 1)) * (3 * sin(beta6L) * (exp(2 * beta6L) + 1) - 2 * beta6L ^ 3 * exp(beta6L) + cos(beta6L) * (3 - beta6L ^ 3 * (exp(2 * beta6L) + 1) - 3 * exp(2 * beta6L)))
"amplitude of sixth cos function";
- input SIunits.Length x = length
+ input SI.Length x = length
"a distance between 0 and length L of the beam";
- input SIunits.AngularFrequency wk1 = (EE * JJ / m) ^ (1 / 2) * beta1 ^ 2
+ input SI.AngularFrequency wk1 = (EE * JJ / m) ^ (1 / 2) * beta1 ^ 2
"1st natural frequency";
- input SIunits.AngularFrequency wk2 = (EE * JJ / m) ^ (1 / 2) * beta2 ^ 2
+ input SI.AngularFrequency wk2 = (EE * JJ / m) ^ (1 / 2) * beta2 ^ 2
"2nd natural frequency";
- input SIunits.AngularFrequency wk3 = (EE * JJ / m) ^ (1 / 2) * beta3 ^ 2
+ input SI.AngularFrequency wk3 = (EE * JJ / m) ^ (1 / 2) * beta3 ^ 2
"3rd natural frequency";
- input SIunits.AngularFrequency wk4 = (EE * JJ / m) ^ (1 / 2) * beta4 ^ 2
+ input SI.AngularFrequency wk4 = (EE * JJ / m) ^ (1 / 2) * beta4 ^ 2
"4th natural frequency";
- input SIunits.AngularFrequency wk5 = (EE * JJ / m) ^ (1 / 2) * beta5 ^ 2
+ input SI.AngularFrequency wk5 = (EE * JJ / m) ^ (1 / 2) * beta5 ^ 2
"5th natural frequency";
- input SIunits.AngularFrequency wk6 = (EE * JJ / m) ^ (1 / 2) * beta6 ^ 2
+ input SI.AngularFrequency wk6 = (EE * JJ / m) ^ (1 / 2) * beta6 ^ 2
"6th natural frequency";
input Real shape1 = A1 / 2 * ((-cosh(beta1 * x)) + cos(beta1 * x) + ((-cos(beta1L)) - cosh(beta1L)) * (sin(beta1 * x) - sinh(beta1 * x)) / (sin(beta1L) - sinh(beta1L)));
input Real shape2 = A2 / 2 * ((-cosh(beta2 * x)) + cos(beta2 * x) + ((-cos(beta2L)) - cosh(beta2L)) * (sin(beta2 * x) - sinh(beta2 * x)) / (sin(beta2L) - sinh(beta2L)));
@@ -182,8 +182,8 @@
end f;
Models.FlexibleBeamModelica beammod(N = N, L = L, W = W, H = H, D = D, E = E, DampCoeff = DampCoeff, F = F);
- SIunits.Length beam_exact;
- SIunits.Length beam_modelica;
+ SI.Length beam_exact;
+ SI.Length beam_modelica;
equation
beam_modelica = beammod.bodyboxN.frame_b.r_0[2]
"displacement of the free end of the flexible beam";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Mechanical/HarmonicOscillator.mo" "converted-libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Mechanical/HarmonicOscillator.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Mechanical/HarmonicOscillator.mo" 2022-03-10 09:57:37.628144078 +0000
+++ "converted-libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Mechanical/HarmonicOscillator.mo" 2022-03-10 09:58:04.584147495 +0000
@@ -3,12 +3,12 @@
package HarmonicOscillator "Models of N-dimensional 1D spring-mass oscillators"
package Models
model HarmonicOscillator
- import Modelica.SIunits;
+ import Modelica.Units.SI;
parameter Integer N = 2 "Number of masses in the system";
- parameter SIunits.Mass m = 1 "Mass of each node";
- parameter SIunits.TranslationalSpringConstant k = 10 "Elastic constant of each spring";
- SIunits.Position x[N] "Positions of the masses";
- SIunits.Velocity v[N] "Velocity of the masses";
+ parameter SI.Mass m = 1 "Mass of each node";
+ parameter SI.TranslationalSpringConstant k = 10 "Elastic constant of each spring";
+ SI.Position x[N] "Positions of the masses";
+ SI.Velocity v[N] "Velocity of the masses";
equation
for i in 1:N loop
der(x[i]) = v[i];
@@ -35,13 +35,13 @@
end HarmonicOscillator;
model HarmonicOscillatorNetwork
- import Modelica.SIunits;
+ import Modelica.Units.SI;
parameter Integer N = 2 "Number of masses in the system";
- parameter SIunits.Mass m = 1 "Mass of each node";
- parameter SIunits.TranslationalSpringConstant k = 10 "Elastic constant of each spring";
- SIunits.Position xm[N] "Positions of the masses";
- SIunits.Velocity v[N] "Velocity of the masses";
- SIunits.Position xs[N] "Positions of the spring network nodes";
+ parameter SI.Mass m = 1 "Mass of each node";
+ parameter SI.TranslationalSpringConstant k = 10 "Elastic constant of each spring";
+ SI.Position xm[N] "Positions of the masses";
+ SI.Velocity v[N] "Velocity of the masses";
+ SI.Position xs[N] "Positions of the spring network nodes";
equation
for i in 1:N loop
der(xm[i]) = v[i];
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Mechanical/Strings.mo" "converted-libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Mechanical/Strings.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Mechanical/Strings.mo" 2022-03-10 09:57:37.628144078 +0000
+++ "converted-libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Mechanical/Strings.mo" 2022-03-10 09:58:04.564147493 +0000
@@ -2,14 +2,14 @@
package Strings "Models of strings suspended in a gravitational field"
package Models
model StringModelica
- import Modelica.SIunits;
+ import Modelica.Units.SI;
parameter Integer N = 1 "number of joints";
- parameter SIunits.Length L "length of the string";
- final parameter SIunits.Length l = L / (N + 1) "length of each bodbox";
- parameter SIunits.RotationalDampingConstant damping "damping coefficient";
- parameter SIunits.Length W "width of the beam";
- parameter SIunits.Height H "height of the beam";
- parameter SIunits.Density D "density of the material";
+ parameter SI.Length L "length of the string";
+ final parameter SI.Length l = L / (N + 1) "length of each bodbox";
+ parameter SI.RotationalDampingConstant damping "damping coefficient";
+ parameter SI.Length W "width of the beam";
+ parameter SI.Height H "height of the beam";
+ parameter SI.Density D "density of the material";
inner Modelica.Mechanics.MultiBody.World world(gravityType = Modelica.Mechanics.MultiBody.Types.GravityTypes.UniformGravity, n = {1, 0, 0})
"uniform gravity on x-axis";
Modelica.Mechanics.MultiBody.Joints.Revolute revolute[N](
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Power/package.mo" "converted-libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Power/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Power/package.mo" 2022-03-10 09:57:37.628144078 +0000
+++ "converted-libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Power/package.mo" 2022-03-10 09:58:04.548147490 +0000
@@ -1,4 +1,5 @@
within ScalableTestSuite;
package Power
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
+
end Power;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Thermal/Advection.mo" "converted-libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Thermal/Advection.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Thermal/Advection.mo" 2022-03-10 09:57:37.636144081 +0000
+++ "converted-libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Thermal/Advection.mo" 2022-03-10 09:58:04.484147482 +0000
@@ -3,16 +3,16 @@
package Models
model SimpleAdvection "Basic thermal advection model with uniform speed"
parameter Integer N = 2 "Number of nodes";
- parameter Modelica.SIunits.Temperature Tstart[N]=ones(N)*300
+ parameter Modelica.Units.SI.Temperature Tstart[N]=ones(N)*300
"Start value of the temperature distribution";
- parameter Modelica.SIunits.Length L = 10 "Pipe length";
- final parameter Modelica.SIunits.Length l = L/N "Length of one volume";
- Modelica.SIunits.Velocity u = 1 "Fluid speed";
- Modelica.SIunits.Temperature Tin = 300 "Inlet temperature";
- Modelica.SIunits.Temperature T[N] "Node temperatures";
- Modelica.SIunits.Temperature Ttilde[N-1](start = Tstart[2:N], each fixed = true)
+ parameter Modelica.Units.SI.Length L = 10 "Pipe length";
+ final parameter Modelica.Units.SI.Length l = L/N "Length of one volume";
+ Modelica.Units.SI.Velocity u = 1 "Fluid speed";
+ Modelica.Units.SI.Temperature Tin = 300 "Inlet temperature";
+ Modelica.Units.SI.Temperature T[N] "Node temperatures";
+ Modelica.Units.SI.Temperature Ttilde[N-1](start = Tstart[2:N], each fixed = true)
"Temperature states";
- Modelica.SIunits.Temperature Tout;
+ Modelica.Units.SI.Temperature Tout;
equation
for j in 1:N-1 loop
der(Ttilde[j]) = u/l*(T[j]-T[j+1]);
@@ -52,7 +52,7 @@
model SteamPipe
"Detailed thermal advection model with thermal expansion effects using IF97 water vapour"
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
replaceable package Medium = Modelica.Media.Water.StandardWater
constrainedby Modelica.Media.Interfaces.PartialMedium;
parameter Integer N = 10 "Number of nodes";
@@ -129,13 +129,13 @@
extends Models.SimpleAdvection(
N = 1000,
Tin = 300 + dT*(0.5*tanh((time-t0)/dt)+0.5));
- parameter Modelica.SIunits.Time t0 = 2
+ parameter Modelica.Units.SI.Time t0 = 2
"Instant of smooth step temperature increase at inlet";
- parameter Modelica.SIunits.Time dt = 0.1
+ parameter Modelica.Units.SI.Time dt = 0.1
"Transition time of temperature increase";
- parameter Modelica.SIunits.TemperatureDifference dT = 10
+ parameter Modelica.Units.SI.TemperatureDifference dT = 10
"Temperature increase at inlet";
- Modelica.SIunits.Temperature Tout_ex
+ Modelica.Units.SI.Temperature Tout_ex
"Exact outlet temperature from analytical solution";
equation
Tout_ex = 300 + dT*(0.5*tanh((time-t0-L/u)/dt)+0.5);
@@ -185,13 +185,13 @@
Tin = 300 + dT*(0.5*tanh((time-t0)/dt)+0.5),
u = 1 + sin(time*2*pi*f));
constant Real pi = Modelica.Constants.pi;
- parameter Modelica.SIunits.Time t0 = 2
+ parameter Modelica.Units.SI.Time t0 = 2
"Instant of smooth step temperature increase at inlet";
- parameter Modelica.SIunits.Time dt = 0.1
+ parameter Modelica.Units.SI.Time dt = 0.1
"Transition time of temperature increase";
- parameter Modelica.SIunits.TemperatureDifference dT = 10
+ parameter Modelica.Units.SI.TemperatureDifference dT = 10
"Temperature increase at inlet";
- parameter Modelica.SIunits.Frequency f = 0.5
+ parameter Modelica.Units.SI.Frequency f = 0.5
"Frequency of fluid speed oscillations";
annotation (experiment(StopTime=20, Interval=4e-3, Tolerance = 1e-6));
end SimpleAdvection_N_100;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Thermal/DistrictHeating.mo" "converted-libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Thermal/DistrictHeating.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Thermal/DistrictHeating.mo" 2022-03-10 09:57:37.636144081 +0000
+++ "converted-libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Thermal/DistrictHeating.mo" 2022-03-10 09:58:04.392147471 +0000
@@ -5,7 +5,7 @@
package Models
model HeatingSystem
"Declarative model of a heating system - continuous-time dynamics"
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
constant Real pi = Modelica.Constants.pi;
parameter Integer N = 3 "Number of heated units";
parameter SI.HeatCapacity Cu[N] = (ones(N)+ linspace(0,1.348,N))*1e7
@@ -67,7 +67,7 @@
model HeatingSystemExplicit
"Explicit ODE model of a heating system - continuous-time dynamics"
- import SI = Modelica.SIunits;
+ import Modelica.Units.SI;
constant Real pi = Modelica.Constants.pi;
parameter Integer N = 3 "Number of heated units";
parameter SI.HeatCapacity Cu[N] = (ones(N)+ linspace(0,1.348,N))*1e7
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Thermal/HeatConduction.mo" "converted-libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Thermal/HeatConduction.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Thermal/HeatConduction.mo" 2022-03-10 09:57:37.636144081 +0000
+++ "converted-libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Thermal/HeatConduction.mo" 2022-03-10 09:58:04.352147465 +0000
@@ -3,17 +3,17 @@
package Models
model OneDHeatTransferTI_FD
"One end at a fixed temperature, one end is insulated; implemented by FD method"
- import Modelica.SIunits;
- parameter SIunits.Length L "Length";
+ import Modelica.Units.SI;
+ parameter SI.Length L "Length";
parameter Integer N = 2 "number of nodes";
- parameter SIunits.Temperature T0 "Initial temperature";
- parameter SIunits.Temperature TN "Temperature at the last node";
- parameter SIunits.SpecificHeatCapacity cp "Material Heat Capacity";
- parameter SIunits.ThermalConductivity lambda
+ parameter SI.Temperature T0 "Initial temperature";
+ parameter SI.Temperature TN "Temperature at the last node";
+ parameter SI.SpecificHeatCapacity cp "Material Heat Capacity";
+ parameter SI.ThermalConductivity lambda
"Material thermal conductivity";
- parameter Modelica.SIunits.Density rho "Material Density";
- final parameter Modelica.SIunits.Length dx = L / (N - 1) "Element length";
- SIunits.Temperature T[N] "temperature of the nodes";
+ parameter Modelica.Units.SI.Density rho "Material Density";
+ final parameter Modelica.Units.SI.Length dx = L / (N - 1) "Element length";
+ SI.Temperature T[N] "temperature of the nodes";
initial equation
for i in 1:N - 1 loop
T[i] = T0;
@@ -67,20 +67,20 @@
model OneDHeatTransferTI_Modelica
"one end at a fixed temperature, one end is insulated; implemented by MSL"
- import Modelica.SIunits;
+ import Modelica.Units.SI;
import Modelica.Thermal;
- parameter SIunits.Length L "Length";
+ parameter SI.Length L "Length";
parameter Integer N = 2 "Number of nodes";
- parameter SIunits.SpecificHeatCapacity cp "Material Heat Capacity";
- parameter SIunits.Density rho "Material Density";
- final parameter SIunits.Mass m = rho * v "mass";
- final parameter SIunits.Volume v = L * A "volume of the rod";
- parameter SIunits.ThermalConductivity lambda
+ parameter SI.SpecificHeatCapacity cp "Material Heat Capacity";
+ parameter SI.Density rho "Material Density";
+ final parameter SI.Mass m = rho * v "mass";
+ final parameter SI.Volume v = L * A "volume of the rod";
+ parameter SI.ThermalConductivity lambda
"Material thermal conductivity";
- parameter SIunits.Area A "Area";
- parameter SIunits.Temperature T0
+ parameter SI.Area A "Area";
+ parameter SI.Temperature T0
"Initial temperature of the heatcapacitors";
- parameter SIunits.Temperature TN "fixed temperature at the last node";
+ parameter SI.Temperature TN "fixed temperature at the last node";
Thermal.HeatTransfer.Sources.FixedTemperature fixedtemperature(T = TN)
"fixed temperature at the last node";
Thermal.HeatTransfer.Components.ThermalConductor thermalconductor[N - 1](each G = lambda * A / (L / (N - 1)))
@@ -149,18 +149,18 @@
model OneDHeatTransferTT_FD
"Both ends are exposed to a fixed temperature, implemented by FD method"
- import Modelica.SIunits;
- parameter SIunits.Length L "length";
+ import Modelica.Units.SI;
+ parameter SI.Length L "length";
parameter Integer N = 2 "number of nodes";
- parameter SIunits.Temperature T0 "Initial temperature";
- parameter SIunits.Temperature T1 "Initial temperature at first node";
- parameter SIunits.Temperature TN "Initial temperature at the last node";
- parameter SIunits.SpecificHeatCapacity cp "Material Heat Capacity";
- parameter SIunits.ThermalConductivity lambda
+ parameter SI.Temperature T0 "Initial temperature";
+ parameter SI.Temperature T1 "Initial temperature at first node";
+ parameter SI.Temperature TN "Initial temperature at the last node";
+ parameter SI.SpecificHeatCapacity cp "Material Heat Capacity";
+ parameter SI.ThermalConductivity lambda
"Material thermal conductivity";
- parameter SIunits.Density rho "Material Density";
- final parameter Modelica.SIunits.Length dx = L / (N - 1) "Element length";
- SIunits.Temperature T[N] "temperature of the nodes";
+ parameter SI.Density rho "Material Density";
+ final parameter Modelica.Units.SI.Length dx = L / (N - 1) "Element length";
+ SI.Temperature T[N] "temperature of the nodes";
initial equation
for i in 2:N - 1 loop
T[i] = T0;
@@ -218,21 +218,21 @@
model OneDHeatTransferTT_Modelica
"both ends at a fixed temperature implemented by MSL"
- import Modelica.SIunits;
+ import Modelica.Units.SI;
import Modelica.Thermal;
- parameter SIunits.Length L "Length";
+ parameter SI.Length L "Length";
parameter Integer N = 3 "Number of nodes";
- parameter SIunits.SpecificHeatCapacity cp "Material Heat Capacity";
- parameter Modelica.SIunits.Density rho "Material Density";
- parameter SIunits.Area A "area";
- final parameter SIunits.Mass m = rho * v "Mass";
- final parameter SIunits.Volume v = L * A;
- parameter SIunits.ThermalConductivity lambda
+ parameter SI.SpecificHeatCapacity cp "Material Heat Capacity";
+ parameter Modelica.Units.SI.Density rho "Material Density";
+ parameter SI.Area A "area";
+ final parameter SI.Mass m = rho * v "Mass";
+ final parameter SI.Volume v = L * A;
+ parameter SI.ThermalConductivity lambda
"Material thermal conductivity";
- parameter SIunits.Temperature T0
+ parameter SI.Temperature T0
"Initial temperature of the heat capacitors";
- parameter SIunits.Temperature T1 "fixed temperature at the first node";
- parameter SIunits.Temperature TN "fixed temperature at the last node";
+ parameter SI.Temperature T1 "fixed temperature at the first node";
+ parameter SI.Temperature TN "fixed temperature at the last node";
Thermal.HeatTransfer.Sources.FixedTemperature fixedtemperature1(T = T1)
"fixed temperature at the first node";
Thermal.HeatTransfer.Sources.FixedTemperature fixedtemperatureN(T = TN)
@@ -310,17 +310,17 @@
package Verification
model OneDHeatTransferTI_Check "analytical solution for TI models"
- import Modelica.SIunits;
- parameter SIunits.Length L = 0.2 "Length of the rod";
+ import Modelica.Units.SI;
+ parameter SI.Length L = 0.2 "Length of the rod";
parameter Integer N = 30 "Number of nodes";
- parameter SIunits.Temperature TN = 330
+ parameter SI.Temperature TN = 330
"Fixed temperature at the last node";
- parameter SIunits.Temperature T0 = 273.15 "Initial temperature";
- parameter SIunits.SpecificHeatCapacity cp = 910 "Material Heat Capacity";
- parameter SIunits.ThermalConductivity lambda = 237
+ parameter SI.Temperature T0 = 273.15 "Initial temperature";
+ parameter SI.SpecificHeatCapacity cp = 910 "Material Heat Capacity";
+ parameter SI.ThermalConductivity lambda = 237
"Material thermal conductivity";
- parameter SIunits.Density rho = 2712 "Material Density";
- parameter SIunits.Area A = 0.05 "cross section area";
+ parameter SI.Density rho = 2712 "Material Density";
+ parameter SI.Area A = 0.05 "cross section area";
function f
input Real t "Time";
@@ -341,9 +341,9 @@
y := T_l + y;
end f;
- Modelica.SIunits.Temperature T_mid_exact;
- Modelica.SIunits.Temperature T_mid_numerical;
- Modelica.SIunits.Temperature T_mid_modelica;
+ Modelica.Units.SI.Temperature T_mid_exact;
+ Modelica.Units.SI.Temperature T_mid_numerical;
+ Modelica.Units.SI.Temperature T_mid_modelica;
Models.OneDHeatTransferTI_FD example(L = L, N = N, T0 = T0, TN = TN, cp = cp, lambda = lambda, rho = rho);
Models.OneDHeatTransferTI_Modelica example2(L = L, N = N, cp = cp, rho = rho, lambda = lambda, A = A, T0 = T0, TN = TN);
equation
@@ -393,18 +393,18 @@
end OneDHeatTransferTI_Check;
model OneDHeatTransferTT_Check "analytical solution for TT models"
- import Modelica.SIunits;
- parameter SIunits.Length L = 0.2 "Length of the rod";
+ import Modelica.Units.SI;
+ parameter SI.Length L = 0.2 "Length of the rod";
parameter Integer N = 30 "Number of nodes";
- parameter SIunits.Temperature T0 = 273.15 "Initial temperature";
- parameter SIunits.Temperature T1 = 330 "Fixed temperature at first node";
- parameter SIunits.Temperature TN = 300
+ parameter SI.Temperature T0 = 273.15 "Initial temperature";
+ parameter SI.Temperature T1 = 330 "Fixed temperature at first node";
+ parameter SI.Temperature TN = 300
"Fixed temperature at the last node";
- parameter SIunits.SpecificHeatCapacity cp = 910 "Material Heat Capacity";
- parameter SIunits.ThermalConductivity lambda = 237
+ parameter SI.SpecificHeatCapacity cp = 910 "Material Heat Capacity";
+ parameter SI.ThermalConductivity lambda = 237
"Material thermal conductivity";
- parameter SIunits.Area A = 0.05 "Area";
- parameter Modelica.SIunits.Density rho = 2712 "Material Density";
+ parameter SI.Area A = 0.05 "Area";
+ parameter Modelica.Units.SI.Density rho = 2712 "Material Density";
function f
input Real t "Time";
@@ -426,11 +426,11 @@
y := T_0 + (T_l - T_0) * x / l + y;
end f;
- Modelica.SIunits.Temperature T_mid_exact
+ Modelica.Units.SI.Temperature T_mid_exact
"Temperature value that function returns";
- Modelica.SIunits.Temperature T_mid_numerical
+ Modelica.Units.SI.Temperature T_mid_numerical
"Temperature value that discretized equation returns";
- Modelica.SIunits.Temperature T_mid_modelica
+ Modelica.Units.SI.Temperature T_mid_modelica
"Temperature value that heat capacitor returns";
Models.OneDHeatTransferTT_FD example(L = L, N = N, T0 = T0, T1 = T1, TN = TN, cp = cp, lambda = lambda, rho = rho);
Models.OneDHeatTransferTT_Modelica example2(L = L, N = N, cp = cp, rho = rho, A = A, lambda = lambda, T0 = T0, T1 = T1, TN = TN);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Thermal/HeatExchanger.mo" "converted-libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Thermal/HeatExchanger.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Thermal/HeatExchanger.mo" 2022-03-10 09:57:37.636144081 +0000
+++ "converted-libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/Thermal/HeatExchanger.mo" 2022-03-10 09:58:04.264147454 +0000
@@ -3,37 +3,37 @@
package Models
model CounterCurrentHeatExchangerEquations
"countercurrent heat exchanger implemented by equations"
- import Modelica.SIunits;
- parameter SIunits.Length L "length of the channels";
+ import Modelica.Units.SI;
+ parameter SI.Length L "length of the channels";
parameter Integer N "number of nodes";
- parameter SIunits.MassFlowRate wB "mass flow rate of fluid B";
- parameter SIunits.Area areaA "cross sectional area of channel A";
- parameter SIunits.Area areaB "cross sectional area of channel B";
- parameter SIunits.Density rhoA "density of fluid A";
- parameter SIunits.Density rhoB "density of fluid B";
- parameter SIunits.SpecificHeatCapacity cpA
+ parameter SI.MassFlowRate wB "mass flow rate of fluid B";
+ parameter SI.Area areaA "cross sectional area of channel A";
+ parameter SI.Area areaB "cross sectional area of channel B";
+ parameter SI.Density rhoA "density of fluid A";
+ parameter SI.Density rhoB "density of fluid B";
+ parameter SI.SpecificHeatCapacity cpA
"specific heat capacity of fluid A";
- parameter SIunits.SpecificHeatCapacity cpB
+ parameter SI.SpecificHeatCapacity cpB
"specific heat capacity of fluid B";
- parameter SIunits.SpecificHeatCapacity cpW
+ parameter SI.SpecificHeatCapacity cpW
"specific heat capacity of the wall";
- parameter SIunits.CoefficientOfHeatTransfer gammaA
+ parameter SI.CoefficientOfHeatTransfer gammaA
"heat transfer coefficient of fluid A";
- parameter SIunits.CoefficientOfHeatTransfer gammaB
+ parameter SI.CoefficientOfHeatTransfer gammaB
"heat transfer coefficient of fluid B";
- parameter SIunits.Length omega "perimeter";
- final parameter SIunits.Length l = L / (N - 1)
+ parameter SI.Length omega "perimeter";
+ final parameter SI.Length l = L / (N - 1)
"length of the each wall segment";
- SIunits.MassFlowRate wA "mass flow rate of fluid A";
- SIunits.HeatFlowRate QA[N - 1]
+ SI.MassFlowRate wA "mass flow rate of fluid A";
+ SI.HeatFlowRate QA[N - 1]
"heat flow rate of fluid A in the segments";
- SIunits.HeatFlowRate QB[N - 1]
+ SI.HeatFlowRate QB[N - 1]
"heat flow rate of fluid B in the segments";
- SIunits.Temperature TA[N] "temperature nodes on channel A";
- SIunits.Temperature TB[N] "temperature nodes on channel B";
- SIunits.Temperature TW[N - 1] "temperatures on the wall segments";
- SIunits.HeatFlowRate QtotA "total heat flow rate of fluid A";
- SIunits.HeatFlowRate QtotB "total heat flow rate of fluid B";
+ SI.Temperature TA[N] "temperature nodes on channel A";
+ SI.Temperature TB[N] "temperature nodes on channel B";
+ SI.Temperature TW[N - 1] "temperatures on the wall segments";
+ SI.HeatFlowRate QtotA "total heat flow rate of fluid A";
+ SI.HeatFlowRate QtotB "total heat flow rate of fluid B";
initial equation
for i in 2:N loop
TA[i] = 300;
@@ -120,37 +120,37 @@
model CocurrentHeatExchangerEquations
"cocurrent heat exchanger implemented by equations"
- import Modelica.SIunits;
- parameter SIunits.Length L "length of the channels";
+ import Modelica.Units.SI;
+ parameter SI.Length L "length of the channels";
parameter Integer N "number of nodes";
- parameter SIunits.MassFlowRate wB "mass flow rate of fluid B";
- parameter SIunits.Area areaA "cross sectional area of channel A";
- parameter SIunits.Area areaB "cross sectional area of channel B";
- parameter SIunits.Density rhoA "density of fluid A";
- parameter SIunits.Density rhoB "density of fluid B";
- parameter SIunits.SpecificHeatCapacity cpA
+ parameter SI.MassFlowRate wB "mass flow rate of fluid B";
+ parameter SI.Area areaA "cross sectional area of channel A";
+ parameter SI.Area areaB "cross sectional area of channel B";
+ parameter SI.Density rhoA "density of fluid A";
+ parameter SI.Density rhoB "density of fluid B";
+ parameter SI.SpecificHeatCapacity cpA
"specific heat capacity of fluid A";
- parameter SIunits.SpecificHeatCapacity cpB
+ parameter SI.SpecificHeatCapacity cpB
"specific heat capacity of fluid B";
- parameter SIunits.SpecificHeatCapacity cpW
+ parameter SI.SpecificHeatCapacity cpW
"specific heat capacity of the wall";
- parameter SIunits.CoefficientOfHeatTransfer gammaA
+ parameter SI.CoefficientOfHeatTransfer gammaA
"heat transfer coefficient of fluid A";
- parameter SIunits.CoefficientOfHeatTransfer gammaB
+ parameter SI.CoefficientOfHeatTransfer gammaB
"heat transfer coefficient of fluid B";
- parameter SIunits.Length omega "perimeter";
- final parameter SIunits.Length l = L / (N - 1)
+ parameter SI.Length omega "perimeter";
+ final parameter SI.Length l = L / (N - 1)
"length of the each wall segment";
- SIunits.MassFlowRate wA "mass flow rate of fluid A";
- SIunits.HeatFlowRate QA[N - 1]
+ SI.MassFlowRate wA "mass flow rate of fluid A";
+ SI.HeatFlowRate QA[N - 1]
"heat flow rate of fluid A in the segments";
- SIunits.HeatFlowRate QB[N - 1]
+ SI.HeatFlowRate QB[N - 1]
"heat flow rate of fluid B in the segments";
- SIunits.Temperature TA[N] "temperature nodes on channel A";
- SIunits.Temperature TB[N] "temperature nodes on channel B";
- SIunits.Temperature TW[N - 1] "temperatures on the wall segments";
- SIunits.HeatFlowRate QtotA "total heat flow rate of fluid A";
- SIunits.HeatFlowRate QtotB "total heat flow rate of fluid B";
+ SI.Temperature TA[N] "temperature nodes on channel A";
+ SI.Temperature TB[N] "temperature nodes on channel B";
+ SI.Temperature TW[N - 1] "temperatures on the wall segments";
+ SI.HeatFlowRate QtotA "total heat flow rate of fluid A";
+ SI.HeatFlowRate QtotB "total heat flow rate of fluid B";
initial equation
for i in 2:N loop
TA[i] = 300;
@@ -240,51 +240,51 @@
package Verification
model SteadyStateAnalysis "steady state analysis for heat exchangers"
- import Modelica.SIunits;
- parameter SIunits.Length L = 10 "length of the channels";
+ import Modelica.Units.SI;
+ parameter SI.Length L = 10 "length of the channels";
parameter Integer N = 20 "number of nodes";
- parameter SIunits.MassFlowRate wB = 1 "mass flow rate of fluid B";
- parameter SIunits.Area areaA = 5e-5 "cross sectional area of channel A";
- parameter SIunits.Area areaB = 5e-5 "cross sectional area of channel B";
- parameter SIunits.Density rhoA = 1000 "density of fluid A";
- parameter SIunits.Density rhoB = 1000 "density of fluid B";
- parameter SIunits.SpecificHeatCapacity cpA = 4200
+ parameter SI.MassFlowRate wB = 1 "mass flow rate of fluid B";
+ parameter SI.Area areaA = 5e-5 "cross sectional area of channel A";
+ parameter SI.Area areaB = 5e-5 "cross sectional area of channel B";
+ parameter SI.Density rhoA = 1000 "density of fluid A";
+ parameter SI.Density rhoB = 1000 "density of fluid B";
+ parameter SI.SpecificHeatCapacity cpA = 4200
"specific heat capacity of fluid A";
- parameter SIunits.SpecificHeatCapacity cpB = 4200
+ parameter SI.SpecificHeatCapacity cpB = 4200
"specific heat capacity of fluid B";
- parameter SIunits.SpecificHeatCapacity cpW = 2000
+ parameter SI.SpecificHeatCapacity cpW = 2000
"specific heat capacity of wall";
- parameter SIunits.CoefficientOfHeatTransfer gammaA = 4000
+ parameter SI.CoefficientOfHeatTransfer gammaA = 4000
"heat transfer coefficient of fluid A";
- parameter SIunits.CoefficientOfHeatTransfer gammaB = 10000
+ parameter SI.CoefficientOfHeatTransfer gammaB = 10000
"heat transfer coefficient of fluid B";
- parameter SIunits.Length omega = 0.1 "perimeter";
- parameter SIunits.PerUnit UA = L * omega * gammaA * gammaB / (gammaA + gammaB);
+ parameter SI.Length omega = 0.1 "perimeter";
+ parameter SI.PerUnit UA = L * omega * gammaA * gammaB / (gammaA + gammaB);
Models.CounterCurrentHeatExchangerEquations countercur(L = L, N = N, wB = wB, areaA = areaA, areaB = areaB, rhoA = rhoA, rhoB = rhoB, cpA = cpA, cpB = cpB, cpW = cpW, gammaA = gammaA, gammaB = gammaB, omega = omega);
Models.CocurrentHeatExchangerEquations cocur(L = L, N = N, wB = wB, areaA = areaA, areaB = areaB, rhoA = rhoA, rhoB = rhoB, cpA = cpA, cpB = cpB, cpW = cpW, gammaA = gammaA, gammaB = gammaB, omega = omega);
- SIunits.Temperature dTeogCocur
+ SI.Temperature dTeogCocur
"average temperature driving force at cocurrent mode";
- SIunits.Temperature dTeogCountercur
+ SI.Temperature dTeogCountercur
"average temperature driving force at countercurrent mode";
- SIunits.HeatFlowRate Qcocur_ss
+ SI.HeatFlowRate Qcocur_ss
"steady state rate equation at cocurrent mode";
- SIunits.HeatFlowRate Qcocur_fluidA
+ SI.HeatFlowRate Qcocur_fluidA
"total heat flow rate of fluid A at cocurrent mode";
- SIunits.HeatFlowRate Qcocur_fluidB
+ SI.HeatFlowRate Qcocur_fluidB
"total heat flow rate of fluid B at cocurrent mode";
- SIunits.HeatFlowRate Qcountercur_ss
+ SI.HeatFlowRate Qcountercur_ss
"steady state rate equation at countercurrent mode";
- SIunits.HeatFlowRate Qcountercur_fluidA
+ SI.HeatFlowRate Qcountercur_fluidA
"total heat flow rate of fluid A at countercurrent mode";
- SIunits.HeatFlowRate Qcountercur_fluidB
+ SI.HeatFlowRate Qcountercur_fluidB
"total heat flow rate of fluid B at countercurrent mode";
- SIunits.Temperature P1
+ SI.Temperature P1
"temperature difference between fluid A and B at node N at cocurrent mode";
- SIunits.Temperature P2
+ SI.Temperature P2
"temperature difference between fluid A and B at node 1 at cocurrent mode";
- SIunits.Temperature P3
+ SI.Temperature P3
"temperature difference between fluid A and B at node N at countercurrent mode";
- SIunits.Temperature P4
+ SI.Temperature P4
"temperature difference between fluid A and B at node 1 at countercurrent mode";
equation
P1 = cocur.TB[N] - cocur.TA[N];
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/openmodelica.metadata.json" "converted-libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/openmodelica.metadata.json"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/openmodelica.metadata.json" 2022-03-10 09:57:37.636144081 +0000
+++ "converted-libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/openmodelica.metadata.json" 2022-03-10 09:59:13.972156281 +0000
@@ -1 +1 @@
-{"path":"ScalableTestSuite", "sha":"6890d260ad3d6a84f7fdad387e2cb7a9326eb0e0", "support":"noSupport", "uses":{"Modelica":"3.2.3"}, "version":"1.11.5-master", "zipfile":"https://github.com/casella/ScalableTestSuite/archive/6890d260ad3d6a84f7fdad387e2cb7a9326eb0e0.zip"}
+{"path": "ScalableTestSuite", "sha": "6890d260ad3d6a84f7fdad387e2cb7a9326eb0e0", "support": "noSupport", "uses": {"Modelica": "4.0.0"}, "version": "1.11.5-master", "zipfile": "https://github.com/casella/ScalableTestSuite/archive/6890d260ad3d6a84f7fdad387e2cb7a9326eb0e0.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/ScalableTestSuite 1.11.5-master/package.mo" "converted-libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/package.mo" 2022-03-10 09:57:37.636144081 +0000
+++ "converted-libraries/.openmodelica/libraries/ScalableTestSuite 1.11.5-master/package.mo" 2022-03-10 09:59:13.968156280 +0000
@@ -1,7 +1,7 @@
within ;
package ScalableTestSuite "A library of scalable Modelica test models"
annotation(version = "1.11.5",
- uses(Modelica(version = "3.2.3")),
+ uses(Modelica(version = "4.0.0")),
Documentation(info="
This library contains a collection of Modelica models whose size can be scaled by means of integer parameter(s). This is useful to test the ability of Modelica tools to compile and simulate models of increasing size efficiently.
The library contains examples with a physical motivation, which are also verified against known analytical solutions wherever possible, as well as elementary models to stress some specific features of the Modelica tools.