Comparison Summary

Modelica400 with alias name: Modelica 4.0.0	Modelica323 with alias name: Modelica 3.2.3
Version: 4.0.0	Version: 3.2.3
Version date: 2020-06-04	Version date: 2019-01-23

model Blocks.Examples.PID_Controller

Component	Modelica 4.0.0	Modelica 3.2.3
driveAngle	Units.SI.Angle	SIunits.Angle
PI	initType=Modelica400.Blocks.Types.Init.SteadyState	initType=Modelica323.Blocks.Types.InitPID.SteadyState
	limiter(u(start=0))
		limitsAtInit=false

model Blocks.Examples.Filter

Component	Modelica 4.0.0	Modelica 3.2.3
f_cut	Units.SI.Frequency	SIunits.Frequency

model Blocks.Examples.FilterWithDifferentiation

Component	Modelica 4.0.0	Modelica 3.2.3
f_cut	Units.SI.Frequency	SIunits.Frequency

model Blocks.Examples.FilterWithRiseTime

Component	Modelica 4.0.0	Modelica 3.2.3
riseTime	Units.SI.Time	SIunits.Time

model Blocks.Examples.SlewRateLimiter

Component	Modelica 4.0.0	Modelica 3.2.3
vMax	Units.SI.Velocity	SIunits.Velocity
aMax	Units.SI.Acceleration	SIunits.Acceleration
s	Units.SI.Position	SIunits.Position
sSmoothed	Units.SI.Position	SIunits.Position
vLimited	Units.SI.Velocity	SIunits.Velocity
aLimited	Units.SI.Acceleration	SIunits.Acceleration

model Blocks.Examples.InverseModel

Component	Modelica 4.0.0	Modelica 3.2.3
sine	f=2
sine		freqHz=2
criticalDamping	f=50*sine.f	f=50*sine.freqHz

model Blocks.Examples.RealNetwork1

Component	Modelica 4.0.0	Modelica 3.2.3
sine	f=0.1
sine		freqHz=0.1

model Blocks.Examples.IntegerNetwork1

Component	Modelica 4.0.0	Modelica 3.2.3
sine	f=0.1
sine		freqHz=0.1

model Blocks.Examples.BusUsage

Component	Modelica 4.0.0	Modelica 3.2.3
sine	f=1
sine		freqHz=1

model Blocks.Examples.TotalHarmonicDistortion

Component	Modelica 4.0.0	Modelica 3.2.3
f1	Units.SI.Frequency	SIunits.Frequency
V1	Units.SI.Voltage	SIunits.Voltage
V3	Units.SI.Voltage	SIunits.Voltage
sineVoltage3	f=3*f1
sineVoltage3		freqHz=3*f1
sineVoltage1	f=f1
sineVoltage1		freqHz=f1

expandable connector Blocks.Examples.BusUsage_Utilities.Interfaces.ControlBus

Component	Modelica 4.0.0	Modelica 3.2.3
realSignal1	Units.SI.AngularVelocity	SIunits.AngularVelocity
realSignal2	Units.SI.Velocity	SIunits.Velocity

block Blocks.Continuous.Integrator

Component	Modelica 4.0.0	Modelica 3.2.3
initType	=Init.InitialState	=Modelica323.Blocks.Types.Init.InitialState

block Blocks.Continuous.LimIntegrator

Component	Modelica 4.0.0	Modelica 3.2.3
initType	=Init.InitialState	=Modelica323.Blocks.Types.Init.InitialState

block Blocks.Continuous.Derivative

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Time	SIunits.Time
initType	=Init.NoInit	=Modelica323.Blocks.Types.Init.NoInit

block Blocks.Continuous.FirstOrder

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Time	SIunits.Time
initType	=Init.NoInit	=Modelica323.Blocks.Types.Init.NoInit

block Blocks.Continuous.SecondOrder

Component	Modelica 4.0.0	Modelica 3.2.3
initType	=Init.NoInit	=Modelica323.Blocks.Types.Init.NoInit

block Blocks.Continuous.PI

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Time	SIunits.Time
initType	=Init.NoInit	=Modelica323.Blocks.Types.Init.NoInit

block Blocks.Continuous.PID

Component	Modelica 4.0.0	Modelica 3.2.3
Ti	Units.SI.Time	SIunits.Time
Td	Units.SI.Time	SIunits.Time
initType	Blocks.Types.Init	Blocks.Types.InitPID
unitTime	Units.SI.Time	SIunits.Time
I	initType=if initType == Init.SteadyState then Init.SteadyState else if initType == Init.InitialState then Init.InitialState else Init.NoInit	initType=if initType == InitPID.SteadyState then Init.SteadyState else if initType == InitPID.InitialState or initType == InitPID.DoNotUse_InitialIntegratorState then Init.InitialState else Init.NoInit
D	initType=if initType == Init.SteadyState or initType == Init.InitialOutput then Init.SteadyState else if initType == Init.InitialState then Init.InitialState else Init.NoInit	initType=if initType == InitPID.SteadyState or initType == InitPID.InitialOutput then Init.SteadyState else if initType == InitPID.InitialState then Init.InitialState else Init.NoInit

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
initial equation
if initType==Init.InitialOutput then	if initType==InitPID.InitialOutput then
y = y_start; ...

block Blocks.Continuous.LimPID

Component	Modelica 4.0.0	Modelica 3.2.3
Ti	Units.SI.Time	SIunits.Time
Td	Units.SI.Time	SIunits.Time
initType	Blocks.Types.Init	Blocks.Types.InitPID
unitTime	Units.SI.Time	SIunits.Time
I	initType=if initType == Init.SteadyState then Init.SteadyState else if initType == Init.InitialState then Init.InitialState else Init.NoInit	initType=if initType == InitPID.SteadyState then Init.SteadyState else if initType == InitPID.InitialState or initType == InitPID.DoNotUse_InitialIntegratorState then Init.InitialState else Init.NoInit
D	initType=if initType == Init.SteadyState or initType == Init.InitialOutput then Init.SteadyState else if initType == Init.InitialState then Init.InitialState else Init.NoInit	initType=if initType == InitPID.SteadyState or initType == InitPID.InitialOutput then Init.SteadyState else if initType == InitPID.InitialState then Init.InitialState else Init.NoInit
limiter		limitsAtInit=limitsAtInit
limitsAtInit		Present

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
initial equation
if initType==Init.InitialOutput then	if initType==InitPID.InitialOutput then
gainPID.y = y_start; ...
equation if initType == Init.InitialOutput and (y_start < yMin or y_start > yMax) then	equation if initType == InitPID.InitialOutput and (y_start < yMin or y_start > yMax) then
Modelica400.Utilities.Streams.error("LimPID: Start value y_start (=" + String( y_start) + ") is outside of the limits of yMin (=" + String(yMin) + ") and yMax (=" + String(yMax) + ")"); ...

block Blocks.Continuous.LowpassButterworth

Component	Modelica 4.0.0	Modelica 3.2.3
f	Units.SI.Frequency	SIunits.Frequency

block Blocks.Continuous.CriticalDamping

Component	Modelica 4.0.0	Modelica 3.2.3
f	Units.SI.Frequency	SIunits.Frequency

block Blocks.Continuous.Filter

Component	Modelica 4.0.0	Modelica 3.2.3
f_cut	Units.SI.Frequency	SIunits.Frequency
f_min	Units.SI.Frequency	SIunits.Frequency

function Blocks.Continuous.Internal.Filter.coefficients.lowPass

Component	Modelica 4.0.0	Modelica 3.2.3
f_cut	Units.SI.Frequency	SIunits.Frequency
w_cut	Units.SI.AngularVelocity	SIunits.AngularVelocity

function Blocks.Continuous.Internal.Filter.coefficients.highPass

Component	Modelica 4.0.0	Modelica 3.2.3
f_cut	Units.SI.Frequency	SIunits.Frequency
w_cut	Units.SI.AngularVelocity	SIunits.AngularVelocity

function Blocks.Continuous.Internal.Filter.coefficients.bandPass

Component	Modelica 4.0.0	Modelica 3.2.3
f_min	Units.SI.Frequency	SIunits.Frequency
f_max	Units.SI.Frequency	SIunits.Frequency
f0	Units.SI.Frequency	SIunits.Frequency
w_cut	Units.SI.AngularVelocity	SIunits.AngularVelocity

function Blocks.Continuous.Internal.Filter.coefficients.bandStop

Component	Modelica 4.0.0	Modelica 3.2.3
f_min	Units.SI.Frequency	SIunits.Frequency
f_max	Units.SI.Frequency	SIunits.Frequency
f0	Units.SI.Frequency	SIunits.Frequency
w_cut	Units.SI.AngularVelocity	SIunits.AngularVelocity

function Blocks.Continuous.Internal.Filter.roots.lowPass

Component	Modelica 4.0.0	Modelica 3.2.3
f_cut	Units.SI.Frequency	SIunits.Frequency

function Blocks.Continuous.Internal.Filter.roots.highPass

Component	Modelica 4.0.0	Modelica 3.2.3
f_cut	Units.SI.Frequency	SIunits.Frequency

function Blocks.Continuous.Internal.Filter.roots.bandPass

Component	Modelica 4.0.0	Modelica 3.2.3
f_min	Units.SI.Frequency	SIunits.Frequency
f_max	Units.SI.Frequency	SIunits.Frequency

function Blocks.Continuous.Internal.Filter.roots.bandStop

Component	Modelica 4.0.0	Modelica 3.2.3
f_min	Units.SI.Frequency	SIunits.Frequency
f_max	Units.SI.Frequency	SIunits.Frequency

function Blocks.Continuous.Internal.Filter.Utilities.bandPassAlpha

Component	Modelica 4.0.0	Modelica 3.2.3
w	Units.SI.AngularVelocity	SIunits.AngularVelocity

block Blocks.Discrete.FirstOrderHold

Component	Modelica 4.0.0	Modelica 3.2.3
tSample	Units.SI.Time	SIunits.Time

block Blocks.Interfaces.SignalSource

Component	Modelica 4.0.0	Modelica 3.2.3
startTime	Units.SI.Time	SIunits.Time

block Blocks.Interfaces.DiscreteBlock

Component	Modelica 4.0.0	Modelica 3.2.3
samplePeriod	Units.SI.Time	SIunits.Time
startTime	Units.SI.Time	SIunits.Time

block Blocks.Interfaces.IntegerSignalSource

Component	Modelica 4.0.0	Modelica 3.2.3
startTime	Units.SI.Time	SIunits.Time

block Blocks.Interfaces.PartialNoise

Component	Modelica 4.0.0	Modelica 3.2.3
samplePeriod	Units.SI.Period	SIunits.Period
startTime	Units.SI.Time	SIunits.Time

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
initial equation
localSeed = if useAutomaticLocalSeed then automaticLocalSeed(getInstanceName()) else fixedLocalSeed;	localSeed = if useAutomaticLocalSeed then impureRandomInteger(globalSeed.id_impure) else fixedLocalSeed;
pre(state) = generator.initialState(localSeed, actualGlobalSeed); ...

block Blocks.Logical.TriggeredTrapezoid

Component	Modelica 4.0.0	Modelica 3.2.3
rising	Units.SI.Time	SIunits.Time
falling	Units.SI.Time	SIunits.Time
T	Units.SI.Time	SIunits.Time

block Blocks.Logical.Timer

Component	Modelica 4.0.0	Modelica 3.2.3
entryTime	Units.SI.Time	SIunits.Time

block Blocks.Math.UnitConversions.To_degC

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
y = Modelica.Units.Conversions.to_degC(u);	y = SI.Conversions.to_degC(u);

block Blocks.Math.UnitConversions.From_degC

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
y = Modelica.Units.Conversions.from_degC(u);	y = SI.Conversions.from_degC(u);

block Blocks.Math.UnitConversions.To_degF

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
y = Modelica.Units.Conversions.to_degF(u);	y = SI.Conversions.to_degF(u);

block Blocks.Math.UnitConversions.From_degF

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
y = Modelica.Units.Conversions.from_degF(u);	y = SI.Conversions.from_degF(u);

block Blocks.Math.UnitConversions.To_degRk

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
y = Modelica.Units.Conversions.to_degRk(u);	y = SI.Conversions.to_degRk(u);

block Blocks.Math.UnitConversions.From_degRk

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
y = Modelica.Units.Conversions.from_degRk(u);	y = SI.Conversions.from_degRk(u);

block Blocks.Math.UnitConversions.To_deg

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
y = Modelica.Units.Conversions.to_deg(u);	y = SI.Conversions.to_deg(u);

block Blocks.Math.UnitConversions.From_deg

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
y = Modelica.Units.Conversions.from_deg(u);	y = SI.Conversions.from_deg(u);

block Blocks.Math.UnitConversions.To_rpm

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
y = Modelica.Units.Conversions.to_rpm(u);	y = SI.Conversions.to_rpm(u);

block Blocks.Math.UnitConversions.From_rpm

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
y = Modelica.Units.Conversions.from_rpm(u);	y = SI.Conversions.from_rpm(u);

block Blocks.Math.UnitConversions.To_kmh

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
y = Modelica.Units.Conversions.to_kmh(u);	y = SI.Conversions.to_kmh(u);

block Blocks.Math.UnitConversions.From_kmh

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
y = Modelica.Units.Conversions.from_kmh(u);	y = SI.Conversions.from_kmh(u);

block Blocks.Math.UnitConversions.To_day

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
y = Modelica.Units.Conversions.to_day(u);	y = SI.Conversions.to_day(u);

block Blocks.Math.UnitConversions.From_day

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
y = Modelica.Units.Conversions.from_day(u);	y = SI.Conversions.from_day(u);

block Blocks.Math.UnitConversions.To_hour

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
y = Modelica.Units.Conversions.to_hour(u);	y = SI.Conversions.to_hour(u);

block Blocks.Math.UnitConversions.From_hour

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
y = Modelica.Units.Conversions.from_hour(u);	y = SI.Conversions.from_hour(u);

block Blocks.Math.UnitConversions.To_minute

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
y = Modelica.Units.Conversions.to_minute(u);	y = SI.Conversions.to_minute(u);

block Blocks.Math.UnitConversions.From_minute

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
y = Modelica.Units.Conversions.from_minute(u);	y = SI.Conversions.from_minute(u);

block Blocks.Math.UnitConversions.To_litre

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
y = Modelica.Units.Conversions.to_litre(u);	y = SI.Conversions.to_litre(u);

block Blocks.Math.UnitConversions.From_litre

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
y = Modelica.Units.Conversions.from_litre(u);	y = SI.Conversions.from_litre(u);

block Blocks.Math.UnitConversions.To_kWh

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
y = Modelica.Units.Conversions.to_kWh(u);	y = SI.Conversions.to_kWh(u);

block Blocks.Math.UnitConversions.From_kWh

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
y = Modelica.Units.Conversions.from_kWh(u);	y = SI.Conversions.from_kWh(u);

block Blocks.Math.UnitConversions.To_bar

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
y = Modelica.Units.Conversions.to_bar(u);	y = SI.Conversions.to_bar(u);

block Blocks.Math.UnitConversions.From_bar

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
y = Modelica.Units.Conversions.from_bar(u);	y = SI.Conversions.from_bar(u);

block Blocks.Math.UnitConversions.To_gps

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
y = Modelica.Units.Conversions.to_gps(u);	y = SI.Conversions.to_gps(u);

block Blocks.Math.UnitConversions.From_gps

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
y = Modelica.Units.Conversions.from_gps(u);	y = SI.Conversions.from_gps(u);

block Blocks.Math.Mean

Component	Modelica 4.0.0	Modelica 3.2.3
f	Units.SI.Frequency	SIunits.Frequency
t0	Units.SI.Time	SIunits.Time
y_last	Present

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... x = x0;
y_last = 0;	y = 0;
... when sample(t0 + 1/f, 1/f) then
y_last = if not yGreaterOrEqualZero then fpre(x) else max(0.0, fpre(x));	y = if not yGreaterOrEqualZero then fpre(x) else max(0.0, fpre(x));
reinit(x, 0);
end when;
y = y_last;

block Blocks.Math.RectifiedMean

Component	Modelica 4.0.0	Modelica 3.2.3
f	Units.SI.Frequency	SIunits.Frequency

block Blocks.Math.ContinuousMean

Component	Modelica 4.0.0	Modelica 3.2.3
t_eps	Units.SI.Time	SIunits.Time

block Blocks.Math.RootMeanSquare

Component	Modelica 4.0.0	Modelica 3.2.3
f	Units.SI.Frequency	SIunits.Frequency

block Blocks.Math.Variance

Component	Modelica 4.0.0	Modelica 3.2.3
t_eps	Units.SI.Time	SIunits.Time

block Blocks.Math.StandardDeviation

Component	Modelica 4.0.0	Modelica 3.2.3
t_eps	Units.SI.Time	SIunits.Time

block Blocks.Math.Harmonic

Component	Modelica 4.0.0	Modelica 3.2.3
f	Units.SI.Frequency	SIunits.Frequency
sin1	final f=k*f
sin1		final freqHz=k*f
sin2	final f=k*f
sin2		final freqHz=k*f

block Blocks.Math.TotalHarmonicDistortion

Component	Modelica 4.0.0	Modelica 3.2.3
f	Units.SI.Frequency	SIunits.Frequency

block Blocks.Math.RealFFT

Component	Modelica 4.0.0	Modelica 3.2.3
f_max	Units.SI.Frequency	SIunits.Frequency
f_res	Units.SI.Frequency	SIunits.Frequency

block Blocks.Math.Pythagoras

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... y2 = u1^2 - u2^2;
valid = y2 >= 0;	if y2>=0 then
y = if noEvent(y2 >= 0) then sqrt(y2) else 0;	y=sqrt(y2);
end if;	valid = true;
	else y=0; valid = false; end if; end if;

block Blocks.Math.LinearDependency

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
y = y0 + k1u1 + k2u2;	y = y0(1 + k1u1 + k2*u2);

block Blocks.MathBoolean.And

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
y = Modelica400.Math.BooleanVectors.andTrue(u);	y = Modelica323.Math.BooleanVectors.allTrue(u);

block Blocks.MathBoolean.Nand

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
y = not Modelica400.Math.BooleanVectors.andTrue(u);	y = not Modelica323.Math.BooleanVectors.allTrue(u);

block Blocks.MathBoolean.OnDelay

Component	Modelica 4.0.0	Modelica 3.2.3
delayTime	Units.SI.Time	SIunits.Time
t_next	Units.SI.Time	SIunits.Time

block Blocks.Nonlinear.Limiter

Component	Modelica 4.0.0	Modelica 3.2.3
limitsAtInit		Present

block Blocks.Nonlinear.VariableLimiter

Component	Modelica 4.0.0	Modelica 3.2.3
limitsAtInit		Present

block Blocks.Nonlinear.SlewRateLimiter

Component	Modelica 4.0.0	Modelica 3.2.3
Td	Units.SI.Time	SIunits.Time

block Blocks.Nonlinear.DeadZone

Component	Modelica 4.0.0	Modelica 3.2.3
deadZoneAtInit		Present

block Blocks.Nonlinear.FixedDelay

Component	Modelica 4.0.0	Modelica 3.2.3
delayTime	Units.SI.Time	SIunits.Time

block Blocks.Nonlinear.PadeDelay

Component	Modelica 4.0.0	Modelica 3.2.3
delayTime	Units.SI.Time	SIunits.Time

block Blocks.Nonlinear.VariableDelay

Component	Modelica 4.0.0	Modelica 3.2.3
delayMax	Units.SI.Duration	SIunits.Duration

block Blocks.Sources.Ramp

Component	Modelica 4.0.0	Modelica 3.2.3
duration	Units.SI.Time	SIunits.Time

block Blocks.Sources.Sine

Component	Modelica 4.0.0	Modelica 3.2.3
phase	Units.SI.Angle	SIunits.Angle
f	Present
freqHz		Present

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
y = offset + (if time < startTime then 0 else amplitudeModelica400.Math.sin(2 pif(time - startTime) + phase));	y = offset + (if time < startTime then 0 else amplitudeModelica323.Math.sin(2 pifreqHz(time - startTime) + phase));

block Blocks.Sources.Cosine

Component	Modelica 4.0.0	Modelica 3.2.3
phase	Units.SI.Angle	SIunits.Angle
f	Present
freqHz		Present

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
y = offset + (if time < startTime then 0 else amplitudeModelica400.Math.cos(2 pif(time - startTime) + phase));	y = offset + (if time < startTime then 0 else amplitudeModelica323.Math.cos(2 pifreqHz(time - startTime) + phase));

block Blocks.Sources.ExpSine

Component	Modelica 4.0.0	Modelica 3.2.3
phase	Units.SI.Angle	SIunits.Angle
damping	Units.SI.Damping	SIunits.Damping
f	Present
freqHz		Present

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
y = offset + (if time < startTime then 0 else amplitudeModelica400.Math.exp(-( time - startTime)damping)Modelica400.Math.sin(2pif(time - startTime) + phase));	y = offset + (if time < startTime then 0 else amplitudeModelica323.Math.exp(-( time - startTime)damping)Modelica323.Math.sin(2pifreqHz(time - startTime) + phase));

block Blocks.Sources.Exponentials

Component	Modelica 4.0.0	Modelica 3.2.3
riseTime	Units.SI.Time	SIunits.Time
riseTimeConst	Units.SI.Time	SIunits.Time
fallTimeConst	Units.SI.Time	SIunits.Time

block Blocks.Sources.Pulse

Component	Modelica 4.0.0	Modelica 3.2.3
period	Units.SI.Time	SIunits.Time
T_width	Units.SI.Time	SIunits.Time
T_start	Units.SI.Time	SIunits.Time

block Blocks.Sources.SawTooth

Component	Modelica 4.0.0	Modelica 3.2.3
period	Units.SI.Time	SIunits.Time
T_start	Units.SI.Time	SIunits.Time

block Blocks.Sources.Trapezoid

Component	Modelica 4.0.0	Modelica 3.2.3
rising	Units.SI.Time	SIunits.Time
width	Units.SI.Time	SIunits.Time
falling	Units.SI.Time	SIunits.Time
period	Units.SI.Time	SIunits.Time
T_rising	Units.SI.Time	SIunits.Time
T_width	Units.SI.Time	SIunits.Time
T_falling	Units.SI.Time	SIunits.Time
T_start	Units.SI.Time	SIunits.Time

block Blocks.Sources.KinematicPTP

Component	Modelica 4.0.0	Modelica 3.2.3
startTime	Units.SI.Time	SIunits.Time
Ta1	Units.SI.Time	SIunits.Time
Ta2	Units.SI.Time	SIunits.Time
Tv	Units.SI.Time	SIunits.Time
Te	Units.SI.Time	SIunits.Time

block Blocks.Sources.KinematicPTP2

Component	Modelica 4.0.0	Modelica 3.2.3
startTime	Units.SI.Time	SIunits.Time
endTime	Units.SI.Time	SIunits.Time
Ta1	Units.SI.Time	SIunits.Time
Ta2	Units.SI.Time	SIunits.Time
Tv	Units.SI.Time	SIunits.Time
Te	Units.SI.Time	SIunits.Time
Ta1s	Units.SI.Time	SIunits.Time
Ta2s	Units.SI.Time	SIunits.Time
Tvs	Units.SI.Time	SIunits.Time
Tes	Units.SI.Time	SIunits.Time

block Blocks.Sources.TimeTable

Component	Modelica 4.0.0	Modelica 3.2.3
timeScale	Units.SI.Time	SIunits.Time
shiftTime	Units.SI.Time	SIunits.Time
a	discrete
b	discrete
nextEvent	Units.SI.Time	SIunits.Time

block Blocks.Sources.CombiTimeTable

Component	Modelica 4.0.0	Modelica 3.2.3
timeScale	Units.SI.Time	SIunits.Time
startTime	Units.SI.Time	SIunits.Time
shiftTime	Units.SI.Time	SIunits.Time
t_min	Units.SI.Time	SIunits.Time
t_max	Units.SI.Time	SIunits.Time
nextTimeEvent	Units.SI.Time	SIunits.Time

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... end for;
elseif smoothness == Modelica400.Blocks.Types.Smoothness.LinearSegments then for i in 1:nout loop y[i] = p_offset[i] + Internal.getTimeTableValueNoDer2(tableID, i, timeScaled, nextTimeEventScaled, pre(nextTimeEventScaled)); end for;
else ...

block Blocks.Sources.BooleanStep

Component	Modelica 4.0.0	Modelica 3.2.3
startTime	Units.SI.Time	SIunits.Time

block Blocks.Sources.BooleanPulse

Component	Modelica 4.0.0	Modelica 3.2.3
period	Units.SI.Time	SIunits.Time
startTime	Units.SI.Time	SIunits.Time
Twidth	Units.SI.Time	SIunits.Time
pulseStart	Units.SI.Time	SIunits.Time

block Blocks.Sources.SampleTrigger

Component	Modelica 4.0.0	Modelica 3.2.3
period	Units.SI.Time	SIunits.Time
startTime	Units.SI.Time	SIunits.Time

block Blocks.Sources.BooleanTable

Component	Modelica 4.0.0	Modelica 3.2.3
table	Units.SI.Time	SIunits.Time
startTime	Units.SI.Time	SIunits.Time
shiftTime	Units.SI.Time	SIunits.Time

block Blocks.Sources.RadioButtonSource

Component	Modelica 4.0.0	Modelica 3.2.3
buttonTimeTable	Units.SI.Time	SIunits.Time
table	y(start=false, fixed=true)

block Blocks.Sources.IntegerTable

Component	Modelica 4.0.0	Modelica 3.2.3
startTime	Units.SI.Time	SIunits.Time
shiftTime	Units.SI.Time	SIunits.Time

block Blocks.Tables.CombiTable1Ds

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... end for;
elseif smoothness == Modelica400.Blocks.Types.Smoothness.LinearSegments then for i in 1:nout loop y[i] = Internal.getTable1DValueNoDer2(tableID, i, u); end for;
else ...

block Blocks.Tables.CombiTable2Dv

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... end for;
elseif smoothness == Modelica400.Blocks.Types.Smoothness.LinearSegments then for j in 1:n loop y[j] = Modelica400.Blocks.Tables.Internal.getTable2DValueNoDer2( tableID, u1[j], u2[j]); end for;
else ...

model ComplexBlocks.Examples.ShowTransferFunction

Component	Modelica 4.0.0	Modelica 3.2.3
phi	Units.SI.Angle	SIunits.Angle
logFrequencySweep	Blocks.Sources.LogFrequencySweep	ComplexBlocks.Sources.LogFrequencySweep

block ComplexBlocks.Interfaces.ComplexSignalSource

Component	Modelica 4.0.0	Modelica 3.2.3
startTime	Units.SI.Time	SIunits.Time

block ComplexBlocks.ComplexMath.Sqrt

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
y = Modelica400.ComplexMath.sqrt(uInternal);	y = Modelica323.ComplexMath.'sqrt'(uInternal);

block ComplexBlocks.ComplexMath.Bode

Component	Modelica 4.0.0	Modelica 3.2.3
dB	Units.SI.AmplitudeLevelDifference	SIunits.AmplitudeLevelDifference

block ComplexBlocks.ComplexMath.TransferFunction

Component	Modelica 4.0.0	Modelica 3.2.3
w	unit="rad/s"

block ComplexBlocks.Sources.ComplexRotatingPhasor

Component	Modelica 4.0.0	Modelica 3.2.3
w	Units.SI.AngularVelocity	SIunits.AngularVelocity
phi0	Units.SI.Angle	SIunits.Angle
phi	Units.SI.Angle	SIunits.Angle

block ComplexBlocks.Sources.ComplexRampPhasor

Component	Modelica 4.0.0	Modelica 3.2.3
phi	Units.SI.Angle	SIunits.Angle
startTime	Units.SI.Time	SIunits.Time
duration	Units.SI.Time	SIunits.Time

model StateGraph.Examples.FirstExample

Component	Modelica 4.0.0	Modelica 3.2.3
initialStep	nIn=1
initialStep	nOut=1
step	nIn=1
step	nOut=1

model StateGraph.Examples.FirstExample_Variant2

Component	Modelica 4.0.0	Modelica 3.2.3
initialStep	nIn=1
initialStep	nOut=1
step	nIn=1
step	nOut=1

model StateGraph.Examples.FirstExample_Variant3

Component	Modelica 4.0.0	Modelica 3.2.3
initialStep	nIn=1
initialStep	nOut=1
step	nIn=1
step	nOut=1

model StateGraph.Examples.ExecutionPaths

Component	Modelica 4.0.0	Modelica 3.2.3
step0	nIn=1
step0	nOut=1
step1	nIn=1
step1	nOut=1
step6	nIn=1
step6	nOut=1
step2	nIn=1
step2	nOut=1
step3	nIn=1
step3	nOut=1
step4	nIn=1
step4	nOut=1
step5	nIn=1
step5	nOut=1
step4a	nIn=1
step4a	nOut=1
NumericValue1	Blocks.Interaction.Show.RealValue	StateGraph.Temporary.NumericValue

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... connect(setCondition.y, transition7.condition);
connect(setReal.y, NumericValue1.numberPort);	connect(setReal.y, NumericValue1.Value);
connect(transition3.inPort, alternative.split[1]); ...

model StateGraph.Examples.ShowCompositeStep

Component	Modelica 4.0.0	Modelica 3.2.3
step0	nIn=1
step0	nOut=1
step1	nIn=1
step1	nOut=1
step6	nIn=1
step6	nOut=1

model StateGraph.Examples.ShowExceptions

Component	Modelica 4.0.0	Modelica 3.2.3
initialStep	nIn=1
initialStep	nOut=1
step1	nIn=1
step1	nOut=1

model StateGraph.Examples.ControlledTanks

Component	Modelica 4.0.0	Modelica 3.2.3
start	Blocks.Sources.RadioButtonSource	StateGraph.Temporary.RadioButton
stop	Blocks.Sources.RadioButtonSource	StateGraph.Temporary.RadioButton
shut	Blocks.Sources.RadioButtonSource	StateGraph.Temporary.RadioButton

model StateGraph.Examples.Utilities.TankController

Component	Modelica 4.0.0	Modelica 3.2.3
limit	Real	StateGraph.Temporary.SetRealParameter
limit		graphical
waitTime	Units.SI.Time	StateGraph.Temporary.SetRealParameter
waitTime		graphical
s1	nOut=1
s2	nIn=1
emptyTanks	nIn=1
emptyTanks	nOut=1

model StateGraph.Examples.Utilities.MakeProduct

Component	Modelica 4.0.0	Modelica 3.2.3
limit	Real	StateGraph.Temporary.SetRealParameter
limit		graphical
waitTime	Units.SI.Time	StateGraph.Temporary.SetRealParameter
waitTime		graphical
fillTank1	nIn=1
fillTank1	nOut=1
fillTank2	nIn=1
fillTank2	nOut=1
emptyTank2	nIn=1
emptyTank2	nOut=1
wait1	nIn=1
wait1	nOut=1
wait2	nIn=1
wait2	nOut=1

connector StateGraph.Examples.Utilities.Inflow1

Component	Modelica 4.0.0	Modelica 3.2.3
Fi	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate

connector StateGraph.Examples.Utilities.Inflow2

Component	Modelica 4.0.0	Modelica 3.2.3
Fi	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate

connector StateGraph.Examples.Utilities.Outflow1

Component	Modelica 4.0.0	Modelica 3.2.3
Fo	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate

connector StateGraph.Examples.Utilities.Outflow2

Component	Modelica 4.0.0	Modelica 3.2.3
Fo	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate

model StateGraph.Examples.Utilities.CompositeStep

Component	Modelica 4.0.0	Modelica 3.2.3
step3	nIn=1
step3	nOut=1
step4	nIn=1
step4	nOut=1
step4a	nIn=1
step4a	nOut=1
initStep	nIn=1
initStep	nOut=1
exitStep	nIn=1
exitStep	nOut=1

model StateGraph.Examples.Utilities.CompositeStep1

Component	Modelica 4.0.0	Modelica 3.2.3
initStep	nIn=1
initStep	nOut=1
exitStep	nIn=1
exitStep	nOut=1

model StateGraph.Examples.Utilities.CompositeStep2

Component	Modelica 4.0.0	Modelica 3.2.3
initStep	nIn=1
initStep	nOut=1
exitStep	nIn=1
exitStep	nOut=1
waitTime	Units.SI.Time	StateGraph.Temporary.SetRealParameter
waitTime		graphical

block StateGraph.Interfaces.PartialStep

Component	Modelica 4.0.0	Modelica 3.2.3
nIn	=0	=1
nOut	=0	=1
outerStatePort	localActive=localActive

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... localActive = pre(newActive);
newActive = if outerStatePort.subgraphStatePort.resume then oldActive else ( Modelica400.Math.BooleanVectors.anyTrue(inPort.set) or localActive and not Modelica400.Math.BooleanVectors.anyTrue(outPort.reset)) and not outerStatePort.subgraphStatePort.suspend;	newActive = if outerStatePort.subgraphStatePort.resume then oldActive else ( StateGraph.Temporary.anyTrue(inPort.set) or localActive and not StateGraph.Temporary.anyTrue(outPort.reset)) and not outerStatePort.subgraphStatePort.suspend;
when outerStatePort.subgraphStatePort.suspend then ... end when;
	outerStatePort.subgraphStatePort.activeSteps = if localActive then 1.0 else 0.0;
for i in 1:nIn loop ...

block StateGraph.Interfaces.PartialTransition

Component	Modelica 4.0.0	Modelica 3.2.3
waitTime	Units.SI.Time	SIunits.Time
t	Units.SI.Time	SIunits.Time
t_start	Units.SI.Time	SIunits.Time
t_start	discrete

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
initial equation
	if enableTimer then
pre(t_start) = time;
	end if;
pre(enableFire) = false; ... else
when false then	t_start = 0;
t_start = pre(t_start); end when;
t_dummy = 0; ...

block StateGraph.Alternative

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... join.occupied = fill(outPort.occupied, nBranches);
inPort.reset = Modelica400.Math.BooleanVectors.anyTrue(split.reset);	inPort.reset = StateGraph.Temporary.anyTrue(split.reset);
outPort.set = Modelica400.Math.BooleanVectors.anyTrue(join.set);	outPort.set = StateGraph.Temporary.anyTrue(join.set);

block StateGraph.Parallel

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... join.reset = fill(outPort.reset, nBranches);
inPort.occupied = Modelica400.Math.BooleanVectors.anyTrue(split.occupied);	inPort.occupied = StateGraph.Temporary.anyTrue(split.occupied);
outPort.available = Modelica400.Math.BooleanVectors.andTrue(join.available);	outPort.available = StateGraph.Temporary.allTrue(join.available);

model StateGraph.PartialCompositeStep

Component	Modelica 4.0.0	Modelica 3.2.3
stateGraphRoot	suspend=Modelica400.Math.BooleanVectors.anyTrue(suspend.reset) or outerState.subgraphStatePort.suspend	suspend=StateGraph.Temporary.anyTrue(suspend.reset) or outerState.subgraphStatePort.suspend
stateGraphRoot	resume=Modelica400.Math.BooleanVectors.anyTrue(resume.set) or outerState.subgraphStatePort.resume	resume=StateGraph.Temporary.anyTrue(resume.set) or outerState.subgraphStatePort.resume
outerState	active=active

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... equation connect(outerState.subgraphStatePort, stateGraphRoot.subgraphStatePort);
	outerState.subgraphStatePort.activeSteps = if active then 1.0 else 0.0;
activeSteps = -integer(innerState.stateGraphRoot.subgraphStatePort.activeSteps);
active = pre(newActive);
newActive = activeSteps > 0 and not Modelica400.Math.BooleanVectors.anyTrue( suspend.reset) and not outerState.subgraphStatePort.suspend or Modelica400.Math.BooleanVectors.anyTrue(resume.set) or outerState.subgraphStatePort.resume;	newActive = activeSteps > 0 and not StateGraph.Temporary.anyTrue(suspend.reset) and not outerState.subgraphStatePort.suspend or StateGraph.Temporary.anyTrue(resume.set) or outerState.subgraphStatePort.resume;
for i in 1:nResume loop ...

model Electrical.Analog.Examples.CauerLowPassAnalog

Component	Modelica 4.0.0	Modelica 3.2.3
l1	Units.SI.Inductance	SIunits.Inductance
l2	Units.SI.Inductance	SIunits.Inductance
c1	Units.SI.Capacitance	SIunits.Capacitance
c2	Units.SI.Capacitance	SIunits.Capacitance
c3	Units.SI.Capacitance	SIunits.Capacitance
c4	Units.SI.Capacitance	SIunits.Capacitance
c5	Units.SI.Capacitance	SIunits.Capacitance

model Electrical.Analog.Examples.CauerLowPassOPV

Component	Modelica 4.0.0	Modelica 3.2.3
l1	Units.SI.Capacitance	SIunits.Capacitance
l2	Units.SI.Capacitance	SIunits.Capacitance
c1	Units.SI.Capacitance	SIunits.Capacitance
c2	Units.SI.Capacitance	SIunits.Capacitance
c3	Units.SI.Capacitance	SIunits.Capacitance
c4	Units.SI.Capacitance	SIunits.Capacitance
c5	Units.SI.Capacitance	SIunits.Capacitance

model Electrical.Analog.Examples.CauerLowPassSC

Component	Modelica 4.0.0	Modelica 3.2.3
l1	Units.SI.Capacitance	SIunits.Capacitance
l2	Units.SI.Capacitance	SIunits.Capacitance
c1	Units.SI.Capacitance	SIunits.Capacitance
c2	Units.SI.Capacitance	SIunits.Capacitance
c3	Units.SI.Capacitance	SIunits.Capacitance
c4	Units.SI.Capacitance	SIunits.Capacitance
c5	Units.SI.Capacitance	SIunits.Capacitance

model Electrical.Analog.Examples.CharacteristicIdealDiodes

Component	Modelica 4.0.0	Modelica 3.2.3
SineVoltage1	f=1
SineVoltage1		freqHz=1
SineVoltage2	f=1
SineVoltage2		freqHz=1
SineVoltage3	f=1
SineVoltage3		freqHz=1

model Electrical.Analog.Examples.CharacteristicThyristors

Component	Modelica 4.0.0	Modelica 3.2.3
SineVoltage1	f=1
SineVoltage1		freqHz=1

model Electrical.Analog.Examples.ChuaCircuit

Component	Modelica 4.0.0	Modelica 3.2.3
model		encapsulated

model Electrical.Analog.Examples.DifferenceAmplifier

Component	Modelica 4.0.0	Modelica 3.2.3
model		encapsulated
V1	f=0.2e9
V1		freqHz=0.2e9

model Electrical.Analog.Examples.HeatingMOSInverter

Component	Modelica 4.0.0	Modelica 3.2.3
Sin	f=1
Sin		freqHz=1
H_PMOS	Electrical.Analog.Semiconductors.PMOS	Electrical.Analog.Semiconductors.HeatingPMOS
H_NMOS	Electrical.Analog.Semiconductors.NMOS	Electrical.Analog.Semiconductors.HeatingNMOS

model Electrical.Analog.Examples.HeatingPNP_NORGate

Component	Modelica 4.0.0	Modelica 3.2.3
CapVal	Units.SI.Capacitance	SIunits.Capacitance
tauVal	Units.SI.Time	SIunits.Time
C1	final C=CapVal
C1		C=CapVal
C2	final C=CapVal
C2		C=CapVal
C3	final C=CapVal
C3		C=CapVal
T1	Electrical.Analog.Semiconductors.PNP	Electrical.Analog.Semiconductors.HeatingPNP
T2	Electrical.Analog.Semiconductors.PNP	Electrical.Analog.Semiconductors.HeatingPNP

model Electrical.Analog.Examples.HeatingRectifier

Component	Modelica 4.0.0	Modelica 3.2.3
HeatingDiode1	Electrical.Analog.Semiconductors.Diode	Electrical.Analog.Semiconductors.HeatingDiode
SineVoltage1	f=1
SineVoltage1		freqHz=1

model Electrical.Analog.Examples.NandGate

Component	Modelica 4.0.0	Modelica 3.2.3
model		encapsulated

model Electrical.Analog.Examples.OvervoltageProtection

Component	Modelica 4.0.0	Modelica 3.2.3
sineVoltage	f=5
sineVoltage		freqHz=5

model Electrical.Analog.Examples.Rectifier

Component	Modelica 4.0.0	Modelica 3.2.3
VAC	Units.SI.Voltage	SIunits.Voltage
f	Units.SI.Frequency	SIunits.Frequency
LAC	Units.SI.Inductance	SIunits.Inductance
Ron	Units.SI.Resistance	SIunits.Resistance
Goff	Units.SI.Conductance	SIunits.Conductance
Vknee	Units.SI.Voltage	SIunits.Voltage
CDC	Units.SI.Capacitance	SIunits.Capacitance
IDC	Units.SI.Current	SIunits.Current
uDC	Units.SI.Voltage	SIunits.Voltage
iAC	Units.SI.Current	SIunits.Current
uAC	Units.SI.Voltage	SIunits.Voltage
Losses	Units.SI.Power	SIunits.Power
SineVoltage1	f=f
SineVoltage1		freqHz=f
SineVoltage2	f=f
SineVoltage2		freqHz=f
SineVoltage3	f=f
SineVoltage3		freqHz=f

model Electrical.Analog.Examples.ShowSaturatingInductor

Component	Modelica 4.0.0	Modelica 3.2.3
Lzer	Units.SI.Inductance	SIunits.Inductance
Lnom	Units.SI.Inductance	SIunits.Inductance
Inom	Units.SI.Current	SIunits.Current
Linf	Units.SI.Inductance	SIunits.Inductance
U	Units.SI.Voltage	SIunits.Voltage
f	Units.SI.Frequency	SIunits.Frequency
phase	Units.SI.Angle	SIunits.Angle
SineVoltage1	f=f
SineVoltage1		freqHz=f

model Electrical.Analog.Examples.ShowVariableResistor

Component	Modelica 4.0.0	Modelica 3.2.3
SineVoltage1	f=1
SineVoltage1		freqHz=1

model Electrical.Analog.Examples.ThyristorBehaviourTest

Component	Modelica 4.0.0	Modelica 3.2.3
sineVoltage	f=10000
sineVoltage		freqHz=10000

model Electrical.Analog.Examples.AmplifierWithOpAmpDetailed

Component	Modelica 4.0.0	Modelica 3.2.3
sineVoltage	f=1000
sineVoltage		freqHz=1000

model Electrical.Analog.Examples.CompareTransformers

Component	Modelica 4.0.0	Modelica 3.2.3
Vdc	Units.SI.Voltage	SIunits.Voltage
Vpeak	Units.SI.Voltage	SIunits.Voltage
f	Units.SI.Frequency	SIunits.Frequency
phi0	Units.SI.Angle	SIunits.Angle
R1	Units.SI.Resistance	SIunits.Resistance
L1sigma	Units.SI.Inductance	SIunits.Inductance
Lm1	Units.SI.Inductance	SIunits.Inductance
L2sigma	Units.SI.Inductance	SIunits.Inductance
R2	Units.SI.Resistance	SIunits.Resistance
RL	Units.SI.Resistance	SIunits.Resistance
L1	Units.SI.Inductance	SIunits.Inductance
L2	Units.SI.Inductance	SIunits.Inductance
M	Units.SI.Inductance	SIunits.Inductance
v1B	Units.SI.Voltage	SIunits.Voltage
i1B	Units.SI.Current	SIunits.Current
v2B	Units.SI.Voltage	SIunits.Voltage
i2B	Units.SI.Current	SIunits.Current
v1I	Units.SI.Voltage	SIunits.Voltage
i1I	Units.SI.Current	SIunits.Current
v2I	Units.SI.Voltage	SIunits.Voltage
i2I	Units.SI.Current	SIunits.Current
sineVoltage1	f=f
sineVoltage1		freqHz=f
sineVoltage2	f=f
sineVoltage2		freqHz=f

model Electrical.Analog.Examples.ControlledSwitchWithArc

Component	Modelica 4.0.0	Modelica 3.2.3
sineVoltage	f=1
sineVoltage		freqHz=1

model Electrical.Analog.Examples.SimpleTriacCircuit

Component	Modelica 4.0.0	Modelica 3.2.3
V	f=10000
V		freqHz=10000
trapezoidCurrent	Present
trapezoidCurrent
pulseCurrent		Present
pulseCurrent

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... connect(simpleTriac.n, L.p);
connect(trapezoidCurrent.n, simpleTriac.g);	connect(pulseCurrent.n, simpleTriac.g);
connect(trapezoidCurrent.p, ground.p);	connect(pulseCurrent.p, ground.p);

model Electrical.Analog.Examples.IdealTriacCircuit

Component	Modelica 4.0.0	Modelica 3.2.3
V	f=2
V		freqHz=2

model Electrical.Analog.Examples.AD_DA_conversion

Component	Modelica 4.0.0	Modelica 3.2.3
sineVoltage	f=10
sineVoltage		freqHz=10

model Electrical.Analog.Examples.GenerationOfFMUs

Component	Modelica 4.0.0	Modelica 3.2.3
sine12	f=2
sine12		freqHz=2
sine34	f=2
sine34		freqHz=2

model Electrical.Analog.Examples.ResonanceCircuits

Component	Modelica 4.0.0	Modelica 3.2.3
C	Units.SI.Capacitance	SIunits.Capacitance
L	Units.SI.Inductance	SIunits.Inductance
fRes	Units.SI.Frequency	SIunits.Frequency
f	Units.SI.Frequency	SIunits.Frequency
current1	f=f
current1		freqHz=f
voltage2	f=f
voltage2		freqHz=f

model Electrical.Analog.Examples.InvertingAmp

Component	Modelica 4.0.0	Modelica 3.2.3
Vps	Units.SI.Voltage	SIunits.Voltage
Vns	Units.SI.Voltage	SIunits.Voltage
Vin	Units.SI.Voltage	SIunits.Voltage
f	Units.SI.Frequency	SIunits.Frequency
R1	Units.SI.Resistance	SIunits.Resistance
R2	Units.SI.Resistance	SIunits.Resistance

model Electrical.Analog.Examples.OpAmps.Differentiator

Component	Modelica 4.0.0	Modelica 3.2.3
Vin	Units.SI.Voltage	SIunits.Voltage
f	Units.SI.Frequency	SIunits.Frequency
der_	Present
der_
Vps		Present
Vns		Present
k		Present
R		Present
C		Present
opAmp		Present
opAmp
r		Present
r
c		Present
c

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
connect(vIn.p, der_.p1);	connect(r.n, c.n);
connect(vIn.n, der_.n1);	connect(vIn.p, c.p);
connect(der_.n1, ground.p);	connect(vIn.n, ground.p);
connect(der_.p2, vOut.p);	connect(ground.p, opAmp.in_p);
connect(der_.n2, vOut.n);	connect(opAmp.in_n, r.n);
	connect(r.p, opAmp.out); connect(opAmp.out, vOut.p); connect(vOut.n, ground.p);

model Electrical.Analog.Examples.OpAmps.Integrator

Component	Modelica 4.0.0	Modelica 3.2.3
Vin	Units.SI.Voltage	SIunits.Voltage
f	Units.SI.Frequency	SIunits.Frequency
integrator	Present
integrator
Vps		Present
Vns		Present
k		Present
R		Present
C		Present
opAmp		Present
opAmp
r		Present
r
c		Present
c

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
connect(integrator.n1, ground.p);	connect(c.n, r.n);
connect(integrator.p2, vOut.p);	connect(c.p, opAmp.out);
connect(integrator.n2, vOut.n);	connect(c.n, opAmp.in_n);
connect(vIn.p, integrator.p1);	connect(ground.p, opAmp.in_p);
connect(vIn.n, integrator.n1);	connect(vIn.p, r.p);
	connect(ground.p, vIn.n); connect(opAmp.out, vOut.p); connect(ground.p, vOut.n);

model Electrical.Analog.Examples.OpAmps.LowPass

Component	Modelica 4.0.0	Modelica 3.2.3
Vin	Units.SI.Voltage	SIunits.Voltage
f	Units.SI.Frequency	SIunits.Frequency
fG	Units.SI.Frequency	SIunits.Frequency
firstOrder	Present
firstOrder
Vps		Present
Vns		Present
k		Present
R1		Present
R2		Present
C		Present
opAmp		Present
opAmp
r1		Present
r1
r2		Present
r2
c		Present
c

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
connect(firstOrder.n1, ground.p);	connect(r1.n, r2.n);
connect(firstOrder.p2, vOut.p);	connect(r2.n, opAmp.in_n);
connect(firstOrder.n2, vOut.n);	connect(r2.p, opAmp.out);
connect(vIn.p, firstOrder.p1);	connect(r2.p, c.p);
connect(vIn.n, firstOrder.n1);	connect(c.n, r2.n);
	connect(ground.p, opAmp.in_p); connect(vIn.p, r1.p); connect(ground.p, vIn.n); connect(opAmp.out, vOut.p); connect(ground.p, vOut.n);

model Electrical.Analog.Examples.OpAmps.HighPass

Component	Modelica 4.0.0	Modelica 3.2.3
Vin	Units.SI.Voltage	SIunits.Voltage
f	Units.SI.Frequency	SIunits.Frequency
fG	Units.SI.Frequency	SIunits.Frequency
derivative	Present
derivative
Vps		Present
Vns		Present
k		Present
R1		Present
R2		Present
C		Present
opAmp		Present
opAmp
r1		Present
r1
r2		Present
r2
c		Present
c

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
connect(derivative.n1, ground.p);	connect(r1.n, r2.n);
connect(derivative.p2, vOut.p);	connect(r2.n, opAmp.in_n);
connect(derivative.n2, vOut.n);	connect(r2.p, opAmp.out);
connect(vIn.p, derivative.p1);	connect(c.n, r1.p);
connect(vIn.n, derivative.n1);	connect(ground.p, opAmp.in_p);
	connect(vIn.p, c.p); connect(ground.p, vIn.n); connect(opAmp.out, vOut.p); connect(ground.p, vOut.n);

model Electrical.Analog.Examples.OpAmps.VoltageFollower

Component	Modelica 4.0.0	Modelica 3.2.3
Vps	Units.SI.Voltage	SIunits.Voltage
Vns	Units.SI.Voltage	SIunits.Voltage
Vin	Units.SI.Voltage	SIunits.Voltage
f	Units.SI.Frequency	SIunits.Frequency
Ri	Units.SI.Resistance	SIunits.Resistance
Rl	Units.SI.Resistance	SIunits.Resistance
opAmp	Electrical.Analog.Ideal.IdealizedOpAmpLimited	Electrical.Analog.Ideal.IdealizedOpAmpLimted

model Electrical.Analog.Examples.OpAmps.Comparator

Component	Modelica 4.0.0	Modelica 3.2.3
Vps	Units.SI.Voltage	SIunits.Voltage
Vns	Units.SI.Voltage	SIunits.Voltage
Vin	Units.SI.Voltage	SIunits.Voltage
f	Units.SI.Frequency	SIunits.Frequency
Vref	Units.SI.Voltage	SIunits.Voltage
R	Units.SI.Resistance	SIunits.Resistance
opAmp	Electrical.Analog.Ideal.IdealizedOpAmpLimited	Electrical.Analog.Ideal.IdealizedOpAmpLimted

model Electrical.Analog.Examples.OpAmps.InvertingSchmittTrigger

Component	Modelica 4.0.0	Modelica 3.2.3
Vps	Units.SI.Voltage	SIunits.Voltage
Vns	Units.SI.Voltage	SIunits.Voltage
Vin	Units.SI.Voltage	SIunits.Voltage
f	Units.SI.Frequency	SIunits.Frequency
vHys	Units.SI.Voltage	SIunits.Voltage
R1	Units.SI.Resistance	SIunits.Resistance
R2	Units.SI.Resistance	SIunits.Resistance
opAmp	Electrical.Analog.Ideal.IdealizedOpAmpLimited	Electrical.Analog.Ideal.IdealizedOpAmpLimted

model Electrical.Analog.Examples.OpAmps.SchmittTrigger

Component	Modelica 4.0.0	Modelica 3.2.3
Vps	Units.SI.Voltage	SIunits.Voltage
Vns	Units.SI.Voltage	SIunits.Voltage
Vin	Units.SI.Voltage	SIunits.Voltage
f	Units.SI.Frequency	SIunits.Frequency
vHys	Units.SI.Voltage	SIunits.Voltage
R1	Units.SI.Resistance	SIunits.Resistance
R2	Units.SI.Resistance	SIunits.Resistance
opAmp	Electrical.Analog.Ideal.IdealizedOpAmpLimited	Electrical.Analog.Ideal.IdealizedOpAmpLimted

model Electrical.Analog.Examples.OpAmps.Multivibrator

Component	Modelica 4.0.0	Modelica 3.2.3
Vps	Units.SI.Voltage	SIunits.Voltage
Vns	Units.SI.Voltage	SIunits.Voltage
f	Units.SI.Frequency	SIunits.Frequency
R1	Units.SI.Resistance	SIunits.Resistance
R2	Units.SI.Resistance	SIunits.Resistance
R	Units.SI.Resistance	SIunits.Resistance
C	Units.SI.Capacitance	SIunits.Capacitance
opAmp	Electrical.Analog.Ideal.IdealizedOpAmpLimited	Electrical.Analog.Ideal.IdealizedOpAmpLimted

model Electrical.Analog.Examples.OpAmps.SignalGenerator

Component	Modelica 4.0.0	Modelica 3.2.3
Vps	Units.SI.Voltage	SIunits.Voltage
Vns	Units.SI.Voltage	SIunits.Voltage
VAmp	Units.SI.Voltage	SIunits.Voltage
R1	Units.SI.Resistance	SIunits.Resistance
R2	Units.SI.Resistance	SIunits.Resistance
f	Units.SI.Frequency	SIunits.Frequency
R	Units.SI.Resistance	SIunits.Resistance
C	Units.SI.Capacitance	SIunits.Capacitance
opAmp1	Electrical.Analog.Ideal.IdealizedOpAmpLimited	Electrical.Analog.Ideal.IdealizedOpAmpLimted
opAmp2	Electrical.Analog.Ideal.IdealizedOpAmpLimited	Electrical.Analog.Ideal.IdealizedOpAmpLimted

model Electrical.Analog.Examples.OpAmps.LCOscillator

Component	Modelica 4.0.0	Modelica 3.2.3
VAmp	Units.SI.Voltage	SIunits.Voltage
f	Units.SI.Frequency	SIunits.Frequency
L	Units.SI.Inductance	SIunits.Inductance
C	Units.SI.Capacitance	SIunits.Capacitance
R	Units.SI.Resistance	SIunits.Resistance
R1	Units.SI.Resistance	SIunits.Resistance
R2	Units.SI.Resistance	SIunits.Resistance
opAmp	Electrical.Analog.Ideal.IdealizedOpAmpLimited	Electrical.Analog.Ideal.IdealizedOpAmpLimted

model Electrical.Analog.Examples.Utilities.NonlinearResistor

Component	Modelica 4.0.0	Modelica 3.2.3
Ga	Units.SI.Conductance	SIunits.Conductance
Gb	Units.SI.Conductance	SIunits.Conductance
Ve	Units.SI.Voltage	SIunits.Voltage

model Electrical.Analog.Examples.Utilities.RealSwitch

Component	Modelica 4.0.0	Modelica 3.2.3
S	Electrical.Analog.Ideal.ControlledIdealTwoWaySwitch	Electrical.Analog.Ideal.ControlledIdealCommutingSwitch

model Electrical.Analog.Examples.Utilities.DirectCapacitor

Component	Modelica 4.0.0	Modelica 3.2.3
C	Units.SI.Capacitance	SIunits.Capacitance

model Electrical.Analog.Examples.Utilities.InverseCapacitor

Component	Modelica 4.0.0	Modelica 3.2.3
C	Units.SI.Capacitance	SIunits.Capacitance

model Electrical.Analog.Examples.Utilities.SwitchedCapacitor

Component	Modelica 4.0.0	Modelica 3.2.3
clock	Units.SI.Time	SIunits.Time
R	Units.SI.Resistance	SIunits.Resistance
IdealCommutingSwitch1	Electrical.Analog.Ideal.IdealTwoWaySwitch	Electrical.Analog.Ideal.IdealCommutingSwitch
IdealCommutingSwitch2	Electrical.Analog.Ideal.IdealTwoWaySwitch	Electrical.Analog.Ideal.IdealCommutingSwitch
oneOhm	Units.SI.Resistance	SIunits.Resistance

model Electrical.Analog.Examples.Utilities.Resistor

Component	Modelica 4.0.0	Modelica 3.2.3
R	Units.SI.Resistance	SIunits.Resistance

model Electrical.Analog.Examples.Utilities.DirectInductor

Component	Modelica 4.0.0	Modelica 3.2.3
L	Units.SI.Inductance	SIunits.Inductance

model Electrical.Analog.Examples.Utilities.InverseInductor

Component	Modelica 4.0.0	Modelica 3.2.3
L	Units.SI.Inductance	SIunits.Inductance

model Electrical.Analog.Examples.Utilities.Conductor

Component	Modelica 4.0.0	Modelica 3.2.3
G	Units.SI.Conductance	SIunits.Conductance

model Electrical.Analog.Basic.Resistor

Component	Modelica 4.0.0	Modelica 3.2.3
R	Units.SI.Resistance	SIunits.Resistance
T_ref	Units.SI.Temperature	SIunits.Temperature
alpha	Units.SI.LinearTemperatureCoefficient	SIunits.LinearTemperatureCoefficient
R_actual	Units.SI.Resistance	SIunits.Resistance

model Electrical.Analog.Basic.Conductor

Component	Modelica 4.0.0	Modelica 3.2.3
G	Units.SI.Conductance	SIunits.Conductance
T_ref	Units.SI.Temperature	SIunits.Temperature
alpha	Units.SI.LinearTemperatureCoefficient	SIunits.LinearTemperatureCoefficient
G_actual	Units.SI.Conductance	SIunits.Conductance

model Electrical.Analog.Basic.Capacitor

Component	Modelica 4.0.0	Modelica 3.2.3
C	Units.SI.Capacitance	SIunits.Capacitance

model Electrical.Analog.Basic.Inductor

Component	Modelica 4.0.0	Modelica 3.2.3
L	Units.SI.Inductance	SIunits.Inductance

model Electrical.Analog.Basic.SaturatingInductor

Component	Modelica 4.0.0	Modelica 3.2.3
Inom	Units.SI.Current	SIunits.Current
Lnom	Units.SI.Inductance	SIunits.Inductance
Lzer	Units.SI.Inductance	SIunits.Inductance
Linf	Units.SI.Inductance	SIunits.Inductance
Lact	Units.SI.Inductance	SIunits.Inductance
Psi	Units.SI.MagneticFlux	SIunits.MagneticFlux
Ipar	Units.SI.Current	SIunits.Current

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
initial equation
(Lnom - Linf)/(Lzer - Linf)=Ipar/Inom*(pi/2 - atan(Ipar/Inom));	(Lnom - Linf) = (Lzer - Linf)Ipar/Inom(Modelica323.Constants.pi/2 - Modelica323.Math.atan(Ipar/Inom));

equation assert(Lzer > Lnom*(1 + eps), "Lzer (= " + String(Lzer) + ") has to be > Lnom (= " + String(Lnom) + ")");	equation assert(Lzer > Lnom + Modelica323.Constants.eps, "Lzer (= " + String(Lzer) + ") has to be > Lnom (= " + String(Lnom) + ")");
assert(Linf < Lnom*(1 - eps), "Linf (= " + String(Linf) + ") has to be < Lnom (= " + String(Lnom) + ")");	assert(Linf < Lnom - Modelica323.Constants.eps, "Linf (= " + String(Linf) + ") has to be < Lnom (= " + String(Lnom) + ")");
Lact = Linf + (Lzer - Linf)*(if noEvent(abs(i)/Ipar<small) then 1 else atan(i/Ipar)/(i/Ipar));	(Lact - Linf)i/Ipar = (Lzer - Linf)noEvent(Modelica323.Math.atan(i/Ipar));
Psi = Linfi + (Lzer - Linf)Ipar*atan(i/Ipar);	Psi = Lact*i;
v = der(Psi);

model Electrical.Analog.Basic.Transformer

Component	Modelica 4.0.0	Modelica 3.2.3
L1	Units.SI.Inductance	SIunits.Inductance
L2	Units.SI.Inductance	SIunits.Inductance
M	Units.SI.Inductance	SIunits.Inductance

model Electrical.Analog.Basic.M_Transformer

Component	Modelica 4.0.0	Modelica 3.2.3
L	Units.SI.Inductance	SIunits.Inductance
v	Units.SI.Voltage	SIunits.Voltage
i	Units.SI.Current	SIunits.Current
Lm	Units.SI.Inductance	SIunits.Inductance

model Electrical.Analog.Basic.Gyrator

Component	Modelica 4.0.0	Modelica 3.2.3
G1	Units.SI.Conductance	SIunits.Conductance
G2	Units.SI.Conductance	SIunits.Conductance

model Electrical.Analog.Basic.TranslationalEMF

Component	Modelica 4.0.0	Modelica 3.2.3
k	Units.SI.ElectricalForceConstant	SIunits.ElectricalForceConstant
v	Units.SI.Voltage	SIunits.Voltage
i	Units.SI.Current	SIunits.Current
s	Units.SI.Position	SIunits.Position
vel	Units.SI.Velocity	SIunits.Velocity
f	Units.SI.Force	SIunits.Force
fElectrical	Units.SI.Force	SIunits.Force

model Electrical.Analog.Basic.VCC

Component	Modelica 4.0.0	Modelica 3.2.3
transConductance	Units.SI.Conductance	SIunits.Conductance

model Electrical.Analog.Basic.CCV

Component	Modelica 4.0.0	Modelica 3.2.3
transResistance	Units.SI.Resistance	SIunits.Resistance

model Electrical.Analog.Basic.OpAmp

Component	Modelica 4.0.0	Modelica 3.2.3
vin	Units.SI.Voltage	SIunits.Voltage

model Electrical.Analog.Basic.OpAmpDetailed

Component	Modelica 4.0.0	Modelica 3.2.3
Rdm	Units.SI.Resistance	SIunits.Resistance
Rcm	Units.SI.Resistance	SIunits.Resistance
Cin	Units.SI.Capacitance	SIunits.Capacitance
Vos	Units.SI.Voltage	SIunits.Voltage
Ib	Units.SI.Current	SIunits.Current
Ios	Units.SI.Current	SIunits.Current
vcp	Units.SI.Voltage	SIunits.Voltage
vcm	Units.SI.Voltage	SIunits.Voltage
fp1	Units.SI.Frequency	SIunits.Frequency
fp2	Units.SI.Frequency	SIunits.Frequency
fp3	Units.SI.Frequency	SIunits.Frequency
fp4	Units.SI.Frequency	SIunits.Frequency
fz	Units.SI.Frequency	SIunits.Frequency
sr_p	Units.SI.VoltageSlope	SIunits.VoltageSlope
sr_m	Units.SI.VoltageSlope	SIunits.VoltageSlope
Rout	Units.SI.Resistance	SIunits.Resistance
Imaxso	Units.SI.Current	SIunits.Current
Imaxsi	Units.SI.Current	SIunits.Current
Ts	Units.SI.Time	SIunits.Time
vcp_abs	Units.SI.Voltage	SIunits.Voltage
vcm_abs	Units.SI.Voltage	SIunits.Voltage
I1	Units.SI.Current	SIunits.Current
I2	Units.SI.Current	SIunits.Current
sr_p_val	Units.SI.VoltageSlope	SIunits.VoltageSlope
sr_m_val	Units.SI.VoltageSlope	SIunits.VoltageSlope
Imaxso_val	Units.SI.Current	SIunits.Current
Imaxsi_val	Units.SI.Current	SIunits.Current
v_pos	Units.SI.Voltage	SIunits.Voltage
v_neg	Units.SI.Voltage	SIunits.Voltage
v_vos	Units.SI.Voltage	SIunits.Voltage
v_3	Units.SI.Voltage	SIunits.Voltage
v_in	Units.SI.Voltage	SIunits.Voltage
v_4	Units.SI.Voltage	SIunits.Voltage
i_vos	Units.SI.Current	SIunits.Current
i_3	Units.SI.Current	SIunits.Current
i_r2	Units.SI.Current	SIunits.Current
i_c3	Units.SI.Current	SIunits.Current
i_4	Units.SI.Current	SIunits.Current
q_sum	Units.SI.Voltage	SIunits.Voltage
q_sum_help	Units.SI.Voltage	SIunits.Voltage
q_fp1	Units.SI.Voltage	SIunits.Voltage
v_source	Units.SI.Voltage	SIunits.Voltage
x	Units.SI.Voltage	SIunits.Voltage
v_out	Units.SI.Voltage	SIunits.Voltage
i_out	Units.SI.Current	SIunits.Current
Pi		Present

model Electrical.Analog.Basic.VariableResistor

Component	Modelica 4.0.0	Modelica 3.2.3
T_ref	Units.SI.Temperature	SIunits.Temperature
alpha	Units.SI.LinearTemperatureCoefficient	SIunits.LinearTemperatureCoefficient
R_actual	Units.SI.Resistance	SIunits.Resistance

model Electrical.Analog.Basic.VariableConductor

Component	Modelica 4.0.0	Modelica 3.2.3
T_ref	Units.SI.Temperature	SIunits.Temperature
alpha	Units.SI.LinearTemperatureCoefficient	SIunits.LinearTemperatureCoefficient
G_actual	Units.SI.Conductance	SIunits.Conductance

model Electrical.Analog.Basic.VariableCapacitor

Component	Modelica 4.0.0	Modelica 3.2.3
Cmin	Units.SI.Capacitance	SIunits.Capacitance
Q	Units.SI.ElectricCharge	SIunits.ElectricCharge
IC	Units.SI.Voltage	SIunits.Voltage

model Electrical.Analog.Basic.VariableInductor

Component	Modelica 4.0.0	Modelica 3.2.3
Psi	Units.SI.MagneticFlux	SIunits.MagneticFlux
Lmin	Units.SI.Inductance	SIunits.Inductance
IC	Units.SI.Current	SIunits.Current

model Electrical.Analog.Basic.Potentiometer

Component	Modelica 4.0.0	Modelica 3.2.3
R	Units.SI.Resistance	SIunits.Resistance
T_ref	Units.SI.Temperature	SIunits.Temperature
alpha	Units.SI.LinearTemperatureCoefficient	SIunits.LinearTemperatureCoefficient
Rp	Units.SI.Resistance	SIunits.Resistance
Rn	Units.SI.Resistance	SIunits.Resistance

model Electrical.Analog.Basic.GeneralCurrentToVoltageAdaptor

Component	Modelica 4.0.0	Modelica 3.2.3
v	Units.SI.Voltage	SIunits.Voltage
i	Units.SI.Current	SIunits.Current

model Electrical.Analog.Basic.GeneralVoltageToCurrentAdaptor

Component	Modelica 4.0.0	Modelica 3.2.3
v	Units.SI.Voltage	SIunits.Voltage
i	Units.SI.Current	SIunits.Current

model Electrical.Analog.Ideal.IdealIntermediateSwitch

Component	Modelica 4.0.0	Modelica 3.2.3
Ron	Units.SI.Resistance	SIunits.Resistance
Goff	Units.SI.Conductance	SIunits.Conductance
unitVoltage	Units.SI.Voltage	SIunits.Voltage
unitCurrent	Units.SI.Current	SIunits.Current

model Electrical.Analog.Ideal.ControlledIdealIntermediateSwitch

Component	Modelica 4.0.0	Modelica 3.2.3
level	Units.SI.Voltage	SIunits.Voltage
Ron	Units.SI.Resistance	SIunits.Resistance
Goff	Units.SI.Conductance	SIunits.Conductance
unitVoltage	Units.SI.Voltage	SIunits.Voltage
unitCurrent	Units.SI.Current	SIunits.Current

model Electrical.Analog.Ideal.IdealOpAmp

Component	Modelica 4.0.0	Modelica 3.2.3
v1	Units.SI.Voltage	SIunits.Voltage
v2	Units.SI.Voltage	SIunits.Voltage
i1	Units.SI.Current	SIunits.Current
i2	Units.SI.Current	SIunits.Current

model Electrical.Analog.Ideal.IdealOpAmpLimited

Component	Modelica 4.0.0	Modelica 3.2.3
vin	Units.SI.Voltage	SIunits.Voltage
unitVoltage	Units.SI.Voltage	SIunits.Voltage

model Electrical.Analog.Ideal.IdealTransformer

Component	Modelica 4.0.0	Modelica 3.2.3
Lm1	Units.SI.Inductance	SIunits.Inductance
im1	Units.SI.Current	SIunits.Current
psim1	Units.SI.MagneticFlux	SIunits.MagneticFlux

model Electrical.Analog.Ideal.ControlledIdealOpeningSwitch

Component	Modelica 4.0.0	Modelica 3.2.3
level	Units.SI.Voltage	SIunits.Voltage

model Electrical.Analog.Ideal.ControlledIdealClosingSwitch

Component	Modelica 4.0.0	Modelica 3.2.3
level	Units.SI.Voltage	SIunits.Voltage

model Electrical.Analog.Ideal.ControlledOpenerWithArc

Component	Modelica 4.0.0	Modelica 3.2.3
level	Units.SI.Voltage	SIunits.Voltage

model Electrical.Analog.Ideal.ControlledCloserWithArc

Component	Modelica 4.0.0	Modelica 3.2.3
level	Units.SI.Voltage	SIunits.Voltage

model Electrical.Analog.Ideal.IdealTriac

Component	Modelica 4.0.0	Modelica 3.2.3
Ron	Units.SI.Resistance	SIunits.Resistance
Goff	Units.SI.Conductance	SIunits.Conductance
Vknee	Units.SI.Voltage	SIunits.Voltage
Rdis	Units.SI.Resistance	SIunits.Resistance
Cdis	Units.SI.Capacitance	SIunits.Capacitance

model Electrical.Analog.Ideal.AD_Converter

Component	Modelica 4.0.0	Modelica 3.2.3
VRefHigh	Units.SI.Voltage	SIunits.Voltage
VRefLow	Units.SI.Voltage	SIunits.Voltage
Rin	Units.SI.Resistance	SIunits.Resistance

model Electrical.Analog.Ideal.DA_Converter

Component	Modelica 4.0.0	Modelica 3.2.3
vout	Units.SI.Voltage	SIunits.Voltage
Vref	Units.SI.Voltage	SIunits.Voltage

connector Electrical.Analog.Interfaces.Pin

Component	Modelica 4.0.0	Modelica 3.2.3
v	Units.SI.ElectricPotential	SIunits.ElectricPotential
i	Units.SI.Current	SIunits.Current

connector Electrical.Analog.Interfaces.PositivePin

Component	Modelica 4.0.0	Modelica 3.2.3
v	Units.SI.ElectricPotential	SIunits.ElectricPotential
i	Units.SI.Current	SIunits.Current

connector Electrical.Analog.Interfaces.NegativePin

Component	Modelica 4.0.0	Modelica 3.2.3
v	Units.SI.ElectricPotential	SIunits.ElectricPotential
i	Units.SI.Current	SIunits.Current

model Electrical.Analog.Interfaces.TwoPin

Component	Modelica 4.0.0	Modelica 3.2.3
v	Units.SI.Voltage	SIunits.Voltage

model Electrical.Analog.Interfaces.OnePort

Component	Modelica 4.0.0	Modelica 3.2.3
i	Units.SI.Current	SIunits.Current
v		Present
p		Present
p
n		Present
n

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
	v = p.v - n.v;
0 = p.i + n.i; ...

model Electrical.Analog.Interfaces.TwoPort

Component	Modelica 4.0.0	Modelica 3.2.3
v1		Present
v2		Present
i1		Present
i2		Present
p1		Present
p1
n1		Present
n1
p2		Present
p2
n2		Present
n2

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
	v1 = p1.v - n1.v; v2 = p2.v - n2.v;
0 = p1.i + n1.i;
0 = p2.i + n2.i;
	i1 = p1.i; i2 = p2.i;

model Electrical.Analog.Interfaces.ConditionalHeatPort

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature
LossPower	Units.SI.Power	SIunits.Power
T_heatPort	Units.SI.Temperature	SIunits.Temperature

model Electrical.Analog.Interfaces.VoltageSource

Component	Modelica 4.0.0	Modelica 3.2.3
offset	Units.SI.Voltage	SIunits.Voltage
startTime	Units.SI.Time	SIunits.Time

model Electrical.Analog.Interfaces.CurrentSource

Component	Modelica 4.0.0	Modelica 3.2.3
offset	Units.SI.Current	SIunits.Current
startTime	Units.SI.Time	SIunits.Time

model Electrical.Analog.Interfaces.IdealSemiconductor

Component	Modelica 4.0.0	Modelica 3.2.3
Ron	Units.SI.Resistance	SIunits.Resistance
Goff	Units.SI.Conductance	SIunits.Conductance
Vknee	Units.SI.Voltage	SIunits.Voltage
unitVoltage	Units.SI.Voltage	SIunits.Voltage
unitCurrent	Units.SI.Current	SIunits.Current

model Electrical.Analog.Interfaces.IdealSwitch

Component	Modelica 4.0.0	Modelica 3.2.3
Ron	Units.SI.Resistance	SIunits.Resistance
Goff	Units.SI.Conductance	SIunits.Conductance
unitVoltage	Units.SI.Voltage	SIunits.Voltage
unitCurrent	Units.SI.Current	SIunits.Current

model Electrical.Analog.Interfaces.IdealSwitchWithArc

Component	Modelica 4.0.0	Modelica 3.2.3
Ron	Units.SI.Resistance	SIunits.Resistance
Goff	Units.SI.Conductance	SIunits.Conductance
V0	Units.SI.Voltage	SIunits.Voltage
dVdt	Units.SI.VoltageSlope	SIunits.VoltageSlope
Vmax	Units.SI.Voltage	SIunits.Voltage
tSwitch	Units.SI.Time	SIunits.Time

model Electrical.Analog.Lines.OLine

Component	Modelica 4.0.0	Modelica 3.2.3
v13	Units.SI.Voltage	SIunits.Voltage
v23	Units.SI.Voltage	SIunits.Voltage
i1	Units.SI.Current	SIunits.Current
i2	Units.SI.Current	SIunits.Current
length	Units.SI.Length	SIunits.Length
alpha_R	Units.SI.LinearTemperatureCoefficient	SIunits.LinearTemperatureCoefficient
alpha_G	Units.SI.LinearTemperatureCoefficient	SIunits.LinearTemperatureCoefficient
T	Units.SI.Temperature	SIunits.Temperature
T_ref	Units.SI.Temperature	SIunits.Temperature
rm	Units.SI.Resistance	SIunits.Resistance
lm	Units.SI.Inductance	SIunits.Inductance

model Electrical.Analog.Lines.M_OLine

Component	Modelica 4.0.0	Modelica 3.2.3
length	Units.SI.Length	SIunits.Length
alpha_R	Units.SI.LinearTemperatureCoefficient	SIunits.LinearTemperatureCoefficient
alpha_G	Units.SI.LinearTemperatureCoefficient	SIunits.LinearTemperatureCoefficient
T	Units.SI.Temperature	SIunits.Temperature
T_ref	Units.SI.Temperature	SIunits.Temperature

model Electrical.Analog.Lines.ULine

Component	Modelica 4.0.0	Modelica 3.2.3
v13	Units.SI.Voltage	SIunits.Voltage
v23	Units.SI.Voltage	SIunits.Voltage
i1	Units.SI.Current	SIunits.Current
i2	Units.SI.Current	SIunits.Current
length	Units.SI.Length	SIunits.Length
alpha	Units.SI.LinearTemperatureCoefficient	SIunits.LinearTemperatureCoefficient
T	Units.SI.Temperature	SIunits.Temperature
T_ref	Units.SI.Temperature	SIunits.Temperature
rm	Units.SI.Resistance	SIunits.Resistance

model Electrical.Analog.Lines.TLine1

Component	Modelica 4.0.0	Modelica 3.2.3
Z0	Units.SI.Resistance	SIunits.Resistance
TD	Units.SI.Time	SIunits.Time
er	Units.SI.Voltage	SIunits.Voltage
es	Units.SI.Voltage	SIunits.Voltage

model Electrical.Analog.Lines.TLine2

Component	Modelica 4.0.0	Modelica 3.2.3
Z0	Units.SI.Resistance	SIunits.Resistance
F	Units.SI.Frequency	SIunits.Frequency
er	Units.SI.Voltage	SIunits.Voltage
es	Units.SI.Voltage	SIunits.Voltage
TD	Units.SI.Time	SIunits.Time

model Electrical.Analog.Lines.TLine3

Component	Modelica 4.0.0	Modelica 3.2.3
Z0	Units.SI.Resistance	SIunits.Resistance
F	Units.SI.Frequency	SIunits.Frequency
er	Units.SI.Voltage	SIunits.Voltage
es	Units.SI.Voltage	SIunits.Voltage
TD	Units.SI.Time	SIunits.Time

model Electrical.Analog.Semiconductors.Diode

Component	Modelica 4.0.0	Modelica 3.2.3
Ids	Units.SI.Current	SIunits.Current
Vt	Units.SI.Voltage	SIunits.Voltage
R	Units.SI.Resistance	SIunits.Resistance
useTemperatureDependency	Present
EG	Present
N	Present
TNOM	Present
XTI	Present
vt_t	Present
id	Present
htemp	Present
aux	Present
auxp	Present

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
assert(T_heatPort > 0,"Temperature must be positive");	i = smooth(1, Ids*(exlin(v/Vt, Maxexp) - 1) + v/R);
htemp = T_heatPort;	LossPower = v*i;
vt_t = khtemp/q; if useTemperatureDependency then id = Ids(exlin(v/(Nvt_t), Maxexp) - 1); i = idpow(htemp/TNOM, XTI/N)auxp + v/R; else id = Ids(exlin(v/Vt, Maxexp) - 1); i = smooth(1, id + v/R); end if; aux = (htemp/TNOM - 1)EG/(Nvt_t); auxp = exp(aux); LossPower = i*v;

model Electrical.Analog.Semiconductors.Diode2

Component	Modelica 4.0.0	Modelica 3.2.3
Vf	Units.SI.Voltage	SIunits.Voltage
Ids	Units.SI.Current	SIunits.Current
Rs	Units.SI.Resistance	SIunits.Resistance
Vt	Units.SI.Voltage	SIunits.Voltage
Bv	Units.SI.Voltage	SIunits.Voltage
Gp	Units.SI.Conductance	SIunits.Conductance
vd	Units.SI.Voltage	SIunits.Voltage
id	Units.SI.Current	SIunits.Current
VdMax	Units.SI.Voltage	SIunits.Voltage
iVdMax	Units.SI.Current	SIunits.Current
diVdMax	Units.SI.Conductance	SIunits.Conductance
Vt_applied	Units.SI.Voltage	SIunits.Voltage

model Electrical.Analog.Semiconductors.ZDiode

Component	Modelica 4.0.0	Modelica 3.2.3
Ids	Units.SI.Current	SIunits.Current
Vt	Units.SI.Voltage	SIunits.Voltage
R	Units.SI.Resistance	SIunits.Resistance
Bv	Units.SI.Voltage	SIunits.Voltage
Ibv	Units.SI.Current	SIunits.Current

model Electrical.Analog.Semiconductors.NMOS

Component	Modelica 4.0.0	Modelica 3.2.3
W	Units.SI.Length	SIunits.Length
L	Units.SI.Length	SIunits.Length
Beta	Units.SI.Transconductance	SIunits.Transconductance
Vt	Units.SI.Voltage	SIunits.Voltage
dW	Units.SI.Length	SIunits.Length
dL	Units.SI.Length	SIunits.Length
RDS	Units.SI.Resistance	SIunits.Resistance
useTemperatureDependency	Present
Tnom	Present
kvt	Present
kk2	Present
beta_t	Present
vt_t	Present
k2_t	Present

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... assert(W + dW > 0, "NMOS: Effective width must be positive");
assert(T_heatPort > 0,"NMOS: Temperature must be positive");
gds = if (RDS < 1e-20 and RDS > -1e-20) then 1e20 else 1/RDS;
v = beta_t*(W + dW)/(L + dL);	v = Beta*(W + dW)/(L + dL);
ud = smooth(0,if (D.v < S.v) then S.v else D.v);
us = smooth(0,if (D.v < S.v) then D.v else S.v);	us = if (D.v < S.v) then D.v else S.v;
uds = ud - us;
ubs = smooth(0,if (B.v > us) then 0 else B.v - us);
ugst = (G.v - us - vt_t + k2_tubs)K5;	ugst = (G.v - us - Vt + K2ubs)K5;
id = smooth(0,if (ugst <= 0) then udsgds else if (ugst > uds) then vuds( ugst - uds/2) + udsgds else vugstugst/2 + uds*gds);
beta_t = if useTemperatureDependency then Betapow((T_heatPort/Tnom), -1.5) else Beta; vt_t = if useTemperatureDependency then Vt(1 + (T_heatPort - Tnom)kvt) else Vt; k2_t = if useTemperatureDependency then K2(1 + (T_heatPort - Tnom)*kk2) else K2;
G.i = 0; ...

model Electrical.Analog.Semiconductors.PMOS

Component	Modelica 4.0.0	Modelica 3.2.3
W	Units.SI.Length	SIunits.Length
L	Units.SI.Length	SIunits.Length
Beta	Units.SI.Transconductance	SIunits.Transconductance
Vt	Units.SI.Voltage	SIunits.Voltage
dW	Units.SI.Length	SIunits.Length
dL	Units.SI.Length	SIunits.Length
RDS	Units.SI.Resistance	SIunits.Resistance
useTemperatureDependency	Present
Tnom	Present
kvt	Present
kk2	Present
beta_t	Present
vt_t	Present
k2_t	Present

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... assert(W + dW > 0, "PMOS: Effective width must be positive");
assert(T_heatPort > 0,"PMOS: Temperature must be positive");
gds = if (RDS < 1e-20 and RDS > -1e-20) then 1e20 else 1/RDS;
v = beta_t*(W + dW)/(L + dL);	v = Beta*(W + dW)/(L + dL);
ud = smooth(0,if (D.v > S.v) then S.v else D.v); ... ubs = smooth(0,if (B.v < us) then 0 else B.v - us);
ugst = (G.v - us - vt_t + k2_tubs)K5;	ugst = (G.v - us - Vt + K2ubs)K5;
id = smooth(0,if (ugst >= 0) then udsgds else if (ugst < uds) then -vuds( ugst - uds/2) + udsgds else -vugstugst/2 + uds*gds);
beta_t = if useTemperatureDependency then Betapow((T_heatPort/Tnom), -1.5) else Beta; vt_t = if useTemperatureDependency then Vt(1 + (T_heatPort - Tnom)kvt) else Vt; k2_t = if useTemperatureDependency then K2(1 + (T_heatPort - Tnom)*kk2) else K2;
G.i = 0; ...

model Electrical.Analog.Semiconductors.NPN

Component	Modelica 4.0.0	Modelica 3.2.3
Is	Units.SI.Current	SIunits.Current
Vak	Units.SI.InversePotential	SIunits.InversePotential
Tauf	Units.SI.Time	SIunits.Time
Taur	Units.SI.Time	SIunits.Time
Ccs	Units.SI.Capacitance	SIunits.Capacitance
Cje	Units.SI.Capacitance	SIunits.Capacitance
Cjc	Units.SI.Capacitance	SIunits.Capacitance
Phie	Units.SI.Voltage	SIunits.Voltage
Phic	Units.SI.Voltage	SIunits.Voltage
Gbc	Units.SI.Conductance	SIunits.Conductance
Gbe	Units.SI.Conductance	SIunits.Conductance
Vt	Units.SI.Voltage	SIunits.Voltage
IC	Units.SI.Voltage	SIunits.Voltage
vbc	Units.SI.Voltage	SIunits.Voltage
vbe	Units.SI.Voltage	SIunits.Voltage
ibc	Units.SI.Current	SIunits.Current
ibe	Units.SI.Current	SIunits.Current
cbc	Units.SI.Capacitance	SIunits.Capacitance
cbe	Units.SI.Capacitance	SIunits.Capacitance
Capcje	Units.SI.Capacitance	SIunits.Capacitance
Capcjc	Units.SI.Capacitance	SIunits.Capacitance
useTemperatureDependency	Present
Tnom	Present
XTI	Present
XTB	Present
EG	Present
NF	Present
NR	Present
useSubstrate	Present
vcs	Present
is_t	Present
br_t	Present
bf_t	Present
vt_t	Present
hexp	Present
htempexp	Present
vS	Present
iS	Present
S	Present
S

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... if UIC then
vcs = IC;	C.v = IC;
end if;

equation assert(T_heatPort > 0,"Temperature must be positive");	equation vbc = B.v - C.v;
vbc = B.v - C.v;
vbe = B.v - E.v;
vcs = C.v - vS;
qbk = 1 - vbc*Vak;
hexp = (T_heatPort/Tnom - 1)*EG/vt_t;	ibc = smooth(1, Is(exlin2(vbc/Vt, EMin, EMax) - 1) + vbcGbc);
htempexp = smooth(1, exlin2(hexp, EMin, EMax));	ibe = smooth(1, Is(exlin2(vbe/Vt, EMin, EMax) - 1) + vbeGbe);
is_t = if useTemperatureDependency then Ispow(T_heatPort/Tnom, XTI)htempexp else Is; br_t = if useTemperatureDependency then Brpow(T_heatPort/Tnom, XTB) else Br; bf_t = if useTemperatureDependency then Bfpow(T_heatPort/Tnom, XTB) else Bf; vt_t = if useTemperatureDependency then (k/q)T_heatPort else Vt; ibc = smooth(1, is_t(exlin2(vbc/(NRvt_t), EMin, EMax) - 1) + vbcGbc); ibe = smooth(1, is_t(exlin2(vbe/(NFvt_t), EMin, EMax) - 1) + vbe*Gbe);
Capcjc = smooth(1, Cjc*powlin(vbc/Phic, Mc));
Capcje = smooth(1, Cje*powlin(vbe/Phie, Me));
cbc = smooth(1, Tauris_t/(NRvt_t)exlin2(vbc/(NRvt_t), EMin, EMax) + Capcjc);	cbc = smooth(1, TaurIs/Vtexlin2(vbc/Vt, EMin, EMax) + Capcjc);
cbe = smooth(1, Taufis_t/(NFvt_t)exlin2(vbe/(NFvt_t), EMin, EMax) + Capcje);	cbe = smooth(1, TaufIs/Vtexlin2(vbe/Vt, EMin, EMax) + Capcje);
C.i = (ibe - ibc)qbk - ibc/br_t - cbcder(vbc) - iS;	C.i = (ibe - ibc)qbk - ibc/Br - cbcder(vbc) + Ccs*der(C.v);
B.i = ibe/bf_t + ibc/br_t + cbcder(vbc) + cbeder(vbe);	B.i = ibe/Bf + ibc/Br + cbcder(vbc) + cbeder(vbe);
E.i = -B.i - C.i - iS;	E.i = -B.i - C.i + Ccs*der(C.v);
iS = -Ccs * der(vcs);	LossPower = (C.v-E.v)(ibe-ibc)qbk + vbcibc/Br + vbeibe/Bf;
if not useSubstrate then vS = 0; end if; LossPower = vbcibc/br_t + vbeibe/bf_t + (ibe - ibc)qbk(C.v - E.v);

model Electrical.Analog.Semiconductors.PNP

Component	Modelica 4.0.0	Modelica 3.2.3
Is	Units.SI.Current	SIunits.Current
Vak	Units.SI.InversePotential	SIunits.InversePotential
Tauf	Units.SI.Time	SIunits.Time
Taur	Units.SI.Time	SIunits.Time
Ccs	Units.SI.Capacitance	SIunits.Capacitance
Cje	Units.SI.Capacitance	SIunits.Capacitance
Cjc	Units.SI.Capacitance	SIunits.Capacitance
Phie	Units.SI.Voltage	SIunits.Voltage
Phic	Units.SI.Voltage	SIunits.Voltage
Gbc	Units.SI.Conductance	SIunits.Conductance
Gbe	Units.SI.Conductance	SIunits.Conductance
Vt	Units.SI.Voltage	SIunits.Voltage
Capcje	Units.SI.Capacitance	SIunits.Capacitance
Capcjc	Units.SI.Capacitance	SIunits.Capacitance
useTemperatureDependency	Present
Tnom	Present
XTI	Present
XTB	Present
EG	Present
NF	Present
NR	Present
IC	Present
UIC	Present
useSubstrate	Present
vcb	Present
veb	Present
vcs	Present
icb	Present
ieb	Present
ccb	Present
ceb	Present
is_t	Present
br_t	Present
bf_t	Present
vt_t	Present
hexp	Present
htempexp	Present
vS	Present
iS	Present
S	Present
S
vbc		Present
vbe		Present
ibc		Present
ibe		Present
cbc		Present
cbe		Present

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
initial equation	vbc = C.v - B.v;
if UIC then	vbe = E.v - B.v;
vcs = IC;	qbk = 1 - vbc*Vak;
end if;	ibc = smooth(1, Is(exlin2(vbc/Vt, EMin, EMax) - 1) + vbcGbc);
	ibe = smooth(1, Is(exlin2(vbe/Vt, EMin, EMax) - 1) + vbeGbe);
equation assert(T_heatPort > 0,"Temperature must be positive");	Capcjc = smooth(1, Cjc*powlin(vbc/Phic, Mc));
vcb = C.v - B.v;	Capcje = smooth(1, Cje*powlin(vbe/Phie, Me));
veb = E.v - B.v;	cbc = smooth(1, TaurIs/Vtexlin2(vbc/Vt, EMin, EMax) + Capcjc);
vcs = C.v - vS;	cbe = smooth(1, TaufIs/Vtexlin2(vbe/Vt, EMin, EMax) + Capcje);
qbk = 1 - vcb*Vak;	C.i = -((ibe - ibc)qbk - ibc/Br - cbcder(vbc) - Ccs*der(C.v));
hexp = (T_heatPort/Tnom - 1)*EG/vt_t;	B.i = -(ibe/Bf + ibc/Br + cbeder(vbe) + cbcder(vbc));
htempexp = smooth(1, exlin2(hexp, EMin, EMax));	E.i = -B.i - C.i + Ccs*der(C.v);
is_t = if useTemperatureDependency then Ispow(T_heatPort/Tnom, XTI)htempexp else Is;	LossPower = (E.v-C.v)(ibe-ibc)qbk + vbcibc/Br + vbeibe/Bf;
br_t = if useTemperatureDependency then Brpow(T_heatPort/Tnom, XTB) else Br; bf_t = if useTemperatureDependency then Bfpow(T_heatPort/Tnom, XTB) else Bf; vt_t = if useTemperatureDependency then (k/q)T_heatPort else Vt; icb = smooth(1, is_t(exlin2(vcb/(NRvt_t), EMin, EMax) - 1) + vcbGbc); ieb = smooth(1, is_t(exlin2(veb/(NFvt_t), EMin, EMax) - 1) + vebGbe); Capcjc = smooth(1, Cjcpowlin(vcb/Phic, Mc)); Capcje = smooth(1, Cjepowlin(veb/Phie, Me)); ccb = smooth(1, Tauris_t/(NRvt_t)exlin2(vcb/(NRvt_t), EMin, EMax) + Capcjc); ceb = smooth(1, Taufis_t/(NFvt_t)exlin2(veb/(NFvt_t), EMin, EMax) + Capcje); C.i = icb/br_t + ccbder(vcb) + (icb - ieb)qbk - iS; B.i = -ieb/bf_t - icb/br_t - cebder(veb) - ccbder(vcb); E.i = -B.i - C.i - iS; iS = -Ccs der(vcs); if not useSubstrate then vS = 0; end if; LossPower = vcbicb/br_t + vebieb/bf_t + (icb - ieb)qbk(C.v- E.v);

model Electrical.Analog.Semiconductors.Thyristor

Component	Modelica 4.0.0	Modelica 3.2.3
VDRM	Units.SI.Voltage	SIunits.Voltage
VRRM	Units.SI.Voltage	SIunits.Voltage
IDRM	Units.SI.Current	SIunits.Current
VTM	Units.SI.Voltage	SIunits.Voltage
IH	Units.SI.Current	SIunits.Current
ITM	Units.SI.Current	SIunits.Current
VGT	Units.SI.Voltage	SIunits.Voltage
IGT	Units.SI.Current	SIunits.Current
TON	Units.SI.Time	SIunits.Time
TOFF	Units.SI.Time	SIunits.Time
Vt	Units.SI.Voltage	SIunits.Voltage
iGK	Units.SI.Current	SIunits.Current
vGK	Units.SI.Voltage	SIunits.Voltage
vAK	Units.SI.Voltage	SIunits.Voltage
vControl	Units.SI.Voltage	SIunits.Voltage
vContot	Units.SI.Voltage	SIunits.Voltage
vConmain	Units.SI.Voltage	SIunits.Voltage
Von	Units.SI.Voltage	SIunits.Voltage
Voff	Units.SI.Voltage	SIunits.Voltage
Ron	Units.SI.Resistance	SIunits.Resistance
Roff	Units.SI.Resistance	SIunits.Resistance

model Electrical.Analog.Semiconductors.SimpleTriac

Component	Modelica 4.0.0	Modelica 3.2.3
VDRM	Units.SI.Voltage	SIunits.Voltage
VRRM	Units.SI.Voltage	SIunits.Voltage
IDRM	Units.SI.Current	SIunits.Current
VTM	Units.SI.Voltage	SIunits.Voltage
IH	Units.SI.Current	SIunits.Current
ITM	Units.SI.Current	SIunits.Current
VGT	Units.SI.Voltage	SIunits.Voltage
IGT	Units.SI.Current	SIunits.Current
TON	Units.SI.Time	SIunits.Time
TOFF	Units.SI.Time	SIunits.Time
Vt	Units.SI.Voltage	SIunits.Voltage
useHeatPort		Present
T		Present
heatPort		Present
heatPort

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... connect(idealDiode1.p, g);
LossPower = p.ip.v + n.in.v + g.i*g.v;

model Electrical.Analog.Sources.SignalVoltage

Component	Modelica 4.0.0	Modelica 3.2.3
i	Units.SI.Current	SIunits.Current

model Electrical.Analog.Sources.ConstantVoltage

Component	Modelica 4.0.0	Modelica 3.2.3
V	Units.SI.Voltage	SIunits.Voltage

model Electrical.Analog.Sources.StepVoltage

Component	Modelica 4.0.0	Modelica 3.2.3
V	Units.SI.Voltage	SIunits.Voltage

model Electrical.Analog.Sources.RampVoltage

Component	Modelica 4.0.0	Modelica 3.2.3
V	Units.SI.Voltage	SIunits.Voltage
duration	Units.SI.Time	SIunits.Time

model Electrical.Analog.Sources.SineVoltage

Component	Modelica 4.0.0	Modelica 3.2.3
V	Units.SI.Voltage	SIunits.Voltage
phase	Units.SI.Angle	SIunits.Angle
f	Present
freqHz		Present

model Electrical.Analog.Sources.CosineVoltage

Component	Modelica 4.0.0	Modelica 3.2.3
V	Units.SI.Voltage	SIunits.Voltage
phase	Units.SI.Angle	SIunits.Angle
f	Present
freqHz		Present

model Electrical.Analog.Sources.ExpSineVoltage

Component	Modelica 4.0.0	Modelica 3.2.3
V	Units.SI.Voltage	SIunits.Voltage
phase	Units.SI.Angle	SIunits.Angle
damping	Units.SI.Damping	SIunits.Damping
f	Present
freqHz		Present

model Electrical.Analog.Sources.ExponentialsVoltage

Component	Modelica 4.0.0	Modelica 3.2.3
riseTime	Units.SI.Time	SIunits.Time
riseTimeConst	Units.SI.Time	SIunits.Time
fallTimeConst	Units.SI.Time	SIunits.Time

model Electrical.Analog.Sources.PulseVoltage

Component	Modelica 4.0.0	Modelica 3.2.3
V	Units.SI.Voltage	SIunits.Voltage
period	Units.SI.Time	SIunits.Time

model Electrical.Analog.Sources.SawToothVoltage

Component	Modelica 4.0.0	Modelica 3.2.3
V	Units.SI.Voltage	SIunits.Voltage
period	Units.SI.Time	SIunits.Time

model Electrical.Analog.Sources.TrapezoidVoltage

Component	Modelica 4.0.0	Modelica 3.2.3
V	Units.SI.Voltage	SIunits.Voltage
rising	Units.SI.Time	SIunits.Time
width	Units.SI.Time	SIunits.Time
falling	Units.SI.Time	SIunits.Time
period	Units.SI.Time	SIunits.Time

model Electrical.Analog.Sources.SignalCurrent

Component	Modelica 4.0.0	Modelica 3.2.3
v	Units.SI.Voltage	SIunits.Voltage

model Electrical.Analog.Sources.ConstantCurrent

Component	Modelica 4.0.0	Modelica 3.2.3
I	Units.SI.Current	SIunits.Current

model Electrical.Analog.Sources.StepCurrent

Component	Modelica 4.0.0	Modelica 3.2.3
I	Units.SI.Current	SIunits.Current

model Electrical.Analog.Sources.RampCurrent

Component	Modelica 4.0.0	Modelica 3.2.3
I	Units.SI.Current	SIunits.Current
duration	Units.SI.Time	SIunits.Time

model Electrical.Analog.Sources.SineCurrent

Component	Modelica 4.0.0	Modelica 3.2.3
I	Units.SI.Current	SIunits.Current
phase	Units.SI.Angle	SIunits.Angle
f	Present
freqHz		Present

model Electrical.Analog.Sources.CosineCurrent

Component	Modelica 4.0.0	Modelica 3.2.3
I	Units.SI.Current	SIunits.Current
phase	Units.SI.Angle	SIunits.Angle
f	Present
freqHz		Present

model Electrical.Analog.Sources.ExpSineCurrent

Component	Modelica 4.0.0	Modelica 3.2.3
phase	Units.SI.Angle	SIunits.Angle
damping	Units.SI.Damping	SIunits.Damping
f	Present
freqHz		Present

model Electrical.Analog.Sources.ExponentialsCurrent

Component	Modelica 4.0.0	Modelica 3.2.3
riseTime	Units.SI.Time	SIunits.Time
riseTimeConst	Units.SI.Time	SIunits.Time
fallTimeConst	Units.SI.Time	SIunits.Time

model Electrical.Analog.Sources.PulseCurrent

Component	Modelica 4.0.0	Modelica 3.2.3
I	Units.SI.Current	SIunits.Current
period	Units.SI.Time	SIunits.Time

model Electrical.Analog.Sources.SawToothCurrent

Component	Modelica 4.0.0	Modelica 3.2.3
I	Units.SI.Current	SIunits.Current
period	Units.SI.Time	SIunits.Time

model Electrical.Analog.Sources.TrapezoidCurrent

Component	Modelica 4.0.0	Modelica 3.2.3
I	Units.SI.Current	SIunits.Current
rising	Units.SI.Time	SIunits.Time
width	Units.SI.Time	SIunits.Time
falling	Units.SI.Time	SIunits.Time
period	Units.SI.Time	SIunits.Time

model Electrical.Analog.Sources.SupplyVoltage

Component	Modelica 4.0.0	Modelica 3.2.3
Vps	Units.SI.Voltage	SIunits.Voltage
Vns	Units.SI.Voltage	SIunits.Voltage

model Electrical.Digital.Examples.Multiplexer

Component	Modelica 4.0.0	Modelica 3.2.3
CLK	Electrical.Digital.Sources.DigitalClock	Electrical.Digital.Sources.Clock

model Electrical.Digital.Examples.FlipFlop

Component	Modelica 4.0.0	Modelica 3.2.3
CLK	Electrical.Digital.Sources.DigitalClock	Electrical.Digital.Sources.Clock

model Electrical.Digital.Examples.FullAdder

Component	Modelica 4.0.0	Modelica 3.2.3
CLK	Electrical.Digital.Sources.DigitalClock	Electrical.Digital.Sources.Clock

model Electrical.Digital.Examples.Counter3

Component	Modelica 4.0.0	Modelica 3.2.3
clock	Present
clock
Clock		Present
Clock

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
connect(Enable.y, Counter.enable);
connect(clock.y, Counter.count);	connect(Clock.y, Counter.count);

model Electrical.Digital.Examples.Counter

Component	Modelica 4.0.0	Modelica 3.2.3
clock	Present
clock
Clock		Present
Clock

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
connect(Enable.y, Counter.enable);
connect(clock.y, Counter.count);	connect(Clock.y, Counter.count);
connect(Q0.x[1], Counter.q[1]); ...

model Electrical.Digital.Examples.Utilities.MUX4

Component	Modelica 4.0.0	Modelica 3.2.3
delayTime	Units.SI.Time	SIunits.Time

model Electrical.Digital.Examples.Utilities.RS

Component	Modelica 4.0.0	Modelica 3.2.3
delayTime	Units.SI.Time	SIunits.Time

model Electrical.Digital.Examples.Utilities.RSFF

Component	Modelica 4.0.0	Modelica 3.2.3
delayTime	Units.SI.Time	SIunits.Time

model Electrical.Digital.Examples.Utilities.DFF

Component	Modelica 4.0.0	Modelica 3.2.3
Tdel	Units.SI.Time	SIunits.Time

model Electrical.Digital.Examples.Utilities.JKFF

Component	Modelica 4.0.0	Modelica 3.2.3
delayTime	Units.SI.Time	SIunits.Time

model Electrical.Digital.Examples.Utilities.Counter

Component	Modelica 4.0.0	Modelica 3.2.3
delayTime	Units.SI.Time	SIunits.Time

model Electrical.Digital.Interfaces.MemoryBase

Component	Modelica 4.0.0	Modelica 3.2.3
tHL	Units.SI.Time	SIunits.Time
tLH	Units.SI.Time	SIunits.Time

block Electrical.Digital.Delay.DelayParams

Component	Modelica 4.0.0	Modelica 3.2.3
tLH	Units.SI.Time	SIunits.Time
tHL	Units.SI.Time	SIunits.Time

model Electrical.Digital.Delay.TransportDelay

Component	Modelica 4.0.0	Modelica 3.2.3
delayTime	Units.SI.Time	SIunits.Time

block Electrical.Digital.Delay.InertialDelay

Component	Modelica 4.0.0	Modelica 3.2.3
delayTime	Units.SI.Time	SIunits.Time
t_next	Units.SI.Time	SIunits.Time

model Electrical.Digital.Delay.InertialDelaySensitive

Component	Modelica 4.0.0	Modelica 3.2.3
tLH	Units.SI.Time	SIunits.Time
tHL	Units.SI.Time	SIunits.Time
delayTime	Units.SI.Time	SIunits.Time
t_next	Units.SI.Time	SIunits.Time

model Electrical.Digital.Delay.InertialDelaySensitiveVector

Component	Modelica 4.0.0	Modelica 3.2.3
tHL	Units.SI.Time	SIunits.Time
tLH	Units.SI.Time	SIunits.Time

model Electrical.Digital.Sources.Pulse

Component	Modelica 4.0.0	Modelica 3.2.3
period	Units.SI.Time	SIunits.Time
startTime	Units.SI.Time	SIunits.Time
T0	Units.SI.Time	SIunits.Time

model Electrical.Digital.Registers.DFFREG

Component	Modelica 4.0.0	Modelica 3.2.3
tHL	Units.SI.Time	SIunits.Time
tLH	Units.SI.Time	SIunits.Time

model Electrical.Digital.Registers.DFFREGSRH

Component	Modelica 4.0.0	Modelica 3.2.3
tHL	Units.SI.Time	SIunits.Time
tLH	Units.SI.Time	SIunits.Time

model Electrical.Digital.Registers.DLATREG

Component	Modelica 4.0.0	Modelica 3.2.3
tHL	Units.SI.Time	SIunits.Time
tLH	Units.SI.Time	SIunits.Time

model Electrical.Digital.Registers.DLATREGSRH

Component	Modelica 4.0.0	Modelica 3.2.3
tHL	Units.SI.Time	SIunits.Time
tLH	Units.SI.Time	SIunits.Time

model Electrical.Digital.Tristates.NXFERGATE

Component	Modelica 4.0.0	Modelica 3.2.3
tHL	Units.SI.Time	SIunits.Time
tLH	Units.SI.Time	SIunits.Time

model Electrical.Digital.Tristates.NRXFERGATE

Component	Modelica 4.0.0	Modelica 3.2.3
tHL	Units.SI.Time	SIunits.Time
tLH	Units.SI.Time	SIunits.Time

model Electrical.Digital.Tristates.PXFERGATE

Component	Modelica 4.0.0	Modelica 3.2.3
tHL	Units.SI.Time	SIunits.Time
tLH	Units.SI.Time	SIunits.Time

model Electrical.Digital.Tristates.PRXFERGATE

Component	Modelica 4.0.0	Modelica 3.2.3
tHL	Units.SI.Time	SIunits.Time
tLH	Units.SI.Time	SIunits.Time

model Electrical.Digital.Tristates.BUF3S

Component	Modelica 4.0.0	Modelica 3.2.3
tHL	Units.SI.Time	SIunits.Time
tLH	Units.SI.Time	SIunits.Time

model Electrical.Digital.Tristates.BUF3SL

Component	Modelica 4.0.0	Modelica 3.2.3
tHL	Units.SI.Time	SIunits.Time
tLH	Units.SI.Time	SIunits.Time

model Electrical.Digital.Tristates.INV3S

Component	Modelica 4.0.0	Modelica 3.2.3
tHL	Units.SI.Time	SIunits.Time
tLH	Units.SI.Time	SIunits.Time

model Electrical.Digital.Tristates.INV3SL

Component	Modelica 4.0.0	Modelica 3.2.3
tHL	Units.SI.Time	SIunits.Time
tLH	Units.SI.Time	SIunits.Time

model Electrical.Digital.Multiplexers.MUX2x1

Component	Modelica 4.0.0	Modelica 3.2.3
tHL	Units.SI.Time	SIunits.Time
tLH	Units.SI.Time	SIunits.Time

model Electrical.Machines.Examples.DCMachines.DCPM_Start

Component	Modelica 4.0.0	Modelica 3.2.3
Va	Units.SI.Voltage	SIunits.Voltage
tStart	Units.SI.Time	SIunits.Time
tRamp	Units.SI.Time	SIunits.Time
TLoad	Units.SI.Torque	SIunits.Torque
tStep	Units.SI.Time	SIunits.Time
JLoad	Units.SI.Inertia	SIunits.Inertia

model Electrical.Machines.Examples.DCMachines.DCPM_CurrentControlled

Component	Modelica 4.0.0	Modelica 3.2.3
TLoad	Units.SI.Torque	SIunits.Torque
wLoad	Units.SI.AngularVelocity	SIunits.AngularVelocity
JLoad	Units.SI.Inertia	SIunits.Inertia
Ra	Units.SI.Resistance	SIunits.Resistance
ViNominal	Units.SI.Voltage	SIunits.Voltage
Ta	Units.SI.Time	SIunits.Time
Ts	Units.SI.Time	SIunits.Time
k	Units.SI.Resistance	SIunits.Resistance
Ti	Units.SI.Time	SIunits.Time
kPhi	Units.SI.MagneticFlux	SIunits.MagneticFlux
PID	initType=Modelica400.Blocks.Types.Init.InitialOutput	initType=Modelica323.Blocks.Types.InitPID.InitialOutput

model Electrical.Machines.Examples.DCMachines.DCEE_Start

Component	Modelica 4.0.0	Modelica 3.2.3
Va	Units.SI.Voltage	SIunits.Voltage
tStart	Units.SI.Time	SIunits.Time
tRamp	Units.SI.Time	SIunits.Time
Ve	Units.SI.Voltage	SIunits.Voltage
TLoad	Units.SI.Torque	SIunits.Torque
tStep	Units.SI.Time	SIunits.Time
JLoad	Units.SI.Inertia	SIunits.Inertia

model Electrical.Machines.Examples.DCMachines.DCSE_Start

Component	Modelica 4.0.0	Modelica 3.2.3
Va	Units.SI.Voltage	SIunits.Voltage
tStart	Units.SI.Time	SIunits.Time
tRamp	Units.SI.Time	SIunits.Time
TLoad	Units.SI.Torque	SIunits.Torque
wLoad	Units.SI.AngularVelocity	SIunits.AngularVelocity
JLoad	Units.SI.Inertia	SIunits.Inertia

model Electrical.Machines.Examples.DCMachines.DCSE_SinglePhase

Component	Modelica 4.0.0	Modelica 3.2.3
Va	Units.SI.Voltage	SIunits.Voltage
tStart	Units.SI.Time	SIunits.Time
tRamp	Units.SI.Time	SIunits.Time
TLoad	Units.SI.Torque	SIunits.Torque
wLoad	Units.SI.AngularVelocity	SIunits.AngularVelocity
JLoad	Units.SI.Inertia	SIunits.Inertia
constantVoltage	f=50
constantVoltage		freqHz=50

model Electrical.Machines.Examples.DCMachines.DCPM_Temperature

Component	Modelica 4.0.0	Modelica 3.2.3
Va	Units.SI.Voltage	SIunits.Voltage
Ve	Units.SI.Voltage	SIunits.Voltage
w0	Units.SI.AngularVelocity	SIunits.AngularVelocity
TLoad	Units.SI.Torque	SIunits.Torque
JLoad	Units.SI.Inertia	SIunits.Inertia

model Electrical.Machines.Examples.DCMachines.DCPM_Cooling

Component	Modelica 4.0.0	Modelica 3.2.3
Va	Units.SI.Voltage	SIunits.Voltage
Ve	Units.SI.Voltage	SIunits.Voltage
w0	Units.SI.AngularVelocity	SIunits.AngularVelocity
TLoad	Units.SI.Torque	SIunits.Torque
JLoad	Units.SI.Inertia	SIunits.Inertia
TAmbient	Units.SI.Temperature	SIunits.Temperature
Ca	Units.SI.HeatCapacity	SIunits.HeatCapacity
Cc	Units.SI.HeatCapacity	SIunits.HeatCapacity
Losses	Units.SI.Power	SIunits.Power
T0	Units.SI.Temperature	SIunits.Temperature
dTCoolant	Units.SI.TemperatureDifference	SIunits.TemperatureDifference
dTArmature	Units.SI.TemperatureDifference	SIunits.TemperatureDifference
G_armature_core	Units.SI.ThermalConductance	SIunits.ThermalConductance
G_core_cooling	Units.SI.ThermalConductance	SIunits.ThermalConductance
CoolantFlow	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate

model Electrical.Machines.Examples.DCMachines.DCPM_withLosses

Component	Modelica 4.0.0	Modelica 3.2.3
Va	Units.SI.Voltage	SIunits.Voltage
tStart	Units.SI.Time	SIunits.Time
tRamp	Units.SI.Time	SIunits.Time
TLoad1	Units.SI.Torque	SIunits.Torque
wLoad1	Units.SI.AngularVelocity	SIunits.AngularVelocity
TLoad2	Units.SI.Torque	SIunits.Torque
wLoad2	Units.SI.AngularVelocity	SIunits.AngularVelocity
JLoad	Units.SI.Inertia	SIunits.Inertia

record Electrical.Machines.Examples.ControlledDCDrives.Utilities.DriveDataDCPM

Component	Modelica 4.0.0	Modelica 3.2.3
Ra	Units.SI.Resistance	SIunits.Resistance
Ta	Units.SI.Time	SIunits.Time
PNominal	Units.SI.Power	SIunits.Power
tauNominal	Units.SI.Torque	SIunits.Torque
kPhi	Units.SI.ElectricalTorqueConstant	SIunits.ElectricalTorqueConstant
w0	Units.SI.AngularVelocity	SIunits.AngularVelocity
fS	Units.SI.Frequency	SIunits.Frequency
VBat	Units.SI.Voltage	SIunits.Voltage
Td	Units.SI.Time	SIunits.Time
Tmf	Units.SI.Time	SIunits.Time
Tsigma	Units.SI.Time	SIunits.Time
JL	Units.SI.Inertia	SIunits.Inertia
VaMax	Units.SI.Voltage	SIunits.Voltage
IaMax	Units.SI.Current	SIunits.Current
tauMax	Units.SI.Torque	SIunits.Torque
wMax	Units.SI.AngularVelocity	SIunits.AngularVelocity
aMax	Units.SI.AngularAcceleration	SIunits.AngularAcceleration
TiI	Units.SI.Time	SIunits.Time
Tsub	Units.SI.Time	SIunits.Time
Tiw	Units.SI.Time	SIunits.Time
Tfw	Units.SI.Time	SIunits.Time

block Electrical.Machines.Examples.ControlledDCDrives.Utilities.LimitedPI

Component	Modelica 4.0.0	Modelica 3.2.3
Ti	Units.SI.Time	SIunits.Time

model Electrical.Machines.Examples.ControlledDCDrives.Utilities.Battery

Component	Modelica 4.0.0	Modelica 3.2.3
V0	Units.SI.Voltage	SIunits.Voltage
INominal	Units.SI.Current	SIunits.Current
Ri	Units.SI.Resistance	SIunits.Resistance

model Electrical.Machines.Examples.ControlledDCDrives.Utilities.DcdcInverter

Component	Modelica 4.0.0	Modelica 3.2.3
fS	Units.SI.Frequency	SIunits.Frequency
Td	Units.SI.Time	SIunits.Time
Tmf	Units.SI.Time	SIunits.Time
VMax	Units.SI.Voltage	SIunits.Voltage
Ti	Units.SI.Time	SIunits.Time
RonT	Units.SI.Resistance	SIunits.Resistance
GoffT	Units.SI.Conductance	SIunits.Conductance
VkneeT	Units.SI.Voltage	SIunits.Voltage
RonD	Units.SI.Resistance	SIunits.Resistance
GoffD	Units.SI.Conductance	SIunits.Conductance
VkneeD	Units.SI.Voltage	SIunits.Voltage
pDC	Units.SI.Power	SIunits.Power
pMot	Units.SI.Power	SIunits.Power

model Electrical.Machines.Examples.ControlledDCDrives.Utilities.IdealDcDc

Component	Modelica 4.0.0	Modelica 3.2.3
Td	Units.SI.Time	SIunits.Time
Ti	Units.SI.Time	SIunits.Time

model Electrical.Machines.Examples.ControlledDCDrives.Utilities.SwitchingDcDc

Component	Modelica 4.0.0	Modelica 3.2.3
fS	Units.SI.Frequency	SIunits.Frequency
VMax	Units.SI.Voltage	SIunits.Voltage
RonT	Units.SI.Resistance	SIunits.Resistance
GoffT	Units.SI.Conductance	SIunits.Conductance
VkneeT	Units.SI.Voltage	SIunits.Voltage
RonD	Units.SI.Resistance	SIunits.Resistance
GoffD	Units.SI.Conductance	SIunits.Conductance
VkneeD	Units.SI.Voltage	SIunits.Voltage
adaptor	Electrical.PowerConverters.DCDC.Control.Voltage2DutyCycle	Electrical.PowerConverters.DCDC.Control.VoltageToDutyCycle

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... connect(vRef, adaptor.v);
connect(vMax, adaptor.vLim);	connect(vMax, adaptor.vMaxExt);

model Electrical.Machines.Examples.Transformers.TransformerTestbench

Component	Modelica 4.0.0	Modelica 3.2.3
RL	Units.SI.Resistance	SIunits.Resistance
source	Electrical.Polyphase.Sources.SineVoltage	Electrical.MultiPhase.Sources.SineVoltage
starS	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
deltaS	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta
deltaL	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta
load	Electrical.Polyphase.Basic.Resistor	Electrical.MultiPhase.Basic.Resistor
starL	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star

model Electrical.Machines.Examples.Transformers.AsymmetricalLoad

Component	Modelica 4.0.0	Modelica 3.2.3
RL	Units.SI.Resistance	SIunits.Resistance
source	Electrical.Polyphase.Sources.SineVoltage	Electrical.MultiPhase.Sources.SineVoltage
starS	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
currentSensorS	Electrical.Polyphase.Sensors.CurrentSensor	Electrical.MultiPhase.Sensors.CurrentSensor
plugToPin_n	Electrical.Polyphase.Basic.PlugToPin_n	Electrical.MultiPhase.Basic.PlugToPin_n

model Electrical.Machines.Examples.Transformers.Rectifier6pulse

Component	Modelica 4.0.0	Modelica 3.2.3
V	Units.SI.Voltage	SIunits.Voltage
f	Units.SI.Frequency	SIunits.Frequency
RL	Units.SI.Resistance	SIunits.Resistance
C	Units.SI.Capacitance	SIunits.Capacitance
VC0	Units.SI.Voltage	SIunits.Voltage
source	Electrical.Polyphase.Sources.SineVoltage	Electrical.MultiPhase.Sources.SineVoltage
starAC	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
currentSensor	Electrical.Polyphase.Sensors.CurrentSensor	Electrical.MultiPhase.Sensors.CurrentSensor
diode1	Electrical.Polyphase.Ideal.IdealDiode	Electrical.MultiPhase.Ideal.IdealDiode
star1	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
diode2	Electrical.Polyphase.Ideal.IdealDiode	Electrical.MultiPhase.Ideal.IdealDiode
star2	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star

model Electrical.Machines.Examples.Transformers.Rectifier12pulse

Component	Modelica 4.0.0	Modelica 3.2.3
diode3	Electrical.Polyphase.Ideal.IdealDiode	Electrical.MultiPhase.Ideal.IdealDiode
star3	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
diode4	Electrical.Polyphase.Ideal.IdealDiode	Electrical.MultiPhase.Ideal.IdealDiode
star4	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star

model Electrical.Machines.BasicMachines.DCMachines.DC_PermanentMagnet

Component	Modelica 4.0.0	Modelica 3.2.3
TpmOperational	Units.SI.Temperature	SIunits.Temperature
airGapDC	final quasiStatic=quasiStatic
airGapDC		final quasiStationary=quasiStationary
Lme	Units.SI.Inductance	SIunits.Inductance
IeNominal	Units.SI.Current	SIunits.Current

model Electrical.Machines.BasicMachines.DCMachines.DC_ElectricalExcited

Component	Modelica 4.0.0	Modelica 3.2.3
IeNominal	Units.SI.Current	SIunits.Current
Re	Units.SI.Resistance	SIunits.Resistance
TeRef	Units.SI.Temperature	SIunits.Temperature
Le	Units.SI.Inductance	SIunits.Inductance
TeOperational	Units.SI.Temperature	SIunits.Temperature
ve	Units.SI.Voltage	SIunits.Voltage
ie	Units.SI.Current	SIunits.Current
airGapDC	final quasiStatic=quasiStatic
airGapDC		final quasiStationary=quasiStationary
lesigma	final quasiStatic=quasiStatic
lesigma		final quasiStationary=quasiStationary
Lme	Units.SI.Inductance	SIunits.Inductance
Lesigma	Units.SI.Inductance	SIunits.Inductance

model Electrical.Machines.BasicMachines.DCMachines.DC_SeriesExcited

Component	Modelica 4.0.0	Modelica 3.2.3
Re	Units.SI.Resistance	SIunits.Resistance
TeRef	Units.SI.Temperature	SIunits.Temperature
Le	Units.SI.Inductance	SIunits.Inductance
TeNominal	Units.SI.Temperature	SIunits.Temperature
TeOperational	Units.SI.Temperature	SIunits.Temperature
ve	Units.SI.Voltage	SIunits.Voltage
ie	Units.SI.Current	SIunits.Current
airGapDC	final quasiStatic=quasiStatic
airGapDC		final quasiStationary=quasiStationary
lesigma	final quasiStatic=quasiStatic
lesigma		final quasiStationary=quasiStationary
Lme	Units.SI.Inductance	SIunits.Inductance
Lesigma	Units.SI.Inductance	SIunits.Inductance

model Electrical.Machines.BasicMachines.Transformers.Yy.Yy00

Component	Modelica 4.0.0	Modelica 3.2.3
star1	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
star2	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star

model Electrical.Machines.BasicMachines.Transformers.Yy.Yy02

Component	Modelica 4.0.0	Modelica 3.2.3
star1	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
star2	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
Rot2	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta

model Electrical.Machines.BasicMachines.Transformers.Yy.Yy04

Component	Modelica 4.0.0	Modelica 3.2.3
star1	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
star2	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
Rot2	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta

model Electrical.Machines.BasicMachines.Transformers.Yy.Yy06

Component	Modelica 4.0.0	Modelica 3.2.3
star1	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
star2	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star

model Electrical.Machines.BasicMachines.Transformers.Yy.Yy08

Component	Modelica 4.0.0	Modelica 3.2.3
star1	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
star2	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
Rot2	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta

model Electrical.Machines.BasicMachines.Transformers.Yy.Yy10

Component	Modelica 4.0.0	Modelica 3.2.3
star1	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
star2	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
Rot2	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta

model Electrical.Machines.BasicMachines.Transformers.Yd.Yd01

Component	Modelica 4.0.0	Modelica 3.2.3
star1	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
Delta2	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta

model Electrical.Machines.BasicMachines.Transformers.Yd.Yd03

Component	Modelica 4.0.0	Modelica 3.2.3
star1	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
Delta2	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta
Rot2	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta

model Electrical.Machines.BasicMachines.Transformers.Yd.Yd05

Component	Modelica 4.0.0	Modelica 3.2.3
star1	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
Delta2	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta

model Electrical.Machines.BasicMachines.Transformers.Yd.Yd07

Component	Modelica 4.0.0	Modelica 3.2.3
star1	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
Delta2	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta

model Electrical.Machines.BasicMachines.Transformers.Yd.Yd09

Component	Modelica 4.0.0	Modelica 3.2.3
star1	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
Delta2	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta
Rot2	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta

model Electrical.Machines.BasicMachines.Transformers.Yd.Yd11

Component	Modelica 4.0.0	Modelica 3.2.3
star1	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
Delta2	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta

model Electrical.Machines.BasicMachines.Transformers.Yz.Yz01

Component	Modelica 4.0.0	Modelica 3.2.3
star1	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
star2	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
Rot21	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta
Rot22	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta

model Electrical.Machines.BasicMachines.Transformers.Yz.Yz03

Component	Modelica 4.0.0	Modelica 3.2.3
star1	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
star2	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
Rot21	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta
Rot22	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta

model Electrical.Machines.BasicMachines.Transformers.Yz.Yz05

Component	Modelica 4.0.0	Modelica 3.2.3
star1	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
star2	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
Rot21	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta

model Electrical.Machines.BasicMachines.Transformers.Yz.Yz07

Component	Modelica 4.0.0	Modelica 3.2.3
star1	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
star2	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
Rot21	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta

model Electrical.Machines.BasicMachines.Transformers.Yz.Yz09

Component	Modelica 4.0.0	Modelica 3.2.3
star1	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
star2	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
Rot21	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta
Rot22	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta

model Electrical.Machines.BasicMachines.Transformers.Yz.Yz11

Component	Modelica 4.0.0	Modelica 3.2.3
star1	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
star2	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
Rot21	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta
Rot22	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta

model Electrical.Machines.BasicMachines.Transformers.Dy.Dy01

Component	Modelica 4.0.0	Modelica 3.2.3
star2	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
Delta1	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta
Rot2	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta

model Electrical.Machines.BasicMachines.Transformers.Dy.Dy03

Component	Modelica 4.0.0	Modelica 3.2.3
star2	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
Delta1	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta
Rot2	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta

model Electrical.Machines.BasicMachines.Transformers.Dy.Dy05

Component	Modelica 4.0.0	Modelica 3.2.3
star2	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
Delta1	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta

model Electrical.Machines.BasicMachines.Transformers.Dy.Dy07

Component	Modelica 4.0.0	Modelica 3.2.3
star2	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
Delta1	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta
Rot2	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta

model Electrical.Machines.BasicMachines.Transformers.Dy.Dy09

Component	Modelica 4.0.0	Modelica 3.2.3
star2	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
Delta1	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta
Rot2	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta

model Electrical.Machines.BasicMachines.Transformers.Dy.Dy11

Component	Modelica 4.0.0	Modelica 3.2.3
star2	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
Delta1	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta

model Electrical.Machines.BasicMachines.Transformers.Dd.Dd00

Component	Modelica 4.0.0	Modelica 3.2.3
Delta1	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta
Delta2	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta

model Electrical.Machines.BasicMachines.Transformers.Dd.Dd02

Component	Modelica 4.0.0	Modelica 3.2.3
Delta1	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta
Delta2	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta
Rot2	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta

model Electrical.Machines.BasicMachines.Transformers.Dd.Dd04

Component	Modelica 4.0.0	Modelica 3.2.3
Delta1	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta
Delta2	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta

model Electrical.Machines.BasicMachines.Transformers.Dd.Dd06

Component	Modelica 4.0.0	Modelica 3.2.3
Delta1	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta
Delta2	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta

model Electrical.Machines.BasicMachines.Transformers.Dd.Dd08

Component	Modelica 4.0.0	Modelica 3.2.3
Delta1	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta
Rot2	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta
Delta2	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta

model Electrical.Machines.BasicMachines.Transformers.Dd.Dd10

Component	Modelica 4.0.0	Modelica 3.2.3
Delta1	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta
Delta2	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta

model Electrical.Machines.BasicMachines.Transformers.Dz.Dz00

Component	Modelica 4.0.0	Modelica 3.2.3
star2	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
Rot21	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta
Rot22	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta
Delta1	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta

model Electrical.Machines.BasicMachines.Transformers.Dz.Dz02

Component	Modelica 4.0.0	Modelica 3.2.3
star2	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
Rot21	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta
Rot22	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta
Delta1	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta

model Electrical.Machines.BasicMachines.Transformers.Dz.Dz04

Component	Modelica 4.0.0	Modelica 3.2.3
star2	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
Rot21	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta
Delta1	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta

model Electrical.Machines.BasicMachines.Transformers.Dz.Dz06

Component	Modelica 4.0.0	Modelica 3.2.3
star2	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
Rot21	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta
Delta1	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta

model Electrical.Machines.BasicMachines.Transformers.Dz.Dz08

Component	Modelica 4.0.0	Modelica 3.2.3
star2	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
Rot21	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta
Rot22	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta
Delta1	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta

model Electrical.Machines.BasicMachines.Transformers.Dz.Dz10

Component	Modelica 4.0.0	Modelica 3.2.3
star2	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
Rot21	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta
Rot22	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta
Delta1	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta

model Electrical.Machines.BasicMachines.Components.PartialAirGap

Component	Modelica 4.0.0	Modelica 3.2.3
tauElectrical	Units.SI.Torque	SIunits.Torque
gamma	Units.SI.Angle	SIunits.Angle
i_ss	Units.SI.Current	SIunits.Current
i_sr	Units.SI.Current	SIunits.Current
i_rs	Units.SI.Current	SIunits.Current
i_rr	Units.SI.Current	SIunits.Current
psi_ms	Units.SI.MagneticFlux	SIunits.MagneticFlux
psi_mr	Units.SI.MagneticFlux	SIunits.MagneticFlux

model Electrical.Machines.BasicMachines.Components.AirGapS

Component	Modelica 4.0.0	Modelica 3.2.3
Lm	Units.SI.Inductance	SIunits.Inductance
i_ms	Units.SI.Current	SIunits.Current
L	Units.SI.Inductance	SIunits.Inductance

model Electrical.Machines.BasicMachines.Components.AirGapR

Component	Modelica 4.0.0	Modelica 3.2.3
Lmd	Units.SI.Inductance	SIunits.Inductance
Lmq	Units.SI.Inductance	SIunits.Inductance
i_mr	Units.SI.Current	SIunits.Current
L	Units.SI.Inductance	SIunits.Inductance

model Electrical.Machines.BasicMachines.Components.Inductor

Component	Modelica 4.0.0	Modelica 3.2.3
L	Units.SI.Inductance	SIunits.Inductance
v_	Units.SI.Voltage	SIunits.Voltage
i_	Units.SI.Current	SIunits.Current

model Electrical.Machines.BasicMachines.Components.SquirrelCage

Component	Modelica 4.0.0	Modelica 3.2.3
Lrsigma	Units.SI.Inductance	SIunits.Inductance
Rr	Units.SI.Resistance	SIunits.Resistance
T_ref	Units.SI.Temperature	SIunits.Temperature
alpha	Units.SI.LinearTemperatureCoefficient	SIunits.LinearTemperatureCoefficient
Rr_actual	Units.SI.Resistance	SIunits.Resistance

model Electrical.Machines.BasicMachines.Components.DamperCage

Component	Modelica 4.0.0	Modelica 3.2.3
Lrsigmad	Units.SI.Inductance	SIunits.Inductance
Lrsigmaq	Units.SI.Inductance	SIunits.Inductance
Rrd	Units.SI.Resistance	SIunits.Resistance
Rrq	Units.SI.Resistance	SIunits.Resistance
T_ref	Units.SI.Temperature	SIunits.Temperature
alpha	Units.SI.LinearTemperatureCoefficient	SIunits.LinearTemperatureCoefficient
Rrd_actual	Units.SI.Resistance	SIunits.Resistance
Rrq_actual	Units.SI.Resistance	SIunits.Resistance

model Electrical.Machines.BasicMachines.Components.ElectricalExcitation

Component	Modelica 4.0.0	Modelica 3.2.3
ie	Units.SI.Current	SIunits.Current
ve	Units.SI.Voltage	SIunits.Voltage

model Electrical.Machines.BasicMachines.Components.PermanentMagnet

Component	Modelica 4.0.0	Modelica 3.2.3
Ie	Units.SI.Current	SIunits.Current

model Electrical.Machines.BasicMachines.Components.InductorDC

Component	Modelica 4.0.0	Modelica 3.2.3
L	Units.SI.Inductance	SIunits.Inductance
quasiStatic	Present
quasiStationary		Present

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
v = if quasiStatic then 0 else L*der(i);	v = if quasiStationary then 0 else L*der(i);

model Electrical.Machines.BasicMachines.Components.PartialAirGapDC

Component	Modelica 4.0.0	Modelica 3.2.3
w	Units.SI.AngularVelocity	SIunits.AngularVelocity
vei	Units.SI.Voltage	SIunits.Voltage
ie	Units.SI.Current	SIunits.Current
psi_e	Units.SI.MagneticFlux	SIunits.MagneticFlux
vai	Units.SI.Voltage	SIunits.Voltage
ia	Units.SI.Current	SIunits.Current
tauElectrical	Units.SI.Torque	SIunits.Torque
quasiStatic	Present
quasiStationary		Present

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... ie = -pin_en.i;
vei = if quasiStatic then 0 else der(psi_e);	vei = if quasiStationary then 0 else der(psi_e);
w = der(flange.phi) - der(support.phi); ...

model Electrical.Machines.BasicMachines.Components.AirGapDC

Component	Modelica 4.0.0	Modelica 3.2.3
Le	Units.SI.Inductance	SIunits.Inductance

model Electrical.Machines.BasicMachines.Components.CompoundDCExcitation

Component	Modelica 4.0.0	Modelica 3.2.3
v	Units.SI.Voltage	SIunits.Voltage
i	Units.SI.Current	SIunits.Current
ve	Units.SI.Voltage	SIunits.Voltage
ie	Units.SI.Current	SIunits.Current
vse	Units.SI.Voltage	SIunits.Voltage
ise	Units.SI.Current	SIunits.Current

model Electrical.Machines.BasicMachines.Components.PartialCore

Component	Modelica 4.0.0	Modelica 3.2.3
v1	Units.SI.Voltage	SIunits.Voltage
i1	Units.SI.Current	SIunits.Current
v2	Units.SI.Voltage	SIunits.Voltage
i2	Units.SI.Current	SIunits.Current
v3	Units.SI.Voltage	SIunits.Voltage
i3	Units.SI.Current	SIunits.Current
im	Units.SI.Current	SIunits.Current
plug_p1	Electrical.Polyphase.Interfaces.PositivePlug	Electrical.MultiPhase.Interfaces.PositivePlug
plug_n1	Electrical.Polyphase.Interfaces.NegativePlug	Electrical.MultiPhase.Interfaces.NegativePlug
plug_p2	Electrical.Polyphase.Interfaces.PositivePlug	Electrical.MultiPhase.Interfaces.PositivePlug
plug_n2	Electrical.Polyphase.Interfaces.NegativePlug	Electrical.MultiPhase.Interfaces.NegativePlug
plug_p3	Electrical.Polyphase.Interfaces.PositivePlug	Electrical.MultiPhase.Interfaces.PositivePlug
plug_n3	Electrical.Polyphase.Interfaces.NegativePlug	Electrical.MultiPhase.Interfaces.NegativePlug

model Electrical.Machines.Sensors.VoltageQuasiRMSSensor

Component	Modelica 4.0.0	Modelica 3.2.3
plug_p	Electrical.Polyphase.Interfaces.PositivePlug	Electrical.MultiPhase.Interfaces.PositivePlug
plug_n	Electrical.Polyphase.Interfaces.NegativePlug	Electrical.MultiPhase.Interfaces.NegativePlug
VoltageSensor1	Electrical.Polyphase.Sensors.VoltageSensor	Electrical.MultiPhase.Sensors.VoltageSensor

model Electrical.Machines.Sensors.CurrentQuasiRMSSensor

Component	Modelica 4.0.0	Modelica 3.2.3
plug_p	Electrical.Polyphase.Interfaces.PositivePlug	Electrical.MultiPhase.Interfaces.PositivePlug
plug_n	Electrical.Polyphase.Interfaces.NegativePlug	Electrical.MultiPhase.Interfaces.NegativePlug
CurrentSensor1	Electrical.Polyphase.Sensors.CurrentSensor	Electrical.MultiPhase.Sensors.CurrentSensor

model Electrical.Machines.Sensors.ElectricalPowerSensor

Component	Modelica 4.0.0	Modelica 3.2.3
plug_p	Electrical.Polyphase.Interfaces.PositivePlug	Electrical.MultiPhase.Interfaces.PositivePlug
plug_ni	Electrical.Polyphase.Interfaces.NegativePlug	Electrical.MultiPhase.Interfaces.NegativePlug
plug_nv	Electrical.Polyphase.Interfaces.NegativePlug	Electrical.MultiPhase.Interfaces.NegativePlug
v_	Units.SI.Voltage	SIunits.Voltage
i_	Units.SI.Current	SIunits.Current

model Electrical.Machines.Sensors.RotorDisplacementAngle

Component	Modelica 4.0.0	Modelica 3.2.3
plug_p	Electrical.Polyphase.Interfaces.PositivePlug	Electrical.MultiPhase.Interfaces.PositivePlug
plug_n	Electrical.Polyphase.Interfaces.NegativePlug	Electrical.MultiPhase.Interfaces.NegativePlug
VoltageSensor1	Electrical.Polyphase.Sensors.VoltageSensor	Electrical.MultiPhase.Sensors.VoltageSensor

model Electrical.Machines.Sensors.HallSensor

Component	Modelica 4.0.0	Modelica 3.2.3
phi0	Units.SI.Angle	SIunits.Angle

model Electrical.Machines.SpacePhasors.Components.SpacePhasor

Component	Modelica 4.0.0	Modelica 3.2.3
v	Units.SI.Voltage	SIunits.Voltage
i	Units.SI.Current	SIunits.Current
plug_p	Electrical.Polyphase.Interfaces.PositivePlug	Electrical.MultiPhase.Interfaces.PositivePlug
plug_n	Electrical.Polyphase.Interfaces.NegativePlug	Electrical.MultiPhase.Interfaces.NegativePlug

model Electrical.Machines.SpacePhasors.Components.Rotator

Component	Modelica 4.0.0	Modelica 3.2.3
angle	unit="rad"

block Electrical.Machines.SpacePhasors.Blocks.ToSpacePhasor

Component	Modelica 4.0.0	Modelica 3.2.3
phi	Units.SI.Angle	SIunits.Angle

block Electrical.Machines.SpacePhasors.Blocks.FromSpacePhasor

Component	Modelica 4.0.0	Modelica 3.2.3
phi	Units.SI.Angle	SIunits.Angle

function Electrical.Machines.SpacePhasors.Functions.ToSpacePhasor

Component	Modelica 4.0.0	Modelica 3.2.3
phi	Units.SI.Angle	SIunits.Angle

function Electrical.Machines.SpacePhasors.Functions.FromSpacePhasor

Component	Modelica 4.0.0	Modelica 3.2.3
phi	Units.SI.Angle	SIunits.Angle

function Electrical.Machines.SpacePhasors.Functions.Rotator

Component	Modelica 4.0.0	Modelica 3.2.3
angle	Units.SI.Angle	SIunits.Angle

function Electrical.Machines.SpacePhasors.Functions.ToPolar

Component	Modelica 4.0.0	Modelica 3.2.3
angle	Units.SI.Angle	SIunits.Angle

function Electrical.Machines.SpacePhasors.Functions.FromPolar

Component	Modelica 4.0.0	Modelica 3.2.3
angle	Units.SI.Angle	SIunits.Angle

function Electrical.Machines.SpacePhasors.Functions.quasiRMS

Component	Modelica 4.0.0	Modelica 3.2.3
phi	Units.SI.Angle	SIunits.Angle

function Electrical.Machines.SpacePhasors.Functions.activePower

Component	Modelica 4.0.0	Modelica 3.2.3
v	Units.SI.Voltage	SIunits.Voltage
i	Units.SI.Current	SIunits.Current
p	Units.SI.Power	SIunits.Power
v_	Units.SI.Voltage	SIunits.Voltage
i_	Units.SI.Current	SIunits.Current

record Electrical.Machines.Losses.FrictionParameters

Component	Modelica 4.0.0	Modelica 3.2.3
PRef	Units.SI.Power	SIunits.Power
wRef	Units.SI.AngularVelocity	SIunits.AngularVelocity
tauRef	Units.SI.Torque	SIunits.Torque
wLinear	Units.SI.AngularVelocity	SIunits.AngularVelocity
tauLinear	Units.SI.Torque	SIunits.Torque

record Electrical.Machines.Losses.BrushParameters

Component	Modelica 4.0.0	Modelica 3.2.3
V	Units.SI.Voltage	SIunits.Voltage
ILinear	Units.SI.Current	SIunits.Current

record Electrical.Machines.Losses.StrayLoadParameters

Component	Modelica 4.0.0	Modelica 3.2.3
PRef	Units.SI.Power	SIunits.Power
IRef	Units.SI.Current	SIunits.Current
wRef	Units.SI.AngularVelocity	SIunits.AngularVelocity
tauRef	Units.SI.Torque	SIunits.Torque

record Electrical.Machines.Losses.CoreParameters

Component	Modelica 4.0.0	Modelica 3.2.3
PRef	Units.SI.Power	SIunits.Power
VRef	Units.SI.Voltage	SIunits.Voltage
wRef	Units.SI.AngularVelocity	SIunits.AngularVelocity
GcRef	Units.SI.Conductance	SIunits.Conductance
wMin	Units.SI.AngularVelocity	SIunits.AngularVelocity

record Electrical.Machines.Losses.PermanentMagnetLossParameters

Component	Modelica 4.0.0	Modelica 3.2.3
PRef	Units.SI.Power	SIunits.Power
IRef	Units.SI.Current	SIunits.Current
wRef	Units.SI.AngularVelocity	SIunits.AngularVelocity
tauRef	Units.SI.Torque	SIunits.Torque

model Electrical.Machines.Losses.InductionMachines.StrayLoad

Component	Modelica 4.0.0	Modelica 3.2.3
iRMS	Units.SI.Current	SIunits.Current

model Electrical.Machines.Losses.InductionMachines.PermanentMagnetLosses

Component	Modelica 4.0.0	Modelica 3.2.3
is	Units.SI.Current	SIunits.Current
iRMS	Units.SI.Current	SIunits.Current

model Electrical.Machines.Losses.InductionMachines.Core

Component	Modelica 4.0.0	Modelica 3.2.3
w	Units.SI.AngularVelocity	SIunits.AngularVelocity
Gc	Units.SI.Conductance	SIunits.Conductance
wLimit	Units.SI.AngularVelocity	SIunits.AngularVelocity

function Electrical.Machines.Losses.DCMachines.brushVoltageDrop

Component	Modelica 4.0.0	Modelica 3.2.3
i	Units.SI.Current	SIunits.Current
v	Units.SI.Voltage	SIunits.Voltage

model Electrical.Machines.Losses.DCMachines.Core

Component	Modelica 4.0.0	Modelica 3.2.3
w	Units.SI.AngularVelocity	SIunits.AngularVelocity
Gc	Units.SI.Conductance	SIunits.Conductance
wLimit	Units.SI.AngularVelocity	SIunits.AngularVelocity

package Electrical.Machines.Thermal.Constants

Component	Modelica 4.0.0	Modelica 3.2.3
alpha20Zero	Units.SI.LinearTemperatureCoefficient	SIunits.LinearTemperatureCoefficient
alpha20Aluminium	Units.SI.LinearTemperatureCoefficient	SIunits.LinearTemperatureCoefficient
alpha20Brass	Units.SI.LinearTemperatureCoefficient	SIunits.LinearTemperatureCoefficient
alpha20Bronze	Units.SI.LinearTemperatureCoefficient	SIunits.LinearTemperatureCoefficient
alpha20Copper	Units.SI.LinearTemperatureCoefficient	SIunits.LinearTemperatureCoefficient

function Electrical.Machines.Thermal.convertAlpha

Component	Modelica 4.0.0	Modelica 3.2.3
alpha1	Units.SI.LinearTemperatureCoefficient	SIunits.LinearTemperatureCoefficient
T2	Units.SI.Temperature	SIunits.Temperature
T1	Units.SI.Temperature	SIunits.Temperature
alpha2	Units.SI.LinearTemperatureCoefficient	SIunits.LinearTemperatureCoefficient

function Electrical.Machines.Thermal.convertResistance

Component	Modelica 4.0.0	Modelica 3.2.3
RRef	Units.SI.Resistance	SIunits.Resistance
TRef	Units.SI.Temperature	SIunits.Temperature
alpha20	Units.SI.LinearTemperatureCoefficient	SIunits.LinearTemperatureCoefficient
T	Units.SI.Temperature	SIunits.Temperature
R	Units.SI.Resistance	SIunits.Resistance

function Electrical.Machines.Thermal.linearTemperatureDependency

Component	Modelica 4.0.0	Modelica 3.2.3
TRef	Units.SI.Temperature	SIunits.Temperature
alpha20	Units.SI.LinearTemperatureCoefficient	SIunits.LinearTemperatureCoefficient
T	Units.SI.Temperature	SIunits.Temperature

model Electrical.Machines.Thermal.DCMachines.ThermalAmbientDCPM

Component	Modelica 4.0.0	Modelica 3.2.3
Tpm	Units.SI.Temperature	SIunits.Temperature
Q_flowPermanentMagnet	Units.SI.HeatFlowRate	SIunits.HeatFlowRate
Q_flowTotal	Units.SI.HeatFlowRate	SIunits.HeatFlowRate
TPermanentMagnet	unit="K"

model Electrical.Machines.Thermal.DCMachines.ThermalAmbientDCEE

Component	Modelica 4.0.0	Modelica 3.2.3
Te	Units.SI.Temperature	SIunits.Temperature
Q_flowExcitation	Units.SI.HeatFlowRate	SIunits.HeatFlowRate
Q_flowTotal	Units.SI.HeatFlowRate	SIunits.HeatFlowRate
TExcitation	unit="K"

model Electrical.Machines.Thermal.DCMachines.ThermalAmbientDCSE

Component	Modelica 4.0.0	Modelica 3.2.3
Tse	Units.SI.Temperature	SIunits.Temperature
Q_flowSeriesExcitation	Units.SI.HeatFlowRate	SIunits.HeatFlowRate
Q_flowTotal	Units.SI.HeatFlowRate	SIunits.HeatFlowRate
T_se	unit="K"

model Electrical.Machines.Thermal.DCMachines.ThermalAmbientDCCE

Component	Modelica 4.0.0	Modelica 3.2.3
Te	Units.SI.Temperature	SIunits.Temperature
Tse	Units.SI.Temperature	SIunits.Temperature
Q_flowShuntExcitation	Units.SI.HeatFlowRate	SIunits.HeatFlowRate
Q_flowSeriesExcitation	Units.SI.HeatFlowRate	SIunits.HeatFlowRate
Q_flowTotal	Units.SI.HeatFlowRate	SIunits.HeatFlowRate
T_e	unit="K"
T_se	unit="K"

model Electrical.Machines.Thermal.ThermalAmbientTransformer

Component	Modelica 4.0.0	Modelica 3.2.3
TDefault	Units.SI.Temperature	SIunits.Temperature
T1	Units.SI.Temperature	SIunits.Temperature
T2	Units.SI.Temperature	SIunits.Temperature
Q_flow1	Units.SI.HeatFlowRate	SIunits.HeatFlowRate
Q_flow2	Units.SI.HeatFlowRate	SIunits.HeatFlowRate
Q_flowCore	Units.SI.HeatFlowRate	SIunits.HeatFlowRate
Q_flowTotal	Units.SI.HeatFlowRate	SIunits.HeatFlowRate
TPrimary	unit="K"
TSecondary	unit="K"

connector Electrical.Machines.Interfaces.SpacePhasor

Component	Modelica 4.0.0	Modelica 3.2.3
v_	Units.SI.Voltage	SIunits.Voltage
i_	Units.SI.Current	SIunits.Current

model Electrical.Machines.Interfaces.PartialBasicMachine

Component	Modelica 4.0.0	Modelica 3.2.3
Jr	Units.SI.Inertia	SIunits.Inertia
Js	Units.SI.Inertia	SIunits.Inertia
phiMechanical	Units.SI.Angle	SIunits.Angle
wMechanical	Units.SI.AngularVelocity	SIunits.AngularVelocity
tauElectrical	Units.SI.Torque	SIunits.Torque
tauShaft	Units.SI.Torque	SIunits.Torque

model Electrical.Machines.Interfaces.PartialBasicInductionMachine

Component	Modelica 4.0.0	Modelica 3.2.3
fsNominal	Units.SI.Frequency	SIunits.Frequency
TsOperational	Units.SI.Temperature	SIunits.Temperature
Rs	Units.SI.Resistance	SIunits.Resistance
TsRef	Units.SI.Temperature	SIunits.Temperature
Lszero	Units.SI.Inductance	SIunits.Inductance
Lssigma	Units.SI.Inductance	SIunits.Inductance
vs	Units.SI.Voltage	SIunits.Voltage
is	Units.SI.Current	SIunits.Current
i_0_s	Units.SI.Current	SIunits.Current
idq_ss	Units.SI.Current	SIunits.Current
idq_sr	Units.SI.Current	SIunits.Current
idq_rs	Units.SI.Current	SIunits.Current
idq_rr	Units.SI.Current	SIunits.Current
plug_sp	Electrical.Polyphase.Interfaces.PositivePlug	Electrical.MultiPhase.Interfaces.PositivePlug
plug_sn	Electrical.Polyphase.Interfaces.NegativePlug	Electrical.MultiPhase.Interfaces.NegativePlug
rs	Electrical.Polyphase.Basic.Resistor	Electrical.MultiPhase.Basic.Resistor

model Electrical.Machines.Interfaces.InductionMachines.PartialThermalAmbientInductionMachines

Component	Modelica 4.0.0	Modelica 3.2.3
TDefault	Units.SI.Temperature	SIunits.Temperature
Ts	Units.SI.Temperature	SIunits.Temperature
Q_flowStatorWinding	Units.SI.HeatFlowRate	SIunits.HeatFlowRate
Q_flowStatorCore	Units.SI.HeatFlowRate	SIunits.HeatFlowRate
Q_flowRotorCore	Units.SI.HeatFlowRate	SIunits.HeatFlowRate
Q_flowStrayLoad	Units.SI.HeatFlowRate	SIunits.HeatFlowRate
Q_flowFriction	Units.SI.HeatFlowRate	SIunits.HeatFlowRate
TStatorWinding	unit="K"

record Electrical.Machines.Interfaces.InductionMachines.PartialPowerBalanceInductionMachines

Component	Modelica 4.0.0	Modelica 3.2.3
powerStator	Units.SI.Power	SIunits.Power
powerMechanical	Units.SI.Power	SIunits.Power
powerInertiaStator	Units.SI.Power	SIunits.Power
powerInertiaRotor	Units.SI.Power	SIunits.Power
lossPowerTotal	Units.SI.Power	SIunits.Power
lossPowerStatorWinding	Units.SI.Power	SIunits.Power
lossPowerStatorCore	Units.SI.Power	SIunits.Power
lossPowerRotorCore	Units.SI.Power	SIunits.Power
lossPowerStrayLoad	Units.SI.Power	SIunits.Power
lossPowerFriction	Units.SI.Power	SIunits.Power

record Electrical.Machines.Interfaces.InductionMachines.PowerBalanceSMPM

Component	Modelica 4.0.0	Modelica 3.2.3
lossPowerRotorWinding	Units.SI.Power	SIunits.Power
lossPowerPermanentMagnet	Units.SI.Power	SIunits.Power

record Electrical.Machines.Interfaces.InductionMachines.PowerBalanceSMEE

Component	Modelica 4.0.0	Modelica 3.2.3
lossPowerRotorWinding	Units.SI.Power	SIunits.Power
powerExcitation	Units.SI.Power	SIunits.Power
lossPowerExcitation	Units.SI.Power	SIunits.Power
lossPowerBrush	Units.SI.Power	SIunits.Power

record Electrical.Machines.Interfaces.InductionMachines.PowerBalanceSMR

Component	Modelica 4.0.0	Modelica 3.2.3
lossPowerRotorWinding	Units.SI.Power	SIunits.Power

model Electrical.Machines.Interfaces.PartialBasicDCMachine

Component	Modelica 4.0.0	Modelica 3.2.3
TaOperational	Units.SI.Temperature	SIunits.Temperature
VaNominal	Units.SI.Voltage	SIunits.Voltage
IaNominal	Units.SI.Current	SIunits.Current
wNominal	Units.SI.AngularVelocity	SIunits.AngularVelocity
TaNominal	Units.SI.Temperature	SIunits.Temperature
Ra	Units.SI.Resistance	SIunits.Resistance
TaRef	Units.SI.Temperature	SIunits.Temperature
La	Units.SI.Inductance	SIunits.Inductance
va	Units.SI.Voltage	SIunits.Voltage
ia	Units.SI.Current	SIunits.Current
la	final quasiStatic=quasiStatic
la		final quasiStationary=quasiStationary
ViNominal	Units.SI.Voltage	SIunits.Voltage
psi_eNominal	Units.SI.MagneticFlux	SIunits.MagneticFlux
quasiStatic	Present
quasiStationary		Present

model Electrical.Machines.Interfaces.DCMachines.PartialThermalAmbientDCMachines

Component	Modelica 4.0.0	Modelica 3.2.3
TDefault	Units.SI.Temperature	SIunits.Temperature
Ta	Units.SI.Temperature	SIunits.Temperature
Q_flowArmature	Units.SI.HeatFlowRate	SIunits.HeatFlowRate
Q_flowCore	Units.SI.HeatFlowRate	SIunits.HeatFlowRate
Q_flowStrayLoad	Units.SI.HeatFlowRate	SIunits.HeatFlowRate
Q_flowFriction	Units.SI.HeatFlowRate	SIunits.HeatFlowRate
Q_flowBrush	Units.SI.HeatFlowRate	SIunits.HeatFlowRate
TArmature	unit="K"

record Electrical.Machines.Interfaces.DCMachines.PartialPowerBalanceDCMachines

Component	Modelica 4.0.0	Modelica 3.2.3
powerArmature	Units.SI.Power	SIunits.Power
powerMechanical	Units.SI.Power	SIunits.Power
powerInertiaStator	Units.SI.Power	SIunits.Power
powerInertiaRotor	Units.SI.Power	SIunits.Power
lossPowerTotal	Units.SI.Power	SIunits.Power
lossPowerArmature	Units.SI.Power	SIunits.Power
lossPowerCore	Units.SI.Power	SIunits.Power
lossPowerStrayLoad	Units.SI.Power	SIunits.Power
lossPowerFriction	Units.SI.Power	SIunits.Power
lossPowerBrush	Units.SI.Power	SIunits.Power

record Electrical.Machines.Interfaces.DCMachines.PowerBalanceDCPM

Component	Modelica 4.0.0	Modelica 3.2.3
lossPowerPermanentMagnet	Units.SI.Power	SIunits.Power

record Electrical.Machines.Interfaces.DCMachines.PowerBalanceDCEE

Component	Modelica 4.0.0	Modelica 3.2.3
powerExcitation	Units.SI.Power	SIunits.Power
lossPowerExcitation	Units.SI.Power	SIunits.Power

record Electrical.Machines.Interfaces.DCMachines.PowerBalanceDCSE

Component	Modelica 4.0.0	Modelica 3.2.3
powerSeriesExcitation	Units.SI.Power	SIunits.Power
lossPowerSeriesExcitation	Units.SI.Power	SIunits.Power

record Electrical.Machines.Interfaces.DCMachines.PowerBalanceDCCE

Component	Modelica 4.0.0	Modelica 3.2.3
powerShuntExcitation	Units.SI.Power	SIunits.Power
powerSeriesExcitation	Units.SI.Power	SIunits.Power
lossPowerShuntExcitation	Units.SI.Power	SIunits.Power
lossPowerSeriesExcitation	Units.SI.Power	SIunits.Power

model Electrical.Machines.Interfaces.PartialBasicTransformer

Component	Modelica 4.0.0	Modelica 3.2.3
R1	Units.SI.Resistance	SIunits.Resistance
T1Ref	Units.SI.Temperature	SIunits.Temperature
L1sigma	Units.SI.Inductance	SIunits.Inductance
R2	Units.SI.Resistance	SIunits.Resistance
T2Ref	Units.SI.Temperature	SIunits.Temperature
L2sigma	Units.SI.Inductance	SIunits.Inductance
T1Operational	Units.SI.Temperature	SIunits.Temperature
T2Operational	Units.SI.Temperature	SIunits.Temperature
v1	Units.SI.Voltage	SIunits.Voltage
i1	Units.SI.Current	SIunits.Current
v2	Units.SI.Voltage	SIunits.Voltage
i2	Units.SI.Current	SIunits.Current
plug1	Electrical.Polyphase.Interfaces.PositivePlug	Electrical.MultiPhase.Interfaces.PositivePlug
plug2	Electrical.Polyphase.Interfaces.NegativePlug	Electrical.MultiPhase.Interfaces.NegativePlug
r1	Electrical.Polyphase.Basic.Resistor	Electrical.MultiPhase.Basic.Resistor
l1sigma	Electrical.Polyphase.Basic.Inductor	Electrical.MultiPhase.Basic.Inductor
r2	Electrical.Polyphase.Basic.Resistor	Electrical.MultiPhase.Basic.Resistor
l2sigma	Electrical.Polyphase.Basic.Inductor	Electrical.MultiPhase.Basic.Inductor

record Electrical.Machines.Interfaces.PowerBalanceTransformer

Component	Modelica 4.0.0	Modelica 3.2.3
power1	Units.SI.Power	SIunits.Power
power2	Units.SI.Power	SIunits.Power
lossPowerTotal	Units.SI.Power	SIunits.Power
lossPower1	Units.SI.Power	SIunits.Power
lossPower2	Units.SI.Power	SIunits.Power
lossPowerCore	Units.SI.Power	SIunits.Power

model Electrical.Machines.Interfaces.FlangeSupport

Component	Modelica 4.0.0	Modelica 3.2.3
phi	Units.SI.Angle	SIunits.Angle
tau	Units.SI.Torque	SIunits.Torque
w	Units.SI.AngularVelocity	SIunits.AngularVelocity

record Electrical.Machines.Utilities.ParameterRecords.InductionMachineData

Component	Modelica 4.0.0	Modelica 3.2.3
Jr	Units.SI.Inertia	SIunits.Inertia
Js	Units.SI.Inertia	SIunits.Inertia
fsNominal	Units.SI.Frequency	SIunits.Frequency
Rs	Units.SI.Resistance	SIunits.Resistance
TsRef	Units.SI.Temperature	SIunits.Temperature
Lszero	Units.SI.Inductance	SIunits.Inductance
Lssigma	Units.SI.Inductance	SIunits.Inductance

record Electrical.Machines.Utilities.ParameterRecords.SM_PermanentMagnetData

Component	Modelica 4.0.0	Modelica 3.2.3
VsOpenCircuit	Units.SI.Voltage	SIunits.Voltage

record Electrical.Machines.Utilities.ParameterRecords.SM_ElectricalExcitedData

Component	Modelica 4.0.0	Modelica 3.2.3
VsNominal	Units.SI.Voltage	SIunits.Voltage
IeOpenCircuit	Units.SI.Current	SIunits.Current
Re	Units.SI.Resistance	SIunits.Resistance
TeRef	Units.SI.Temperature	SIunits.Temperature

record Electrical.Machines.Utilities.ParameterRecords.SM_ReluctanceRotorData

Component	Modelica 4.0.0	Modelica 3.2.3
Lmd	Units.SI.Inductance	SIunits.Inductance
Lmq	Units.SI.Inductance	SIunits.Inductance
Lrsigmad	Units.SI.Inductance	SIunits.Inductance
Lrsigmaq	Units.SI.Inductance	SIunits.Inductance
Rrd	Units.SI.Resistance	SIunits.Resistance
Rrq	Units.SI.Resistance	SIunits.Resistance
TrRef	Units.SI.Temperature	SIunits.Temperature

record Electrical.Machines.Utilities.ParameterRecords.DcPermanentMagnetData

Component	Modelica 4.0.0	Modelica 3.2.3
Jr	Units.SI.Inertia	SIunits.Inertia
Js	Units.SI.Inertia	SIunits.Inertia
VaNominal	Units.SI.Voltage	SIunits.Voltage
IaNominal	Units.SI.Current	SIunits.Current
wNominal	Units.SI.AngularVelocity	SIunits.AngularVelocity
TaNominal	Units.SI.Temperature	SIunits.Temperature
Ra	Units.SI.Resistance	SIunits.Resistance
TaRef	Units.SI.Temperature	SIunits.Temperature
La	Units.SI.Inductance	SIunits.Inductance
ViNominal	Units.SI.Voltage	SIunits.Voltage

record Electrical.Machines.Utilities.ParameterRecords.DcElectricalExcitedData

Component	Modelica 4.0.0	Modelica 3.2.3
IeNominal	Units.SI.Current	SIunits.Current
Re	Units.SI.Resistance	SIunits.Resistance
TeRef	Units.SI.Temperature	SIunits.Temperature
Le	Units.SI.Inductance	SIunits.Inductance

record Electrical.Machines.Utilities.ParameterRecords.DcSeriesExcitedData

Component	Modelica 4.0.0	Modelica 3.2.3
Re	Units.SI.Resistance	SIunits.Resistance
TeRef	Units.SI.Temperature	SIunits.Temperature
Le	Units.SI.Inductance	SIunits.Inductance
TeNominal	Units.SI.Temperature	SIunits.Temperature

record Electrical.Machines.Utilities.ParameterRecords.TransformerData

Component	Modelica 4.0.0	Modelica 3.2.3
R1	Units.SI.Resistance	SIunits.Resistance
T1Ref	Units.SI.Temperature	SIunits.Temperature
L1sigma	Units.SI.Inductance	SIunits.Inductance
R2	Units.SI.Resistance	SIunits.Resistance
T2Ref	Units.SI.Temperature	SIunits.Temperature
L2sigma	Units.SI.Inductance	SIunits.Inductance

block Electrical.Machines.Utilities.VfController

Component	Modelica 4.0.0	Modelica 3.2.3
orientation	Units.SI.Angle	SIunits.Angle
VNominal	Units.SI.Voltage	SIunits.Voltage
fNominal	Units.SI.Frequency	SIunits.Frequency
BasePhase	Units.SI.Angle	SIunits.Angle
x	Units.SI.Angle	SIunits.Angle
amplitude	Units.SI.Voltage	SIunits.Voltage

model Electrical.Machines.Utilities.SwitchYD

Component	Modelica 4.0.0	Modelica 3.2.3
plugSupply	Electrical.Polyphase.Interfaces.PositivePlug	Electrical.MultiPhase.Interfaces.PositivePlug
plug_sp	Electrical.Polyphase.Interfaces.PositivePlug	Electrical.MultiPhase.Interfaces.PositivePlug
plug_sn	Electrical.Polyphase.Interfaces.NegativePlug	Electrical.MultiPhase.Interfaces.NegativePlug
star	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
delta	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta
Ron	Present
Goff	Present
delayTime	Present
idealCloser	Present
idealCloser
idealOpener	Present
idealOpener
logicalDelay	Present
logicalDelay
idealCommutingSwitch		Present
idealCommutingSwitch

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... connect(delta.plug_p, plug_sp);
connect(idealCloser.plug_p, plug_sn);	connect(idealCommutingSwitch.plug_n2, delta.plug_n);
connect(idealCloser.plug_n, delta.plug_n);	connect(idealCommutingSwitch.plug_n1, star.plug_p);
connect(idealOpener.plug_p, plug_sn);	connect(idealCommutingSwitch.plug_p, plug_sn);
connect(idealOpener.plug_n, star.plug_p);	connect(control, idealCommutingSwitch.control);
connect(control, logicalDelay.u); connect(logicalDelay.y1, idealOpener.control); connect(logicalDelay.y2, idealCloser.control);

model Electrical.Machines.Utilities.TerminalBox

Component	Modelica 4.0.0	Modelica 3.2.3
plug_sp	Electrical.Polyphase.Interfaces.PositivePlug	Electrical.MultiPhase.Interfaces.PositivePlug
plug_sn	Electrical.Polyphase.Interfaces.NegativePlug	Electrical.MultiPhase.Interfaces.NegativePlug
star	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
delta	Electrical.Polyphase.Basic.Delta	Electrical.MultiPhase.Basic.Delta
plugSupply	Electrical.Polyphase.Interfaces.PositivePlug	Electrical.MultiPhase.Interfaces.PositivePlug

model Electrical.Machines.Utilities.MultiTerminalBox

Component	Modelica 4.0.0	Modelica 3.2.3
mSystems	=Modelica400.Electrical.Polyphase.Functions.numberOfSymmetricBaseSystems(m)	=Modelica323.Electrical.MultiPhase.Functions.numberOfSymmetricBaseSystems(m)
plug_sp	Electrical.Polyphase.Interfaces.PositivePlug	Electrical.MultiPhase.Interfaces.PositivePlug
plug_sn	Electrical.Polyphase.Interfaces.NegativePlug	Electrical.MultiPhase.Interfaces.NegativePlug
multiStar	Electrical.Polyphase.Basic.MultiStar	Electrical.MultiPhase.Basic.MultiStar
multiDelta	Electrical.Polyphase.Basic.MultiDelta	Electrical.MultiPhase.Basic.MultiDelta
plugSupply	Electrical.Polyphase.Interfaces.PositivePlug	Electrical.MultiPhase.Interfaces.PositivePlug
starpoint	Electrical.Polyphase.Interfaces.NegativePlug	Electrical.MultiPhase.Interfaces.NegativePlug

model Electrical.Machines.Utilities.SwitchedRheostat

Component	Modelica 4.0.0	Modelica 3.2.3
plug_p	Electrical.Polyphase.Interfaces.PositivePlug	Electrical.MultiPhase.Interfaces.PositivePlug
plug_n	Electrical.Polyphase.Interfaces.NegativePlug	Electrical.MultiPhase.Interfaces.NegativePlug
RStart	Units.SI.Resistance	SIunits.Resistance
tStart	Units.SI.Time	SIunits.Time
star	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
idealCommutingSwitch	Electrical.Polyphase.Ideal.IdealCommutingSwitch	Electrical.MultiPhase.Ideal.IdealCommutingSwitch
rheostat	Electrical.Polyphase.Basic.Resistor	Electrical.MultiPhase.Basic.Resistor
starRheostat	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star

model Electrical.Machines.Utilities.RampedRheostat

Component	Modelica 4.0.0	Modelica 3.2.3
plug_p	Electrical.Polyphase.Interfaces.PositivePlug	Electrical.MultiPhase.Interfaces.PositivePlug
plug_n	Electrical.Polyphase.Interfaces.NegativePlug	Electrical.MultiPhase.Interfaces.NegativePlug
RStart	Units.SI.Resistance	SIunits.Resistance
tStart	Units.SI.Time	SIunits.Time
tRamp	Units.SI.Time	SIunits.Time
star	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
rheostat	Electrical.Polyphase.Basic.VariableResistor	Electrical.MultiPhase.Basic.VariableResistor

record Electrical.Machines.Utilities.SynchronousMachineData

Component	Modelica 4.0.0	Modelica 3.2.3
SNominal	Units.SI.ApparentPower	SIunits.ApparentPower
VsNominal	Units.SI.Voltage	SIunits.Voltage
IsNominal	Units.SI.Current	SIunits.Current
ZReference	Units.SI.Impedance	SIunits.Impedance
fsNominal	Units.SI.Frequency	SIunits.Frequency
omega	Units.SI.AngularVelocity	SIunits.AngularVelocity
IeOpenCircuit	Units.SI.Current	SIunits.Current
Ta	Units.SI.Time	SIunits.Time
Td0Transient	Units.SI.Time	SIunits.Time
Td0Subtransient	Units.SI.Time	SIunits.Time
Tq0Subtransient	Units.SI.Time	SIunits.Time
TsSpecification	Units.SI.Temperature	SIunits.Temperature
TsRef	Units.SI.Temperature	SIunits.Temperature
TrSpecification	Units.SI.Temperature	SIunits.Temperature
TrRef	Units.SI.Temperature	SIunits.Temperature
TeSpecification	Units.SI.Temperature	SIunits.Temperature
TeRef	Units.SI.Temperature	SIunits.Temperature
Rs	Units.SI.Resistance	SIunits.Resistance
Lssigma	Units.SI.Inductance	SIunits.Inductance
Lmd	Units.SI.Inductance	SIunits.Inductance
Lmq	Units.SI.Inductance	SIunits.Inductance
Lrsigmad	Units.SI.Inductance	SIunits.Inductance
Lrsigmaq	Units.SI.Inductance	SIunits.Inductance
Rrd	Units.SI.Resistance	SIunits.Resistance
Rrq	Units.SI.Resistance	SIunits.Resistance
Re	Units.SI.Resistance	SIunits.Resistance

record Electrical.Machines.Utilities.TransformerData

Component	Modelica 4.0.0	Modelica 3.2.3
f	Units.SI.Frequency	SIunits.Frequency
V1	Units.SI.Voltage	SIunits.Voltage
V2	Units.SI.Voltage	SIunits.Voltage
SNominal	Units.SI.ApparentPower	SIunits.ApparentPower
P_sc	Units.SI.Power	SIunits.Power
V1ph	Units.SI.Voltage	SIunits.Voltage
I1ph	Units.SI.Current	SIunits.Current
V2ph	Units.SI.Voltage	SIunits.Voltage
I2ph	Units.SI.Current	SIunits.Current
Z1ph	Units.SI.Impedance	SIunits.Impedance
R1	Units.SI.Resistance	SIunits.Resistance
L1sigma	Units.SI.Inductance	SIunits.Inductance
Z2ph	Units.SI.Impedance	SIunits.Impedance
R2	Units.SI.Resistance	SIunits.Resistance
L2sigma	Units.SI.Inductance	SIunits.Inductance

model Electrical.PowerConverters.Examples.ACDC.Rectifier1Pulse.Thyristor1Pulse_R

Component	Modelica 4.0.0	Modelica 3.2.3
constantFiringAngle	Units.SI.Angle	SIunits.Angle
R	Units.SI.Resistance	SIunits.Resistance

model Electrical.PowerConverters.Examples.ACDC.Rectifier1Pulse.Thyristor1Pulse_R_Characteristic

Component	Modelica 4.0.0	Modelica 3.2.3
R	Units.SI.Resistance	SIunits.Resistance

model Electrical.PowerConverters.Examples.ACDC.RectifierBridge2Pulse.DiodeBridge2Pulse

Component	Modelica 4.0.0	Modelica 3.2.3
Vrms	Units.SI.Voltage	SIunits.Voltage
f	Units.SI.Frequency	SIunits.Frequency
R	Units.SI.Resistance	SIunits.Resistance
sinevoltage	f=f
sinevoltage		freqHz=f

model Electrical.PowerConverters.Examples.ACDC.RectifierBridge2Pulse.HalfControlledBridge2Pulse

Component	Modelica 4.0.0	Modelica 3.2.3
Vrms	Units.SI.Voltage	SIunits.Voltage
f	Units.SI.Frequency	SIunits.Frequency
constantFiringAngle	Units.SI.Angle	SIunits.Angle
R	Units.SI.Resistance	SIunits.Resistance
sinevoltage	f=f
sinevoltage		freqHz=f

model Electrical.PowerConverters.Examples.ACDC.RectifierBridge2Pulse.ThyristorBridge2Pulse_R

Component	Modelica 4.0.0	Modelica 3.2.3
constantFiringAngle	Units.SI.Angle	SIunits.Angle
R	Units.SI.Resistance	SIunits.Resistance

model Electrical.PowerConverters.Examples.ACDC.RectifierBridge2Pulse.ThyristorBridge2Pulse_RL

Component	Modelica 4.0.0	Modelica 3.2.3
constantFiringAngle	Units.SI.Angle	SIunits.Angle
R	Units.SI.Resistance	SIunits.Resistance
L	Units.SI.Inductance	SIunits.Inductance

model Electrical.PowerConverters.Examples.ACDC.RectifierBridge2Pulse.ThyristorBridge2Pulse_RLV

Component	Modelica 4.0.0	Modelica 3.2.3
constantFiringAngle	Units.SI.Angle	SIunits.Angle
R	Units.SI.Resistance	SIunits.Resistance
L	Units.SI.Inductance	SIunits.Inductance
VDC	Units.SI.Voltage	SIunits.Voltage

model Electrical.PowerConverters.Examples.ACDC.RectifierBridge2Pulse.ThyristorBridge2Pulse_RLV_Characteristic

Component	Modelica 4.0.0	Modelica 3.2.3
Vdi0	Units.SI.Voltage	SIunits.Voltage
R	Units.SI.Resistance	SIunits.Resistance
L	Units.SI.Inductance	SIunits.Inductance
VDC	Units.SI.Voltage	SIunits.Voltage

model Electrical.PowerConverters.Examples.ACDC.RectifierBridge2Pulse.ThyristorBridge2Pulse_DC_Drive

Component	Modelica 4.0.0	Modelica 3.2.3
Vrms	Units.SI.Voltage	SIunits.Voltage
f	Units.SI.Frequency	SIunits.Frequency
SMains	Units.SI.ApparentPower	SIunits.ApparentPower
ZMains	Units.SI.Impedance	SIunits.Impedance
RMains	Units.SI.Resistance	SIunits.Resistance
LMains	Units.SI.Inductance	SIunits.Inductance
Ld	Units.SI.Inductance	SIunits.Inductance
tauNominal	Units.SI.Torque	SIunits.Torque
w	Units.SI.AngularVelocity	SIunits.AngularVelocity
tau	Units.SI.Torque	SIunits.Torque
sinevoltage	f=f
sinevoltage		freqHz=f

model Electrical.PowerConverters.Examples.ACDC.RectifierCenterTap2Pulse.DiodeCenterTap2Pulse

Component	Modelica 4.0.0	Modelica 3.2.3
Vrms	Units.SI.Voltage	SIunits.Voltage
f	Units.SI.Frequency	SIunits.Frequency
R	Units.SI.Resistance	SIunits.Resistance
sinevoltage_n	f=f
sinevoltage_n		freqHz=f
sinevoltage_p	f=f
sinevoltage_p		freqHz=f

model Electrical.PowerConverters.Examples.ACDC.RectifierCenterTap2Pulse.ThyristorCenterTap2Pulse_R

Component	Modelica 4.0.0	Modelica 3.2.3
constantFiringAngle	Units.SI.Angle	SIunits.Angle
R	Units.SI.Resistance	SIunits.Resistance

model Electrical.PowerConverters.Examples.ACDC.RectifierCenterTap2Pulse.ThyristorCenterTap2Pulse_RL

Component	Modelica 4.0.0	Modelica 3.2.3
constantFiringAngle	Units.SI.Angle	SIunits.Angle
R	Units.SI.Resistance	SIunits.Resistance
L	Units.SI.Inductance	SIunits.Inductance

model Electrical.PowerConverters.Examples.ACDC.RectifierCenterTap2Pulse.ThyristorCenterTap2Pulse_RLV

Component	Modelica 4.0.0	Modelica 3.2.3
constantFiringAngle	Units.SI.Angle	SIunits.Angle
R	Units.SI.Resistance	SIunits.Resistance
L	Units.SI.Inductance	SIunits.Inductance
VDC	Units.SI.Voltage	SIunits.Voltage

model Electrical.PowerConverters.Examples.ACDC.RectifierCenterTap2Pulse.ThyristorCenterTap2Pulse_RLV_Characteristic

Component	Modelica 4.0.0	Modelica 3.2.3
R	Units.SI.Resistance	SIunits.Resistance
L	Units.SI.Inductance	SIunits.Inductance
VDC	Units.SI.Voltage	SIunits.Voltage

model Electrical.PowerConverters.Examples.ACDC.RectifierCenterTapmPulse.DiodeCenterTapmPulse

Component	Modelica 4.0.0	Modelica 3.2.3
Vrms	Units.SI.Voltage	SIunits.Voltage
f	Units.SI.Frequency	SIunits.Frequency
R	Units.SI.Resistance	SIunits.Resistance
star	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
sineVoltage_p	Electrical.Polyphase.Sources.SineVoltage	Electrical.MultiPhase.Sources.SineVoltage

model Electrical.PowerConverters.Examples.ACDC.RectifierCenterTapmPulse.ThyristorCenterTapmPulse_R

Component	Modelica 4.0.0	Modelica 3.2.3
constantFiringAngle	Units.SI.Angle	SIunits.Angle
R	Units.SI.Resistance	SIunits.Resistance

model Electrical.PowerConverters.Examples.ACDC.RectifierCenterTapmPulse.ThyristorCenterTapmPulse_RL

Component	Modelica 4.0.0	Modelica 3.2.3
constantFiringAngle	Units.SI.Angle	SIunits.Angle
R	Units.SI.Resistance	SIunits.Resistance
L	Units.SI.Inductance	SIunits.Inductance

model Electrical.PowerConverters.Examples.ACDC.RectifierCenterTapmPulse.ThyristorCenterTapmPulse_RLV

Component	Modelica 4.0.0	Modelica 3.2.3
constantFiringAngle	Units.SI.Angle	SIunits.Angle
R	Units.SI.Resistance	SIunits.Resistance
L	Units.SI.Inductance	SIunits.Inductance
VDC	Units.SI.Voltage	SIunits.Voltage

model Electrical.PowerConverters.Examples.ACDC.RectifierCenterTapmPulse.ThyristorCenterTapmPulse_RLV_Characteristic

Component	Modelica 4.0.0	Modelica 3.2.3
R	Units.SI.Resistance	SIunits.Resistance
L	Units.SI.Inductance	SIunits.Inductance
VDC	Units.SI.Voltage	SIunits.Voltage

model Electrical.PowerConverters.Examples.ACDC.RectifierBridge2mPulse.DiodeBridge2mPulse

Component	Modelica 4.0.0	Modelica 3.2.3
Vrms	Units.SI.Voltage	SIunits.Voltage
f	Units.SI.Frequency	SIunits.Frequency
R	Units.SI.Resistance	SIunits.Resistance
sineVoltage	Electrical.Polyphase.Sources.SineVoltage	Electrical.MultiPhase.Sources.SineVoltage
multiStarResistance	Electrical.Polyphase.Basic.MultiStarResistance	Electrical.MultiPhase.Basic.MultiStarResistance

model Electrical.PowerConverters.Examples.ACDC.RectifierBridge2mPulse.HalfControlledBridge2mPulse

Component	Modelica 4.0.0	Modelica 3.2.3
Vrms	Units.SI.Voltage	SIunits.Voltage
f	Units.SI.Frequency	SIunits.Frequency
constantFiringAngle	Units.SI.Angle	SIunits.Angle
R	Units.SI.Resistance	SIunits.Resistance
sineVoltage	Electrical.Polyphase.Sources.SineVoltage	Electrical.MultiPhase.Sources.SineVoltage
multiStarResistance	Electrical.Polyphase.Basic.MultiStarResistance	Electrical.MultiPhase.Basic.MultiStarResistance

model Electrical.PowerConverters.Examples.ACDC.RectifierBridge2mPulse.ThyristorBridge2mPulse_R

Component	Modelica 4.0.0	Modelica 3.2.3
constantFiringAngle	Units.SI.Angle	SIunits.Angle
R	Units.SI.Resistance	SIunits.Resistance

model Electrical.PowerConverters.Examples.ACDC.RectifierBridge2mPulse.ThyristorBridge2mPulse_RL

Component	Modelica 4.0.0	Modelica 3.2.3
constantFiringAngle	Units.SI.Angle	SIunits.Angle
R	Units.SI.Resistance	SIunits.Resistance
L	Units.SI.Inductance	SIunits.Inductance

model Electrical.PowerConverters.Examples.ACDC.RectifierBridge2mPulse.ThyristorBridge2mPulse_RLV

Component	Modelica 4.0.0	Modelica 3.2.3
constantFiringAngle	Units.SI.Angle	SIunits.Angle
R	Units.SI.Resistance	SIunits.Resistance
L	Units.SI.Inductance	SIunits.Inductance
VDC	Units.SI.Voltage	SIunits.Voltage

model Electrical.PowerConverters.Examples.ACDC.RectifierBridge2mPulse.ThyristorBridge2mPulse_RLV_Characteristic

Component	Modelica 4.0.0	Modelica 3.2.3
Vdi0	Units.SI.Voltage	SIunits.Voltage
R	Units.SI.Resistance	SIunits.Resistance
L	Units.SI.Inductance	SIunits.Inductance
VDC	Units.SI.Voltage	SIunits.Voltage

model Electrical.PowerConverters.Examples.ACDC.RectifierBridge2mPulse.ThyristorBridge2mPulse_DC_Drive

Component	Modelica 4.0.0	Modelica 3.2.3
Vrms	Units.SI.Voltage	SIunits.Voltage
f	Units.SI.Frequency	SIunits.Frequency
SMains	Units.SI.ApparentPower	SIunits.ApparentPower
ZMains	Units.SI.Impedance	SIunits.Impedance
RMains	Units.SI.Resistance	SIunits.Resistance
LMains	Units.SI.Inductance	SIunits.Inductance
Ld	Units.SI.Inductance	SIunits.Inductance
tauNominal	Units.SI.Torque	SIunits.Torque
w	Units.SI.AngularVelocity	SIunits.AngularVelocity
tau	Units.SI.Torque	SIunits.Torque
sinevoltage	Electrical.Polyphase.Sources.SineVoltage	Electrical.MultiPhase.Sources.SineVoltage
rMains	Electrical.Polyphase.Basic.Resistor	Electrical.MultiPhase.Basic.Resistor
lMains	Electrical.Polyphase.Basic.Inductor	Electrical.MultiPhase.Basic.Inductor
earthing	Electrical.Polyphase.Basic.MultiStarResistance	Electrical.MultiPhase.Basic.MultiStarResistance

model Electrical.PowerConverters.Examples.ACDC.RectifierCenterTap2mPulse.DiodeCenterTap2mPulse

Component	Modelica 4.0.0	Modelica 3.2.3
Vrms	Units.SI.Voltage	SIunits.Voltage
f	Units.SI.Frequency	SIunits.Frequency
R	Units.SI.Resistance	SIunits.Resistance
star	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
sineVoltage_p	Electrical.Polyphase.Sources.SineVoltage	Electrical.MultiPhase.Sources.SineVoltage
sineVoltage_n	Electrical.Polyphase.Sources.SineVoltage	Electrical.MultiPhase.Sources.SineVoltage

model Electrical.PowerConverters.Examples.ACDC.RectifierCenterTap2mPulse.ThyristorCenterTap2mPulse_R

Component	Modelica 4.0.0	Modelica 3.2.3
constantFiringAngle	Units.SI.Angle	SIunits.Angle
R	Units.SI.Resistance	SIunits.Resistance

model Electrical.PowerConverters.Examples.ACDC.RectifierCenterTap2mPulse.ThyristorCenterTap2mPulse_RL

Component	Modelica 4.0.0	Modelica 3.2.3
constantFiringAngle	Units.SI.Angle	SIunits.Angle
R	Units.SI.Resistance	SIunits.Resistance
L	Units.SI.Inductance	SIunits.Inductance

model Electrical.PowerConverters.Examples.ACDC.RectifierCenterTap2mPulse.ThyristorCenterTap2mPulse_RLV

Component	Modelica 4.0.0	Modelica 3.2.3
constantFiringAngle	Units.SI.Angle	SIunits.Angle
R	Units.SI.Resistance	SIunits.Resistance
L	Units.SI.Inductance	SIunits.Inductance
VDC	Units.SI.Voltage	SIunits.Voltage

model Electrical.PowerConverters.Examples.ACDC.RectifierCenterTap2mPulse.ThyristorCenterTap2mPulse_RLV_Characteristic

Component	Modelica 4.0.0	Modelica 3.2.3
R	Units.SI.Resistance	SIunits.Resistance
L	Units.SI.Inductance	SIunits.Inductance
VDC	Units.SI.Voltage	SIunits.Voltage

model Electrical.PowerConverters.Examples.ACDC.ExampleTemplates.Thyristor1Pulse

Component	Modelica 4.0.0	Modelica 3.2.3
Vrms	Units.SI.Voltage	SIunits.Voltage
f	Units.SI.Frequency	SIunits.Frequency
sinevoltage	f=f
sinevoltage		freqHz=f

model Electrical.PowerConverters.Examples.ACDC.ExampleTemplates.ThyristorBridge2Pulse

Component	Modelica 4.0.0	Modelica 3.2.3
Vrms	Units.SI.Voltage	SIunits.Voltage
f	Units.SI.Frequency	SIunits.Frequency
sinevoltage	f=f
sinevoltage		freqHz=f

model Electrical.PowerConverters.Examples.ACDC.ExampleTemplates.ThyristorCenterTap2Pulse

Component	Modelica 4.0.0	Modelica 3.2.3
Vrms	Units.SI.Voltage	SIunits.Voltage
f	Units.SI.Frequency	SIunits.Frequency
sinevoltage_n	f=f
sinevoltage_n		freqHz=f
sinevoltage_p	f=f
sinevoltage_p		freqHz=f

model Electrical.PowerConverters.Examples.ACDC.ExampleTemplates.ThyristorCenterTapmPulse

Component	Modelica 4.0.0	Modelica 3.2.3
Vrms	Units.SI.Voltage	SIunits.Voltage
f	Units.SI.Frequency	SIunits.Frequency
star	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
sineVoltage_p	Electrical.Polyphase.Sources.SineVoltage	Electrical.MultiPhase.Sources.SineVoltage

model Electrical.PowerConverters.Examples.ACDC.ExampleTemplates.ThyristorBridge2mPulse

Component	Modelica 4.0.0	Modelica 3.2.3
Vrms	Units.SI.Voltage	SIunits.Voltage
f	Units.SI.Frequency	SIunits.Frequency
sineVoltage	Electrical.Polyphase.Sources.SineVoltage	Electrical.MultiPhase.Sources.SineVoltage
multiStarResistance	Electrical.Polyphase.Basic.MultiStarResistance	Electrical.MultiPhase.Basic.MultiStarResistance

model Electrical.PowerConverters.Examples.ACDC.ExampleTemplates.ThyristorCenterTap2mPulse

Component	Modelica 4.0.0	Modelica 3.2.3
Vrms	Units.SI.Voltage	SIunits.Voltage
f	Units.SI.Frequency	SIunits.Frequency
star	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
sineVoltage_p	Electrical.Polyphase.Sources.SineVoltage	Electrical.MultiPhase.Sources.SineVoltage
sineVoltage_n	Electrical.Polyphase.Sources.SineVoltage	Electrical.MultiPhase.Sources.SineVoltage

model Electrical.PowerConverters.Examples.DCAC.SinglePhaseTwoLevel.SinglePhaseTwoLevel_R

Component	Modelica 4.0.0	Modelica 3.2.3
R	Units.SI.Resistance	SIunits.Resistance
f1	Units.SI.Frequency	SIunits.Frequency

model Electrical.PowerConverters.Examples.DCAC.SinglePhaseTwoLevel.SinglePhaseTwoLevel_RL

Component	Modelica 4.0.0	Modelica 3.2.3
R	Units.SI.Resistance	SIunits.Resistance
L	Units.SI.Inductance	SIunits.Inductance
f1	Units.SI.Frequency	SIunits.Frequency

model Electrical.PowerConverters.Examples.DCAC.ExampleTemplates.SinglePhaseTwoLevel

Component	Modelica 4.0.0	Modelica 3.2.3
f	Units.SI.Frequency	SIunits.Frequency
sine	f=50
sine		freqHz=50

model Electrical.PowerConverters.Examples.DCDC.ChopperStepDown.ChopperStepDown_R

Component	Modelica 4.0.0	Modelica 3.2.3
loadResistor	Present
loadResistor
adaptor	Present
adaptor
vRef	Present
vRef
R		Present
resistor		Present
resistor

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
connect(loadResistor.n, currentSensor.p);	connect(chopperStepDown.dc_p2, resistor.p);
connect(loadResistor.p, capacitor.p);	connect(resistor.n, currentSensor.p);
connect(adaptor.dutyCycle, signalPWM.dutyCycle); connect(vRef.y, adaptor.v);

model Electrical.PowerConverters.Examples.DCDC.ChopperStepDown.ChopperStepDown_RL

Component	Modelica 4.0.0	Modelica 3.2.3
LLoad	Present
loadResistor	Present
loadResistor
loadInductor	Present
loadInductor
adaptor	Present
adaptor
vRef	Present
vRef
R		Present
L		Present
resistor		Present
resistor
inductor		Present
inductor

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
connect(loadResistor.p, capacitor.p);	connect(chopperStepDown.dc_p2, resistor.p);
connect(loadInductor.n, currentSensor.p);	connect(resistor.n, inductor.p);
connect(loadResistor.n, loadInductor.p);	connect(inductor.n, currentSensor.p);
connect(adaptor.dutyCycle, signalPWM.dutyCycle); connect(adaptor.v, vRef.y);

model Electrical.PowerConverters.Examples.DCDC.ChopperStepUp.ChopperStepUp_R

Component	Modelica 4.0.0	Modelica 3.2.3
loadResistor	Present
loadResistor
adaptor	Present
adaptor
vRef	Present
vRef
R		Present
resistor		Present
resistor

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
connect(loadResistor.n, currentSensor.p);	connect(resistor.n, currentSensor.p);
connect(loadResistor.p, capacitor.p);	connect(capacitor.p, resistor.p);
connect(adaptor.dutyCycle, signalPWM.dutyCycle); connect(vRef.y, adaptor.v);

model Electrical.PowerConverters.Examples.DCDC.HBridge.HBridge_R

Component	Modelica 4.0.0	Modelica 3.2.3
R	Units.SI.Resistance	SIunits.Resistance

model Electrical.PowerConverters.Examples.DCDC.HBridge.HBridge_RL

Component	Modelica 4.0.0	Modelica 3.2.3
R	Units.SI.Resistance	SIunits.Resistance
L	Units.SI.Inductance	SIunits.Inductance

model Electrical.PowerConverters.Examples.DCDC.HBridge.HBridge_DC_Drive

Component	Modelica 4.0.0	Modelica 3.2.3
Ld	Units.SI.Inductance	SIunits.Inductance
tauNominal	Units.SI.Torque	SIunits.Torque

model Electrical.PowerConverters.Examples.DCDC.ExampleTemplates.ChopperStepDown

Component	Modelica 4.0.0	Modelica 3.2.3
f	Units.SI.Frequency	SIunits.Frequency
Vsource	Units.SI.Voltage	SIunits.Voltage
dutyCycle	=0.20	=0.25
V0	Units.SI.Voltage	SIunits.Voltage
chopperStepDown		useHeatPort=false
signalPWM	constantDutyCycle=dutyCycle
	f=f
		final constantDutyCycle=dutyCycle
		final f=f
L	Present
C	Present
ILoad	Present
RLoad	Present
inductor	Present
inductor
capacitor	Present
capacitor

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... connect(constantVoltage.n, chopperStepDown.dc_n1);
	connect(chopperStepDown.dc_p2, voltageSensor.p);
connect(voltageSensor.n, currentSensor.p);
	connect(currentSensor.n, chopperStepDown.dc_n2);
connect(constantVoltage.n, ground.p); ... connect(signalPWM.fire, chopperStepDown.fire_p);
connect(chopperStepDown.dc_p2, inductor.p); connect(inductor.n, capacitor.p); connect(voltageSensor.p, capacitor.p); connect(chopperStepDown.dc_n2, capacitor.n); connect(capacitor.n, currentSensor.n);

model Electrical.PowerConverters.Examples.DCDC.ExampleTemplates.ChopperStepUp

Component	Modelica 4.0.0	Modelica 3.2.3
f	Units.SI.Frequency	SIunits.Frequency
Vsource	Units.SI.Voltage	SIunits.Voltage
C	Units.SI.Capacitance	SIunits.Capacitance
dutyCycle	=0.20	=0.25
V0	Units.SI.Voltage	SIunits.Voltage
constantVoltage	V=Vsource
constantVoltage		final V=Vsource
chopperStepUp		useHeatPort=false
signalPWM	constantDutyCycle=dutyCycle
	f=f
		final constantDutyCycle=dutyCycle
		final f=f
L	Present
ILoad	Present
RLoad	Present
inductor	Present
inductor
Lsource		Present
inductorSource		Present
inductorSource

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... connect(signalPWM.fire, chopperStepUp.fire_p);
connect(constantVoltage.p, inductor.p);	connect(constantVoltage.p, inductorSource.p);
connect(inductor.n, chopperStepUp.dc_p1);	connect(inductorSource.n, chopperStepUp.dc_p1);
connect(voltageSensor.p, capacitor.p); ...

model Electrical.PowerConverters.Examples.DCDC.ExampleTemplates.HBridge

Component	Modelica 4.0.0	Modelica 3.2.3
f	Units.SI.Frequency	SIunits.Frequency

block Electrical.PowerConverters.ACDC.Control.Signal2mPulse

Component	Modelica 4.0.0	Modelica 3.2.3
constantFiringAngle	Units.SI.Angle	SIunits.Angle
f	Units.SI.Frequency	SIunits.Frequency
fCut	Units.SI.Frequency	SIunits.Frequency
vStart	Units.SI.Voltage	SIunits.Voltage
firingAngle	unit="rad"
firingAngleMax	Units.SI.Angle	SIunits.Angle
gain	final k=1/pi	final k=1/2/pi/f
limiter	final uMax=min(firingAngleMax, pi)	final uMax=max(Modelica323.Constants.pi, firingAngleMax)
limiter	final uMin=max(firingAngleMin, 0)	final uMin=0
v	each unit="V"
firingAngleMin	Present
greaterNegative	Present
greaterNegative
gainPositive	Present
gainPositive
gainNegative	Present
gainNegative
negativeEqual		Present
negativeEqual

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
assert(firingAngleMax>firingAngleMin, "Signal2mPulse: firingAngleMax has to be greater than firingAngleMin");
connect(positiveThreshold.y, timerPositive.u);
connect(negativeThreshold.y, timerNegative.u);
	connect(timerPositive.y, greaterPositive.u1); connect(negativeEqual.u1, timerNegative.y);
connect(greaterPositive.y, fire_p);
connect(greaterNegative.y, fire_n);	connect(negativeEqual.y, fire_n);
connect(gain.y, replicator.u);
connect(replicator.y, greaterPositive.u2);
connect(replicator.y, greaterNegative.u2);	connect(replicator.y, negativeEqual.u2);
connect(limiter.y, gain.u); ... connect(realPassThrough.y, negativeThreshold.u);
connect(timerPositive.y, gainPositive.u); connect(gainPositive.y, greaterPositive.u1); connect(gainNegative.y, greaterNegative.u1); connect(timerNegative.y, gainNegative.u);

model Electrical.PowerConverters.ACDC.Control.VoltageBridge2Pulse

Component	Modelica 4.0.0	Modelica 3.2.3
f	Units.SI.Frequency	SIunits.Frequency
constantFiringAngle	Units.SI.Angle	SIunits.Angle
firingAngleMax	Units.SI.Angle	SIunits.Angle
fCut	Units.SI.Frequency	SIunits.Frequency
vStart	Units.SI.Voltage	SIunits.Voltage
firingAngle	unit="rad"

model Electrical.PowerConverters.ACDC.Control.VoltageBridge2mPulse

Component	Modelica 4.0.0	Modelica 3.2.3
f	Units.SI.Frequency	SIunits.Frequency
constantFiringAngle	Units.SI.Angle	SIunits.Angle
firingAngleMax	Units.SI.Angle	SIunits.Angle
fCut	Units.SI.Frequency	SIunits.Frequency
vStart	Units.SI.Voltage	SIunits.Voltage
firingAngle	unit="rad"
ac	Electrical.Polyphase.Interfaces.PositivePlug	Electrical.MultiPhase.Interfaces.PositivePlug
delta	Electrical.Polyphase.Basic.MultiDelta	Electrical.MultiPhase.Basic.MultiDelta
voltageSensor	Electrical.Polyphase.Sensors.VoltageSensor	Electrical.MultiPhase.Sensors.VoltageSensor

model Electrical.PowerConverters.ACDC.Control.VoltageCenterTap2mPulse

Component	Modelica 4.0.0	Modelica 3.2.3
f	Units.SI.Frequency	SIunits.Frequency
constantFiringAngle	Units.SI.Angle	SIunits.Angle
firingAngleMax	Units.SI.Angle	SIunits.Angle
fCut	Units.SI.Frequency	SIunits.Frequency
vStart	Units.SI.Voltage	SIunits.Voltage
firingAngle	unit="rad"
ac	Electrical.Polyphase.Interfaces.PositivePlug	Electrical.MultiPhase.Interfaces.PositivePlug
delta	Electrical.Polyphase.Basic.MultiDelta	Electrical.MultiPhase.Basic.MultiDelta
voltageSensor	Electrical.Polyphase.Sensors.PotentialSensor	Electrical.MultiPhase.Sensors.PotentialSensor

block Electrical.PowerConverters.ACDC.Control.Filter

Component	Modelica 4.0.0	Modelica 3.2.3
f	Units.SI.Frequency	SIunits.Frequency
fCut	Units.SI.Frequency	SIunits.Frequency
fa	Units.SI.Frequency	SIunits.Frequency

model Electrical.PowerConverters.ACDC.DiodeBridge2Pulse

Component	Modelica 4.0.0	Modelica 3.2.3
RonDiode	Units.SI.Resistance	SIunits.Resistance
GoffDiode	Units.SI.Conductance	SIunits.Conductance
VkneeDiode	Units.SI.Voltage	SIunits.Voltage

model Electrical.PowerConverters.ACDC.ThyristorBridge2Pulse

Component	Modelica 4.0.0	Modelica 3.2.3
RonThyristor	Units.SI.Resistance	SIunits.Resistance
GoffThyristor	Units.SI.Conductance	SIunits.Conductance
VkneeThyristor	Units.SI.Voltage	SIunits.Voltage

model Electrical.PowerConverters.ACDC.HalfControlledBridge2Pulse

Component	Modelica 4.0.0	Modelica 3.2.3
RonDiode	Units.SI.Resistance	SIunits.Resistance
GoffDiode	Units.SI.Conductance	SIunits.Conductance
VkneeDiode	Units.SI.Voltage	SIunits.Voltage
RonThyristor	Units.SI.Resistance	SIunits.Resistance
GoffThyristor	Units.SI.Conductance	SIunits.Conductance
VkneeThyristor	Units.SI.Voltage	SIunits.Voltage

model Electrical.PowerConverters.ACDC.DiodeCenterTap2Pulse

Component	Modelica 4.0.0	Modelica 3.2.3
RonDiode	Units.SI.Resistance	SIunits.Resistance
GoffDiode	Units.SI.Conductance	SIunits.Conductance
VkneeDiode	Units.SI.Voltage	SIunits.Voltage

model Electrical.PowerConverters.ACDC.ThyristorCenterTap2Pulse

Component	Modelica 4.0.0	Modelica 3.2.3
RonThyristor	Units.SI.Resistance	SIunits.Resistance
GoffThyristor	Units.SI.Conductance	SIunits.Conductance
VkneeThyristor	Units.SI.Voltage	SIunits.Voltage

model Electrical.PowerConverters.ACDC.DiodeCenterTapmPulse

Component	Modelica 4.0.0	Modelica 3.2.3
RonDiode	Units.SI.Resistance	SIunits.Resistance
GoffDiode	Units.SI.Conductance	SIunits.Conductance
VkneeDiode	Units.SI.Voltage	SIunits.Voltage
diode	Electrical.Polyphase.Ideal.IdealDiode	Electrical.MultiPhase.Ideal.IdealDiode
star	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star

model Electrical.PowerConverters.ACDC.ThyristorCenterTapmPulse

Component	Modelica 4.0.0	Modelica 3.2.3
RonThyristor	Units.SI.Resistance	SIunits.Resistance
GoffThyristor	Units.SI.Conductance	SIunits.Conductance
VkneeThyristor	Units.SI.Voltage	SIunits.Voltage
thyristor	Electrical.Polyphase.Ideal.IdealThyristor	Electrical.MultiPhase.Ideal.IdealThyristor
star	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star

model Electrical.PowerConverters.ACDC.DiodeBridge2mPulse

Component	Modelica 4.0.0	Modelica 3.2.3
RonDiode	Units.SI.Resistance	SIunits.Resistance
GoffDiode	Units.SI.Conductance	SIunits.Conductance
VkneeDiode	Units.SI.Voltage	SIunits.Voltage
diode_p	Electrical.Polyphase.Ideal.IdealDiode	Electrical.MultiPhase.Ideal.IdealDiode
diode_n	Electrical.Polyphase.Ideal.IdealDiode	Electrical.MultiPhase.Ideal.IdealDiode
star_p	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
star_n	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star

model Electrical.PowerConverters.ACDC.ThyristorBridge2mPulse

Component	Modelica 4.0.0	Modelica 3.2.3
RonThyristor	Units.SI.Resistance	SIunits.Resistance
GoffThyristor	Units.SI.Conductance	SIunits.Conductance
VkneeThyristor	Units.SI.Voltage	SIunits.Voltage
thyristor_p	Electrical.Polyphase.Ideal.IdealThyristor	Electrical.MultiPhase.Ideal.IdealThyristor
thyristor_n	Electrical.Polyphase.Ideal.IdealThyristor	Electrical.MultiPhase.Ideal.IdealThyristor
star_p	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
star_n	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star

model Electrical.PowerConverters.ACDC.HalfControlledBridge2mPulse

Component	Modelica 4.0.0	Modelica 3.2.3
RonDiode	Units.SI.Resistance	SIunits.Resistance
GoffDiode	Units.SI.Conductance	SIunits.Conductance
VkneeDiode	Units.SI.Voltage	SIunits.Voltage
RonThyristor	Units.SI.Resistance	SIunits.Resistance
GoffThyristor	Units.SI.Conductance	SIunits.Conductance
VkneeThyristor	Units.SI.Voltage	SIunits.Voltage
star_p	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
star_n	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
thyristor_p	Electrical.Polyphase.Ideal.IdealThyristor	Electrical.MultiPhase.Ideal.IdealThyristor
diode_n	Electrical.Polyphase.Ideal.IdealDiode	Electrical.MultiPhase.Ideal.IdealDiode

model Electrical.PowerConverters.ACDC.DiodeCenterTap2mPulse

Component	Modelica 4.0.0	Modelica 3.2.3
RonDiode	Units.SI.Resistance	SIunits.Resistance
GoffDiode	Units.SI.Conductance	SIunits.Conductance
VkneeDiode	Units.SI.Voltage	SIunits.Voltage
diode_p	Electrical.Polyphase.Ideal.IdealDiode	Electrical.MultiPhase.Ideal.IdealDiode
diode_n	Electrical.Polyphase.Ideal.IdealDiode	Electrical.MultiPhase.Ideal.IdealDiode
star_p	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
star_n	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star

model Electrical.PowerConverters.ACDC.ThyristorCenterTap2mPulse

Component	Modelica 4.0.0	Modelica 3.2.3
RonThyristor	Units.SI.Resistance	SIunits.Resistance
GoffThyristor	Units.SI.Conductance	SIunits.Conductance
VkneeThyristor	Units.SI.Voltage	SIunits.Voltage
thyristor_p	Electrical.Polyphase.Ideal.IdealThyristor	Electrical.MultiPhase.Ideal.IdealThyristor
thyristor_n	Electrical.Polyphase.Ideal.IdealThyristor	Electrical.MultiPhase.Ideal.IdealThyristor
star_p	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
star_n	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star

block Electrical.PowerConverters.DCAC.Control.PWM

Component	Modelica 4.0.0	Modelica 3.2.3
pwmType	=PowerConverters.Types.PWMType.SVPWM	=Modelica323.Electrical.PowerConverters.Types.PWMType.SVPWM
f	Units.SI.Frequency	SIunits.Frequency
startTime	Units.SI.Time	SIunits.Time
refType	=PowerConverters.Types.ReferenceType.Triangle3	=Modelica323.Electrical.PowerConverters.Types.ReferenceType.Triangle3

block Electrical.PowerConverters.DCAC.Control.SVPWM

Component	Modelica 4.0.0	Modelica 3.2.3
f	Units.SI.Frequency	SIunits.Frequency
phiRef	Units.SI.Angle	SIunits.Angle
phiPos	Units.SI.Angle	SIunits.Angle
phiSec	Units.SI.Angle	SIunits.Angle
T0	Units.SI.Time	SIunits.Time

block Electrical.PowerConverters.DCAC.Control.IntersectivePWM

Component	Modelica 4.0.0	Modelica 3.2.3
f	Units.SI.Frequency	SIunits.Frequency
startTime	Units.SI.Time	SIunits.Time
refType	=PowerConverters.Types.ReferenceType.Triangle3	=Modelica323.Electrical.PowerConverters.Types.ReferenceType.Triangle3

model Electrical.PowerConverters.DCAC.SinglePhase2Level

Component	Modelica 4.0.0	Modelica 3.2.3
RonTransistor	Units.SI.Resistance	SIunits.Resistance
GoffTransistor	Units.SI.Conductance	SIunits.Conductance
VkneeTransistor	Units.SI.Voltage	SIunits.Voltage
RonDiode	Units.SI.Resistance	SIunits.Resistance
GoffDiode	Units.SI.Conductance	SIunits.Conductance
VkneeDiode	Units.SI.Voltage	SIunits.Voltage

model Electrical.PowerConverters.DCDC.Control.SignalPWM

Component	Modelica 4.0.0	Modelica 3.2.3
f	Units.SI.Frequency	SIunits.Frequency
startTime	Units.SI.Time	SIunits.Time

model Electrical.PowerConverters.DCDC.ChopperStepDown

Component	Modelica 4.0.0	Modelica 3.2.3
RonTransistor	Units.SI.Resistance	SIunits.Resistance
GoffTransistor	Units.SI.Conductance	SIunits.Conductance
VkneeTransistor	Units.SI.Voltage	SIunits.Voltage
RonDiode	Units.SI.Resistance	SIunits.Resistance
GoffDiode	Units.SI.Conductance	SIunits.Conductance
VkneeDiode	Units.SI.Voltage	SIunits.Voltage

model Electrical.PowerConverters.DCDC.ChopperStepUp

Component	Modelica 4.0.0	Modelica 3.2.3
RonTransistor	Units.SI.Resistance	SIunits.Resistance
GoffTransistor	Units.SI.Conductance	SIunits.Conductance
VkneeTransistor	Units.SI.Voltage	SIunits.Voltage
RonDiode	Units.SI.Resistance	SIunits.Resistance
GoffDiode	Units.SI.Conductance	SIunits.Conductance
VkneeDiode	Units.SI.Voltage	SIunits.Voltage

model Electrical.PowerConverters.DCDC.HBridge

Component	Modelica 4.0.0	Modelica 3.2.3
RonTransistor	Units.SI.Resistance	SIunits.Resistance
GoffTransistor	Units.SI.Conductance	SIunits.Conductance
VkneeTransistor	Units.SI.Voltage	SIunits.Voltage
RonDiode	Units.SI.Resistance	SIunits.Resistance
GoffDiode	Units.SI.Conductance	SIunits.Conductance
VkneeDiode	Units.SI.Voltage	SIunits.Voltage

model Electrical.PowerConverters.Interfaces.ACDC.ACtwoPin

Component	Modelica 4.0.0	Modelica 3.2.3
vAC	Units.SI.Voltage	SIunits.Voltage
iAC	Units.SI.Current	SIunits.Current
powerAC	Units.SI.Power	SIunits.Power

model Electrical.PowerConverters.Interfaces.ACDC.ACplug

Component	Modelica 4.0.0	Modelica 3.2.3
ac	Electrical.Polyphase.Interfaces.PositivePlug	Electrical.MultiPhase.Interfaces.PositivePlug
vAC	Units.SI.Voltage	SIunits.Voltage
iAC	Units.SI.Current	SIunits.Current
powerAC	Units.SI.Power	SIunits.Power
powerTotalAC	Units.SI.Power	SIunits.Power

model Electrical.PowerConverters.Interfaces.ACDC.ACtwoPlug

Component	Modelica 4.0.0	Modelica 3.2.3
ac_p	Electrical.Polyphase.Interfaces.PositivePlug	Electrical.MultiPhase.Interfaces.PositivePlug
ac_n	Electrical.Polyphase.Interfaces.NegativePlug	Electrical.MultiPhase.Interfaces.NegativePlug
vAC	Units.SI.Voltage	SIunits.Voltage
iAC	Units.SI.Current	SIunits.Current
powerAC	Units.SI.Power	SIunits.Power
powerTotalAC	Units.SI.Power	SIunits.Power

model Electrical.PowerConverters.Interfaces.ACDC.DCtwoPin

Component	Modelica 4.0.0	Modelica 3.2.3
vDC	Units.SI.Voltage	SIunits.Voltage
iDC	Units.SI.Current	SIunits.Current
powerDC	Units.SI.Power	SIunits.Power

model Electrical.PowerConverters.Interfaces.ACDC.DCpin

Component	Modelica 4.0.0	Modelica 3.2.3
vDC	Units.SI.Voltage	SIunits.Voltage
iDC	Units.SI.Current	SIunits.Current
powerDC	Units.SI.Power	SIunits.Power

model Electrical.PowerConverters.Interfaces.DCAC.DCtwoPin

Component	Modelica 4.0.0	Modelica 3.2.3
vDC	Units.SI.Voltage	SIunits.Voltage
iDC	Units.SI.Current	SIunits.Current
powerDC	Units.SI.Power	SIunits.Power

model Electrical.PowerConverters.Interfaces.DCAC.ACpin

Component	Modelica 4.0.0	Modelica 3.2.3
vAC	Units.SI.Voltage	SIunits.Voltage
iAC	Units.SI.Current	SIunits.Current
powerAC	Units.SI.Power	SIunits.Power

model Electrical.PowerConverters.Interfaces.DCAC.ACplug

Component	Modelica 4.0.0	Modelica 3.2.3
ac	Electrical.Polyphase.Interfaces.PositivePlug	Electrical.MultiPhase.Interfaces.PositivePlug
vAC	Units.SI.Voltage	SIunits.Voltage
iAC	Units.SI.Current	SIunits.Current
powerAC	Units.SI.Power	SIunits.Power
powerTotalAC	Units.SI.Power	SIunits.Power

model Electrical.PowerConverters.Interfaces.DCDC.DCtwoPin1

Component	Modelica 4.0.0	Modelica 3.2.3
vDC1	Units.SI.Voltage	SIunits.Voltage
iDC1	Units.SI.Current	SIunits.Current
powerDC1	Units.SI.Power	SIunits.Power

model Electrical.PowerConverters.Interfaces.DCDC.DCtwoPin2

Component	Modelica 4.0.0	Modelica 3.2.3
vDC2	Units.SI.Voltage	SIunits.Voltage
iDC2	Units.SI.Current	SIunits.Current
powerDC2	Units.SI.Power	SIunits.Power

model Electrical.Spice3.Examples.Oscillator

Component	Modelica 4.0.0	Modelica 3.2.3
c	IC=0
c	UIC=true
c1	IC=0
c1	UIC=true

model Electrical.Spice3.Examples.CoupledInductors

Component	Modelica 4.0.0	Modelica 3.2.3
C1	IC=0
C1	UIC=true
C2	IC=0
C2	UIC=true

model Electrical.Spice3.Basic.R_Resistor

Component	Modelica 4.0.0	Modelica 3.2.3
R	Units.SI.Resistance	SIunits.Resistance

model Electrical.Spice3.Basic.C_Capacitor

Component	Modelica 4.0.0	Modelica 3.2.3
C	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
IC	Units.SI.Voltage	SIunits.Voltage
vinternal	Units.SI.Voltage	SIunits.Voltage

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
initial equation
if UIC then
vinternal = IC;
end if;
...

model Electrical.Spice3.Basic.L_Inductor

Component	Modelica 4.0.0	Modelica 3.2.3
L	Units.SI.Inductance	SIunits.Inductance
IC	Units.SI.Current	SIunits.Current
iinternal	Units.SI.Current	SIunits.Current

model Electrical.Spice3.Basic.K_CoupledInductors

Component	Modelica 4.0.0	Modelica 3.2.3
k	min=0
k	max=1
M	Units.SI.Inductance	SIunits.Inductance

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
assert(k>=0,"Coupling factor must be not negative");
assert(k<=1,"Coupling factor must be less than or equal to one");	assert(k<1,"coupling factor must be less than one");
M = ksqrt(inductiveCouplePin1.LinductiveCouplePin2.L); ...

model Electrical.Spice3.Basic.G_VCC

Component	Modelica 4.0.0	Modelica 3.2.3
transConductance	Units.SI.Conductance	SIunits.Conductance

model Electrical.Spice3.Basic.H_CCV

Component	Modelica 4.0.0	Modelica 3.2.3
transResistance	Units.SI.Resistance	SIunits.Resistance

model Electrical.Spice3.Sources.V_constant

Component	Modelica 4.0.0	Modelica 3.2.3
V	Units.SI.Voltage	SIunits.Voltage

model Electrical.Spice3.Sources.V_sin

Component	Modelica 4.0.0	Modelica 3.2.3
VO	Units.SI.Voltage	SIunits.Voltage
VA	Units.SI.Voltage	SIunits.Voltage
FREQ	Units.SI.Frequency	SIunits.Frequency
TD	Units.SI.Time	SIunits.Time
THETA	Units.SI.Damping	SIunits.Damping

model Electrical.Spice3.Sources.V_exp

Component	Modelica 4.0.0	Modelica 3.2.3
V1	Units.SI.Voltage	SIunits.Voltage
V2	Units.SI.Voltage	SIunits.Voltage
TD1	Units.SI.Time	SIunits.Time
TAU1	Units.SI.Time	SIunits.Time
TD2	Units.SI.Time	SIunits.Time
TAU2	Units.SI.Time	SIunits.Time

model Electrical.Spice3.Sources.V_pulse

Component	Modelica 4.0.0	Modelica 3.2.3
V1	Units.SI.Voltage	SIunits.Voltage
V2	Units.SI.Voltage	SIunits.Voltage
TD	Units.SI.Time	SIunits.Time
TR	Units.SI.Time	SIunits.Time
TF	Units.SI.Time	SIunits.Time
PW	Units.SI.Time	SIunits.Time
PER	Units.SI.Time	SIunits.Time
Trising	Units.SI.Time	SIunits.Time
Twidth	Units.SI.Time	SIunits.Time
Tfalling	Units.SI.Time	SIunits.Time
T0	Units.SI.Time	SIunits.Time

model Electrical.Spice3.Sources.V_sffm

Component	Modelica 4.0.0	Modelica 3.2.3
VO	Units.SI.Voltage	SIunits.Voltage
VA	Units.SI.Voltage	SIunits.Voltage
FC	Units.SI.Frequency	SIunits.Frequency
FS	Units.SI.Frequency	SIunits.Frequency

model Electrical.Spice3.Sources.I_constant

Component	Modelica 4.0.0	Modelica 3.2.3
I	Units.SI.Current	SIunits.Current

model Electrical.Spice3.Sources.I_sin

Component	Modelica 4.0.0	Modelica 3.2.3
IO	Units.SI.Current	SIunits.Current
IA	Units.SI.Current	SIunits.Current
FREQ	Units.SI.Frequency	SIunits.Frequency
TD	Units.SI.Time	SIunits.Time
THETA	Units.SI.Damping	SIunits.Damping

model Electrical.Spice3.Sources.I_exp

Component	Modelica 4.0.0	Modelica 3.2.3
I1	Units.SI.Current	SIunits.Current
I2	Units.SI.Current	SIunits.Current
TD1	Units.SI.Time	SIunits.Time
TAU1	Units.SI.Time	SIunits.Time
TD2	Units.SI.Time	SIunits.Time
TAU2	Units.SI.Time	SIunits.Time

model Electrical.Spice3.Sources.I_pulse

Component	Modelica 4.0.0	Modelica 3.2.3
I1	Units.SI.Current	SIunits.Current
I2	Units.SI.Current	SIunits.Current
TD	Units.SI.Time	SIunits.Time
TR	Units.SI.Time	SIunits.Time
TF	Units.SI.Time	SIunits.Time
PW	Units.SI.Time	SIunits.Time
PER	Units.SI.Time	SIunits.Time
Trising	Units.SI.Time	SIunits.Time
Twidth	Units.SI.Time	SIunits.Time
Tfalling	Units.SI.Time	SIunits.Time
T0	Units.SI.Time	SIunits.Time

model Electrical.Spice3.Sources.I_sffm

Component	Modelica 4.0.0	Modelica 3.2.3
IO	Units.SI.Current	SIunits.Current
IA	Units.SI.Current	SIunits.Current
FC	Units.SI.Frequency	SIunits.Frequency
FS	Units.SI.Frequency	SIunits.Frequency

function Electrical.Spice3.Additionals.poly

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... ia = 0;
if n == 1 and na == 1 then	if (na == 1) then
v = a[1] * s[1]; ...

model Electrical.Spice3.Interfaces.TwoPortControlledSources

Component	Modelica 4.0.0	Modelica 3.2.3
v1	Units.SI.Voltage	SIunits.Voltage
v2	Units.SI.Voltage	SIunits.Voltage
i1	Units.SI.Current	SIunits.Current
i2	Units.SI.Current	SIunits.Current

connector Electrical.Spice3.Interfaces.InductiveCouplePinIn

Component	Modelica 4.0.0	Modelica 3.2.3
L	Units.SI.Inductance	SIunits.Inductance
di	Units.SI.CurrentSlope	SIunits.CurrentSlope
v	Units.SI.Voltage	SIunits.Voltage

connector Electrical.Spice3.Interfaces.InductiveCouplePinOut

Component	Modelica 4.0.0	Modelica 3.2.3
L	Units.SI.Inductance	SIunits.Inductance
di	Units.SI.CurrentSlope	SIunits.CurrentSlope
v	Units.SI.Voltage	SIunits.Voltage

model Electrical.Spice3.Interfaces.ConditionalSubstrate

Component	Modelica 4.0.0	Modelica 3.2.3
substrateVoltage	Units.SI.Voltage	SIunits.Voltage
substrateCurrent	Units.SI.Current	SIunits.Current

model Electrical.Spice3.Internal.MOS

Component	Modelica 4.0.0	Modelica 3.2.3
L	Units.SI.Length	SIunits.Length
W	Units.SI.Length	SIunits.Length
AD	Units.SI.Area	SIunits.Area
AS	Units.SI.Area	SIunits.Area
PD	Units.SI.Length	SIunits.Length
PS	Units.SI.Length	SIunits.Length
IC	Units.SI.Voltage	SIunits.Voltage
TEMP	Units.NonSI.Temperature_degC	SIunits.Temp_C
Dinternal	Units.SI.Voltage	SIunits.Voltage
Sinternal	Units.SI.Voltage	SIunits.Voltage
ird	Units.SI.Current	SIunits.Current
irs	Units.SI.Current	SIunits.Current
ibdgmin	Units.SI.Current	SIunits.Current
ibsgmin	Units.SI.Current	SIunits.Current
icBD	Units.SI.Current	SIunits.Current
icBS	Units.SI.Current	SIunits.Current
icGB	Units.SI.Current	SIunits.Current
icGS	Units.SI.Current	SIunits.Current
icGD	Units.SI.Current	SIunits.Current
vDS	Units.SI.Voltage	SIunits.Voltage
vGS	Units.SI.Voltage	SIunits.Voltage

record Electrical.Spice3.Internal.ModelcardMOS

Component	Modelica 4.0.0	Modelica 3.2.3
VTO	Units.SI.Voltage	SIunits.Voltage
KP	Units.SI.Transconductance	SIunits.Transconductance
PHI	Units.SI.Voltage	SIunits.Voltage
LAMBDA	Units.SI.InversePotential	SIunits.InversePotential
RD	Units.SI.Resistance	SIunits.Resistance
RS	Units.SI.Resistance	SIunits.Resistance
CBD	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
CBS	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
IS	Units.SI.Current	SIunits.Current
PB	Units.SI.Voltage	SIunits.Voltage
CGSO	Units.SI.Permittivity	SIunits.Permittivity
CGDO	Units.SI.Permittivity	SIunits.Permittivity
CGBO	Units.SI.Permittivity	SIunits.Permittivity
RSH	Units.SI.Resistance	SIunits.Resistance
CJ	Units.SI.CapacitancePerArea	SIunits.CapacitancePerArea
CJSW	Units.SI.Permittivity	SIunits.Permittivity
JS	Units.SI.CurrentDensity	SIunits.CurrentDensity
TOX	Units.SI.Length	SIunits.Length
NSS	Units.NonSI.PerArea_cm	SIunits.Conversions.NonSIunits.PerArea_cm
LD	Units.SI.Length	SIunits.Length
UO	Units.NonSI.Area_cmPerVoltageSecond	SIunits.Conversions.NonSIunits.Area_cmPerVoltageSecond
TNOM	Units.NonSI.Temperature_degC	SIunits.Temp_C

model Electrical.Spice3.Internal.MOS2

Component	Modelica 4.0.0	Modelica 3.2.3
L	Units.SI.Length	SIunits.Length
W	Units.SI.Length	SIunits.Length
AD	Units.SI.Area	SIunits.Area
AS	Units.SI.Area	SIunits.Area
PD	Units.SI.Length	SIunits.Length
PS	Units.SI.Length	SIunits.Length
OFF	min=0
OFF	max=1
IC_VDS	Units.SI.Voltage	SIunits.Voltage
IC_VGS	Units.SI.Voltage	SIunits.Voltage
IC_VBS	Units.SI.Voltage	SIunits.Voltage
TEMP	Units.NonSI.Temperature_degC	SIunits.Temp_C
Dinternal	Units.SI.Voltage	SIunits.Voltage
Sinternal	Units.SI.Voltage	SIunits.Voltage
vBD	Units.SI.Voltage	SIunits.Voltage
vBS	Units.SI.Voltage	SIunits.Voltage
vGB	Units.SI.Voltage	SIunits.Voltage
vGD	Units.SI.Voltage	SIunits.Voltage
vGS	Units.SI.Voltage	SIunits.Voltage
ird	Units.SI.Current	SIunits.Current
irs	Units.SI.Current	SIunits.Current
ibdgmin	Units.SI.Current	SIunits.Current
ibsgmin	Units.SI.Current	SIunits.Current
icBD	Units.SI.Current	SIunits.Current
icBS	Units.SI.Current	SIunits.Current
icGB	Units.SI.Current	SIunits.Current
icGS	Units.SI.Current	SIunits.Current
icGD	Units.SI.Current	SIunits.Current
IC	Units.SI.Voltage	SIunits.Voltage
c1	=Spice3.Internal.Mos.mos2CalcInitEquationsRevised(p, m)	=Spice3.Internal.Mos.mos2CalcInitEquations(p, C, vp, m)
c2	=Spice3.Internal.Mos.mos2CalcCalcTempDependenciesRevised(p, m, c1, m_type)	=Spice3.Internal.Mos.mos2CalcCalcTempDependencies(p, C, vp, m, c1, m_type)
p_obsolete	=Spice3.Internal.Mos2.mos2RenameParametersRevised(modelcard)	=Spice3.Internal.Mos2.mos2RenameParameters(modelcard, C)
icqmGB		Present
icqmGS		Present
icqmGD		Present
vDS		Present
qm		Present
cc_obsolete		Present
vp		Present
MOScapgd		Present
MOScapgs		Present
MOScapgb		Present

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... 0 = -irs - cc.idrain - cc.iBS - ibsgmin - icGS - icBS;
	vDS = D.v - S.v; (cc_obsolete,qm) = Spice3.Internal.Mos.mos2CalcNoBypassCode( m, m_type, c2, p, C, vp, m_bInit, {G.v,B.v,Dinternal,Sinternal}); icqmGB = 0; icqmGS = 0; icqmGD = 0;

record Electrical.Spice3.Internal.ModelcardMOS2

Component	Modelica 4.0.0	Modelica 3.2.3
NFS	Units.NonSI.PerArea_cm	SIunits.Conversions.NonSIunits.PerArea_cm
XJ	Units.SI.Length	SIunits.Length
VMAX	Units.SI.Velocity	SIunits.Velocity

model Electrical.Spice3.Internal.BJT2

Component	Modelica 4.0.0	Modelica 3.2.3
IC_VBE	Units.SI.Voltage	SIunits.Voltage
IC_VCE	Units.SI.Voltage	SIunits.Voltage
TEMP	Units.NonSI.Temperature_degC	SIunits.Temp_C
Cinternal	Units.SI.Voltage	SIunits.Voltage
Binternal	Units.SI.Voltage	SIunits.Voltage
Einternal	Units.SI.Voltage	SIunits.Voltage
vbe	Units.SI.Voltage	SIunits.Voltage
vbc	Units.SI.Voltage	SIunits.Voltage
vbx	Units.SI.Voltage	SIunits.Voltage
vcs	Units.SI.Voltage	SIunits.Voltage
irc	Units.SI.Current	SIunits.Current
ire	Units.SI.Current	SIunits.Current
irb	Units.SI.Current	SIunits.Current
ibcgmin	Units.SI.Current	SIunits.Current
ibegmin	Units.SI.Current	SIunits.Current
icapbe	Units.SI.Current	SIunits.Current
icapbc	Units.SI.Current	SIunits.Current
icapbx	Units.SI.Current	SIunits.Current
icapcs	Units.SI.Current	SIunits.Current
icaptt	Units.SI.Current	SIunits.Current

record Electrical.Spice3.Internal.ModelcardBJT2

Component	Modelica 4.0.0	Modelica 3.2.3
TNOM	Units.NonSI.Temperature_degC	SIunits.Temp_C
IS	Units.SI.Current	SIunits.Current
ISE	Units.SI.Current	SIunits.Current
ISC	Units.SI.Current	SIunits.Current
VAF	Units.SI.Voltage	SIunits.Voltage
IKF	Units.SI.Current	SIunits.Current
VAR	Units.SI.Voltage	SIunits.Voltage
IKR	Units.SI.Current	SIunits.Current
RE	Units.SI.Resistance	SIunits.Resistance
RC	Units.SI.Resistance	SIunits.Resistance
IRB	Units.SI.Current	SIunits.Current
RB	Units.SI.Resistance	SIunits.Resistance
RBM	Units.SI.Resistance	SIunits.Resistance
CJE	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
VJE	Units.SI.Voltage	SIunits.Voltage
TF	Units.SI.Time	SIunits.Time
ITF	Units.SI.Current	SIunits.Current
VTF	Units.SI.Voltage	SIunits.Voltage
PTF	Units.SI.Frequency	SIunits.Frequency
CJC	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
VJC	Units.SI.Voltage	SIunits.Voltage
TR	Units.SI.Time	SIunits.Time
CJS	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
VJS	Units.SI.Voltage	SIunits.Voltage
EG	Units.SI.GapEnergy	SIunits.GapEnergy

model Electrical.Spice3.Internal.JFET

Component	Modelica 4.0.0	Modelica 3.2.3
IC_VDS	Units.SI.Voltage	SIunits.Voltage
IC_VGS	Units.SI.Voltage	SIunits.Voltage
TEMP	Units.NonSI.Temperature_degC	SIunits.Temp_C
Dinternal	Units.SI.Voltage	SIunits.Voltage
Sinternal	Units.SI.Voltage	SIunits.Voltage
vGD	Units.SI.Voltage	SIunits.Voltage
vGS	Units.SI.Voltage	SIunits.Voltage
ird	Units.SI.Current	SIunits.Current
irs	Units.SI.Current	SIunits.Current
igdgmin	Units.SI.Current	SIunits.Current
igsgmin	Units.SI.Current	SIunits.Current
icGS	Units.SI.Current	SIunits.Current
icGD	Units.SI.Current	SIunits.Current

record Electrical.Spice3.Internal.ModelcardJFET

Component	Modelica 4.0.0	Modelica 3.2.3
CGS	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
CGD	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
IS	Units.SI.Current	SIunits.Current
RD	Units.SI.Resistance	SIunits.Resistance
RS	Units.SI.Resistance	SIunits.Resistance
TNOM	Units.NonSI.Temperature_degC	SIunits.Temp_C
VTO	Units.SI.Voltage	SIunits.Voltage
B	Units.SI.InversePotential	SIunits.InversePotential
LAMBDA	Units.SI.InversePotential	SIunits.InversePotential
PB	Units.SI.Voltage	SIunits.Voltage

model Electrical.Spice3.Internal.DIODE

Component	Modelica 4.0.0	Modelica 3.2.3
IC	Units.SI.Voltage	SIunits.Voltage
TEMP	Units.NonSI.Temperature_degC	SIunits.Temp_C

record Electrical.Spice3.Internal.ModelcardDIODE

Component	Modelica 4.0.0	Modelica 3.2.3
IS	Units.SI.Current	SIunits.Current
RS	Units.SI.Resistance	SIunits.Resistance
TT	Units.SI.Time	SIunits.Time
CJO	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
VJ	Units.SI.Voltage	SIunits.Voltage
EG	Units.SI.ActivationEnergy	SIunits.ActivationEnergy
BV	Units.SI.Voltage	SIunits.Voltage
IBV	Units.SI.Current	SIunits.Current
TNOM	Units.NonSI.Temperature_degC	SIunits.Temp_C
G	Units.SI.Conductance	SIunits.Conductance

model Electrical.Spice3.Internal.R_SEMI

Component	Modelica 4.0.0	Modelica 3.2.3
R	Units.SI.Resistance	SIunits.Resistance
TEMP	Units.NonSI.Temperature_degC	SIunits.Temp_C
L	Units.SI.Length	SIunits.Length
W	Units.SI.Length	SIunits.Length

record Electrical.Spice3.Internal.ModelcardR

Component	Modelica 4.0.0	Modelica 3.2.3
TC1	Units.SI.LinearTemperatureCoefficientResistance	SIunits.LinearTemperatureCoefficientResistance
TC2	Units.SI.QuadraticTemperatureCoefficientResistance	SIunits.QuadraticTemperatureCoefficientResistance
RSH	Units.SI.Resistance	SIunits.Resistance
TNOM	Units.NonSI.Temperature_degC	SIunits.Temp_C
DEFW	Units.SI.Length	SIunits.Length
NARROW	Units.SI.Length	SIunits.Length

model Electrical.Spice3.Internal.C_SEMI

Component	Modelica 4.0.0	Modelica 3.2.3
C	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
TEMP	Units.NonSI.Temperature_degC	SIunits.Temp_C
L	Units.SI.Length	SIunits.Length
W	Units.SI.Length	SIunits.Length
IC	Units.SI.Voltage	SIunits.Voltage
vinternal	Units.SI.Voltage	SIunits.Voltage

record Electrical.Spice3.Internal.ModelcardC

Component	Modelica 4.0.0	Modelica 3.2.3
CJ	Units.SI.CapacitancePerArea	SIunits.CapacitancePerArea
CJSW	Units.SI.Permittivity	SIunits.Permittivity
DEFW	Units.SI.Length	SIunits.Length
NARROW	Units.SI.Length	SIunits.Length

record Electrical.Spice3.Internal.SpiceConstants

Component	Modelica 4.0.0	Modelica 3.2.3
CHARGE	Units.SI.Charge	SIunits.Charge
CONSTCtoK	Units.SI.Temperature	SIunits.Temp_K
CONSTboltz	Units.SI.HeatCapacity	SIunits.HeatCapacity
REFTEMP	Units.SI.Temperature	SIunits.Temp_K
CONSTvt0	=Modelica400.Constants.k*Modelica400.Units.Conversions.from_degC(27)/CHARGE	=Modelica323.Constants.k*SI.Conversions.from_degC(27)/CHARGE
CKTgmin	Units.SI.Conductance	SIunits.Conductance
CKTnomTemp	Units.SI.Temperature	SIunits.Temp_K
CKTtemp	Units.SI.Temperature	SIunits.Temp_K
CKTdefaultMosAD	Units.SI.Area	SIunits.Area
CKTdefaultMosAS	Units.SI.Area	SIunits.Area
CKTdefaultMosL	Units.SI.Length	SIunits.Length
CKTdefaultMosW	Units.SI.Length	SIunits.Length

record Electrical.Spice3.Internal.MaterialParameters

Component	Modelica 4.0.0	Modelica 3.2.3
EnergyGapSi	Units.SI.GapEnergy	SIunits.GapEnergy
SecondBandCorrFactorSi	Units.SI.Temperature	SIunits.Temperature
BandCorrFactorT300	Units.SI.GapEnergy	SIunits.GapEnergy

function Electrical.Spice3.Internal.Functions.junctionPotDepTemp

Component	Modelica 4.0.0	Modelica 3.2.3
phi0	Units.SI.Voltage	SIunits.Voltage
temp	Units.SI.Temperature	SIunits.Temp_K
tnom	Units.SI.Temperature	SIunits.Temp_K
ret	Units.SI.Voltage	SIunits.Voltage
phibtemp	Units.SI.GapEnergy	SIunits.GapEnergy
phibtnom	Units.SI.GapEnergy	SIunits.GapEnergy
vt	Units.SI.Voltage	SIunits.Voltage
unitGapEnergy	Units.SI.GapEnergy	SIunits.GapEnergy
unitVoltage	Units.SI.Voltage	SIunits.Voltage

function Electrical.Spice3.Internal.Functions.saturationCurDepTempSPICE3MOSFET

Component	Modelica 4.0.0	Modelica 3.2.3
satcur0	Units.SI.Current	SIunits.Current
temp	Units.SI.Temperature	SIunits.Temp_K
tnom	Units.SI.Temperature	SIunits.Temp_K
vt	Units.SI.Voltage	SIunits.Voltage
vtnom	Units.SI.Voltage	SIunits.Voltage
energygaptnom	Units.SI.GapEnergy	SIunits.GapEnergy
energygaptemp	Units.SI.GapEnergy	SIunits.GapEnergy
unitGapEnergy	Units.SI.GapEnergy	SIunits.GapEnergy
unitVoltage	Units.SI.Voltage	SIunits.Voltage

function Electrical.Spice3.Internal.Functions.junctionVCrit

Component	Modelica 4.0.0	Modelica 3.2.3
temp	Units.SI.Temperature	SIunits.Temp_K
satcur	Units.SI.Current	SIunits.Current
vte	Units.SI.Voltage	SIunits.Voltage

function Electrical.Spice3.Internal.Functions.junctionParamDepTempSPICE3

Component	Modelica 4.0.0	Modelica 3.2.3
phi0	Units.SI.Voltage	SIunits.Voltage
temp	Units.SI.Temperature	SIunits.Temp_K
tnom	Units.SI.Temperature	SIunits.Temp_K
junctionpot	Units.SI.Voltage	SIunits.Voltage
phibtemp	Units.SI.GapEnergy	SIunits.GapEnergy
phibtnom	Units.SI.GapEnergy	SIunits.GapEnergy
vt	Units.SI.Voltage	SIunits.Voltage
vtnom	Units.SI.Voltage	SIunits.Voltage
junctioncap	Present
jucntioncap		Present

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... gmanew = (junctionpot-pbo)/pbo;
junctioncap = cap0 / (1+mcoeff* (400e-6(tnom-Spice3.Internal.SpiceConstants.REFTEMP)-gmaold)) (1+mcoeff* (400e-6*(temp-Spice3.Internal.SpiceConstants.REFTEMP)-gmanew));	jucntioncap = cap0 / (1+mcoeff* (400e-6(tnom-Spice3.Internal.SpiceConstants.REFTEMP)-gmaold)) (1+mcoeff* (400e-6*(temp-Spice3.Internal.SpiceConstants.REFTEMP)-gmanew));

function Electrical.Spice3.Internal.Functions.junctionCapCoeffs

Component	Modelica 4.0.0	Modelica 3.2.3
phij	Units.SI.Voltage	SIunits.Voltage
f1	Units.SI.Voltage	SIunits.Voltage

function Electrical.Spice3.Internal.Functions.junction2SPICE3MOSFETRevised

Component	Modelica 4.0.0	Modelica 3.2.3
voltage	Units.SI.Voltage	SIunits.Voltage
temp	Units.SI.Temperature	SIunits.Temp_K
satcur	Units.SI.Current	SIunits.Current
out_current	Units.SI.Current	SIunits.Current
out_cond	Units.SI.Conductance	SIunits.Conductance
vte	Units.SI.Voltage	SIunits.Voltage
max_current	Units.SI.Current	SIunits.Current

function Electrical.Spice3.Internal.Functions.junctionCapRevised

Component	Modelica 4.0.0	Modelica 3.2.3
capin	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
voltage	Units.SI.Voltage	SIunits.Voltage
depcap	Units.SI.Voltage	SIunits.Voltage
f1	Units.SI.Voltage	SIunits.Voltage
capout	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
charge	Units.SI.Charge	SIunits.Charge

function Electrical.Spice3.Internal.Functions.saturationCurDepTempSPICE3

Component	Modelica 4.0.0	Modelica 3.2.3
satcur0	Units.SI.Current	SIunits.Current
temp	Units.SI.Temperature	SIunits.Temp_K
tnom	Units.SI.Temperature	SIunits.Temp_K
ret	Units.SI.Current	SIunits.Current
vt	Units.SI.Voltage	SIunits.Voltage
vte	Units.SI.Voltage	SIunits.Voltage

function Electrical.Spice3.Internal.Functions.junctionVoltage23SPICE3

Component	Modelica 4.0.0	Modelica 3.2.3
vb	Units.SI.Voltage	SIunits.Voltage
ivb	Units.SI.Current	SIunits.Current
satcur	Units.SI.Current	SIunits.Current
temp	Units.SI.Temperature	SIunits.Temp_K
v23	Units.SI.Voltage	SIunits.Voltage
vt	Units.SI.Voltage	SIunits.Voltage
cbv	Units.SI.Current	SIunits.Current

function Electrical.Spice3.Internal.Functions.junction3

Component	Modelica 4.0.0	Modelica 3.2.3
voltage	Units.SI.Voltage	SIunits.Voltage
temp	Units.SI.Temperature	SIunits.Temp_K
satcur	Units.SI.Current	SIunits.Current
v23	Units.SI.Voltage	SIunits.Voltage
current	Units.SI.Current	SIunits.Current
cond	Units.SI.Conductance	SIunits.Conductance
max_current	Units.SI.Current	SIunits.Current
vte	Units.SI.Voltage	SIunits.Voltage
vr	Units.SI.Voltage	SIunits.Voltage

function Electrical.Spice3.Internal.Functions.junctionCapTransTime

Component	Modelica 4.0.0	Modelica 3.2.3
capin	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
voltage	Units.SI.Voltage	SIunits.Voltage
depcap	Units.SI.Voltage	SIunits.Voltage
f1	Units.SI.Voltage	SIunits.Voltage
transittime	Units.SI.Time	SIunits.Time
conduct	Units.SI.Conductance	SIunits.Conductance
current	Units.SI.Current	SIunits.Current
capout	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
charge	Units.SI.Charge	SIunits.Charge

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
(capout,charge) := junctionCapRevised( capin, voltage, depcap, mj, phij, f1, f2, f3);	(capout,charge) := junctionCap( capin, voltage, depcap, mj, phij, f1, f2, f3);
capout = capout + transittime * conduct; ...

function Electrical.Spice3.Internal.Functions.junction2

Component	Modelica 4.0.0	Modelica 3.2.3
voltage	Units.SI.Voltage	SIunits.Voltage
temp	Units.SI.Temperature	SIunits.Temp_K
satcur	Units.SI.Current	SIunits.Current
current	Units.SI.Current	SIunits.Current
cond	Units.SI.Conductance	SIunits.Conductance
vte	Units.SI.Voltage	SIunits.Voltage

function Electrical.Spice3.Internal.Functions.resDepTemp

Component	Modelica 4.0.0	Modelica 3.2.3
resist	Units.SI.Resistance	SIunits.Resistance
temp	Units.SI.Temperature	SIunits.Temp_K
tnom	Units.SI.Temperature	SIunits.Temp_K
conduct	Units.SI.Conductance	SIunits.Conductance

function Electrical.Spice3.Internal.Functions.resDepGeom

Component	Modelica 4.0.0	Modelica 3.2.3
width	Units.SI.Length	SIunits.Length
length	Units.SI.Length	SIunits.Length
narrow	Units.SI.Length	SIunits.Length

function Electrical.Spice3.Internal.Functions.saturationCurDepTempSPICE3JFET

Component	Modelica 4.0.0	Modelica 3.2.3
satcur0	Units.SI.Current	SIunits.Current
temp	Units.SI.Temperature	SIunits.Temp_K
tnom	Units.SI.Temperature	SIunits.Temp_K
ret	Units.SI.Current	SIunits.Current
vt	Units.SI.Voltage	SIunits.Voltage

function Electrical.Spice3.Internal.Functions.capDepGeom

Component	Modelica 4.0.0	Modelica 3.2.3
cap0	Units.SI.CapacitancePerArea	SIunits.CapacitancePerArea
capsw0	Units.SI.Permittivity	SIunits.Permittivity
width	Units.SI.Length	SIunits.Length
length	Units.SI.Length	SIunits.Length
narrow	Units.SI.Length	SIunits.Length
out	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance

function Electrical.Spice3.Internal.Functions.energyGapDepTemp

Component	Modelica 4.0.0	Modelica 3.2.3
temp	Units.SI.Temperature	SIunits.Temp_K
ret	Units.SI.GapEnergy	SIunits.GapEnergy

function Electrical.Spice3.Internal.Functions.junction2SPICE3BJT

Component	Modelica 4.0.0	Modelica 3.2.3
voltage	Units.SI.Voltage	SIunits.Voltage
temp	Units.SI.Temperature	SIunits.Temp_K
satcur1	Units.SI.Current	SIunits.Current
satcur2	Units.SI.Current	SIunits.Current
current1	Units.SI.Current	SIunits.Current
cond1	Units.SI.Conductance	SIunits.Conductance
current2	Units.SI.Current	SIunits.Current
cond2	Units.SI.Conductance	SIunits.Conductance
vte	Units.SI.Voltage	SIunits.Voltage
vtn	Units.SI.Voltage	SIunits.Voltage

function Electrical.Spice3.Internal.Functions.energyGapDepTemp_old

Component	Modelica 4.0.0	Modelica 3.2.3
temp	Units.SI.Temperature	SIunits.Temp_K
ret	Units.SI.Voltage	SIunits.Voltage
gap0	Units.SI.Voltage	SIunits.Voltage
coeff2	Units.SI.Temperature	SIunits.Temp_K

record Electrical.Spice3.Internal.SpiceRoot.SpiceRoot

Component	Modelica 4.0.0	Modelica 3.2.3
m_pCurrentValues	Units.SI.Current	SIunits.Current

function Electrical.Spice3.Internal.SpiceRoot.limitJunctionVoltageRevised

Component	Modelica 4.0.0	Modelica 3.2.3
voltage	Units.SI.Voltage	SIunits.Voltage
ret	Units.SI.Voltage	SIunits.Voltage

record Electrical.Spice3.Internal.Model.Model

Component	Modelica 4.0.0	Modelica 3.2.3
m_dTemp	Units.SI.Temperature	SIunits.Temp_K

record Electrical.Spice3.Internal.Mosfet.Mosfet

Component	Modelica 4.0.0	Modelica 3.2.3
m_len	Units.SI.Length	SIunits.Length
m_width	Units.SI.Length	SIunits.Length
m_drainArea	Units.SI.Area	SIunits.Area
m_sourceArea	Units.SI.Area	SIunits.Area
m_drainPerimeter	Units.SI.Length	SIunits.Length
m_sourcePerimeter	Units.SI.Length	SIunits.Length
m_dICVDS	Units.SI.Voltage	SIunits.Voltage
m_dICVGS	Units.SI.Voltage	SIunits.Voltage
m_dICVBS	Units.SI.Voltage	SIunits.Voltage
m_drainPerimiter		Present
m_sourcePerimiter		Present

record Electrical.Spice3.Internal.Mosfet.MosfetModelLineParams

Component	Modelica 4.0.0	Modelica 3.2.3
m_sheetResistance	Units.SI.Resistance	SIunits.Resistance
m_bulkJctBotGradingCoeff	Units.SI.LinearTemperatureCoefficient	SIunits.LinearTemperatureCoefficient
m_bulkJctSideGradingCoeff	Units.SI.LinearTemperatureCoefficient	SIunits.LinearTemperatureCoefficient

record Electrical.Spice3.Internal.Mosfet.MosfetCalc

Component	Modelica 4.0.0	Modelica 3.2.3
m_vds	Units.SI.Voltage	SIunits.Voltage
m_vgs	Units.SI.Voltage	SIunits.Voltage
m_vbs	Units.SI.Voltage	SIunits.Voltage
m_cbs	Units.SI.Current	SIunits.Current
m_gbs	Units.SI.Conductance	SIunits.Conductance
m_cbd	Units.SI.Current	SIunits.Current
m_gbd	Units.SI.Conductance	SIunits.Conductance
m_cdrain	Units.SI.Current	SIunits.Current
m_gds	Units.SI.Conductance	SIunits.Conductance
m_gm	Units.SI.Transconductance	SIunits.Transconductance
m_gmbs	Units.SI.Transconductance	SIunits.Transconductance
m_capbsb	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
m_chargebsb	Units.SI.Charge	SIunits.Charge
m_capbss	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
m_chargebss	Units.SI.Charge	SIunits.Charge
m_capbdb	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
m_chargebdb	Units.SI.Charge	SIunits.Charge
m_capbds	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
m_chargebds	Units.SI.Charge	SIunits.Charge
m_capGSovl	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
m_capGDovl	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
m_capGBovl	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
m_capOx	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
m_von	Units.SI.Voltage	SIunits.Voltage
m_vdsat	Units.SI.Voltage	SIunits.Voltage
m_lEff	Units.SI.Length	SIunits.Length
m_sourceResistance	Units.SI.Resistance	SIunits.Resistance
m_drainResistance	Units.SI.Resistance	SIunits.Resistance

function Electrical.Spice3.Internal.Mosfet.mosfetRenameParametersDev

Component	Modelica 4.0.0	Modelica 3.2.3
W	Units.SI.Length	SIunits.Length
L	Units.SI.Length	SIunits.Length
AD	Units.SI.Area	SIunits.Area
AS	Units.SI.Area	SIunits.Area
PD	Units.SI.Length	SIunits.Length
PS	Units.SI.Length	SIunits.Length
IC_VDS	Units.SI.Voltage	SIunits.Voltage
IC_VGS	Units.SI.Voltage	SIunits.Voltage
IC_VBS	Units.SI.Voltage	SIunits.Voltage
TEMP	Units.NonSI.Temperature_degC	SIunits.Temp_C

record Electrical.Spice3.Internal.Mos.MosModelLineParams

Component	Modelica 4.0.0	Modelica 3.2.3
m_vt0	Units.SI.Voltage	SIunits.Voltage
m_capBD	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
m_capBS	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
m_bulkCapFactor	Units.SI.CapacitancePerArea	SIunits.CapacitancePerArea
m_sideWallCapFactor	Units.SI.Permittivity	SIunits.Permittivity
m_phi	Units.SI.Voltage	SIunits.Voltage
m_gamma	Units.SI.Voltage	SIunits.Voltage
m_lambda	Units.SI.InversePotential	SIunits.InversePotential
m_surfaceStateDensity	Units.NonSI.PerArea_cm	SIunits.Conversions.NonSIunits.PerArea_cm
m_surfaceMobility	Units.NonSI.Area_cmPerVoltageSecond	SIunits.Conversions.NonSIunits.Area_cmPerVoltageSecond
m_latDiff	Units.SI.Length	SIunits.Length
m_jctSatCur	Units.SI.Current	SIunits.Current
m_drainResistance	Units.SI.Resistance	SIunits.Resistance
m_sourceResistance	Units.SI.Resistance	SIunits.Resistance
m_transconductance	Units.SI.Transconductance	SIunits.Transconductance
m_tnom	Units.SI.Temperature	SIunits.Temp_K

record Electrical.Spice3.Internal.Mos.MosModelLineVariables

Component	Modelica 4.0.0	Modelica 3.2.3
m_vt0	Units.SI.Voltage	SIunits.Voltage
m_phi	Units.SI.Voltage	SIunits.Voltage
m_transconductance	Units.SI.Transconductance	SIunits.Transconductance

record Electrical.Spice3.Internal.Mos.MosCalc

Component	Modelica 4.0.0	Modelica 3.2.3
m_tTransconductance	Units.SI.Transconductance	SIunits.Transconductance
m_tSurfMob	Units.NonSI.Area_cmPerVoltageSecond	SIunits.Conversions.NonSIunits.Area_cmPerVoltageSecond
m_tPhi	Units.SI.Voltage	SIunits.Voltage
m_tVto	Units.SI.Voltage	SIunits.Voltage
m_tSatCurDens	Units.SI.CurrentDensity	SIunits.CurrentDensity
m_tDrainSatCur	Units.SI.Current	SIunits.Current
m_tSourceSatCur	Units.SI.Current	SIunits.Current
m_tCBDb	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
m_tCBDs	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
m_tCBSb	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
m_tCBSs	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
m_tCj	Units.SI.CapacitancePerArea	SIunits.CapacitancePerArea
m_tCjsw	Units.SI.Permittivity	SIunits.Permittivity
m_tBulkPot	Units.SI.Voltage	SIunits.Voltage
m_tDepCap	Units.SI.Voltage	SIunits.Voltage
m_tVbi	Units.SI.Voltage	SIunits.Voltage
m_VBScrit	Units.SI.Voltage	SIunits.Voltage
m_VBDcrit	Units.SI.Voltage	SIunits.Voltage
m_f1b	Units.SI.Voltage	SIunits.Voltage
m_f1s	Units.SI.Voltage	SIunits.Voltage
m_dVt	Units.SI.Voltage	SIunits.Voltage
m_capgd	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
m_capgs	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
m_capgb	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
m_qgs	Units.SI.Charge	SIunits.Charge
m_qgd	Units.SI.Charge	SIunits.Charge
m_qgb	Units.SI.Charge	SIunits.Charge

record Electrical.Spice3.Internal.Mos.DEVqmeyer

Component	Modelica 4.0.0	Modelica 3.2.3
qm_capgb	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
qm_capgs	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
qm_capgd	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
qm_qgs	Units.SI.Charge	SIunits.Charge
qm_qgb	Units.SI.Charge	SIunits.Charge
qm_qgd	Units.SI.Charge	SIunits.Charge
qm_vgs	Units.SI.Voltage	SIunits.Voltage
qm_vgb	Units.SI.Voltage	SIunits.Voltage
qm_vgd	Units.SI.Voltage	SIunits.Voltage

record Electrical.Spice3.Internal.Mos.CurrrentsCapacitances

Component	Modelica 4.0.0	Modelica 3.2.3
idrain	Units.SI.Current	SIunits.Current
iBD	Units.SI.Current	SIunits.Current
iBS	Units.SI.Current	SIunits.Current
cGS	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
cGB	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
cGD	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
cBS	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
cBD	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
m_capgd	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance

function Electrical.Spice3.Internal.Mos.mosCalcNoBypassCode

Component	Modelica 4.0.0	Modelica 3.2.3
in_m_pVoltageValues	Units.SI.Voltage	SIunits.Voltage
vbd	Units.SI.Voltage	SIunits.Voltage
vgd	Units.SI.Voltage	SIunits.Voltage
vgb	Units.SI.Voltage	SIunits.Voltage
cur	Units.SI.Current	SIunits.Current

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... int_c.m_vbs = in_m_type * in_m.m_dICVBS;
elseif ( Spice3.Internal.SpiceRoot.initJunctionVoltagesRevised()) then	elseif ( Spice3.Internal.SpiceRoot.initJunctionVoltages()) then
int_c.m_vbs = if (in_m.m_off >0.5) then 0. else int_c.m_VBScrit; ... int_c.m_vds = in_m_type * in_m.m_dICVDS;
elseif ( Spice3.Internal.SpiceRoot.initJunctionVoltagesRevised()) then	elseif ( Spice3.Internal.SpiceRoot.initJunctionVoltages()) then
int_c.m_vds = if (in_m.m_off > 0.5) then 0. else (int_c.m_VBDcrit - int_c.m_VBScrit); ... int_c.m_vgs = in_m_type * in_m.m_dICVGS;
elseif ( Spice3.Internal.SpiceRoot.initJunctionVoltagesRevised()) then	elseif ( Spice3.Internal.SpiceRoot.initJunctionVoltages()) then
if ( in_m.m_off > 0.5) then ... vgb = int_c.m_vgs - int_c.m_vbs;
(int_c.m_cbd,int_c.m_gbd) = Spice3.Internal.Functions.junction2SPICE3MOSFETRevised( vbd, in_m.m_dTemp, 1.0, int_c.m_tDrainSatCur);	(int_c.m_cbd,int_c.m_gbd) = Spice3.Internal.Functions.junction2SPICE3MOSFET( int_c.m_cbd, int_c.m_gbd, vbd, in_m.m_dTemp, 1.0, int_c.m_tDrainSatCur);
out_cc.iBD = in_m_type * int_c.m_cbd;
(int_c.m_cbs,int_c.m_gbs) = Spice3.Internal.Functions.junction2SPICE3MOSFETRevised( int_c.m_vbs, in_m.m_dTemp, 1.0, int_c.m_tSourceSatCur);	(int_c.m_cbs,int_c.m_gbs) = Spice3.Internal.Functions.junction2SPICE3MOSFET( int_c.m_cbs, int_c.m_gbs, int_c.m_vbs, in_m.m_dTemp, 1.0, int_c.m_tSourceSatCur);
out_cc.iBS = in_m_type * int_c.m_cbs; ... int_c.m_chargebds = 0.0;
(int_c.m_capbsb,int_c.m_chargebsb) = Spice3.Internal.Functions.junctionCapRevised( int_c.m_tCBSb, int_c.m_vbs, int_c.m_tDepCap, in_p.m_bulkJctBotGradingCoeff, int_c.m_tBulkPot, int_c.m_f1b, int_c.m_f2b, int_c.m_f3b);	(int_c.m_capbsb,int_c.m_chargebsb) = Spice3.Internal.Functions.junctionCap( int_c.m_tCBSb, int_c.m_vbs, int_c.m_tDepCap, in_p.m_bulkJctBotGradingCoeff, int_c.m_tBulkPot, int_c.m_f1b, int_c.m_f2b, int_c.m_f3b);
(int_c.m_capbdb,int_c.m_chargebdb) = Spice3.Internal.Functions.junctionCapRevised( int_c.m_tCBDb, vbd, int_c.m_tDepCap, in_p.m_bulkJctBotGradingCoeff, int_c.m_tBulkPot, int_c.m_f1b, int_c.m_f2b, int_c.m_f3b);	(int_c.m_capbdb,int_c.m_chargebdb) = Spice3.Internal.Functions.junctionCap( int_c.m_tCBDb, vbd, int_c.m_tDepCap, in_p.m_bulkJctBotGradingCoeff, int_c.m_tBulkPot, int_c.m_f1b, int_c.m_f2b, int_c.m_f3b);
if ( not (in_p.m_capBSIsGiven > 0.5)) then
(int_c.m_capbss,int_c.m_chargebss) = Spice3.Internal.Functions.junctionCapRevised( int_c.m_tCBSs, int_c.m_vbs, int_c.m_tDepCap, in_p.m_bulkJctSideGradingCoeff, int_c.m_tBulkPot, int_c.m_f1s, int_c.m_f2s, int_c.m_f3s);	(int_c.m_capbss,int_c.m_chargebss) = Spice3.Internal.Functions.junctionCap( int_c.m_tCBSs, int_c.m_vbs, int_c.m_tDepCap, in_p.m_bulkJctSideGradingCoeff, int_c.m_tBulkPot, int_c.m_f1s, int_c.m_f2s, int_c.m_f3s);
end if;
if (not (in_p.m_capBDIsGiven > 0.5)) then
(int_c.m_capbds,int_c.m_chargebds) = Spice3.Internal.Functions.junctionCapRevised( int_c.m_tCBDs, vbd, int_c.m_tDepCap, in_p.m_bulkJctSideGradingCoeff, int_c.m_tBulkPot, int_c.m_f1s, int_c.m_f2s, int_c.m_f3s);	(int_c.m_capbds,int_c.m_chargebds) = Spice3.Internal.Functions.junctionCap( int_c.m_tCBDs, vbd, int_c.m_tDepCap, in_p.m_bulkJctSideGradingCoeff, int_c.m_tBulkPot, int_c.m_f1s, int_c.m_f2s, int_c.m_f3s);
end if; ...

function Electrical.Spice3.Internal.Mos.mosCalcDEVqmeyer

Component	Modelica 4.0.0	Modelica 3.2.3
vgs	Units.SI.Voltage	SIunits.Voltage
vgd	Units.SI.Voltage	SIunits.Voltage
vgb	Units.SI.Voltage	SIunits.Voltage
vds	Units.SI.Voltage	SIunits.Voltage
vddif	Units.SI.Voltage	SIunits.Voltage
vddif1	Units.SI.Voltage	SIunits.Voltage
vgst	Units.SI.Voltage	SIunits.Voltage

function Electrical.Spice3.Internal.Mos.mos2CalcNoBypassCodeRevised

Component	Modelica 4.0.0	Modelica 3.2.3
in_m_pVoltageValues	Units.SI.Voltage	SIunits.Voltage
vbd	Units.SI.Voltage	SIunits.Voltage
vgd	Units.SI.Voltage	SIunits.Voltage
vgb	Units.SI.Voltage	SIunits.Voltage

function Electrical.Spice3.Internal.Mos1.mos1ModelLineParamsInitEquations

Component	Modelica 4.0.0	Modelica 3.2.3
vtnom	Units.SI.Voltage	SIunits.Voltage
fermis	Units.SI.Voltage	SIunits.Voltage

function Electrical.Spice3.Internal.Mos1.drainCur

Component	Modelica 4.0.0	Modelica 3.2.3
vb	Units.SI.Voltage	SIunits.Voltage
vg	Units.SI.Voltage	SIunits.Voltage
vds	Units.SI.Voltage	SIunits.Voltage
vgst	Units.SI.Voltage	SIunits.Voltage

function Electrical.Spice3.Internal.Mos1.mos1RenameParameters

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... intern.m_transconductance = if (ex.KP > -1e40) then ex.KP else 2e-5;
intern.m_tnom = if (ex.TNOM > -1e40) then ex.TNOM + SpiceConstants.CONSTCtoK else 300.15 "Parameter measurement temperature (default 27 deg C)";	intern.m_tnom = if (ex.TNOM > -1e40) then ex.TNOM + SpiceConstants.CONSTCtoK else 300.15 "parameter measurement temperature (default 27 deg C)";
intern.m_jctSatCurDensity = ex.JS "A/(m*m) bulk junction saturation current per sq-meter of junction area (default 0)"; ... intern.m_bulkJctPotential = ex.PB "V bulk junction potential (default 0.8)";
intern.m_bulkJctBotGradingCoeff = ex.MJ "Bulk junction bottom grading coeff. (default 0.5)";	intern.m_bulkJctBotGradingCoeff = ex.MJ "bulk junction bottom grading coeff. (default 0.5)";
intern.m_bulkJctSideGradingCoeff = ex.MJSW "Bulk junction sidewall grading coeff. (default 0.5)";	intern.m_bulkJctSideGradingCoeff = ex.MJSW "bulk junction sidewall grading coeff. (default 0.5)";
intern.m_oxideThicknessIsGiven = if (ex.TOX > -1e40) then 1 else 0; ...

function Electrical.Spice3.Internal.Mos1.mos1RenameParametersDev

Component	Modelica 4.0.0	Modelica 3.2.3
W	Units.SI.Length	SIunits.Length
L	Units.SI.Length	SIunits.Length
AD	Units.SI.Area	SIunits.Area
AS	Units.SI.Area	SIunits.Area
PD	Units.SI.Length	SIunits.Length
PS	Units.SI.Length	SIunits.Length
TEMP	Units.NonSI.Temperature_degC	SIunits.Temp_C

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... dev.m_dTemp = TEMP + SpiceConstants.CONSTCtoK "Device temperature";
	dev.m_drainPerimiter = 0; dev.m_sourcePerimiter = 0;
dev.m_uic = false; ...

record Electrical.Spice3.Internal.Mos2.Mos2ModelLineParams

Component	Modelica 4.0.0	Modelica 3.2.3
m_maxDriftVel	Units.SI.Velocity	SIunits.Velocity
m_junctionDepth	Units.SI.Length	SIunits.Length
m_channelCharge	Units.SI.Charge	SIunits.Charge
m_fastSurfaceStateDensity	Units.NonSI.PerArea_cm	SIunits.Conversions.NonSIunits.PerArea_cm

function Electrical.Spice3.Internal.Mos2.mos2ModelLineParamsInitEquationsRevised

Component	Modelica 4.0.0	Modelica 3.2.3
vtnom	Units.SI.Voltage	SIunits.Voltage
fermis	Units.SI.Voltage	SIunits.Voltage

function Electrical.Spice3.Internal.Mos2.drainCurRevised

Component	Modelica 4.0.0	Modelica 3.2.3
vbs	Units.SI.Voltage	SIunits.Voltage
vgs	Units.SI.Voltage	SIunits.Voltage
vds	Units.SI.Voltage	SIunits.Voltage

function Electrical.Spice3.Internal.Mos2.mos2RenameParametersDev

Component	Modelica 4.0.0	Modelica 3.2.3
W	Units.SI.Length	SIunits.Length
L	Units.SI.Length	SIunits.Length
AD	Units.SI.Area	SIunits.Area
AS	Units.SI.Area	SIunits.Area
PD	Units.SI.Length	SIunits.Length
PS	Units.SI.Length	SIunits.Length
TEMP	Units.NonSI.Temperature_degC	SIunits.Temp_C

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... dev.m_sourceSquares = NRS;
dev.m_drainPerimeter = PD;	dev.m_drainPerimiter = PD;
dev.m_sourcePerimeter = PS;	dev.m_sourcePerimiter = PS;
dev.m_dICVDSIsGiven = if (IC > -1e40) then 1 else 0; ...

record Electrical.Spice3.Internal.Diode.DiodeModelLineParams

Component	Modelica 4.0.0	Modelica 3.2.3
m_satCur	Units.SI.Current	SIunits.Current
m_resist	Units.SI.Resistance	SIunits.Resistance
m_transitTime	Units.SI.Time	SIunits.Time
m_junctionCap	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
m_junctionPot	Units.SI.Voltage	SIunits.Voltage
m_gradingCoeff	Units.SI.LinearTemperatureCoefficient	SIunits.LinearTemperatureCoefficient
m_activationEnergy	Units.SI.ActivationEnergy	SIunits.ActivationEnergy
m_breakdownVoltage	Units.SI.Voltage	SIunits.Voltage
m_breakdownCurrent	Units.SI.Current	SIunits.Current
m_nomTemp	Units.SI.Temperature	SIunits.Temp_K
m_conductance	Units.SI.Conductance	SIunits.Conductance

record Electrical.Spice3.Internal.Diode.DiodeModelLineVariables

Component	Modelica 4.0.0	Modelica 3.2.3
m_conductance	Units.SI.Conductance	SIunits.Conductance

record Electrical.Spice3.Internal.Diode.DiodeParams

Component	Modelica 4.0.0	Modelica 3.2.3
m_dIC	Units.SI.Voltage	SIunits.Voltage

record Electrical.Spice3.Internal.Diode.DiodeCalc

Component	Modelica 4.0.0	Modelica 3.2.3
m_tJctPot	Units.SI.Voltage	SIunits.Voltage
m_tJctCap	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
m_tSatCur	Units.SI.Current	SIunits.Current
m_tVcrit	Units.SI.Voltage	SIunits.Voltage
m_tBrkdwnV	Units.SI.Voltage	SIunits.Voltage

record Electrical.Spice3.Internal.Diode.CurrentsCapacitances

Component	Modelica 4.0.0	Modelica 3.2.3
m_dCurrent	Units.SI.Current	SIunits.Current

function Electrical.Spice3.Internal.Diode.diodeNoBypassCode

Component	Modelica 4.0.0	Modelica 3.2.3
in_m_pVoltageValues	Units.SI.Voltage	SIunits.Voltage
m_dCap	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
m_dPNVoltage	Units.SI.Voltage	SIunits.Voltage
m_dCurrent	Units.SI.Current	SIunits.Current
m_dCond	Units.SI.Conductance	SIunits.Conductance
m_dCharge	Units.SI.Charge	SIunits.Charge
m_dCapCurrent	Units.SI.Current	SIunits.Current

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... m_dPNVoltage = in_dp.m_dIC;
elseif (SpiceRoot.initJunctionVoltagesRevised()) then	elseif (SpiceRoot.initJunctionVoltages()) then
if (in_dp.m_bOff) then ...

function Electrical.Spice3.Internal.Diode.diodeCalcAdditionalValues

Component	Modelica 4.0.0	Modelica 3.2.3
in_m_pVoltageValues	Units.SI.Voltage	SIunits.Voltage

function Electrical.Spice3.Internal.Diode.diodeRenameParametersDev

Component	Modelica 4.0.0	Modelica 3.2.3
TEMP	Units.SI.Temperature	SIunits.Temp_K

function Electrical.Spice3.Internal.Diode.diodeRenameParametersDevTemp

Component	Modelica 4.0.0	Modelica 3.2.3
TEMP	Units.NonSI.Temperature_degC	SIunits.Temp_C

record Electrical.Spice3.Internal.Rsemiconductor.ResistorParams

Component	Modelica 4.0.0	Modelica 3.2.3
m_dResist	Units.SI.Resistance	SIunits.Resistance
m_dWidth	Units.SI.Length	SIunits.Length
m_dLength	Units.SI.Length	SIunits.Length
m_dTemp	Units.NonSI.Temperature_degC	SIunits.Temp_C

record Electrical.Spice3.Internal.Rsemiconductor.ResistorModelLineParams

Component	Modelica 4.0.0	Modelica 3.2.3
m_dTC1	Units.SI.LinearTemperatureCoefficientResistance	SIunits.LinearTemperatureCoefficientResistance
m_dTC2	Units.SI.QuadraticTemperatureCoefficientResistance	SIunits.QuadraticTemperatureCoefficientResistance
m_dRsh	Units.SI.Resistance	SIunits.Resistance
m_dDefW	Units.SI.Length	SIunits.Length
m_dNarrow	Units.SI.Length	SIunits.Length
m_dTnom	Units.NonSI.Temperature_degC	SIunits.Temp_C

record Electrical.Spice3.Internal.Rsemiconductor.ResistorVariables

Component	Modelica 4.0.0	Modelica 3.2.3
m_dWidth	Units.SI.Length	SIunits.Length
m_dLength	Units.SI.Length	SIunits.Length
m_dResist	Units.SI.Resistance	SIunits.Resistance
m_dConduct	Units.SI.Conductance	SIunits.Conductance
m_dCond_dTemp	Units.NonSI.Temperature_degC	SIunits.Temp_C

function Electrical.Spice3.Internal.Rsemiconductor.resistorRenameParametersDev

Component	Modelica 4.0.0	Modelica 3.2.3
R	Units.SI.Resistance	SIunits.Resistance
W	Units.SI.Length	SIunits.Length
L	Units.SI.Length	SIunits.Length
TEMP	Units.NonSI.Temperature_degC	SIunits.Temp_C

record Electrical.Spice3.Internal.Bjt.Bjt

Component	Modelica 4.0.0	Modelica 3.2.3
m_dICvbe	Units.SI.Voltage	SIunits.Voltage
m_dICvce	Units.SI.Voltage	SIunits.Voltage
m_transitTimeHighCurrentF	Units.SI.Current	SIunits.Current
m_CScap	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance

record Electrical.Spice3.Internal.Bjt.BjtModelLineParams

Component	Modelica 4.0.0	Modelica 3.2.3
m_tnom	Units.SI.Temperature	SIunits.Temp_K
m_satCur	Units.SI.Current	SIunits.Current
m_leakBEcurrent	Units.SI.Current	SIunits.Current
m_leakBCcurrent	Units.SI.Current	SIunits.Current
m_earlyVoltF	Units.SI.Voltage	SIunits.Voltage
m_rollOffF	Units.SI.Current	SIunits.Current
m_earlyVoltR	Units.SI.Voltage	SIunits.Voltage
m_rollOffR	Units.SI.Current	SIunits.Current
m_emitterResist	Units.SI.Resistance	SIunits.Resistance
m_collectorResist	Units.SI.Resistance	SIunits.Resistance
m_baseCurrentHalfResist	Units.SI.Current	SIunits.Current
m_baseResist	Units.SI.Resistance	SIunits.Resistance
m_minBaseResist	Units.SI.Resistance	SIunits.Resistance
m_depletionCapBE	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
m_potentialBE	Units.SI.Voltage	SIunits.Voltage
m_transitTimeF	Units.SI.Time	SIunits.Time
m_transitTimeHighCurrentF	Units.SI.Current	SIunits.Current
m_transitTimeFVBC	Units.SI.Voltage	SIunits.Voltage
m_excessPhase	Units.SI.Frequency	SIunits.Frequency
m_depletionCapBC	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
m_potentialBC	Units.SI.Voltage	SIunits.Voltage
m_transitTimeR	Units.SI.Time	SIunits.Time
m_capCS	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
m_potentialSubstrate	Units.SI.Voltage	SIunits.Voltage
m_energyGap	Units.SI.GapEnergy	SIunits.GapEnergy
m_collectorConduct	Units.SI.Conductance	SIunits.Conductance
m_emitterConduct	Units.SI.Conductance	SIunits.Conductance
m_transitTimeVBCFactor	Units.SI.InversePotential	SIunits.InversePotential
m_invEarlyVoltF	Units.SI.InversePotential	SIunits.InversePotential
m_invEarlyVoltR	Units.SI.InversePotential	SIunits.InversePotential
m_dICvbe	Units.SI.Voltage	SIunits.Voltage
m_dICvce	Units.SI.Voltage	SIunits.Voltage

record Electrical.Spice3.Internal.Bjt.BjtCalc

Component	Modelica 4.0.0	Modelica 3.2.3
m_tSatCur	Units.SI.Current	SIunits.Current
m_tBEleakCur	Units.SI.Current	SIunits.Current
m_tBCleakCur	Units.SI.Current	SIunits.Current
m_tBEcap	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
m_tBEpot	Units.SI.Voltage	SIunits.Voltage
m_tBCcap	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
m_tBCpot	Units.SI.Voltage	SIunits.Voltage
m_tDepCapBE	Units.SI.Voltage	SIunits.Voltage
m_tDepCapBC	Units.SI.Voltage	SIunits.Voltage
m_tVcrit	Units.SI.Voltage	SIunits.Voltage
m_dVt	Units.SI.Voltage	SIunits.Voltage
m_tF1c	Units.SI.Voltage	SIunits.Voltage
m_tF1e	Units.SI.Voltage	SIunits.Voltage

record Electrical.Spice3.Internal.Bjt.CurrentsCapacitances

Component	Modelica 4.0.0	Modelica 3.2.3
iBE	Units.SI.Current	SIunits.Current
iBEN	Units.SI.Current	SIunits.Current
iBC	Units.SI.Current	SIunits.Current
iBCN	Units.SI.Current	SIunits.Current
iCC	Units.SI.Current	SIunits.Current
capbc	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
capbe	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
capbx	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
captt	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
capcs	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
rx	Units.SI.Resistance	SIunits.Resistance

function Electrical.Spice3.Internal.Bjt.bjtCalcTempDependencies

Component	Modelica 4.0.0	Modelica 3.2.3
vt	Units.SI.Voltage	SIunits.Voltage
egfet	Units.SI.GapEnergy	SIunits.GapEnergy
pbfact	Units.SI.Voltage	SIunits.Voltage
pbo	Units.SI.Voltage	SIunits.Voltage

function Electrical.Spice3.Internal.Bjt.bjtNoBypassCode

Component	Modelica 4.0.0	Modelica 3.2.3
in_m_pVoltageValues	Units.SI.Voltage	SIunits.Voltage
vce	Units.SI.Voltage	SIunits.Voltage
vbe	Units.SI.Voltage	SIunits.Voltage
vbx	Units.SI.Voltage	SIunits.Voltage
vbc	Units.SI.Voltage	SIunits.Voltage
gbe	Units.SI.Conductance	SIunits.Conductance
gbc	Units.SI.Conductance	SIunits.Conductance
cbc	Units.SI.Current	SIunits.Current
gben	Units.SI.Conductance	SIunits.Conductance
cben	Units.SI.Current	SIunits.Current
gbcn	Units.SI.Conductance	SIunits.Conductance
cbcn	Units.SI.Current	SIunits.Current
cjbe	Units.SI.Current	SIunits.Current
cjbc	Units.SI.Current	SIunits.Current
cex	Units.SI.Current	SIunits.Current
gex	Units.SI.Conductance	SIunits.Conductance
ttime	Units.SI.Time	SIunits.Time
bcex0	Units.SI.Current	SIunits.Current
bcex1	Units.SI.Current	SIunits.Current
captt	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
chargebe	Units.SI.Charge	SIunits.Charge
chargebc	Units.SI.Charge	SIunits.Charge
chargebx	Units.SI.Charge	SIunits.Charge
chargecs	Units.SI.Charge	SIunits.Charge
vcs	Units.SI.Voltage	SIunits.Voltage

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... vbx = vbe - vce;
elseif (Spice3.Internal.SpiceRoot.initJunctionVoltagesRevised()) then	elseif (Spice3.Internal.SpiceRoot.initJunctionVoltages()) then
if (in_p3.m_bOff) then ... aux2= in_c.m_tBCcap*(1. - in_p.m_baseFractionBCcap);
(out_cc.capbx,chargebx) = Spice3.Internal.Functions.junctionCapRevised( aux2, vbx, in_c.m_tDepCapBC, in_p.m_junctionExpBC, in_c.m_tBCpot, in_c.m_tF1c, in_c.m_f2c, in_c.m_f3c);	(out_cc.capbx,chargebx) = Spice3.Internal.Functions.junctionCap( aux2, vbx, in_c.m_tDepCapBC, in_p.m_junctionExpBC, in_c.m_tBCpot, in_c.m_tF1c, in_c.m_f2c, in_c.m_f3c);
out_cc.capcs = 0; ...

function Electrical.Spice3.Internal.Bjt.bjtRenameParametersDev

Component	Modelica 4.0.0	Modelica 3.2.3
IC_VBE	Units.SI.Voltage	SIunits.Voltage
IC_VCE	Units.SI.Voltage	SIunits.Voltage
TEMP	Units.NonSI.Temperature_degC	SIunits.Temp_C

record Electrical.Spice3.Internal.Fet.Fet

Component	Modelica 4.0.0	Modelica 3.2.3
m_dICVDS	Units.SI.Voltage	SIunits.Voltage
m_dICVGS	Units.SI.Voltage	SIunits.Voltage
m_tSatCur	Units.SI.Current	SIunits.Current
m_tGatePot	Units.SI.Voltage	SIunits.Voltage
m_tCGS	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
m_tCGD	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
m_corDepCap	Units.SI.Voltage	SIunits.Voltage
m_vcrit	Units.SI.Voltage	SIunits.Voltage
m_f1	Units.SI.Voltage	SIunits.Voltage
m_dVt	Units.SI.Voltage	SIunits.Voltage
m_vgs	Units.SI.Voltage	SIunits.Voltage
m_vgd	Units.SI.Voltage	SIunits.Voltage
m_vds	Units.SI.Voltage	SIunits.Voltage
m_cgd	Units.SI.Current	SIunits.Current
m_ggd	Units.SI.Conductance	SIunits.Conductance
m_cgs	Units.SI.Current	SIunits.Current
m_ggs	Units.SI.Conductance	SIunits.Conductance
m_chargegd	Units.SI.Charge	SIunits.Charge
m_capgd	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
m_chargegs	Units.SI.Charge	SIunits.Charge
m_capgs	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
m_cdrain	Units.SI.Current	SIunits.Current
m_gm	Units.SI.Conductance	SIunits.Conductance
m_gds	Units.SI.Conductance	SIunits.Conductance

record Electrical.Spice3.Internal.Fet.FetModelLine

Component	Modelica 4.0.0	Modelica 3.2.3
m_threshold	Units.SI.Voltage	SIunits.Voltage
m_lModulation	Units.SI.InversePotential	SIunits.InversePotential
m_drainResist	Units.SI.Resistance	SIunits.Resistance
m_sourceResist	Units.SI.Resistance	SIunits.Resistance
m_capGS	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
m_capGD	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
m_gatePotential	Units.SI.Voltage	SIunits.Voltage
m_gateSatCurrent	Units.SI.Current	SIunits.Current
m_drainConduct	Units.SI.Conductance	SIunits.Conductance
m_sourceConduct	Units.SI.Conductance	SIunits.Conductance
m_tnom	Units.SI.Temperature	SIunits.Temp_K

record Electrical.Spice3.Internal.Fet.CurrrentsCapacitances

Component	Modelica 4.0.0	Modelica 3.2.3
idrain	Units.SI.Current	SIunits.Current
iGD	Units.SI.Current	SIunits.Current
iGS	Units.SI.Current	SIunits.Current
cGS	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
cGD	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance

function Electrical.Spice3.Internal.Fet.fetRenameParametersDev

Component	Modelica 4.0.0	Modelica 3.2.3
IC_VDS	Units.SI.Voltage	SIunits.Voltage
IC_VGS	Units.SI.Voltage	SIunits.Voltage
TEMP	Units.NonSI.Temperature_degC	SIunits.Temp_C

record Electrical.Spice3.Internal.Jfet.JfetModelLine

Component	Modelica 4.0.0	Modelica 3.2.3
m_bFac	Units.SI.InversePotential	SIunits.InversePotential

function Electrical.Spice3.Internal.Jfet.drainCur

Component	Modelica 4.0.0	Modelica 3.2.3
vds	Units.SI.Voltage	SIunits.Voltage
vgs	Units.SI.Voltage	SIunits.Voltage
vgd	Units.SI.Voltage	SIunits.Voltage
vto	Units.SI.Voltage	SIunits.Voltage
vgst	Units.SI.Voltage	SIunits.Voltage
vgdt	Units.SI.Voltage	SIunits.Voltage

function Electrical.Spice3.Internal.Jfet.calculateGateCap

Component	Modelica 4.0.0	Modelica 3.2.3
vgs	Units.SI.Voltage	SIunits.Voltage
vgd	Units.SI.Voltage	SIunits.Voltage
capgs	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
chargegs	Units.SI.Charge	SIunits.Charge
capgd	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
chargegd	Units.SI.Charge	SIunits.Charge

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
(capgs,chargegs) := Modelica400.Electrical.Spice3.Internal.Functions.junctionCapRevised( in_f.m_tCGS, vgs, in_f.m_corDepCap, 0.5, in_f.m_tGatePot, in_f.m_f1, in_f.m_f2, in_f.m_f3);	(capgs,chargegs) := Modelica323.Electrical.Spice3.Internal.Functions.junctionCap( in_f.m_tCGS, vgs, in_f.m_corDepCap, 0.5, in_f.m_tGatePot, in_f.m_f1, in_f.m_f2, in_f.m_f3);
(capgd,chargegd) = Modelica400.Electrical.Spice3.Internal.Functions.junctionCapRevised( in_f.m_tCGD, vgd, in_f.m_corDepCap, 0.5, in_f.m_tGatePot, in_f.m_f1, in_f.m_f2, in_f.m_f3);	(capgd,chargegd) = Modelica323.Electrical.Spice3.Internal.Functions.junctionCap( in_f.m_tCGD, vgd, in_f.m_corDepCap, 0.5, in_f.m_tGatePot, in_f.m_f1, in_f.m_f2, in_f.m_f3);

function Electrical.Spice3.Internal.Jfet.jfetNoBypassCode

Component	Modelica 4.0.0	Modelica 3.2.3
in_m_pVoltageValues	Units.SI.Voltage	SIunits.Voltage

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... int_f.m_vgs = in_m_type * int_f.m_dICVGS;
elseif ( Modelica400.Electrical.Spice3.Internal.SpiceRoot.initJunctionVoltagesRevised()) then	elseif (Modelica323.Electrical.Spice3.Internal.SpiceRoot.initJunctionVoltages()) then
if (int_f.m_off == true) then ... int_f.m_vgd = in_m_type * int_f.m_dICVDS + int_f.m_vgs;
elseif ( Modelica400.Electrical.Spice3.Internal.SpiceRoot.initJunctionVoltagesRevised()) then	elseif (Modelica323.Electrical.Spice3.Internal.SpiceRoot.initJunctionVoltages()) then
if (int_f.m_off == true) then ... end if;
int_f.m_vgs = Modelica400.Electrical.Spice3.Internal.SpiceRoot.limitJunctionVoltageRevised( int_f.m_vgs);	int_f.m_vgs = Modelica323.Electrical.Spice3.Internal.SpiceRoot.limitJunctionVoltage(int_f.m_vgs);
int_f.m_vgd = Modelica400.Electrical.Spice3.Internal.SpiceRoot.limitJunctionVoltageRevised( int_f.m_vgd);	int_f.m_vgd = Modelica323.Electrical.Spice3.Internal.SpiceRoot.limitJunctionVoltage(int_f.m_vgd);
int_f.m_vds = int_f.m_vgs - int_f.m_vgd; ...

record Electrical.Spice3.Internal.Csemiconductor.Capacitor

Component	Modelica 4.0.0	Modelica 3.2.3
m_dCapac	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
m_dWidth	Units.SI.Length	SIunits.Length
m_dLength	Units.SI.Length	SIunits.Length

record Electrical.Spice3.Internal.Csemiconductor.CapacitorModelLineParams

Component	Modelica 4.0.0	Modelica 3.2.3
m_dCj	Units.SI.CapacitancePerArea	SIunits.CapacitancePerArea
m_dCjsw	Units.SI.Permittivity	SIunits.Permittivity
m_dDefW	Units.SI.Length	SIunits.Length
m_dNarrow	Units.SI.Length	SIunits.Length

function Electrical.Spice3.Internal.Csemiconductor.capacitorRenameParametersDev

Component	Modelica 4.0.0	Modelica 3.2.3
C	Electrical.Spice3.Types.Capacitance	SIunits.Capacitance
W	Units.SI.Length	SIunits.Length
L	Units.SI.Length	SIunits.Length
TEMP	Units.NonSI.Temperature_degC	SIunits.Temp_C

model Magnetic.FluxTubes.Examples.MovingCoilActuator.Components.PermeanceActuator

Component	Modelica 4.0.0	Modelica 3.2.3
R	Units.SI.Resistance	SIunits.Resistance
r_core	Units.SI.Radius	SIunits.Radius
l_PM	Units.SI.Length	SIunits.Length
t	Units.SI.Length	SIunits.Length
l_air	Units.SI.Length	SIunits.Length
l_FeOut	Units.SI.Length	SIunits.Length
m_a	Units.SI.Mass	SIunits.Mass
c	Units.SI.TranslationalSpringConstant	SIunits.TranslationalSpringConstant
d	Units.SI.TranslationalDampingConstant	SIunits.TranslationalDampingConstant
x_min	Units.SI.Position	SIunits.Position
x_max	Units.SI.Position	SIunits.Position
x	Units.SI.Position	SIunits.Position
L	Units.SI.Inductance	SIunits.Inductance

model Magnetic.FluxTubes.Examples.MovingCoilActuator.Components.ConstantActuator

Component	Modelica 4.0.0	Modelica 3.2.3
k	Units.SI.ElectricalForceConstant	SIunits.ElectricalForceConstant
R	Units.SI.Resistance	SIunits.Resistance
L	Units.SI.Inductance	SIunits.Inductance
m_a	Units.SI.Mass	SIunits.Mass
c	Units.SI.TranslationalSpringConstant	SIunits.TranslationalSpringConstant
d	Units.SI.TranslationalDampingConstant	SIunits.TranslationalDampingConstant
x_min	Units.SI.Position	SIunits.Position
x_max	Units.SI.Position	SIunits.Position
x	Units.SI.Position	SIunits.Position

model Magnetic.FluxTubes.Examples.SolenoidActuator.ComparisonPullInStroke

Component	Modelica 4.0.0	Modelica 3.2.3
v_step	Units.SI.Voltage	SIunits.Voltage

model Magnetic.FluxTubes.Examples.SolenoidActuator.Components.SimpleSolenoid

Component	Modelica 4.0.0	Modelica 3.2.3
R	Units.SI.Resistance	SIunits.Resistance
r_yokeOut	Units.SI.Radius	SIunits.Radius
r_yokeIn	Units.SI.Radius	SIunits.Radius
l_yoke	Units.SI.Length	SIunits.Length
t_yokeBot	Units.SI.Length	SIunits.Length
l_pole	Units.SI.Length	SIunits.Length
t_poleBot	Units.SI.Length	SIunits.Length
t_airPar	Units.SI.Length	SIunits.Length
r_arm	Units.SI.Radius	SIunits.Radius
l_arm	Units.SI.Length	SIunits.Length
c	Units.SI.TranslationalSpringConstant	SIunits.TranslationalSpringConstant
d	Units.SI.TranslationalDampingConstant	SIunits.TranslationalDampingConstant
x_min	Units.SI.Position	SIunits.Position
x_max	Units.SI.Position	SIunits.Position
x	Units.SI.Position	SIunits.Position
rho_steel	Units.SI.Density	SIunits.Density

model Magnetic.FluxTubes.Examples.SolenoidActuator.Components.AdvancedSolenoid

Component	Modelica 4.0.0	Modelica 3.2.3
R	Units.SI.Resistance	SIunits.Resistance
R_par	Units.SI.Resistance	SIunits.Resistance
C_par	Units.SI.Capacitance	SIunits.Capacitance
r_yokeOut	Units.SI.Radius	SIunits.Radius
r_yokeIn	Units.SI.Radius	SIunits.Radius
l_yoke	Units.SI.Length	SIunits.Length
t_yokeBot	Units.SI.Length	SIunits.Length
l_pole	Units.SI.Length	SIunits.Length
t_poleBot	Units.SI.Length	SIunits.Length
t_airPar	Units.SI.Length	SIunits.Length
r_arm	Units.SI.Radius	SIunits.Radius
l_arm	Units.SI.Length	SIunits.Length
c	Units.SI.TranslationalSpringConstant	SIunits.TranslationalSpringConstant
d	Units.SI.TranslationalDampingConstant	SIunits.TranslationalDampingConstant
x_min	Units.SI.Position	SIunits.Position
x_max	Units.SI.Position	SIunits.Position
x	Units.SI.Position	SIunits.Position
Psi_tot	Units.SI.MagneticFlux	SIunits.MagneticFlux
L_statTot	Units.SI.Inductance	SIunits.Inductance
rho_steel	Units.SI.Density	SIunits.Density

model Magnetic.FluxTubes.Examples.Hysteresis.HysteresisModelComparison

Component	Modelica 4.0.0	Modelica 3.2.3
winding1	i(fixed=true, start=0)
winding2	i(start=0, fixed=true)
winding3	i(fixed=true, start=0)

model Magnetic.FluxTubes.Examples.Hysteresis.InductorWithHysteresis

Component	Modelica 4.0.0	Modelica 3.2.3
vSource	f=200
vSource		freqHz=200

model Magnetic.FluxTubes.Examples.Hysteresis.SinglePhaseTransformerWithHysteresis1

Component	Modelica 4.0.0	Modelica 3.2.3
vSource	f=400
vSource		freqHz=400

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
initial equation	connect(winding1.port_n, mag_ground.port);
core.derHstat = 0.0; equation connect(winding1.port_n, mag_ground.port);
connect(vSource.p, resistor1.p); ...

model Magnetic.FluxTubes.Examples.Hysteresis.SinglePhaseTransformerWithHysteresis2

Component	Modelica 4.0.0	Modelica 3.2.3
SineVoltage	f=400
SineVoltage		freqHz=400

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
initial equation	connect(SineVoltage.p, resistor1.p);
transformer.core.derHstat = 0.0; equation connect(SineVoltage.p, resistor1.p);
connect(SineVoltage.n, el_ground1.p); ...

model Magnetic.FluxTubes.Examples.Hysteresis.ThreePhaseTransformerWithRectifier

Component	Modelica 4.0.0	Modelica 3.2.3
vSource1	f=50
vSource1		freqHz=50
vSource2	f=vSource1.f
vSource2		freqHz=vSource1.freqHz
vSource3	f=vSource1.f
vSource3		freqHz=vSource1.freqHz

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
initial equation	connect(vSource1.n, ground1.p);
transformer.core1.derHstat = 0.0; transformer.core2.derHstat = 0.0; transformer.core3.derHstat = 0.0; equation connect(vSource1.n, ground1.p);
connect(vSource2.n, ground1.p); ...

model Magnetic.FluxTubes.Examples.Hysteresis.Components.Transformer1PhaseWithHysteresis

Component	Modelica 4.0.0	Modelica 3.2.3
L1	Units.SI.Length	SIunits.Length
d1	Units.SI.Length	SIunits.Length
rho1	Units.SI.Resistivity	SIunits.Resistivity
alpha1	Units.SI.LinearTemperatureCoefficient	SIunits.LinearTemperatureCoefficient
L2	Units.SI.Length	SIunits.Length
d2	Units.SI.Length	SIunits.Length
rho2	Units.SI.Resistivity	SIunits.Resistivity
alpha2	Units.SI.LinearTemperatureCoefficient	SIunits.LinearTemperatureCoefficient
l1	Units.SI.Length	SIunits.Length
l2	Units.SI.Length	SIunits.Length
a	Units.SI.Length	SIunits.Length
b	Units.SI.Length	SIunits.Length
v1	Units.SI.Voltage	SIunits.Voltage
v2	Units.SI.Voltage	SIunits.Voltage
R1	Units.SI.Resistance	SIunits.Resistance
R2	Units.SI.Resistance	SIunits.Resistance
i1	Units.SI.Current	SIunits.Current
i2	Units.SI.Current	SIunits.Current
B	Units.SI.MagneticFluxDensity	SIunits.MagneticFluxDensity
Hstat	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength
Heddy	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength
H	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength
HStart	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength
I1Start	Units.SI.ElectricCurrent	SIunits.ElectricCurrent
LossPowerWinding	Units.SI.Power	SIunits.Power
LossPowerStat	Units.SI.Power	SIunits.Power
LossPowerEddy	Units.SI.Power	SIunits.Power
sigma	Units.SI.Conductivity	SIunits.Conductivity
t	Units.SI.Length	SIunits.Length
L_l1	Units.SI.Length	SIunits.Length
A_l1	Units.SI.Area	SIunits.Area
L_l2	Units.SI.Length	SIunits.Length
A_l2	Units.SI.Area	SIunits.Area

model Magnetic.FluxTubes.Examples.Hysteresis.Components.Transformer3PhaseYyWithHysteresis

Component	Modelica 4.0.0	Modelica 3.2.3
L1	Units.SI.Length	SIunits.Length
d1	Units.SI.Length	SIunits.Length
rho1	Units.SI.Resistivity	SIunits.Resistivity
alpha1	Units.SI.LinearTemperatureCoefficient	SIunits.LinearTemperatureCoefficient
L2	Units.SI.Length	SIunits.Length
d2	Units.SI.Length	SIunits.Length
rho2	Units.SI.Resistivity	SIunits.Resistivity
alpha2	Units.SI.LinearTemperatureCoefficient	SIunits.LinearTemperatureCoefficient
l1	Units.SI.Length	SIunits.Length
l2	Units.SI.Length	SIunits.Length
a	Units.SI.Length	SIunits.Length
b	Units.SI.Length	SIunits.Length
v1	Units.SI.Voltage	SIunits.Voltage
v2	Units.SI.Voltage	SIunits.Voltage
R1	Units.SI.Resistance	SIunits.Resistance
R2	Units.SI.Resistance	SIunits.Resistance
i1	Units.SI.Current	SIunits.Current
i2	Units.SI.Current	SIunits.Current
B	Units.SI.MagneticFluxDensity	SIunits.MagneticFluxDensity
Phi	Units.SI.MagneticFlux	SIunits.MagneticFlux
Hstat	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength
Heddy	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength
H	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength
HStart	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength
I1Start	Units.SI.ElectricCurrent	SIunits.ElectricCurrent
I2Start	Units.SI.ElectricCurrent	SIunits.ElectricCurrent
LossPowerWinding	Units.SI.Power	SIunits.Power
LossPowerStat	Units.SI.Power	SIunits.Power
LossPowerEddy	Units.SI.Power	SIunits.Power
sigma	Units.SI.Conductivity	SIunits.Conductivity
t	Units.SI.Length	SIunits.Length
L_l1	Units.SI.Length	SIunits.Length
A_l1	Units.SI.Area	SIunits.Area
L_l2	Units.SI.Length	SIunits.Length
A_l2	Units.SI.Area	SIunits.Area
core1		protected
core2		protected
core3		protected
ground		protected
winding11		protected
winding12		protected
winding13		protected
winding21		protected
winding22		protected
winding23		protected
resistor11		protected
resistor21		protected
resistor12		protected
resistor22		protected
resistor23		protected
resistor13		protected
leakage		protected

model Magnetic.FluxTubes.Examples.Utilities.TranslatoryArmatureAndStopper

Component	Modelica 4.0.0	Modelica 3.2.3
L	Units.SI.Length	SIunits.Length
m	Units.SI.Mass	SIunits.Mass
c	Units.SI.TranslationalSpringConstant	SIunits.TranslationalSpringConstant
d	Units.SI.TranslationalDampingConstant	SIunits.TranslationalDampingConstant
x_max	Units.SI.Position	SIunits.Position
x_min	Units.SI.Position	SIunits.Position
s	Units.SI.Position	SIunits.Position
v	Units.SI.Velocity	SIunits.Velocity
a	Units.SI.Acceleration	SIunits.Acceleration

record Magnetic.FluxTubes.Examples.Utilities.CoilDesign

Component	Modelica 4.0.0	Modelica 3.2.3
rho_20	Units.SI.Resistivity	SIunits.Resistivity
alpha_20	Units.SI.LinearTemperatureCoefficient	SIunits.LinearTemperatureCoefficient
T_op	Units.SI.Temperature	SIunits.Temperature
rho	Units.SI.Resistivity	SIunits.Resistivity
h_w	Units.SI.Length	SIunits.Length
b_w	Units.SI.Length	SIunits.Length
A_w	Units.SI.Area	SIunits.Area
l_avg	Units.SI.Length	SIunits.Length
V_op	Units.SI.Voltage	SIunits.Voltage
J_desired	Units.SI.CurrentDensity	SIunits.CurrentDensity
d_wireCalculated	Units.SI.Diameter	SIunits.Diameter
A_wireCalculated	Units.SI.Area	SIunits.Area
R_calculated	Units.SI.Resistance	SIunits.Resistance
P_calculated	Units.SI.Power	SIunits.Power
d_wireChosen	Units.SI.Diameter	SIunits.Diameter
A_wireChosen	Units.SI.Area	SIunits.Area
R_actual	Units.SI.Resistance	SIunits.Resistance
P_actual	Units.SI.Power	SIunits.Power
J_actual	Units.SI.CurrentDensity	SIunits.CurrentDensity

model Magnetic.FluxTubes.Basic.ElectroMagneticConverter

Component	Modelica 4.0.0	Modelica 3.2.3
v	Units.SI.Voltage	SIunits.Voltage
i	Units.SI.Current	SIunits.Current
V_m	Units.SI.MagneticPotentialDifference	SIunits.MagneticPotentialDifference
Phi	Units.SI.MagneticFlux	SIunits.MagneticFlux
Psi	Units.SI.MagneticFlux	SIunits.MagneticFlux
L_stat	Units.SI.Inductance	SIunits.Inductance

model Magnetic.FluxTubes.Basic.ElectroMagneticConverterWithLeakageInductance

Component	Modelica 4.0.0	Modelica 3.2.3
v	Units.SI.Voltage	SIunits.Voltage
i	Units.SI.Current	SIunits.Current
V_m	Units.SI.MagneticPotentialDifference	SIunits.MagneticPotentialDifference
Phi	Units.SI.MagneticFlux	SIunits.MagneticFlux
Phi_ind	Units.SI.MagneticFlux	SIunits.MagneticFlux
Phi_leak	Units.SI.MagneticFlux	SIunits.MagneticFlux
L	Units.SI.Length	SIunits.Length
A	Units.SI.Area	SIunits.Area
mu_rel	Units.SI.RelativePermeability	SIunits.RelativePermeability
G_m	Units.SI.Permeance	SIunits.Permeance
Psi	Units.SI.MagneticFlux	SIunits.MagneticFlux
L_stat	Units.SI.Inductance	SIunits.Inductance

model Magnetic.FluxTubes.Basic.ConstantReluctance

Component	Modelica 4.0.0	Modelica 3.2.3
R_m	Units.SI.Reluctance	SIunits.Reluctance

model Magnetic.FluxTubes.Basic.ConstantPermeance

Component	Modelica 4.0.0	Modelica 3.2.3
G_m	Units.SI.Permeance	SIunits.Permeance

model Magnetic.FluxTubes.Basic.LeakageWithCoefficient

Component	Modelica 4.0.0	Modelica 3.2.3
c_usefulFlux	Units.SI.CouplingCoefficient	SIunits.CouplingCoefficient
R_mUsefulTot	Blocks.Interfaces.RealInput	SIunits.Reluctance
		input
	graphical

model Magnetic.FluxTubes.Basic.EddyCurrent

Component	Modelica 4.0.0	Modelica 3.2.3
G	Units.SI.Conductance	SIunits.Conductance
rho	Units.SI.Resistivity	SIunits.Resistivity
l	Units.SI.Length	SIunits.Length
A	Units.SI.Area	SIunits.Area
R	Units.SI.Resistance	SIunits.Resistance

model Magnetic.FluxTubes.Shapes.FixedShape.GenericFluxTube

Component	Modelica 4.0.0	Modelica 3.2.3
l	Units.SI.Length	SIunits.Length
area	Units.SI.CrossSection	SIunits.CrossSection

model Magnetic.FluxTubes.Shapes.FixedShape.Cuboid

Component	Modelica 4.0.0	Modelica 3.2.3
l	Units.SI.Length	SIunits.Length
a	Units.SI.Length	SIunits.Length
b	Units.SI.Length	SIunits.Length

model Magnetic.FluxTubes.Shapes.FixedShape.HollowCylinderAxialFlux

Component	Modelica 4.0.0	Modelica 3.2.3
l	Units.SI.Length	SIunits.Length
r_i	Units.SI.Radius	SIunits.Radius
r_o	Units.SI.Radius	SIunits.Radius

model Magnetic.FluxTubes.Shapes.FixedShape.HollowCylinderRadialFlux

Component	Modelica 4.0.0	Modelica 3.2.3
l	Units.SI.Length	SIunits.Length
r_i	Units.SI.Radius	SIunits.Radius
r_o	Units.SI.Radius	SIunits.Radius

model Magnetic.FluxTubes.Shapes.Force.HollowCylinderAxialFlux

Component	Modelica 4.0.0	Modelica 3.2.3
l	Units.SI.Length	SIunits.Length
r_i	Units.SI.Radius	SIunits.Radius
r_o	Units.SI.Radius	SIunits.Radius
B	Units.SI.MagneticFluxDensity	SIunits.MagneticFluxDensity
A	Units.SI.Area	SIunits.Area

model Magnetic.FluxTubes.Shapes.Force.HollowCylinderRadialFlux

Component	Modelica 4.0.0	Modelica 3.2.3
l	Units.SI.Length	SIunits.Length
r_i	Units.SI.Radius	SIunits.Radius
r_o	Units.SI.Radius	SIunits.Radius
B_avg	Units.SI.MagneticFluxDensity	SIunits.MagneticFluxDensity
A_avg	Units.SI.Area	SIunits.Area

model Magnetic.FluxTubes.Shapes.Force.CuboidParallelFlux

Component	Modelica 4.0.0	Modelica 3.2.3
l	Units.SI.Length	SIunits.Length
a	Units.SI.Length	SIunits.Length
b	Units.SI.Length	SIunits.Length
B	Units.SI.MagneticFluxDensity	SIunits.MagneticFluxDensity
A	Units.SI.Area	SIunits.Area

model Magnetic.FluxTubes.Shapes.Force.CuboidOrthogonalFlux

Component	Modelica 4.0.0	Modelica 3.2.3
l	Units.SI.Length	SIunits.Length
a	Units.SI.Length	SIunits.Length
b	Units.SI.Length	SIunits.Length
B	Units.SI.MagneticFluxDensity	SIunits.MagneticFluxDensity
A	Units.SI.Area	SIunits.Area

model Magnetic.FluxTubes.Shapes.Force.LeakageAroundPoles

Component	Modelica 4.0.0	Modelica 3.2.3
l	Units.SI.Length	SIunits.Length
w	Units.SI.Length	SIunits.Length
r	Units.SI.Radius	SIunits.Radius

model Magnetic.FluxTubes.Shapes.Leakage.QuarterCylinder

Component	Modelica 4.0.0	Modelica 3.2.3
l	Units.SI.Length	SIunits.Length

model Magnetic.FluxTubes.Shapes.Leakage.QuarterHollowCylinder

Component	Modelica 4.0.0	Modelica 3.2.3
l	Units.SI.Length	SIunits.Length

model Magnetic.FluxTubes.Shapes.Leakage.HalfCylinder

Component	Modelica 4.0.0	Modelica 3.2.3
l	Units.SI.Length	SIunits.Length

model Magnetic.FluxTubes.Shapes.Leakage.HalfHollowCylinder

Component	Modelica 4.0.0	Modelica 3.2.3
l	Units.SI.Length	SIunits.Length

model Magnetic.FluxTubes.Shapes.Leakage.QuarterSphere

Component	Modelica 4.0.0	Modelica 3.2.3
r	Units.SI.Radius	SIunits.Radius

model Magnetic.FluxTubes.Shapes.Leakage.QuarterHollowSphere

Component	Modelica 4.0.0	Modelica 3.2.3
t	Units.SI.Length	SIunits.Length

model Magnetic.FluxTubes.Shapes.Leakage.EighthOfSphere

Component	Modelica 4.0.0	Modelica 3.2.3
r	Units.SI.Radius	SIunits.Radius

model Magnetic.FluxTubes.Shapes.Leakage.EighthOfHollowSphere

Component	Modelica 4.0.0	Modelica 3.2.3
t	Units.SI.Length	SIunits.Length

model Magnetic.FluxTubes.Shapes.Leakage.CoaxCylindersEndFaces

Component	Modelica 4.0.0	Modelica 3.2.3
r_0	Units.SI.Radius	SIunits.Radius
r_1	Units.SI.Radius	SIunits.Radius
r_2	Units.SI.Radius	SIunits.Radius
l_g	Units.SI.Distance	SIunits.Distance
t	Units.SI.Length	SIunits.Length

model Magnetic.FluxTubes.Shapes.HysteresisAndMagnets.GenericHystTellinenSoft

Component	Modelica 4.0.0	Modelica 3.2.3
Js	Units.SI.MagneticFluxDensity	SIunits.MagneticFluxDensity
Br	Units.SI.MagneticFluxDensity	SIunits.MagneticFluxDensity
Hc	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength
eps	Units.SI.MagneticFluxDensity	SIunits.MagneticFluxDensity
unitH	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength

model Magnetic.FluxTubes.Shapes.HysteresisAndMagnets.GenericHystTellinenHard

Component	Modelica 4.0.0	Modelica 3.2.3
Br	Units.SI.MagneticFluxDensity	SIunits.MagneticFluxDensity
Hc	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength
eps	Units.SI.MagneticFluxDensity	SIunits.MagneticFluxDensity
H0	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength
unitH	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength

model Magnetic.FluxTubes.Shapes.HysteresisAndMagnets.GenericHystTellinenEverett

Component	Modelica 4.0.0	Modelica 3.2.3
Js	Units.SI.MagneticFluxDensity	SIunits.MagneticFluxDensity
eps	Units.SI.MagneticFluxDensity	SIunits.MagneticFluxDensity
H2	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength
H3	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength
unitT	Units.SI.MagneticFluxDensity	SIunits.MagneticFluxDensity

model Magnetic.FluxTubes.Shapes.HysteresisAndMagnets.GenericHystTellinenTable

Component	Modelica 4.0.0	Modelica 3.2.3
unitT	Units.SI.MagneticFluxDensity	SIunits.MagneticFluxDensity
eps	Units.SI.MagneticFluxDensity	SIunits.MagneticFluxDensity
tabris	Blocks.Tables.CombiTable1Dv	Blocks.Tables.CombiTable1D
tabfal	Blocks.Tables.CombiTable1Dv	Blocks.Tables.CombiTable1D

model Magnetic.FluxTubes.Shapes.HysteresisAndMagnets.GenericHystPreisachEverett

Component	Modelica 4.0.0	Modelica 3.2.3
eps	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength
t1	Units.SI.Time	SIunits.Time
mu0	=mat.K*Modelica400.Constants.mu_0	=mat.K*Modelica323.Constants.mue_0
J	Units.SI.MagneticFluxDensity	SIunits.MagneticFluxDensity
hmax	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength
alpha	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength
beta	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength
aSav	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength
bSav	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength
E	Units.SI.MagneticFluxDensity	SIunits.MagneticFluxDensity
H1	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength
H2	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength
H3	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength
H4	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength
unitT	Units.SI.MagneticFluxDensity	SIunits.MagneticFluxDensity
x	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength

model Magnetic.FluxTubes.Shapes.HysteresisAndMagnets.GenericHystTellinenPermanentMagnet

Component	Modelica 4.0.0	Modelica 3.2.3
Br	Units.SI.MagneticFluxDensity	SIunits.MagneticFluxDensity
Hc	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength
unitH	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength
eps	Units.SI.MagneticFluxDensity	SIunits.MagneticFluxDensity
H0	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength

model Magnetic.FluxTubes.Shapes.HysteresisAndMagnets.GenericLinearPermanentMagnet

Component	Modelica 4.0.0	Modelica 3.2.3
H	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength
B	Units.SI.MagneticFluxDensity	SIunits.MagneticFluxDensity

record Magnetic.FluxTubes.Material.SoftMagnetic.BaseData

Component	Modelica 4.0.0	Modelica 3.2.3
mu_i	Units.SI.RelativePermeability	SIunits.RelativePermeability
B_myMax	Units.SI.MagneticFluxDensity	SIunits.MagneticFluxDensity

function Magnetic.FluxTubes.Material.SoftMagnetic.mu_rApprox

Component	Modelica 4.0.0	Modelica 3.2.3
B	Units.SI.MagneticFluxDensity	SIunits.MagneticFluxDensity
mu_i	Units.SI.RelativePermeability	SIunits.RelativePermeability
B_myMax	Units.SI.MagneticFluxDensity	SIunits.MagneticFluxDensity
mu_r	Units.SI.RelativePermeability	SIunits.RelativePermeability

record Magnetic.FluxTubes.Material.HardMagnetic.BaseData

Component	Modelica 4.0.0	Modelica 3.2.3
H_cBRef	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength
B_rRef	Units.SI.MagneticFluxDensity	SIunits.MagneticFluxDensity
T_ref	Units.SI.Temperature	SIunits.Temperature
alpha_Br	Units.SI.LinearTemperatureCoefficient	SIunits.LinearTemperatureCoefficient
T_op	Units.SI.Temperature	SIunits.Temperature
B_r	Units.SI.MagneticFluxDensity	SIunits.MagneticFluxDensity
H_cB	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength
mu_r	Units.SI.RelativePermeability	SIunits.RelativePermeability

record Magnetic.FluxTubes.Material.HysteresisEverettParameter.BaseData

Component	Modelica 4.0.0	Modelica 3.2.3
Hsat	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength
Hc	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength
sigma	Units.SI.Conductivity	SIunits.Conductivity

record Magnetic.FluxTubes.Material.HysteresisTableData.BaseData

Component	Modelica 4.0.0	Modelica 3.2.3
sigma	Units.SI.Conductivity	SIunits.Conductivity

model Magnetic.FluxTubes.Sensors.MagneticPotentialDifferenceSensor

Component	Modelica 4.0.0	Modelica 3.2.3
Phi	Units.SI.MagneticFlux	SIunits.MagneticFlux

model Magnetic.FluxTubes.Sources.ConstantMagneticPotentialDifference

Component	Modelica 4.0.0	Modelica 3.2.3
V_m	Units.SI.MagneticPotentialDifference	SIunits.MagneticPotentialDifference
Phi	Units.SI.MagneticFlux	SIunits.MagneticFlux

model Magnetic.FluxTubes.Sources.SignalMagneticPotentialDifference

Component	Modelica 4.0.0	Modelica 3.2.3
Phi	Units.SI.MagneticFlux	SIunits.MagneticFlux

model Magnetic.FluxTubes.Sources.ConstantMagneticFlux

Component	Modelica 4.0.0	Modelica 3.2.3
Phi	Units.SI.MagneticFlux	SIunits.MagneticFlux
V_m	Units.SI.MagneticPotentialDifference	SIunits.MagneticPotentialDifference

model Magnetic.FluxTubes.Sources.SignalMagneticFlux

Component	Modelica 4.0.0	Modelica 3.2.3
V_m	Units.SI.MagneticPotentialDifference	SIunits.MagneticPotentialDifference

connector Magnetic.FluxTubes.Interfaces.MagneticPort

Component	Modelica 4.0.0	Modelica 3.2.3
V_m	Units.SI.MagneticPotential	SIunits.MagneticPotential
Phi	Units.SI.MagneticFlux	SIunits.MagneticFlux

model Magnetic.FluxTubes.Interfaces.ConditionalHeatPort

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature
LossPower	Units.SI.Power	SIunits.Power
T_heatPort	Units.SI.Temperature	SIunits.Temperature

function Magnetic.FluxTubes.Utilities.everett

Component	Modelica 4.0.0	Modelica 3.2.3
a_	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength
b_	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength
J	Units.SI.MagneticFluxDensity	SIunits.MagneticFluxDensity
a	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength
b	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength
h1	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength
h2	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength
h3	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength
h4	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength
unitT	Units.SI.MagneticFluxDensity	SIunits.MagneticFluxDensity

function Magnetic.FluxTubes.Utilities.initPreisach

Component	Modelica 4.0.0	Modelica 3.2.3
x	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength
H	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength
B	Units.SI.MagneticFluxDensity	SIunits.MagneticFluxDensity
hmax	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength
H_l	Units.SI.MagneticFieldStrength	SIunits.MagneticFieldStrength

model Magnetic.FundamentalWave.Examples.Components.EddyCurrentLosses

Component	Modelica 4.0.0	Modelica 3.2.3
R	Units.SI.Resistance	SIunits.Resistance
Gc	Units.SI.Conductance	SIunits.Conductance
R_m	Units.SI.Reluctance	SIunits.Reluctance
lossPower_e	Units.SI.Power	SIunits.Power
lossPower_m	Units.SI.Power	SIunits.Power
star_e	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
star_m	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
sineVoltage_e	Electrical.Polyphase.Sources.SineVoltage	Electrical.MultiPhase.Sources.SineVoltage
sineVoltage_m	Electrical.Polyphase.Sources.SineVoltage	Electrical.MultiPhase.Sources.SineVoltage
resistor_e	Electrical.Polyphase.Basic.Resistor	Electrical.MultiPhase.Basic.Resistor
resistor_m	Electrical.Polyphase.Basic.Resistor	Electrical.MultiPhase.Basic.Resistor
converter_e	Magnetic.FundamentalWave.Components.PolyphaseElectroMagneticConverter	Magnetic.FundamentalWave.Components.MultiPhaseElectroMagneticConverter
converter_m	Magnetic.FundamentalWave.Components.PolyphaseElectroMagneticConverter	Magnetic.FundamentalWave.Components.MultiPhaseElectroMagneticConverter
loss_e	Electrical.Polyphase.Basic.Conductor	Electrical.MultiPhase.Basic.Conductor
powerb_e	Electrical.Polyphase.Sensors.PowerSensor	Electrical.MultiPhase.Sensors.PowerSensor
powerb_m	Electrical.Polyphase.Sensors.PowerSensor	Electrical.MultiPhase.Sensors.PowerSensor

model Magnetic.FundamentalWave.Examples.Components.SinglePhaseInductance

Component	Modelica 4.0.0	Modelica 3.2.3
f	Units.SI.Frequency	SIunits.Frequency
VRMS	Units.SI.Voltage	SIunits.Voltage
R	Units.SI.Resistance	SIunits.Resistance
L	Units.SI.Inductance	SIunits.Inductance
R_m	Units.SI.Reluctance	SIunits.Reluctance
voltageSource_e	f=f
voltageSource_e		freqHz=f
voltageSource_m	f=f
voltageSource_m		freqHz=f

model Magnetic.FundamentalWave.Components.EddyCurrent

Component	Modelica 4.0.0	Modelica 3.2.3
G	Units.SI.Conductance	SIunits.Conductance

model Magnetic.FundamentalWave.Components.SinglePhaseElectroMagneticConverter

Component	Modelica 4.0.0	Modelica 3.2.3
orientation	Units.SI.Angle	SIunits.Angle
v	Units.SI.Voltage	SIunits.Voltage
i	Units.SI.Current	SIunits.Current
V_m	Units.SI.ComplexMagneticPotentialDifference	SIunits.ComplexMagneticPotentialDifference
abs_V_m	Units.SI.MagneticPotentialDifference	SIunits.MagneticPotentialDifference
arg_V_m	Units.SI.Angle	SIunits.Angle
Phi	Units.SI.ComplexMagneticFlux	SIunits.ComplexMagneticFlux
abs_Phi	Units.SI.MagneticPotentialDifference	SIunits.MagneticPotentialDifference
arg_Phi	Units.SI.Angle	SIunits.Angle

model Magnetic.FundamentalWave.BasicMachines.Components.SinglePhaseWinding

Component	Modelica 4.0.0	Modelica 3.2.3
RRef	Units.SI.Resistance	SIunits.Resistance
TRef	Units.SI.Temperature	SIunits.Temperature
alphaRef	Units.SI.LinearTemperatureCoefficient	SIunits.LinearTemperatureCoefficient
TOperational	Units.SI.Temperature	SIunits.Temperature
Lsigma	Units.SI.Inductance	SIunits.Inductance
orientation	Units.SI.Angle	SIunits.Angle
v	Units.SI.Voltage	SIunits.Voltage
i	Units.SI.Current	SIunits.Current
V_m	Units.SI.ComplexMagneticPotentialDifference	SIunits.ComplexMagneticPotentialDifference
abs_V_m	Units.SI.MagneticPotentialDifference	SIunits.MagneticPotentialDifference
arg_V_m	Units.SI.Angle	SIunits.Angle
Phi	Units.SI.ComplexMagneticFlux	SIunits.ComplexMagneticFlux
abs_Phi	Units.SI.MagneticFlux	SIunits.MagneticFlux
arg_Phi	Units.SI.Angle	SIunits.Angle
stray	Present
stray
reluctance		Present
reluctance

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... connect(resistor.n, electroMagneticConverter.pin_p);
connect(electroMagneticConverter.port_p, stray.port_p);	connect(electroMagneticConverter.port_p, reluctance.port_p);
connect(electroMagneticConverter.port_n, stray.port_n);	connect(electroMagneticConverter.port_n, reluctance.port_n);

model Magnetic.FundamentalWave.BasicMachines.Components.RotorSaliencyAirGap

Component	Modelica 4.0.0	Modelica 3.2.3
V_mss	Units.SI.ComplexMagneticPotentialDifference	SIunits.ComplexMagneticPotentialDifference
V_msr	Units.SI.ComplexMagneticPotentialDifference	SIunits.ComplexMagneticPotentialDifference
V_mrr	Units.SI.ComplexMagneticPotentialDifference	SIunits.ComplexMagneticPotentialDifference
Phi_ss	Units.SI.ComplexMagneticFlux	SIunits.ComplexMagneticFlux
Phi_sr	Units.SI.ComplexMagneticFlux	SIunits.ComplexMagneticFlux
Phi_rr	Units.SI.ComplexMagneticFlux	SIunits.ComplexMagneticFlux
tauElectrical	Units.SI.Torque	SIunits.Torque
gamma	Units.SI.Angle	SIunits.Angle

model Magnetic.FundamentalWave.BasicMachines.Components.SaliencyCageWinding

Component	Modelica 4.0.0	Modelica 3.2.3
TRef	Units.SI.Temperature	SIunits.Temperature
alphaRef	Units.SI.LinearTemperatureCoefficient	SIunits.LinearTemperatureCoefficient
TOperational	Units.SI.Temperature	SIunits.Temperature
electroMagneticConverter	Magnetic.FundamentalWave.Components.PolyphaseElectroMagneticConverter	Magnetic.FundamentalWave.Components.MultiPhaseElectroMagneticConverter
resistor	Electrical.Polyphase.Basic.Resistor	Electrical.MultiPhase.Basic.Resistor
star	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
iRMS	Present

model Magnetic.FundamentalWave.Sensors.MagneticFluxSensor

Component	Modelica 4.0.0	Modelica 3.2.3
V_m	Units.SI.ComplexMagneticPotentialDifference	SIunits.ComplexMagneticPotentialDifference

model Magnetic.FundamentalWave.Sensors.MagneticPotentialDifferenceSensor

Component	Modelica 4.0.0	Modelica 3.2.3
Phi	Units.SI.ComplexMagneticFlux	SIunits.ComplexMagneticFlux

model Magnetic.FundamentalWave.Sources.ConstantMagneticPotentialDifference

Component	Modelica 4.0.0	Modelica 3.2.3
V_m	Units.SI.ComplexMagneticPotentialDifference	SIunits.ComplexMagneticPotentialDifference
abs_V_m	Units.SI.MagneticPotentialDifference	SIunits.MagneticPotentialDifference
arg_V_m	Units.SI.Angle	SIunits.Angle
Phi	Units.SI.ComplexMagneticFlux	SIunits.ComplexMagneticFlux
abs_Phi	Units.SI.MagneticPotentialDifference	SIunits.MagneticPotentialDifference
arg_Phi	Units.SI.Angle	SIunits.Angle

model Magnetic.FundamentalWave.Sources.SignalMagneticPotentialDifference

Component	Modelica 4.0.0	Modelica 3.2.3
abs_V_m	Units.SI.MagneticPotentialDifference	SIunits.MagneticPotentialDifference
arg_V_m	Units.SI.Angle	SIunits.Angle
Phi	Units.SI.ComplexMagneticFlux	SIunits.ComplexMagneticFlux
abs_Phi	Units.SI.MagneticPotentialDifference	SIunits.MagneticPotentialDifference
arg_Phi	Units.SI.Angle	SIunits.Angle

model Magnetic.FundamentalWave.Sources.ConstantFlux

Component	Modelica 4.0.0	Modelica 3.2.3
V_m	Units.SI.ComplexMagneticPotentialDifference	SIunits.ComplexMagneticPotentialDifference
abs_V_m	Units.SI.MagneticPotentialDifference	SIunits.MagneticPotentialDifference
arg_V_m	Units.SI.Angle	SIunits.Angle
Phi	Units.SI.ComplexMagneticFlux	SIunits.ComplexMagneticFlux
abs_Phi	Units.SI.MagneticPotentialDifference	SIunits.MagneticPotentialDifference
arg_Phi	Units.SI.Angle	SIunits.Angle

model Magnetic.FundamentalWave.Sources.SignalFlux

Component	Modelica 4.0.0	Modelica 3.2.3
V_m	Units.SI.ComplexMagneticPotentialDifference	SIunits.ComplexMagneticPotentialDifference
abs_V_m	Units.SI.MagneticPotentialDifference	SIunits.MagneticPotentialDifference
arg_V_m	Units.SI.Angle	SIunits.Angle
abs_Phi	Units.SI.MagneticPotentialDifference	SIunits.MagneticPotentialDifference
arg_Phi	Units.SI.Angle	SIunits.Angle

connector Magnetic.FundamentalWave.Interfaces.MagneticPort

Component	Modelica 4.0.0	Modelica 3.2.3
V_m	Units.SI.ComplexMagneticPotential	SIunits.ComplexMagneticPotential
Phi	Units.SI.ComplexMagneticFlux	SIunits.ComplexMagneticFlux

model Magnetic.FundamentalWave.Interfaces.StateSelector

Component	Modelica 4.0.0	Modelica 3.2.3
gamma	Units.SI.Angle	SIunits.Angle

model Magnetic.QuasiStatic.FluxTubes.Examples.LinearInductor

Component	Modelica 4.0.0	Modelica 3.2.3
deviation	Units.SI.Current	SIunits.Current
sourceQS	Electrical.QuasiStatic.SinglePhase.Sources.VoltageSource	Electrical.QuasiStationary.SinglePhase.Sources.VoltageSource
rQS	Electrical.QuasiStatic.SinglePhase.Basic.Resistor	Electrical.QuasiStationary.SinglePhase.Basic.Resistor
groundQS	Electrical.QuasiStatic.SinglePhase.Basic.Ground	Electrical.QuasiStationary.SinglePhase.Basic.Ground
source	f=50
source		freqHz=50
r_mFe	material=Magnetic.FluxTubes.Material.SoftMagnetic.ElectricSheet.M350_50A()	material=Modelica323.Magnetic.FluxTubes.Material.SoftMagnetic.ElectricSheet.M350_50A()
currentSensorQS	Electrical.QuasiStatic.SinglePhase.Sensors.CurrentSensor	Electrical.QuasiStationary.SinglePhase.Sensors.CurrentSensor

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... connect(currentSensorQS.pin_n, rQS.pin_p);
connect(currentSensorQS.i, complexToPolar.u);	connect(currentSensorQS.y, complexToPolar.u);
connect(source.p, currentSensor.p); ...

model Magnetic.QuasiStatic.FluxTubes.Examples.NonLinearInductor

Component	Modelica 4.0.0	Modelica 3.2.3
deviation	Units.SI.Current	SIunits.Current
sourceQS	Electrical.QuasiStatic.SinglePhase.Sources.VoltageSource	Electrical.QuasiStationary.SinglePhase.Sources.VoltageSource
rQS	Electrical.QuasiStatic.SinglePhase.Basic.Resistor	Electrical.QuasiStationary.SinglePhase.Basic.Resistor
groundQS	Electrical.QuasiStatic.SinglePhase.Basic.Ground	Electrical.QuasiStationary.SinglePhase.Basic.Ground
source	f=50
source		freqHz=50
r_mFe	material=Magnetic.FluxTubes.Material.SoftMagnetic.ElectricSheet.M350_50A()	material=Modelica323.Magnetic.FluxTubes.Material.SoftMagnetic.ElectricSheet.M350_50A()
currentSensorQS	Electrical.QuasiStatic.SinglePhase.Sensors.CurrentSensor	Electrical.QuasiStationary.SinglePhase.Sensors.CurrentSensor

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... connect(currentSensorQS.pin_n, rQS.pin_p);
connect(currentSensorQS.i, complexToPolar.u);	connect(currentSensorQS.y, complexToPolar.u);
connect(source.p, currentSensor.p); ...

model Magnetic.QuasiStatic.FluxTubes.Examples.FixedShapes.CylinderSections

Component	Modelica 4.0.0	Modelica 3.2.3
mu_rConst	Units.SI.RelativePermeability	SIunits.RelativePermeability

model Magnetic.QuasiStatic.FluxTubes.Examples.FixedShapes.CuboidSections

Component	Modelica 4.0.0	Modelica 3.2.3
mu_rConst	Units.SI.RelativePermeability	SIunits.RelativePermeability

model Magnetic.QuasiStatic.FluxTubes.Examples.Leakage.CylinderLeakage

Component	Modelica 4.0.0	Modelica 3.2.3
mu_rConst	Units.SI.RelativePermeability	SIunits.RelativePermeability
constantSource	gamma(fixed=true, start=0)

model Magnetic.QuasiStatic.FluxTubes.Examples.Leakage.GeneralLeakage

Component	Modelica 4.0.0	Modelica 3.2.3
leakageWithCoefficient	c_usefulFlux=0.7
constantSource	gamma(fixed=true, start=0)

model Magnetic.QuasiStatic.FluxTubes.Basic.ElectroMagneticConverter

Component	Modelica 4.0.0	Modelica 3.2.3
pin_p	Electrical.QuasiStatic.SinglePhase.Interfaces.PositivePin	Electrical.QuasiStationary.SinglePhase.Interfaces.PositivePin
pin_n	Electrical.QuasiStatic.SinglePhase.Interfaces.NegativePin	Electrical.QuasiStationary.SinglePhase.Interfaces.NegativePin
v	Units.SI.ComplexVoltage	SIunits.ComplexVoltage
i	Units.SI.ComplexCurrent	SIunits.ComplexCurrent
V_m	Units.SI.ComplexMagneticPotentialDifference	SIunits.ComplexMagneticPotentialDifference
Phi	Units.SI.ComplexMagneticFlux	SIunits.ComplexMagneticFlux
omega	Units.SI.AngularVelocity	SIunits.AngularVelocity
Psi	Units.SI.ComplexMagneticFlux	SIunits.ComplexMagneticFlux
L_stat	Units.SI.Inductance	SIunits.Inductance

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... Psi = N*Phi;
L_stat = noEvent(if Modelica400.ComplexMath.abs(i) > eps then Modelica400.ComplexMath.abs(Psi/i) else Modelica400.ComplexMath.abs(Psi/eps));	L_stat = noEvent(if Modelica323.ComplexMath.'abs'(i) > eps then Modelica323.ComplexMath.'abs'(Psi/i) else Modelica323.ComplexMath.'abs'(Psi/ eps));
omega = der(port_p.reference.gamma); ...

model Magnetic.QuasiStatic.FluxTubes.Basic.ConstantReluctance

Component	Modelica 4.0.0	Modelica 3.2.3
R_m	Units.SI.Reluctance	SIunits.Reluctance

model Magnetic.QuasiStatic.FluxTubes.Basic.ConstantPermeance

Component	Modelica 4.0.0	Modelica 3.2.3
G_m	Units.SI.Permeance	SIunits.Permeance

model Magnetic.QuasiStatic.FluxTubes.Basic.LeakageWithCoefficient

Component	Modelica 4.0.0	Modelica 3.2.3
c_usefulFlux	Units.SI.CouplingCoefficient	SIunits.CouplingCoefficient
R_mUsefulTot	Blocks.Interfaces.RealInput	SIunits.Reluctance
		input
	graphical

model Magnetic.QuasiStatic.FluxTubes.Basic.EddyCurrent

Component	Modelica 4.0.0	Modelica 3.2.3
G	Units.SI.Conductance	SIunits.Conductance
rho	Units.SI.Resistivity	SIunits.Resistivity
l	Units.SI.Length	SIunits.Length
A	Units.SI.Area	SIunits.Area
R	Units.SI.Resistance	SIunits.Resistance

model Magnetic.QuasiStatic.FluxTubes.Shapes.FixedShape.GenericFluxTube

Component	Modelica 4.0.0	Modelica 3.2.3
l	Units.SI.Length	SIunits.Length
area	Units.SI.CrossSection	SIunits.CrossSection

model Magnetic.QuasiStatic.FluxTubes.Shapes.FixedShape.Cuboid

Component	Modelica 4.0.0	Modelica 3.2.3
l	Units.SI.Length	SIunits.Length
a	Units.SI.Length	SIunits.Length
b	Units.SI.Length	SIunits.Length

model Magnetic.QuasiStatic.FluxTubes.Shapes.FixedShape.HollowCylinderAxialFlux

Component	Modelica 4.0.0	Modelica 3.2.3
l	Units.SI.Length	SIunits.Length
r_i	Units.SI.Radius	SIunits.Radius
r_o	Units.SI.Radius	SIunits.Radius
alpha	Units.SI.Angle	SIunits.Angle

model Magnetic.QuasiStatic.FluxTubes.Shapes.FixedShape.HollowCylinderRadialFlux

Component	Modelica 4.0.0	Modelica 3.2.3
l	Units.SI.Length	SIunits.Length
r_i	Units.SI.Radius	SIunits.Radius
r_o	Units.SI.Radius	SIunits.Radius
alpha	Units.SI.Angle	SIunits.Angle

model Magnetic.QuasiStatic.FluxTubes.Shapes.Leakage.QuarterCylinder

Component	Modelica 4.0.0	Modelica 3.2.3
l	Units.SI.Length	SIunits.Length

model Magnetic.QuasiStatic.FluxTubes.Shapes.Leakage.QuarterHollowCylinder

Component	Modelica 4.0.0	Modelica 3.2.3
l	Units.SI.Length	SIunits.Length

model Magnetic.QuasiStatic.FluxTubes.Shapes.Leakage.HalfCylinder

Component	Modelica 4.0.0	Modelica 3.2.3
l	Units.SI.Length	SIunits.Length

model Magnetic.QuasiStatic.FluxTubes.Shapes.Leakage.HalfHollowCylinder

Component	Modelica 4.0.0	Modelica 3.2.3
l	Units.SI.Length	SIunits.Length

model Magnetic.QuasiStatic.FluxTubes.Shapes.Leakage.QuarterSphere

Component	Modelica 4.0.0	Modelica 3.2.3
r	Units.SI.Radius	SIunits.Radius

model Magnetic.QuasiStatic.FluxTubes.Shapes.Leakage.QuarterHollowSphere

Component	Modelica 4.0.0	Modelica 3.2.3
t	Units.SI.Length	SIunits.Length

model Magnetic.QuasiStatic.FluxTubes.Shapes.Leakage.EighthOfSphere

Component	Modelica 4.0.0	Modelica 3.2.3
r	Units.SI.Radius	SIunits.Radius

model Magnetic.QuasiStatic.FluxTubes.Shapes.Leakage.EighthOfHollowSphere

Component	Modelica 4.0.0	Modelica 3.2.3
t	Units.SI.Length	SIunits.Length

model Magnetic.QuasiStatic.FluxTubes.Shapes.Leakage.CoaxCylindersEndFaces

Component	Modelica 4.0.0	Modelica 3.2.3
r_0	Units.SI.Radius	SIunits.Radius
r_1	Units.SI.Radius	SIunits.Radius
r_2	Units.SI.Radius	SIunits.Radius
l_g	Units.SI.Distance	SIunits.Distance
t	Units.SI.Length	SIunits.Length

model Magnetic.QuasiStatic.FluxTubes.Sensors.ReferenceSensor

Component	Modelica 4.0.0	Modelica 3.2.3
y	unit="rad"

model Magnetic.QuasiStatic.FluxTubes.Sensors.FrequencySensor

Component	Modelica 4.0.0	Modelica 3.2.3
y	unit="Hz"

model Magnetic.QuasiStatic.FluxTubes.Sensors.Transient.FundamentalWavePermabilitySensor

Component	Modelica 4.0.0	Modelica 3.2.3
f	Units.SI.Frequency	SIunits.Frequency
A	Units.SI.Area	SIunits.Area
l	Units.SI.Length	SIunits.Length
mu	unit="H/m"
mur	unit="1"

model Magnetic.QuasiStatic.FluxTubes.Sensors.Transient.Permeability

Component	Modelica 4.0.0	Modelica 3.2.3
A	Units.SI.Area	SIunits.Area
l	Units.SI.Length	SIunits.Length
Phi	unit="Wb"
V_m	unit="A"
mu	unit="H/m"
mur	unit="1"

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... mu =Phi /V_m*l/A;
mur = mu/Modelica400.Constants.mu_0;	mur = mu/Modelica323.Constants.mue_0;
end if;

model Magnetic.QuasiStatic.FluxTubes.Sources.ConstantMagneticPotentialDifference

Component	Modelica 4.0.0	Modelica 3.2.3
f	Units.SI.Frequency	SIunits.Frequency
V_m	Units.SI.ComplexMagneticPotentialDifference	SIunits.ComplexMagneticPotentialDifference
Phi	Units.SI.ComplexMagneticFlux	SIunits.ComplexMagneticFlux

model Magnetic.QuasiStatic.FluxTubes.Sources.SignalMagneticPotentialDifference

Component	Modelica 4.0.0	Modelica 3.2.3
f	unit="Hz"
Phi	Units.SI.ComplexMagneticFlux	SIunits.ComplexMagneticFlux

model Magnetic.QuasiStatic.FluxTubes.Sources.ConstantMagneticFlux

Component	Modelica 4.0.0	Modelica 3.2.3
f	Units.SI.Frequency	SIunits.Frequency
V_m	Units.SI.ComplexMagneticPotentialDifference	SIunits.ComplexMagneticPotentialDifference
Phi	Units.SI.ComplexMagneticFlux	SIunits.ComplexMagneticFlux

model Magnetic.QuasiStatic.FluxTubes.Sources.SignalMagneticFlux

Component	Modelica 4.0.0	Modelica 3.2.3
f	unit="Hz"
V_m	Units.SI.ComplexMagneticPotentialDifference	SIunits.ComplexMagneticPotentialDifference

connector Magnetic.QuasiStatic.FluxTubes.Interfaces.MagneticPort

Component	Modelica 4.0.0	Modelica 3.2.3
V_m	Units.SI.ComplexMagneticPotential	SIunits.ComplexMagneticPotential
Phi	Units.SI.ComplexMagneticFlux	SIunits.ComplexMagneticFlux

connector Magnetic.QuasiStatic.FluxTubes.Interfaces.PositiveMagneticPort

Component	Modelica 4.0.0	Modelica 3.2.3
reference	Electrical.QuasiStatic.Types.Reference	Electrical.QuasiStationary.Types.Reference

connector Magnetic.QuasiStatic.FluxTubes.Interfaces.NegativeMagneticPort

Component	Modelica 4.0.0	Modelica 3.2.3
reference	Electrical.QuasiStatic.Types.Reference	Electrical.QuasiStationary.Types.Reference

model Magnetic.QuasiStatic.FluxTubes.Interfaces.AbsoluteSensor

Component	Modelica 4.0.0	Modelica 3.2.3
omega	Units.SI.AngularVelocity	SIunits.AngularVelocity

model Magnetic.QuasiStatic.FluxTubes.Interfaces.Source

Component	Modelica 4.0.0	Modelica 3.2.3
omega	Units.SI.AngularVelocity	SIunits.AngularVelocity
gamma	Units.SI.Angle	SIunits.Angle

model Magnetic.QuasiStatic.FundamentalWave.Examples.Components.EddyCurrentLosses

Component	Modelica 4.0.0	Modelica 3.2.3
R	Units.SI.Resistance	SIunits.Resistance
Gc	Units.SI.Conductance	SIunits.Conductance
R_m	Units.SI.Reluctance	SIunits.Reluctance
lossPower_e	Units.SI.Power	SIunits.Power
lossPower_m	Units.SI.Power	SIunits.Power
ground_e	Electrical.QuasiStatic.SinglePhase.Basic.Ground	Electrical.QuasiStationary.SinglePhase.Basic.Ground
ground_m	Electrical.QuasiStatic.SinglePhase.Basic.Ground	Electrical.QuasiStationary.SinglePhase.Basic.Ground
star_e	Electrical.QuasiStatic.Polyphase.Basic.Star	Electrical.QuasiStationary.MultiPhase.Basic.Star
star_m	Electrical.QuasiStatic.Polyphase.Basic.Star	Electrical.QuasiStationary.MultiPhase.Basic.Star
sineVoltage_e	Electrical.QuasiStatic.Polyphase.Sources.VoltageSource	Electrical.QuasiStationary.MultiPhase.Sources.VoltageSource
sineVoltage_m	Electrical.QuasiStatic.Polyphase.Sources.VoltageSource	Electrical.QuasiStationary.MultiPhase.Sources.VoltageSource
resistor_e	Electrical.QuasiStatic.Polyphase.Basic.Resistor	Electrical.QuasiStationary.MultiPhase.Basic.Resistor
resistor_m	Electrical.QuasiStatic.Polyphase.Basic.Resistor	Electrical.QuasiStationary.MultiPhase.Basic.Resistor
powerb_e	Electrical.QuasiStatic.Polyphase.Sensors.PowerSensor	Electrical.QuasiStationary.MultiPhase.Sensors.PowerSensor
powerb_m	Electrical.QuasiStatic.Polyphase.Sensors.PowerSensor	Electrical.QuasiStationary.MultiPhase.Sensors.PowerSensor
loss_e	Electrical.QuasiStatic.Polyphase.Basic.Conductor	Electrical.QuasiStationary.MultiPhase.Basic.Conductor
converter_e	Magnetic.QuasiStatic.FundamentalWave.Components.PolyphaseElectroMagneticConverter	Magnetic.QuasiStatic.FundamentalWave.Components.MultiPhaseElectroMagneticConverter
converter_m	Magnetic.QuasiStatic.FundamentalWave.Components.PolyphaseElectroMagneticConverter	Magnetic.QuasiStatic.FundamentalWave.Components.MultiPhaseElectroMagneticConverter

model Magnetic.QuasiStatic.FundamentalWave.Examples.BasicMachines.InductionMachines.IMC_Characteristics

Component	Modelica 4.0.0	Modelica 3.2.3
VsNominal	Units.SI.Voltage	SIunits.Voltage
fNominal	Units.SI.Frequency	SIunits.Frequency
w_Load	Units.SI.AngularVelocity	SIunits.AngularVelocity
Iqs	Units.SI.Current	SIunits.Current
vSourceQS	Electrical.QuasiStatic.Polyphase.Sources.VoltageSource	Electrical.QuasiStationary.MultiPhase.Sources.VoltageSource
starQS	Electrical.QuasiStatic.Polyphase.Basic.Star	Electrical.QuasiStationary.MultiPhase.Basic.Star
groundQS	Electrical.QuasiStatic.SinglePhase.Basic.Ground	Electrical.QuasiStationary.SinglePhase.Basic.Ground
pSensorQS	Electrical.QuasiStatic.Polyphase.Sensors.PowerSensor	Electrical.QuasiStationary.MultiPhase.Sensors.PowerSensor
iSensorQS	Electrical.QuasiStatic.Polyphase.Sensors.CurrentQuasiRMSSensor	Electrical.QuasiStationary.MultiPhase.Sensors.CurrentQuasiRMSSensor
imcData	Electrical.Machines.Utilities.ParameterRecords.IM_SquirrelCageData	Electrical.Machines.Utilities.ParameterRecords.AIM_SquirrelCageData
groundMachineQS	Electrical.QuasiStatic.SinglePhase.Basic.Ground	Electrical.QuasiStationary.SinglePhase.Basic.Ground
starMachineQS	Electrical.QuasiStatic.Polyphase.Basic.Star	Electrical.QuasiStationary.MultiPhase.Basic.Star

model Magnetic.QuasiStatic.FundamentalWave.Examples.BasicMachines.InductionMachines.IMC_DOL

Component	Modelica 4.0.0	Modelica 3.2.3
VsNominal	Units.SI.Voltage	SIunits.Voltage
fNominal	Units.SI.Frequency	SIunits.Frequency
tOn	Units.SI.Time	SIunits.Time
T_Load	Units.SI.Torque	SIunits.Torque
w_Load	Units.SI.AngularVelocity	SIunits.AngularVelocity
J_Load	Units.SI.Inertia	SIunits.Inertia
Itr	Units.SI.Current	SIunits.Current
Iqs	Units.SI.Current	SIunits.Current
voltageSourceQS	Electrical.QuasiStatic.Polyphase.Sources.VoltageSource	Electrical.QuasiStationary.MultiPhase.Sources.VoltageSource
starQS	Electrical.QuasiStatic.Polyphase.Basic.Star	Electrical.QuasiStationary.MultiPhase.Basic.Star
groundQS	Electrical.QuasiStatic.SinglePhase.Basic.Ground	Electrical.QuasiStationary.SinglePhase.Basic.Ground
powerSensorQS	Electrical.QuasiStatic.Polyphase.Sensors.PowerSensor	Electrical.QuasiStationary.MultiPhase.Sensors.PowerSensor
currentQuasiRMSSensorQS	Electrical.QuasiStatic.Polyphase.Sensors.CurrentQuasiRMSSensor	Electrical.QuasiStationary.MultiPhase.Sensors.CurrentQuasiRMSSensor
idealCloserQS	Electrical.QuasiStatic.Polyphase.Ideal.IdealClosingSwitch	Electrical.QuasiStationary.MultiPhase.Ideal.IdealClosingSwitch
star	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
cosineVoltage	Electrical.Polyphase.Sources.CosineVoltage	Electrical.MultiPhase.Sources.CosineVoltage
idealCloser	Electrical.Polyphase.Ideal.IdealClosingSwitch	Electrical.MultiPhase.Ideal.IdealClosingSwitch
currentQuasiRMSSensor	Electrical.Polyphase.Sensors.CurrentQuasiRMSSensor	Electrical.MultiPhase.Sensors.CurrentQuasiRMSSensor
imc	Magnetic.FundamentalWave.BasicMachines.InductionMachines.IM_SquirrelCage	Magnetic.FundamentalWave.BasicMachines.AsynchronousInductionMachines.AIM_SquirrelCage
powerSensor	Electrical.Polyphase.Sensors.PowerSensor	Electrical.MultiPhase.Sensors.PowerSensor
imcData	Electrical.Machines.Utilities.ParameterRecords.IM_SquirrelCageData	Electrical.Machines.Utilities.ParameterRecords.AIM_SquirrelCageData
groundMachineQS	Electrical.QuasiStatic.SinglePhase.Basic.Ground	Electrical.QuasiStationary.SinglePhase.Basic.Ground
starMachineQS	Electrical.QuasiStatic.Polyphase.Basic.Star	Electrical.QuasiStationary.MultiPhase.Basic.Star
starMachine	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star

model Magnetic.QuasiStatic.FundamentalWave.Examples.BasicMachines.InductionMachines.IMC_YD

Component	Modelica 4.0.0	Modelica 3.2.3
VNominal	Units.SI.Voltage	SIunits.Voltage
fNominal	Units.SI.Frequency	SIunits.Frequency
tStart1	Units.SI.Time	SIunits.Time
tStart2	Units.SI.Time	SIunits.Time
TLoad	Units.SI.Torque	SIunits.Torque
wLoad	Units.SI.AngularVelocity	SIunits.AngularVelocity
JLoad	Units.SI.Inertia	SIunits.Inertia
currentQuasiRMSSensorQS	Electrical.QuasiStatic.Polyphase.Sensors.CurrentQuasiRMSSensor	Electrical.QuasiStationary.MultiPhase.Sensors.CurrentQuasiRMSSensor
sineVoltageQS	Electrical.QuasiStatic.Polyphase.Sources.VoltageSource	Electrical.QuasiStationary.MultiPhase.Sources.VoltageSource
starQS	Electrical.QuasiStatic.Polyphase.Basic.Star	Electrical.QuasiStationary.MultiPhase.Basic.Star
groundQS	Electrical.QuasiStatic.SinglePhase.Basic.Ground	Electrical.QuasiStationary.SinglePhase.Basic.Ground
idealCloserQS	Electrical.QuasiStatic.Polyphase.Ideal.IdealClosingSwitch	Electrical.QuasiStationary.MultiPhase.Ideal.IdealClosingSwitch
imcData	Electrical.Machines.Utilities.ParameterRecords.IM_SquirrelCageData	Electrical.Machines.Utilities.ParameterRecords.AIM_SquirrelCageData
imc	Magnetic.FundamentalWave.BasicMachines.InductionMachines.IM_SquirrelCage	Magnetic.FundamentalWave.BasicMachines.AsynchronousInductionMachines.AIM_SquirrelCage
sineVoltage	Electrical.Polyphase.Sources.SineVoltage	Electrical.MultiPhase.Sources.SineVoltage
star	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
idealCloser	Electrical.Polyphase.Ideal.IdealClosingSwitch	Electrical.MultiPhase.Ideal.IdealClosingSwitch

model Magnetic.QuasiStatic.FundamentalWave.Examples.BasicMachines.InductionMachines.IMC_Transformer

Component	Modelica 4.0.0	Modelica 3.2.3
VNominal	Units.SI.Voltage	SIunits.Voltage
fNominal	Units.SI.Frequency	SIunits.Frequency
tStart1	Units.SI.Time	SIunits.Time
tStart2	Units.SI.Time	SIunits.Time
TLoad	Units.SI.Torque	SIunits.Torque
wLoad	Units.SI.AngularVelocity	SIunits.AngularVelocity
JLoad	Units.SI.Inertia	SIunits.Inertia
iSensorQS	Electrical.QuasiStatic.Polyphase.Sensors.CurrentQuasiRMSSensor	Electrical.QuasiStationary.MultiPhase.Sensors.CurrentQuasiRMSSensor
sineVoltageQS	Electrical.QuasiStatic.Polyphase.Sources.VoltageSource	Electrical.QuasiStationary.MultiPhase.Sources.VoltageSource
starQS	Electrical.QuasiStatic.Polyphase.Basic.Star	Electrical.QuasiStationary.MultiPhase.Basic.Star
groundQS	Electrical.QuasiStatic.SinglePhase.Basic.Ground	Electrical.QuasiStationary.SinglePhase.Basic.Ground
idealCloserQS	Electrical.QuasiStatic.Polyphase.Ideal.IdealClosingSwitch	Electrical.QuasiStationary.MultiPhase.Ideal.IdealClosingSwitch
transformerQS	Electrical.QuasiStatic.Machines.BasicMachines.Transformers.Yy.Yy00	Electrical.QuasiStationary.Machines.BasicMachines.Transformers.Yy.Yy00
ground2QS	Electrical.QuasiStatic.SinglePhase.Basic.Ground	Electrical.QuasiStationary.SinglePhase.Basic.Ground
idealCommutingSwitchQS	Electrical.QuasiStatic.Polyphase.Ideal.IdealCommutingSwitch	Electrical.QuasiStationary.MultiPhase.Ideal.IdealCommutingSwitch
imcData	Electrical.Machines.Utilities.ParameterRecords.IM_SquirrelCageData	Electrical.Machines.Utilities.ParameterRecords.AIM_SquirrelCageData
imc	Magnetic.FundamentalWave.BasicMachines.InductionMachines.IM_SquirrelCage	Magnetic.FundamentalWave.BasicMachines.AsynchronousInductionMachines.AIM_SquirrelCage
iSensor	Electrical.Polyphase.Sensors.CurrentQuasiRMSSensor	Electrical.MultiPhase.Sensors.CurrentQuasiRMSSensor
sineVoltage	Electrical.Polyphase.Sources.SineVoltage	Electrical.MultiPhase.Sources.SineVoltage
star	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
idealCloser	Electrical.Polyphase.Ideal.IdealClosingSwitch	Electrical.MultiPhase.Ideal.IdealClosingSwitch
idealCommutingSwitch	Electrical.Polyphase.Ideal.IdealCommutingSwitch	Electrical.MultiPhase.Ideal.IdealCommutingSwitch

model Magnetic.QuasiStatic.FundamentalWave.Examples.BasicMachines.InductionMachines.IMC_Conveyor

Component	Modelica 4.0.0	Modelica 3.2.3
unitFrequency	Units.SI.Frequency	SIunits.Frequency
VNominal	Units.SI.Voltage	SIunits.Voltage
fNominal	Units.SI.Frequency	SIunits.Frequency
wNominal	Units.SI.AngularVelocity	SIunits.AngularVelocity
TLoad	Units.SI.Torque	SIunits.Torque
JLoad	Units.SI.Inertia	SIunits.Inertia
r	Units.SI.Length	SIunits.Length
currentQuasiRMSSensorQS	Electrical.QuasiStatic.Polyphase.Sensors.CurrentQuasiRMSSensor	Electrical.QuasiStationary.MultiPhase.Sensors.CurrentQuasiRMSSensor
signalVoltageQS	Electrical.QuasiStatic.Polyphase.Sources.VariableVoltageSource	Electrical.QuasiStationary.MultiPhase.Sources.VariableVoltageSource
starQS	Electrical.QuasiStatic.Polyphase.Basic.Star	Electrical.QuasiStationary.MultiPhase.Basic.Star
groundQS	Electrical.QuasiStatic.SinglePhase.Basic.Ground	Electrical.QuasiStationary.SinglePhase.Basic.Ground
imcData	Electrical.Machines.Utilities.ParameterRecords.IM_SquirrelCageData	Electrical.Machines.Utilities.ParameterRecords.AIM_SquirrelCageData
groundMachineQS	Electrical.QuasiStatic.SinglePhase.Basic.Ground	Electrical.QuasiStationary.SinglePhase.Basic.Ground
starMachineQS	Electrical.QuasiStatic.Polyphase.Basic.Star	Electrical.QuasiStationary.MultiPhase.Basic.Star
imc	Magnetic.FundamentalWave.BasicMachines.InductionMachines.IM_SquirrelCage	Magnetic.FundamentalWave.BasicMachines.AsynchronousInductionMachines.AIM_SquirrelCage
currentQuasiRMSSensor	Electrical.Polyphase.Sensors.CurrentQuasiRMSSensor	Electrical.MultiPhase.Sensors.CurrentQuasiRMSSensor
signalVoltage	Electrical.Polyphase.Sources.SignalVoltage	Electrical.MultiPhase.Sources.SignalVoltage
star	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
starMachine	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star

model Magnetic.QuasiStatic.FundamentalWave.Examples.BasicMachines.InductionMachines.IMC_withLosses

Component	Modelica 4.0.0	Modelica 3.2.3
PNominal	Units.SI.Power	SIunits.Power
VNominal	Units.SI.Voltage	SIunits.Voltage
INominal	Units.SI.Current	SIunits.Current
PsNominal	Units.SI.Power	SIunits.Power
lossNominal	Units.SI.Power	SIunits.Power
fNominal	Units.SI.Frequency	SIunits.Frequency
wNominal	Units.SI.AngularVelocity	SIunits.AngularVelocity
TNominal	Units.SI.Torque	SIunits.Torque
TempNominal	Units.SI.Temperature	SIunits.Temperature
PelQS	Units.SI.Power	SIunits.Power
QelQS	Units.SI.ReactivePower	SIunits.ReactivePower
SelQS	Units.SI.ApparentPower	SIunits.ApparentPower
PmechQS	Units.SI.Power	SIunits.Power
Ps_simQS	Units.SI.Power	SIunits.Power
Ps_measQS	Units.SI.Power	SIunits.Power
loss_simQS	Units.SI.Power	SIunits.Power
loss_measQS	Units.SI.Power	SIunits.Power
I_simQS	Units.SI.Current	SIunits.Current
I_measQS	Units.SI.Current	SIunits.Current
w_simQS	Units.SI.AngularVelocity	SIunits.AngularVelocity
w_measQS	Units.SI.AngularVelocity	SIunits.AngularVelocity
electricalPowerSensorQS	Electrical.QuasiStatic.Polyphase.Sensors.PowerSensor	Electrical.QuasiStationary.MultiPhase.Sensors.PowerSensor
currentQuasiRMSSensorQS	Electrical.QuasiStatic.Polyphase.Sensors.CurrentQuasiRMSSensor	Electrical.QuasiStationary.MultiPhase.Sensors.CurrentQuasiRMSSensor
sineVoltageQS	Electrical.QuasiStatic.Polyphase.Sources.VoltageSource	Electrical.QuasiStationary.MultiPhase.Sources.VoltageSource
starQS	Electrical.QuasiStatic.Polyphase.Basic.Star	Electrical.QuasiStationary.MultiPhase.Basic.Star
groundQS	Electrical.QuasiStatic.SinglePhase.Basic.Ground	Electrical.QuasiStationary.SinglePhase.Basic.Ground
imcData	Electrical.Machines.Utilities.ParameterRecords.IM_SquirrelCageData	Electrical.Machines.Utilities.ParameterRecords.AIM_SquirrelCageData

model Magnetic.QuasiStatic.FundamentalWave.Examples.BasicMachines.InductionMachines.IMC_Initialize

Component	Modelica 4.0.0	Modelica 3.2.3
VNominal	Units.SI.Voltage	SIunits.Voltage
fNominal	Units.SI.Frequency	SIunits.Frequency
wSync	Units.SI.AngularVelocity	SIunits.AngularVelocity
tStart	Units.SI.Time	SIunits.Time
TLoad	Units.SI.Torque	SIunits.Torque
wLoad	Units.SI.AngularVelocity	SIunits.AngularVelocity
JLoad	Units.SI.Inertia	SIunits.Inertia
currentQuasiRMSSensorQS	Electrical.QuasiStatic.Polyphase.Sensors.CurrentQuasiRMSSensor	Electrical.QuasiStationary.MultiPhase.Sensors.CurrentQuasiRMSSensor
sineVoltageQS	Electrical.QuasiStatic.Polyphase.Sources.VoltageSource	Electrical.QuasiStationary.MultiPhase.Sources.VoltageSource
starQS	Electrical.QuasiStatic.Polyphase.Basic.Star	Electrical.QuasiStationary.MultiPhase.Basic.Star
groundQS	Electrical.QuasiStatic.SinglePhase.Basic.Ground	Electrical.QuasiStationary.SinglePhase.Basic.Ground
imcData	Electrical.Machines.Utilities.ParameterRecords.IM_SquirrelCageData	Electrical.Machines.Utilities.ParameterRecords.AIM_SquirrelCageData
imc	Magnetic.FundamentalWave.BasicMachines.InductionMachines.IM_SquirrelCage	Magnetic.FundamentalWave.BasicMachines.AsynchronousInductionMachines.AIM_SquirrelCage
currentQuasiRMSSensor	Electrical.Polyphase.Sensors.CurrentQuasiRMSSensor	Electrical.MultiPhase.Sensors.CurrentQuasiRMSSensor
sineVoltage	Electrical.Polyphase.Sources.SineVoltage	Electrical.MultiPhase.Sources.SineVoltage
star	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
starMachineQS	Electrical.QuasiStatic.Polyphase.Basic.Star	Electrical.QuasiStationary.MultiPhase.Basic.Star
starMachine	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star

model Magnetic.QuasiStatic.FundamentalWave.Examples.BasicMachines.InductionMachines.IMS_Characteristics

Component	Modelica 4.0.0	Modelica 3.2.3
VsNominal	Units.SI.Voltage	SIunits.Voltage
fNominal	Units.SI.Frequency	SIunits.Frequency
Rr	Units.SI.Resistance	SIunits.Resistance
w_Load	Units.SI.AngularVelocity	SIunits.AngularVelocity
Iqs	Units.SI.Current	SIunits.Current
imsData	Electrical.Machines.Utilities.ParameterRecords.IM_SlipRingData	Electrical.Machines.Utilities.ParameterRecords.AIM_SlipRingData
vSourceQS	Electrical.QuasiStatic.Polyphase.Sources.VoltageSource	Electrical.QuasiStationary.MultiPhase.Sources.VoltageSource
starQS	Electrical.QuasiStatic.Polyphase.Basic.Star	Electrical.QuasiStationary.MultiPhase.Basic.Star
groundQS	Electrical.QuasiStatic.SinglePhase.Basic.Ground	Electrical.QuasiStationary.SinglePhase.Basic.Ground
pSensorQS	Electrical.QuasiStatic.Polyphase.Sensors.PowerSensor	Electrical.QuasiStationary.MultiPhase.Sensors.PowerSensor
iSensorQS	Electrical.QuasiStatic.Polyphase.Sensors.CurrentQuasiRMSSensor	Electrical.QuasiStationary.MultiPhase.Sensors.CurrentQuasiRMSSensor
starMachineQS	Electrical.QuasiStatic.Polyphase.Basic.Star	Electrical.QuasiStationary.MultiPhase.Basic.Star
groundMachineQS	Electrical.QuasiStatic.SinglePhase.Basic.Ground	Electrical.QuasiStationary.SinglePhase.Basic.Ground
groundRotorQS	Electrical.QuasiStatic.SinglePhase.Basic.Ground	Electrical.QuasiStationary.SinglePhase.Basic.Ground
starRotorQS	Electrical.QuasiStatic.Polyphase.Basic.Star	Electrical.QuasiStationary.MultiPhase.Basic.Star
resistor	Electrical.QuasiStatic.Polyphase.Basic.Resistor	Electrical.QuasiStationary.MultiPhase.Basic.Resistor

model Magnetic.QuasiStatic.FundamentalWave.Examples.BasicMachines.InductionMachines.IMS_Start

Component	Modelica 4.0.0	Modelica 3.2.3
VsNominal	Units.SI.Voltage	SIunits.Voltage
fNominal	Units.SI.Frequency	SIunits.Frequency
tOn	Units.SI.Time	SIunits.Time
RStart	Units.SI.Resistance	SIunits.Resistance
tRheostat	Units.SI.Time	SIunits.Time
T_Load	Units.SI.Torque	SIunits.Torque
w_Load	Units.SI.AngularVelocity	SIunits.AngularVelocity
J_Load	Units.SI.Inertia	SIunits.Inertia
Itr	Units.SI.Current	SIunits.Current
Iqs	Units.SI.Current	SIunits.Current
star	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
sineVoltage	Electrical.Polyphase.Sources.SineVoltage	Electrical.MultiPhase.Sources.SineVoltage
idealCloser	Electrical.Polyphase.Ideal.IdealClosingSwitch	Electrical.MultiPhase.Ideal.IdealClosingSwitch
currentQuasiRMSSensor	Electrical.Polyphase.Sensors.CurrentQuasiRMSSensor	Electrical.MultiPhase.Sensors.CurrentQuasiRMSSensor
ims	Magnetic.FundamentalWave.BasicMachines.InductionMachines.IM_SlipRing	Magnetic.FundamentalWave.BasicMachines.AsynchronousInductionMachines.AIM_SlipRing
imsData	Electrical.Machines.Utilities.ParameterRecords.IM_SlipRingData	Electrical.Machines.Utilities.ParameterRecords.AIM_SlipRingData
voltageSourceQS	Electrical.QuasiStatic.Polyphase.Sources.VoltageSource	Electrical.QuasiStationary.MultiPhase.Sources.VoltageSource
starQS	Electrical.QuasiStatic.Polyphase.Basic.Star	Electrical.QuasiStationary.MultiPhase.Basic.Star
groundQS	Electrical.QuasiStatic.SinglePhase.Basic.Ground	Electrical.QuasiStationary.SinglePhase.Basic.Ground
powerSensorQS	Electrical.QuasiStatic.Polyphase.Sensors.PowerSensor	Electrical.QuasiStationary.MultiPhase.Sensors.PowerSensor
currentQuasiRMSSensorQS	Electrical.QuasiStatic.Polyphase.Sensors.CurrentQuasiRMSSensor	Electrical.QuasiStationary.MultiPhase.Sensors.CurrentQuasiRMSSensor
idealCloserQS	Electrical.QuasiStatic.Polyphase.Ideal.IdealClosingSwitch	Electrical.QuasiStationary.MultiPhase.Ideal.IdealClosingSwitch
powerSensor	Electrical.Polyphase.Sensors.PowerSensor	Electrical.MultiPhase.Sensors.PowerSensor
starMachineQS	Electrical.QuasiStatic.Polyphase.Basic.Star	Electrical.QuasiStationary.MultiPhase.Basic.Star
groundMachineQS	Electrical.QuasiStatic.SinglePhase.Basic.Ground	Electrical.QuasiStationary.SinglePhase.Basic.Ground
starMachine	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star

model Magnetic.QuasiStatic.FundamentalWave.Examples.BasicMachines.SynchronousMachines.SMPM_OpenCircuit

Component	Modelica 4.0.0	Modelica 3.2.3
Vtr	Units.SI.Voltage	SIunits.Voltage
Vqs	Units.SI.Voltage	SIunits.Voltage
starQS	Electrical.QuasiStatic.Polyphase.Basic.Star	Electrical.QuasiStationary.MultiPhase.Basic.Star
groundQS	Electrical.QuasiStatic.SinglePhase.Basic.Ground	Electrical.QuasiStationary.SinglePhase.Basic.Ground
potentialSensorQS	Electrical.QuasiStatic.Polyphase.Sensors.PotentialSensor	Electrical.QuasiStationary.MultiPhase.Sensors.PotentialSensor
smpm	Magnetic.FundamentalWave.BasicMachines.SynchronousMachines.SM_PermanentMagnet	Magnetic.FundamentalWave.BasicMachines.SynchronousInductionMachines.SM_PermanentMagnet
star	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
potentialSensor	Electrical.Polyphase.Sensors.PotentialSensor	Electrical.MultiPhase.Sensors.PotentialSensor
resistorQS	Electrical.QuasiStatic.Polyphase.Basic.Resistor	Electrical.QuasiStationary.MultiPhase.Basic.Resistor

model Magnetic.QuasiStatic.FundamentalWave.Examples.BasicMachines.SynchronousMachines.SMPM_Mains

Component	Modelica 4.0.0	Modelica 3.2.3
f	Units.SI.Frequency	SIunits.Frequency
V	Units.SI.Voltage	SIunits.Voltage
T_Load	Units.SI.Torque	SIunits.Torque
tStep	Units.SI.Time	SIunits.Time
J_Load	Units.SI.Inertia	SIunits.Inertia
Itr	Units.SI.Current	SIunits.Current
Iqs	Units.SI.Current	SIunits.Current
voltageSourceQS	Electrical.QuasiStatic.Polyphase.Sources.VoltageSource	Electrical.QuasiStationary.MultiPhase.Sources.VoltageSource
starQS	Electrical.QuasiStatic.Polyphase.Basic.Star	Electrical.QuasiStationary.MultiPhase.Basic.Star
groundQS	Electrical.QuasiStatic.SinglePhase.Basic.Ground	Electrical.QuasiStationary.SinglePhase.Basic.Ground
powerSensorQS	Electrical.QuasiStatic.Polyphase.Sensors.PowerSensor	Electrical.QuasiStationary.MultiPhase.Sensors.PowerSensor
currentQuasiRMSSensorQS	Electrical.QuasiStatic.Polyphase.Sensors.CurrentQuasiRMSSensor	Electrical.QuasiStationary.MultiPhase.Sensors.CurrentQuasiRMSSensor
groundMachineQS	Electrical.QuasiStatic.SinglePhase.Basic.Ground	Electrical.QuasiStationary.SinglePhase.Basic.Ground
starMachineQS	Electrical.QuasiStatic.Polyphase.Basic.Star	Electrical.QuasiStationary.MultiPhase.Basic.Star
voltageSource	Electrical.Polyphase.Sources.CosineVoltage	Electrical.MultiPhase.Sources.CosineVoltage
star	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
powerSensor	Electrical.Polyphase.Sensors.PowerSensor	Electrical.MultiPhase.Sensors.PowerSensor
currentQuasiRMSSensor	Electrical.Polyphase.Sensors.CurrentQuasiRMSSensor	Electrical.MultiPhase.Sensors.CurrentQuasiRMSSensor
smpm	Magnetic.FundamentalWave.BasicMachines.SynchronousMachines.SM_PermanentMagnet	Magnetic.FundamentalWave.BasicMachines.SynchronousInductionMachines.SM_PermanentMagnet
starMachine	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star

model Magnetic.QuasiStatic.FundamentalWave.Examples.BasicMachines.SynchronousMachines.SMPM_CurrentSource

Component	Modelica 4.0.0	Modelica 3.2.3
VNominal	Units.SI.Voltage	SIunits.Voltage
fNominal	Units.SI.Frequency	SIunits.Frequency
f	Units.SI.Frequency	SIunits.Frequency
tRamp	Units.SI.Time	SIunits.Time
TLoad	Units.SI.Torque	SIunits.Torque
tStep	Units.SI.Time	SIunits.Time
JLoad	Units.SI.Inertia	SIunits.Inertia
thetaQS	Units.SI.Angle	SIunits.Angle
theta	Units.SI.Angle	SIunits.Angle
smpm	Magnetic.FundamentalWave.BasicMachines.SynchronousMachines.SM_PermanentMagnet	Magnetic.FundamentalWave.BasicMachines.SynchronousInductionMachines.SM_PermanentMagnet
signalCurrent	Electrical.Polyphase.Sources.SignalCurrent	Electrical.MultiPhase.Sources.SignalCurrent
star	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
voltageQuasiRMSSensor	Electrical.Polyphase.Sensors.VoltageQuasiRMSSensor	Electrical.MultiPhase.Sensors.VoltageQuasiRMSSensor
starM	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
currentRMSsensor	Electrical.Polyphase.Sensors.CurrentQuasiRMSSensor	Electrical.MultiPhase.Sensors.CurrentQuasiRMSSensor
starMachineQS	Electrical.QuasiStatic.Polyphase.Basic.Star	Electrical.QuasiStationary.MultiPhase.Basic.Star
groundMQS	Electrical.QuasiStatic.SinglePhase.Basic.Ground	Electrical.QuasiStationary.SinglePhase.Basic.Ground
referenceCurrentSourceQS	Electrical.QuasiStatic.Polyphase.Sources.ReferenceCurrentSource	Electrical.QuasiStationary.MultiPhase.Sources.ReferenceCurrentSource
starQS	Electrical.QuasiStatic.Polyphase.Basic.Star	Electrical.QuasiStationary.MultiPhase.Basic.Star
groundeQS	Electrical.QuasiStatic.SinglePhase.Basic.Ground	Electrical.QuasiStationary.SinglePhase.Basic.Ground
resistorQS	Electrical.QuasiStatic.Polyphase.Basic.Resistor	Electrical.QuasiStationary.MultiPhase.Basic.Resistor
currentRMSSensorQS	Electrical.QuasiStatic.Polyphase.Sensors.CurrentQuasiRMSSensor	Electrical.QuasiStationary.MultiPhase.Sensors.CurrentQuasiRMSSensor
voltageQuasiRMSSensorQS	Electrical.QuasiStatic.Polyphase.Sensors.VoltageQuasiRMSSensor	Electrical.QuasiStationary.MultiPhase.Sensors.VoltageQuasiRMSSensor
starMQS	Electrical.QuasiStatic.Polyphase.Basic.Star	Electrical.QuasiStationary.MultiPhase.Basic.Star
starMachine	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
dqToThreePhase	Present
dqToThreePhase
dqToThreePhaseQS	Present
dqToThreePhaseQS
currentController		Present
currentController
currentControllerQS		Present
currentControllerQS

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... connect(terminalBoxQS.plug_sp, smpmQS.plug_sp);
connect(dqToThreePhaseQS.I, referenceCurrentSourceQS.I);	connect(currentControllerQS.I, referenceCurrentSourceQS.I);
connect(referenceCurrentSourceQS.plug_p, starQS.plug_p); ... connect(resistorQS.plug_n, referenceCurrentSourceQS.plug_n);
connect(dqToThreePhase.y, signalCurrent.i);	connect(id.y, currentControllerQS.id_rms);
connect(dqToThreePhaseQS.gamma, referenceCurrentSourceQS.gamma);	connect(id.y, currentController.id_rms);
connect(angleSensorQS.phi, dqToThreePhaseQS.phi);	connect(iq.y, currentControllerQS.iq_rms);
connect(angleSensor.phi, dqToThreePhase.phi);	connect(iq.y, currentController.iq_rms);
	connect(currentController.y, signalCurrent.i); connect(currentControllerQS.gamma, referenceCurrentSourceQS.gamma); connect(angleSensorQS.phi, currentControllerQS.phi); connect(angleSensor.phi, currentController.phi);
connect(smpmQS.flange, rotorAngleQS.flange); ... connect(starMachine.pin_n, groundM.p);
connect(id.y, dqToThreePhaseQS.id_rms); connect(id.y, dqToThreePhase.d); connect(iq.y, dqToThreePhaseQS.iq_rms); connect(iq.y, dqToThreePhase.q);

model Magnetic.QuasiStatic.FundamentalWave.Examples.BasicMachines.SynchronousMachines.SMPM_MTPA

Component	Modelica 4.0.0	Modelica 3.2.3
VNominal	Units.SI.Voltage	SIunits.Voltage
fNominal	Units.SI.Frequency	SIunits.Frequency
f	Units.SI.Frequency	SIunits.Frequency
tRamp	Units.SI.Time	SIunits.Time
TLoad	Units.SI.Torque	SIunits.Torque
tStep	Units.SI.Time	SIunits.Time
JLoad	Units.SI.Inertia	SIunits.Inertia
wNominal	Units.SI.AngularVelocity	SIunits.AngularVelocity
theta	Units.SI.Angle	SIunits.Angle
phi_i	Units.SI.Angle	SIunits.Angle
phi_v	Units.SI.Angle	SIunits.Angle
phi	Units.SI.Angle	SIunits.Angle
epsilon	Units.SI.Angle	SIunits.Angle
starMachineQS	Electrical.QuasiStatic.Polyphase.Basic.Star	Electrical.QuasiStationary.MultiPhase.Basic.Star
groundMQS	Electrical.QuasiStatic.SinglePhase.Basic.Ground	Electrical.QuasiStationary.SinglePhase.Basic.Ground
referenceCurrentSourceQS	Electrical.QuasiStatic.Polyphase.Sources.ReferenceCurrentSource	Electrical.QuasiStationary.MultiPhase.Sources.ReferenceCurrentSource
starQS	Electrical.QuasiStatic.Polyphase.Basic.Star	Electrical.QuasiStationary.MultiPhase.Basic.Star
groundeQS	Electrical.QuasiStatic.SinglePhase.Basic.Ground	Electrical.QuasiStationary.SinglePhase.Basic.Ground
resistorQS	Electrical.QuasiStatic.Polyphase.Basic.Resistor	Electrical.QuasiStationary.MultiPhase.Basic.Resistor
currentRMSSensorQS	Electrical.QuasiStatic.Polyphase.Sensors.CurrentQuasiRMSSensor	Electrical.QuasiStationary.MultiPhase.Sensors.CurrentQuasiRMSSensor
voltageQuasiRMSSensorQS	Electrical.QuasiStatic.Polyphase.Sensors.VoltageQuasiRMSSensor	Electrical.QuasiStationary.MultiPhase.Sensors.VoltageQuasiRMSSensor
starMQS	Electrical.QuasiStatic.Polyphase.Basic.Star	Electrical.QuasiStationary.MultiPhase.Basic.Star

model Magnetic.QuasiStatic.FundamentalWave.Examples.BasicMachines.SynchronousMachines.SMEE_Generator

Component	Modelica 4.0.0	Modelica 3.2.3
VsNominal	Units.SI.Voltage	SIunits.Voltage
fsNominal	Units.SI.Frequency	SIunits.Frequency
w	Units.SI.AngularVelocity	SIunits.AngularVelocity
Ie	Units.SI.Current	SIunits.Current
Ie0	Units.SI.Current	SIunits.Current
gamma0	Units.SI.Angle	SIunits.Angle
thetaQS	Units.SI.Angle	SIunits.Angle
theta	Units.SI.Angle	SIunits.Angle
Ptr	Units.SI.Power	SIunits.Power
Pqs	Units.SI.Power	SIunits.Power
star	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
sineVoltage	Electrical.Polyphase.Sources.SineVoltage	Electrical.MultiPhase.Sources.SineVoltage
powerSensor	Electrical.Polyphase.Sensors.PowerSensor	Electrical.MultiPhase.Sensors.PowerSensor
smee	Magnetic.FundamentalWave.BasicMachines.SynchronousMachines.SM_ElectricalExcited	Magnetic.FundamentalWave.BasicMachines.SynchronousInductionMachines.SM_ElectricalExcited
voltageSourceQS	Electrical.QuasiStatic.Polyphase.Sources.VoltageSource	Electrical.QuasiStationary.MultiPhase.Sources.VoltageSource
starQS	Electrical.QuasiStatic.Polyphase.Basic.Star	Electrical.QuasiStationary.MultiPhase.Basic.Star
groundeQS	Electrical.QuasiStatic.SinglePhase.Basic.Ground	Electrical.QuasiStationary.SinglePhase.Basic.Ground
powerSensorQS	Electrical.QuasiStatic.Polyphase.Sensors.PowerSensor	Electrical.QuasiStationary.MultiPhase.Sensors.PowerSensor
starMachineQS	Electrical.QuasiStatic.Polyphase.Basic.Star	Electrical.QuasiStationary.MultiPhase.Basic.Star
groundMachineQS	Electrical.QuasiStatic.SinglePhase.Basic.Ground	Electrical.QuasiStationary.SinglePhase.Basic.Ground
starMachine	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star

model Magnetic.QuasiStatic.FundamentalWave.Examples.BasicMachines.SynchronousMachines.SMR_CurrentSource

Component	Modelica 4.0.0	Modelica 3.2.3
VNominal	Units.SI.Voltage	SIunits.Voltage
fNominal	Units.SI.Frequency	SIunits.Frequency
f	Units.SI.Frequency	SIunits.Frequency
tRamp	Units.SI.Time	SIunits.Time
TLoad	Units.SI.Torque	SIunits.Torque
tStep	Units.SI.Time	SIunits.Time
JLoad	Units.SI.Inertia	SIunits.Inertia
thetaQS	Units.SI.Angle	SIunits.Angle
theta	Units.SI.Angle	SIunits.Angle
signalCurrent	Electrical.Polyphase.Sources.SignalCurrent	Electrical.MultiPhase.Sources.SignalCurrent
star	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
voltageQuasiRMSSensor	Electrical.Polyphase.Sensors.VoltageQuasiRMSSensor	Electrical.MultiPhase.Sensors.VoltageQuasiRMSSensor
starM	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
currentRMSsensor	Electrical.Polyphase.Sensors.CurrentQuasiRMSSensor	Electrical.MultiPhase.Sensors.CurrentQuasiRMSSensor
starMachineQS	Electrical.QuasiStatic.Polyphase.Basic.Star	Electrical.QuasiStationary.MultiPhase.Basic.Star
groundMQS	Electrical.QuasiStatic.SinglePhase.Basic.Ground	Electrical.QuasiStationary.SinglePhase.Basic.Ground
referenceCurrentSource	Electrical.QuasiStatic.Polyphase.Sources.ReferenceCurrentSource	Electrical.QuasiStationary.MultiPhase.Sources.ReferenceCurrentSource
starQS	Electrical.QuasiStatic.Polyphase.Basic.Star	Electrical.QuasiStationary.MultiPhase.Basic.Star
groundeQS	Electrical.QuasiStatic.SinglePhase.Basic.Ground	Electrical.QuasiStationary.SinglePhase.Basic.Ground
resistorQS	Electrical.QuasiStatic.Polyphase.Basic.Resistor	Electrical.QuasiStationary.MultiPhase.Basic.Resistor
smr	Magnetic.FundamentalWave.BasicMachines.SynchronousMachines.SM_ReluctanceRotor	Magnetic.FundamentalWave.BasicMachines.SynchronousInductionMachines.SM_ReluctanceRotor
currentRMSSensorQS	Electrical.QuasiStatic.Polyphase.Sensors.CurrentQuasiRMSSensor	Electrical.QuasiStationary.MultiPhase.Sensors.CurrentQuasiRMSSensor
voltageQuasiRMSSensorQS	Electrical.QuasiStatic.Polyphase.Sensors.VoltageQuasiRMSSensor	Electrical.QuasiStationary.MultiPhase.Sensors.VoltageQuasiRMSSensor
starMQS	Electrical.QuasiStatic.Polyphase.Basic.Star	Electrical.QuasiStationary.MultiPhase.Basic.Star
starMachine	Electrical.Polyphase.Basic.Star	Electrical.MultiPhase.Basic.Star
dqToThreePhase	Present
dqToThreePhase
dqToThreePhaseQS	Present
dqToThreePhaseQS
currentController		Present
currentController
currentControllerQS		Present
currentControllerQS

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... connect(groundMQS.pin, starMachineQS.pin_n);
connect(dqToThreePhaseQS.I, referenceCurrentSource.I);	connect(currentControllerQS.I, referenceCurrentSource.I);
connect(referenceCurrentSource.plug_p, starQS.plug_p); ... connect(currentRMSSensorQS.plug_n, terminalBoxQS.plugSupply);
connect(id.y, dqToThreePhaseQS.id_rms);	connect(id.y, currentControllerQS.id_rms);
connect(id.y, dqToThreePhase.d);	connect(id.y, currentController.id_rms);
connect(iq.y, dqToThreePhaseQS.iq_rms);	connect(iq.y, currentControllerQS.iq_rms);
connect(iq.y, dqToThreePhase.q);	connect(iq.y, currentController.iq_rms);
connect(angleSensor.phi, dqToThreePhase.phi);	connect(angleSensor.phi, currentController.phi);
connect(dqToThreePhase.y, signalCurrent.i);	connect(currentController.y, signalCurrent.i);
connect(dqToThreePhaseQS.gamma, referenceCurrentSource.gamma);	connect(currentControllerQS.gamma, referenceCurrentSource.gamma);
connect(angleSensorQS.phi, dqToThreePhaseQS.phi);	connect(angleSensorQS.phi, currentControllerQS.phi);
connect(starMQS.plug_p, voltageQuasiRMSSensorQS.plug_p); ...

model Magnetic.QuasiStatic.FundamentalWave.Components.EddyCurrent

Component	Modelica 4.0.0	Modelica 3.2.3
G	Units.SI.Conductance	SIunits.Conductance
omega	Units.SI.AngularVelocity	SIunits.AngularVelocity

model Magnetic.QuasiStatic.FundamentalWave.Components.QuasiStaticAnalogElectroMagneticConverter

Component	Modelica 4.0.0	Modelica 3.2.3
v	Units.SI.Voltage	SIunits.Voltage
i	Units.SI.Current	SIunits.Current
V_m	Units.SI.ComplexMagneticPotentialDifference	SIunits.ComplexMagneticPotentialDifference
abs_V_m	Units.SI.MagneticPotentialDifference	SIunits.MagneticPotentialDifference
arg_V_m	Units.SI.Angle	SIunits.Angle
Phi	Units.SI.ComplexMagneticFlux	SIunits.ComplexMagneticFlux
abs_Phi	Units.SI.MagneticPotentialDifference	SIunits.MagneticPotentialDifference
arg_Phi	Units.SI.Angle	SIunits.Angle
gamma	Units.SI.Angle	SIunits.Angle
omega	Units.SI.AngularVelocity	SIunits.AngularVelocity

model Magnetic.QuasiStatic.FundamentalWave.BasicMachines.InductionMachines.IM_SquirrelCage

Component	Modelica 4.0.0	Modelica 3.2.3
Lm	Units.SI.Inductance	SIunits.Inductance
Lrsigma	Units.SI.Inductance	SIunits.Inductance
Rr	Units.SI.Resistance	SIunits.Resistance
TrRef	Units.SI.Temperature	SIunits.Temperature
TrOperational	Units.SI.Temperature	SIunits.Temperature
ir	Units.SI.ComplexCurrent	SIunits.ComplexCurrent
abs_ir	Units.SI.Current	SIunits.Current
arg_ir	Units.SI.Angle	SIunits.Angle
rotorCage	Magnetic.QuasiStatic.FundamentalWave.BasicMachines.Components.SymmetricPolyphaseCageWinding	Magnetic.QuasiStatic.FundamentalWave.BasicMachines.Components.SymmetricMultiPhaseCageWinding

model Magnetic.QuasiStatic.FundamentalWave.BasicMachines.InductionMachines.IM_SlipRing

Component	Modelica 4.0.0	Modelica 3.2.3
plug_rn	Electrical.QuasiStatic.Polyphase.Interfaces.NegativePlug	Electrical.QuasiStationary.MultiPhase.Interfaces.NegativePlug
plug_rp	Electrical.QuasiStatic.Polyphase.Interfaces.PositivePlug	Electrical.QuasiStationary.MultiPhase.Interfaces.PositivePlug
Lm	Units.SI.Inductance	SIunits.Inductance
Lrsigma	Units.SI.Inductance	SIunits.Inductance
Rr	Units.SI.Resistance	SIunits.Resistance
TrRef	Units.SI.Temperature	SIunits.Temperature
TrOperational	Units.SI.Temperature	SIunits.Temperature
VsNominal	Units.SI.Voltage	SIunits.Voltage
VrLockedRotor	Units.SI.Voltage	SIunits.Voltage
vr	Units.SI.ComplexVoltage	SIunits.ComplexVoltage
abs_vr	Units.SI.Voltage	SIunits.Voltage
arg_vr	Units.SI.Angle	SIunits.Angle
ir	Units.SI.ComplexCurrent	SIunits.ComplexCurrent
abs_ir	Units.SI.Current	SIunits.Current
arg_ir	Units.SI.Angle	SIunits.Angle
Pr	Units.SI.ActivePower	SIunits.ActivePower
Pr_total	Units.SI.ActivePower	SIunits.ActivePower
Qr	Units.SI.ReactivePower	SIunits.ReactivePower
Qr_total	Units.SI.ReactivePower	SIunits.ReactivePower
Sr	Units.SI.ApparentPower	SIunits.ApparentPower
Sr_total	Units.SI.ApparentPower	SIunits.ApparentPower
rotor	Magnetic.QuasiStatic.FundamentalWave.BasicMachines.Components.SymmetricPolyphaseWinding	Magnetic.QuasiStatic.FundamentalWave.BasicMachines.Components.SymmetricMultiPhaseWinding

model Magnetic.QuasiStatic.FundamentalWave.BasicMachines.SynchronousMachines.SM_PermanentMagnet

Component	Modelica 4.0.0	Modelica 3.2.3
Lmd	Units.SI.Inductance	SIunits.Inductance
Lmq	Units.SI.Inductance	SIunits.Inductance
Lrsigmad	Units.SI.Inductance	SIunits.Inductance
Lrsigmaq	Units.SI.Inductance	SIunits.Inductance
Rrd	Units.SI.Resistance	SIunits.Resistance
Rrq	Units.SI.Resistance	SIunits.Resistance
TrRef	Units.SI.Temperature	SIunits.Temperature
TpmOperational	Units.SI.Temperature	SIunits.Temperature
TrOperational	Units.SI.Temperature	SIunits.Temperature
VsOpenCircuit	Units.SI.Voltage	SIunits.Voltage
V_mPM	Units.SI.MagneticPotentialDifference	SIunits.MagneticPotentialDifference

model Magnetic.QuasiStatic.FundamentalWave.BasicMachines.SynchronousMachines.SM_ElectricalExcited

Component	Modelica 4.0.0	Modelica 3.2.3
Lmd	Units.SI.Inductance	SIunits.Inductance
Lmq	Units.SI.Inductance	SIunits.Inductance
Lrsigmad	Units.SI.Inductance	SIunits.Inductance
Lrsigmaq	Units.SI.Inductance	SIunits.Inductance
Rrd	Units.SI.Resistance	SIunits.Resistance
Rrq	Units.SI.Resistance	SIunits.Resistance
TrRef	Units.SI.Temperature	SIunits.Temperature
TrOperational	Units.SI.Temperature	SIunits.Temperature
TeOperational	Units.SI.Temperature	SIunits.Temperature
VsNominal	Units.SI.Voltage	SIunits.Voltage
IeOpenCircuit	Units.SI.Current	SIunits.Current
Re	Units.SI.Resistance	SIunits.Resistance
TeRef	Units.SI.Temperature	SIunits.Temperature
ve	Units.SI.Voltage	SIunits.Voltage
ie	Units.SI.Current	SIunits.Current

model Magnetic.QuasiStatic.FundamentalWave.BasicMachines.SynchronousMachines.SM_ReluctanceRotor

Component	Modelica 4.0.0	Modelica 3.2.3
Lmd	Units.SI.Inductance	SIunits.Inductance
Lmq	Units.SI.Inductance	SIunits.Inductance
Lrsigmad	Units.SI.Inductance	SIunits.Inductance
Lrsigmaq	Units.SI.Inductance	SIunits.Inductance
Rrd	Units.SI.Resistance	SIunits.Resistance
Rrq	Units.SI.Resistance	SIunits.Resistance
TrRef	Units.SI.Temperature	SIunits.Temperature
TrOperational	Units.SI.Temperature	SIunits.Temperature

model Magnetic.QuasiStatic.FundamentalWave.BasicMachines.Components.QuasiStaticAnalogWinding

Component	Modelica 4.0.0	Modelica 3.2.3
RRef	Units.SI.Resistance	SIunits.Resistance
TRef	Units.SI.Temperature	SIunits.Temperature
alphaRef	Units.SI.LinearTemperatureCoefficient	SIunits.LinearTemperatureCoefficient
TOperational	Units.SI.Temperature	SIunits.Temperature
v	Units.SI.Voltage	SIunits.Voltage
i	Units.SI.Current	SIunits.Current
V_m	Units.SI.ComplexMagneticPotentialDifference	SIunits.ComplexMagneticPotentialDifference
abs_V_m	Units.SI.MagneticPotentialDifference	SIunits.MagneticPotentialDifference
arg_V_m	Units.SI.Angle	SIunits.Angle
Phi	Units.SI.ComplexMagneticFlux	SIunits.ComplexMagneticFlux
abs_Phi	Units.SI.MagneticFlux	SIunits.MagneticFlux
arg_Phi	Units.SI.Angle	SIunits.Angle

model Magnetic.QuasiStatic.FundamentalWave.BasicMachines.Components.RotorSaliencyAirGap

Component	Modelica 4.0.0	Modelica 3.2.3
V_ms	Units.SI.ComplexMagneticPotentialDifference	SIunits.ComplexMagneticPotentialDifference
V_msr	Units.SI.ComplexMagneticPotentialDifference	SIunits.ComplexMagneticPotentialDifference
V_mr	Units.SI.ComplexMagneticPotentialDifference	SIunits.ComplexMagneticPotentialDifference
V_mrr	Units.SI.ComplexMagneticPotentialDifference	SIunits.ComplexMagneticPotentialDifference
Phi_s	Units.SI.ComplexMagneticFlux	SIunits.ComplexMagneticFlux
Phi_sr	Units.SI.ComplexMagneticFlux	SIunits.ComplexMagneticFlux
Phi_r	Units.SI.ComplexMagneticFlux	SIunits.ComplexMagneticFlux
Phi_rr	Units.SI.ComplexMagneticFlux	SIunits.ComplexMagneticFlux
tauElectrical	Units.SI.Torque	SIunits.Torque
gamma	Units.SI.Angle	SIunits.Angle
gammas	Units.SI.Angle	SIunits.Angle
gammar	Units.SI.Angle	SIunits.Angle

model Magnetic.QuasiStatic.FundamentalWave.BasicMachines.Components.SaliencyCageWinding

Component	Modelica 4.0.0	Modelica 3.2.3
TRef	Units.SI.Temperature	SIunits.Temperature
alphaRef	Units.SI.LinearTemperatureCoefficient	SIunits.LinearTemperatureCoefficient
TOperational	Units.SI.Temperature	SIunits.Temperature
electroMagneticConverter	Magnetic.QuasiStatic.FundamentalWave.Components.PolyphaseElectroMagneticConverter	Magnetic.QuasiStatic.FundamentalWave.Components.MultiPhaseElectroMagneticConverter
resistor	Electrical.QuasiStatic.Polyphase.Basic.Resistor	Electrical.QuasiStationary.MultiPhase.Basic.Resistor
star	Electrical.QuasiStatic.Polyphase.Basic.Star	Electrical.QuasiStationary.MultiPhase.Basic.Star
ground	Electrical.QuasiStatic.SinglePhase.Basic.Ground	Electrical.QuasiStationary.SinglePhase.Basic.Ground

model Magnetic.QuasiStatic.FundamentalWave.BasicMachines.Components.PermanentMagnet

Component	Modelica 4.0.0	Modelica 3.2.3
V_m	Units.SI.ComplexMagneticPotentialDifference	SIunits.ComplexMagneticPotentialDifference
abs_V_m	Units.SI.MagneticPotentialDifference	SIunits.MagneticPotentialDifference
arg_V_m	Units.SI.Angle	SIunits.Angle
gamma	Units.SI.Angle	SIunits.Angle
Phi	Units.SI.ComplexMagneticFlux	SIunits.ComplexMagneticFlux
abs_Phi	Units.SI.MagneticPotentialDifference	SIunits.MagneticPotentialDifference
arg_Phi	Units.SI.Angle	SIunits.Angle
V_mGamma	Units.SI.ComplexMagneticPotentialDifference	SIunits.ComplexMagneticPotentialDifference

model Magnetic.QuasiStatic.FundamentalWave.Losses.StrayLoad

Component	Modelica 4.0.0	Modelica 3.2.3
iRMS	Units.SI.Current	SIunits.Current

model Magnetic.QuasiStatic.FundamentalWave.Losses.PermanentMagnetLosses

Component	Modelica 4.0.0	Modelica 3.2.3
is	Units.SI.ComplexCurrent	SIunits.ComplexCurrent
iRMS	Units.SI.Current	SIunits.Current

model Magnetic.QuasiStatic.FundamentalWave.Sensors.MagneticFluxSensor

Component	Modelica 4.0.0	Modelica 3.2.3
V_m	Units.SI.ComplexMagneticPotentialDifference	SIunits.ComplexMagneticPotentialDifference
abs_Phi	Units.SI.MagneticFlux	SIunits.MagneticFlux
arg_Phi	Units.SI.Angle	SIunits.Angle

model Magnetic.QuasiStatic.FundamentalWave.Sensors.MagneticPotentialDifferenceSensor

Component	Modelica 4.0.0	Modelica 3.2.3
abs_V_m	Units.SI.MagneticPotentialDifference	SIunits.MagneticPotentialDifference
arg_V_m	Units.SI.Angle	SIunits.Angle
Phi	Units.SI.ComplexMagneticFlux	SIunits.ComplexMagneticFlux

model Magnetic.QuasiStatic.FundamentalWave.Sensors.MagneticPotentialSensor

Component	Modelica 4.0.0	Modelica 3.2.3
abs_V_m	Units.SI.MagneticPotentialDifference	SIunits.MagneticPotentialDifference
arg_V_m	Units.SI.Angle	SIunits.Angle

model Magnetic.QuasiStatic.FundamentalWave.Sensors.RotorDisplacementAngle

Component	Modelica 4.0.0	Modelica 3.2.3
plug_p	Electrical.QuasiStatic.Polyphase.Interfaces.PositivePlug	Electrical.QuasiStationary.MultiPhase.Interfaces.PositivePlug
plug_n	Electrical.QuasiStatic.Polyphase.Interfaces.NegativePlug	Electrical.QuasiStationary.MultiPhase.Interfaces.NegativePlug
referenceSensor	Electrical.QuasiStatic.Polyphase.Sensors.ReferenceSensor	Electrical.QuasiStationary.MultiPhase.Sensors.ReferenceSensor
voltageSensor	Electrical.QuasiStatic.Polyphase.Sensors.VoltageSensor	Electrical.QuasiStationary.MultiPhase.Sensors.VoltageSensor
toSpacePhasor	Electrical.QuasiStatic.Polyphase.Blocks.ToSpacePhasor	Electrical.QuasiStationary.MultiPhase.Blocks.ToSpacePhasor

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... connect(voltageSensor.plug_n, plug_n);
connect(referenceSensor.gamma, add3_1.u2);	connect(referenceSensor.y, add3_1.u2);
connect(add.y, add3_1.u1);
connect(toSpacePhasor.u,voltageSensor.v);	connect(toSpacePhasor.u, voltageSensor.y);
connect(toSpacePhasor.y, toPolar.u); ...

model Magnetic.QuasiStatic.FundamentalWave.Sources.ConstantMagneticPotentialDifference

Component	Modelica 4.0.0	Modelica 3.2.3
f	Units.SI.Frequency	SIunits.Frequency
V_m	Units.SI.ComplexMagneticPotentialDifference	SIunits.ComplexMagneticPotentialDifference
abs_V_m	Units.SI.MagneticPotentialDifference	SIunits.MagneticPotentialDifference
arg_V_m	Units.SI.Angle	SIunits.Angle
Phi	Units.SI.ComplexMagneticFlux	SIunits.ComplexMagneticFlux
abs_Phi	Units.SI.MagneticPotentialDifference	SIunits.MagneticPotentialDifference
arg_Phi	Units.SI.Angle	SIunits.Angle

model Magnetic.QuasiStatic.FundamentalWave.Sources.SignalMagneticPotentialDifference

Component	Modelica 4.0.0	Modelica 3.2.3
abs_V_m	Units.SI.MagneticPotentialDifference	SIunits.MagneticPotentialDifference
arg_V_m	Units.SI.Angle	SIunits.Angle
Phi	Units.SI.ComplexMagneticFlux	SIunits.ComplexMagneticFlux
abs_Phi	Units.SI.MagneticPotentialDifference	SIunits.MagneticPotentialDifference
arg_Phi	Units.SI.Angle	SIunits.Angle

model Magnetic.QuasiStatic.FundamentalWave.Sources.ConstantFlux

Component	Modelica 4.0.0	Modelica 3.2.3
f	Units.SI.Frequency	SIunits.Frequency
V_m	Units.SI.ComplexMagneticPotentialDifference	SIunits.ComplexMagneticPotentialDifference
abs_V_m	Units.SI.MagneticPotentialDifference	SIunits.MagneticPotentialDifference
arg_V_m	Units.SI.Angle	SIunits.Angle
Phi	Units.SI.ComplexMagneticFlux	SIunits.ComplexMagneticFlux
abs_Phi	Units.SI.MagneticPotentialDifference	SIunits.MagneticPotentialDifference
arg_Phi	Units.SI.Angle	SIunits.Angle

model Magnetic.QuasiStatic.FundamentalWave.Sources.SignalFlux

Component	Modelica 4.0.0	Modelica 3.2.3
V_m	Units.SI.ComplexMagneticPotentialDifference	SIunits.ComplexMagneticPotentialDifference
abs_V_m	Units.SI.MagneticPotentialDifference	SIunits.MagneticPotentialDifference
arg_V_m	Units.SI.Angle	SIunits.Angle
abs_Phi	Units.SI.MagneticPotentialDifference	SIunits.MagneticPotentialDifference
arg_Phi	Units.SI.Angle	SIunits.Angle

connector Magnetic.QuasiStatic.FundamentalWave.Interfaces.MagneticPort

Component	Modelica 4.0.0	Modelica 3.2.3
V_m	Units.SI.ComplexMagneticPotential	SIunits.ComplexMagneticPotential
Phi	Units.SI.ComplexMagneticFlux	SIunits.ComplexMagneticFlux

connector Magnetic.QuasiStatic.FundamentalWave.Interfaces.PositiveMagneticPort

Component	Modelica 4.0.0	Modelica 3.2.3
reference	Electrical.QuasiStatic.Types.Reference	Electrical.QuasiStationary.Types.Reference

connector Magnetic.QuasiStatic.FundamentalWave.Interfaces.NegativeMagneticPort

Component	Modelica 4.0.0	Modelica 3.2.3
reference	Electrical.QuasiStatic.Types.Reference	Electrical.QuasiStationary.Types.Reference

block Magnetic.QuasiStatic.FundamentalWave.Utilities.VfController

Component	Modelica 4.0.0	Modelica 3.2.3
orientation	Units.SI.Angle	SIunits.Angle
VNominal	Units.SI.Voltage	SIunits.Voltage
fNominal	Units.SI.Frequency	SIunits.Frequency
BasePhase	Units.SI.Angle	SIunits.Angle
amplitude	Units.SI.Voltage	SIunits.Voltage

model Magnetic.QuasiStatic.FundamentalWave.Utilities.TerminalBox

Component	Modelica 4.0.0	Modelica 3.2.3
plug_sp	Electrical.QuasiStatic.Polyphase.Interfaces.PositivePlug	Electrical.QuasiStationary.MultiPhase.Interfaces.PositivePlug
plug_sn	Electrical.QuasiStatic.Polyphase.Interfaces.NegativePlug	Electrical.QuasiStationary.MultiPhase.Interfaces.NegativePlug
star	Electrical.QuasiStatic.Polyphase.Basic.Star	Electrical.QuasiStationary.MultiPhase.Basic.Star
delta	Electrical.QuasiStatic.Polyphase.Basic.Delta	Electrical.QuasiStationary.MultiPhase.Basic.Delta
plugSupply	Electrical.QuasiStatic.Polyphase.Interfaces.PositivePlug	Electrical.QuasiStationary.MultiPhase.Interfaces.PositivePlug
starpoint	Electrical.QuasiStatic.SinglePhase.Interfaces.NegativePin	Electrical.QuasiStationary.SinglePhase.Interfaces.NegativePin

model Magnetic.QuasiStatic.FundamentalWave.Utilities.MultiTerminalBox

Component	Modelica 4.0.0	Modelica 3.2.3
mSystems	=Modelica400.Electrical.Polyphase.Functions.numberOfSymmetricBaseSystems(m)	=Electrical.MultiPhase.Functions.numberOfSymmetricBaseSystems(m)
plug_sp	Electrical.QuasiStatic.Polyphase.Interfaces.PositivePlug	Electrical.QuasiStationary.MultiPhase.Interfaces.PositivePlug
plug_sn	Electrical.QuasiStatic.Polyphase.Interfaces.NegativePlug	Electrical.QuasiStationary.MultiPhase.Interfaces.NegativePlug
multiStar	Electrical.QuasiStatic.Polyphase.Basic.MultiStar	Electrical.QuasiStationary.MultiPhase.Basic.MultiStar
multiDelta	Electrical.QuasiStatic.Polyphase.Basic.MultiDelta	Electrical.QuasiStationary.MultiPhase.Basic.MultiDelta
plugSupply	Electrical.QuasiStatic.Polyphase.Interfaces.PositivePlug	Electrical.QuasiStationary.MultiPhase.Interfaces.PositivePlug
starpoint	Electrical.QuasiStatic.Polyphase.Interfaces.NegativePlug	Electrical.QuasiStationary.MultiPhase.Interfaces.NegativePlug

model Magnetic.QuasiStatic.FundamentalWave.Utilities.SwitchedRheostat

Component	Modelica 4.0.0	Modelica 3.2.3
plug_p	Electrical.QuasiStatic.Polyphase.Interfaces.PositivePlug	Electrical.QuasiStationary.MultiPhase.Interfaces.PositivePlug
plug_n	Electrical.QuasiStatic.Polyphase.Interfaces.NegativePlug	Electrical.QuasiStationary.MultiPhase.Interfaces.NegativePlug
RStart	Units.SI.Resistance	SIunits.Resistance
tStart	Units.SI.Time	SIunits.Time
star	Electrical.QuasiStatic.Polyphase.Basic.Star	Electrical.QuasiStationary.MultiPhase.Basic.Star
ground	Electrical.QuasiStatic.SinglePhase.Basic.Ground	Electrical.QuasiStationary.SinglePhase.Basic.Ground
idealCommutingSwitch	Electrical.QuasiStatic.Polyphase.Ideal.IdealCommutingSwitch	Electrical.QuasiStationary.MultiPhase.Ideal.IdealCommutingSwitch
rheostat	Electrical.QuasiStatic.Polyphase.Basic.Resistor	Electrical.QuasiStationary.MultiPhase.Basic.Resistor
starRheostat	Electrical.QuasiStatic.Polyphase.Basic.Star	Electrical.QuasiStationary.MultiPhase.Basic.Star

model Magnetic.QuasiStatic.FundamentalWave.Utilities.CurrentController

Component	Modelica 4.0.0	Modelica 3.2.3
gamma0	Units.SI.Angle	SIunits.Angle
singleToMultiPhase	Electrical.QuasiStatic.Polyphase.Blocks.SingleToPolyphase	Electrical.QuasiStationary.MultiPhase.Blocks.SingleToMultiPhase

model Magnetic.QuasiStatic.FundamentalWave.Utilities.SwitchYD

Component	Modelica 4.0.0	Modelica 3.2.3
plugSupply	Electrical.QuasiStatic.Polyphase.Interfaces.PositivePlug	Electrical.QuasiStationary.MultiPhase.Interfaces.PositivePlug
plug_sp	Electrical.QuasiStatic.Polyphase.Interfaces.PositivePlug	Electrical.QuasiStationary.MultiPhase.Interfaces.PositivePlug
plug_sn	Electrical.QuasiStatic.Polyphase.Interfaces.NegativePlug	Electrical.QuasiStationary.MultiPhase.Interfaces.NegativePlug
star	Electrical.QuasiStatic.Polyphase.Basic.Star	Electrical.QuasiStationary.MultiPhase.Basic.Star
delta	Electrical.QuasiStatic.Polyphase.Basic.Delta	Electrical.QuasiStationary.MultiPhase.Basic.Delta
Ron	Present
Goff	Present
delayTime	Present
idealCloser	Present
idealCloser
idealOpener	Present
idealOpener
logicalDelay	Present
logicalDelay
idealCommutingSwitch		Present
idealCommutingSwitch

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... connect(delta.plug_p, plug_sp);
connect(idealCloser.plug_p, plug_sn);	connect(idealCommutingSwitch.plug_n2, delta.plug_n);
connect(idealCloser.plug_n, delta.plug_n);	connect(idealCommutingSwitch.plug_n1, star.plug_p);
connect(plug_sn, idealOpener.plug_p);	connect(idealCommutingSwitch.plug_p, plug_sn);
connect(idealOpener.plug_n, star.plug_p);	connect(control, idealCommutingSwitch.control);
connect(control, logicalDelay.u); connect(logicalDelay.y1, idealOpener.control); connect(logicalDelay.y2, idealCloser.control);

model Mechanics.MultiBody.World

Component	Modelica 4.0.0	Modelica 3.2.3
g	Units.SI.Acceleration	SIunits.Acceleration
axisLength	Units.SI.Distance	SIunits.Distance
axisDiameter	Units.SI.Distance	SIunits.Distance
gravityArrowTail	Units.SI.Position	SIunits.Position
gravityArrowLength	Units.SI.Length	SIunits.Length
gravityArrowDiameter	Units.SI.Diameter	SIunits.Diameter
gravitySphereDiameter	Units.SI.Diameter	SIunits.Diameter
groundLength_u	Units.SI.Length	SIunits.Length
groundLength_v	Units.SI.Length	SIunits.Length
nominalLength	Units.SI.Length	SIunits.Length
defaultAxisLength	Units.SI.Length	SIunits.Length
defaultJointLength	Units.SI.Length	SIunits.Length
defaultJointWidth	Units.SI.Length	SIunits.Length
defaultForceLength	Units.SI.Length	SIunits.Length
defaultForceWidth	Units.SI.Length	SIunits.Length
defaultBodyDiameter	Units.SI.Length	SIunits.Length
defaultArrowDiameter	Units.SI.Length	SIunits.Length
headLength	Units.SI.Length	SIunits.Length
headWidth	Units.SI.Length	SIunits.Length
lineLength	Units.SI.Length	SIunits.Length
lineWidth	Units.SI.Length	SIunits.Length
scaledLabel	Units.SI.Length	SIunits.Length
labelStart	Units.SI.Length	SIunits.Length
gravityHeadLength	Units.SI.Length	SIunits.Length
gravityHeadWidth	Units.SI.Length	SIunits.Length
gravityLineLength	Units.SI.Length	SIunits.Length
mu	Present
mue		Present

model Mechanics.MultiBody.Examples.Elementary.ForceAndTorque

Component	Modelica 4.0.0	Modelica 3.2.3
world	defaultNm_to_m=120
world	defaultN_to_m=1200
forceAndTorque		Nm_to_m=120
forceAndTorque		N_to_m=1200

model Mechanics.MultiBody.Examples.Elementary.LineForceWithTwoMasses

Component	Modelica 4.0.0	Modelica 3.2.3
m	Units.SI.Mass	SIunits.Mass
rod_f_diff	Units.SI.Force	SIunits.Force
body_f_diff	Units.SI.Force	SIunits.Force

model Mechanics.MultiBody.Examples.Elementary.PointGravity

Component	Modelica 4.0.0	Modelica 3.2.3
world	mu=1
world		mue=1

model Mechanics.MultiBody.Examples.Elementary.PointGravityWithPointMasses

Component	Modelica 4.0.0	Modelica 3.2.3
world	mu=1
world		mue=1

model Mechanics.MultiBody.Examples.Elementary.PointGravityWithPointMasses2

Component	Modelica 4.0.0	Modelica 3.2.3
world	mu=5
world		mue=5

model Mechanics.MultiBody.Examples.Elementary.RollingWheel

Component	Modelica 4.0.0	Modelica 3.2.3
wheel1	radius=0.3
	m=2
	I_axis=0.06
	I_long=0.12
		wheelRadius=0.3
		wheelMass=2
		wheel_I_axis=0.06
		wheel_I_long=0.12

model Mechanics.MultiBody.Examples.Elementary.RollingWheelSetDriving

Component	Modelica 4.0.0	Modelica 3.2.3
wheelSet	R_wheel=0.1
	m_wheel=0.5
	I_wheelAxis=0.01
	I_wheelLong=0.02
	track=0.5
		wheelRadius=0.1
		wheelMass=0.5
		wheel_I_axis=0.01
		wheel_I_long=0.02
		wheelDistance=0.5
sine1	f=1
sine1		freqHz=1
sine2	f=1
sine2		freqHz=1
shape	final r_shape={0,-wheelSet.width_wheel,0}	final r_shape={0,-wheelSet.wheelWidth,0}
	final length=2*wheelSet.width_wheel	final length=2*wheelSet.wheelWidth
	final width=2*wheelSet.R_wheel	final width=2*wheelSet.wheelRadius
	final height=2*wheelSet.R_wheel	final height=2*wheelSet.wheelRadius

model Mechanics.MultiBody.Examples.Elementary.RollingWheelSetPulling

Component	Modelica 4.0.0	Modelica 3.2.3
wheelSet	R_wheel=0.1
	m_wheel=0.5
	I_wheelAxis=0.01
	I_wheelLong=0.02
	track=0.5
		wheelRadius=0.1
		wheelMass=0.5
		wheel_I_axis=0.01
		wheel_I_long=0.02
		wheelDistance=0.5
shape	final r_shape={0,-wheelSet.width_wheel,0}	final r_shape={0,-wheelSet.wheelWidth,0}
	final length=2*wheelSet.width_wheel	final length=2*wheelSet.wheelWidth
	final width=2*wheelSet.R_wheel	final width=2*wheelSet.wheelRadius
	final height=2*wheelSet.R_wheel	final height=2*wheelSet.wheelRadius

model Mechanics.MultiBody.Examples.Elementary.UserDefinedGravityField

Component	Modelica 4.0.0	Modelica 3.2.3
geodeticLatitude	Units.NonSI.Angle_deg	SIunits.Conversions.NonSIunits.Angle_deg
height	Units.SI.Position	SIunits.Position
gravity	Units.SI.Acceleration	SIunits.Acceleration

model Mechanics.MultiBody.Examples.Elementary.Surfaces

Component	Modelica 4.0.0	Modelica 3.2.3
sine	f=0.5
sine		freqHz=0.5
fixedTranslation1	r={0,-1.3,torus.R + torus.r}	r={0,-1.3,torus.ro + torus.ri}

function Mechanics.MultiBody.Examples.Elementary.Utilities.theoreticalNormalGravityWGS84

Component	Modelica 4.0.0	Modelica 3.2.3
phi	Units.NonSI.Angle_deg	SIunits.Conversions.NonSIunits.Angle_deg
a	Units.SI.Position	SIunits.Position
b	Units.SI.Position	SIunits.Position
g_e	Units.SI.AngularAcceleration	SIunits.AngularAcceleration
g_p	Units.SI.AngularAcceleration	SIunits.AngularAcceleration
w	Units.SI.AngularVelocity	SIunits.AngularVelocity
gn	Units.SI.AngularAcceleration	SIunits.AngularAcceleration
gh	Units.SI.AngularAcceleration	SIunits.AngularAcceleration
h	Units.SI.Position	SIunits.Position

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... h := r[2];
sinphi2 = Modelica400.Math.sin(Modelica400.Units.Conversions.from_deg(phi))^2;	sinphi2 = Modelica323.Math.sin(Modelica323.SIunits.Conversions.from_deg(phi))^2;
gn = g_e(1 + ksinphi2)/sqrt(1 - e2*sinphi2); ...

model Mechanics.MultiBody.Examples.Loops.Engine1a

Component	Modelica 4.0.0	Modelica 3.2.3
b1	Present
b1
b2	Present
b2
cylinder	Present
cylinder
Piston		Present
Piston
Rod		Present
Rod
B2		Present
B2
Bearing		Present
Bearing
world		Present
world
Inertia		Present
Inertia
Crank4		Present
Crank4
Crank1		Present
Crank1
Crank3		Present
Crank3
Crank2		Present
Crank2
B1		Present
B1
Mid		Present
Mid
Cylinder		Present
Cylinder
cylPosition		Present
cylPosition

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
connect(cylPosition.frame_b, cylinder.frame_a);	connect(world.frame_b, Bearing.frame_a);
connect(b2.frame_a, mid.frame_b);	connect(Crank2.frame_a, Crank1.frame_b);
connect(b2.frame_b, connectingRod.frame_b);	connect(Crank2.frame_b, Crank3.frame_a);
connect(connectingRod.frame_a, b1.frame_b);	connect(Bearing.frame_b, Crank1.frame_a);
connect(b1.frame_a, piston.frame_b);	connect(cylPosition.frame_b, Cylinder.frame_a);
connect(cylinder.frame_b, piston.frame_a);	connect(world.frame_b, cylPosition.frame_a);
	connect(Crank3.frame_b, Crank4.frame_a); connect(B1.frame_a, Mid.frame_b); connect(B1.frame_b, Rod.frame_b); connect(Rod.frame_a, B2.frame_b); connect(B2.frame_a, Piston.frame_b); connect(Inertia.flange_b, Bearing.axis); connect(Mid.frame_a, Crank2.frame_b); connect(Cylinder.frame_b, Piston.frame_a);

model Mechanics.MultiBody.Examples.Loops.Engine1b

Component	Modelica 4.0.0	Modelica 3.2.3
b1	Present
b1
b2	Present
b2
cylinder	Present
cylinder
rod1	Present
rod1
rod3	Present
rod3
B2		Present
B2
B1		Present
B1
Cylinder		Present
Cylinder
Rod1		Present
Rod1
Rod3		Present
Rod3

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
connect(cylinder.frame_b, rod3.frame_a);	connect(B1.frame_b, Rod1.frame_a);
connect(cylPosition.frame_b, cylinder.frame_a);	connect(Rod1.frame_b, B2.frame_b);
connect(gasForce.flange_a, cylinder.support);	connect(Cylinder.frame_b, Rod3.frame_a);
connect(gasForce.flange_b, cylinder.axis);	connect(B2.frame_a, Rod3.frame_b);
connect(piston.frame_a, cylinder.frame_b);	connect(cylPosition.frame_b, Cylinder.frame_a);
connect(rod3.frame_b, b1.frame_a);	connect(gasForce.flange_a, Cylinder.support);
connect(mid.frame_b, b2.frame_a);	connect(Cylinder.axis, gasForce.flange_b);
connect(b2.frame_b, connectingRod.frame_b);	connect(Piston.frame_a, Rod3.frame_a);
connect(b2.frame_b, rod1.frame_b);	connect(B1.frame_b, Rod2.frame_a);
connect(b1.frame_b, rod1.frame_a);	connect(Mid.frame_b, B1.frame_a);

model Mechanics.MultiBody.Examples.Loops.Engine1b_analytic

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
connect(mid.frame_b, jointRRP.frame_a);	connect(Mid.frame_b, jointRRP.frame_a);
connect(jointRRP.frame_b, cylPosition.frame_b);
connect(gasForce.flange_a, jointRRP.bearing);	connect(jointRRP.axis, gasForce.flange_b);
connect(gasForce.flange_b, jointRRP.axis);	connect(jointRRP.bearing, gasForce.flange_a);
connect(jointRRP.frame_ib, piston.frame_a);	connect(jointRRP.frame_ib, Piston.frame_a);
connect(connectingRod.frame_b, jointRRP.frame_ia);	connect(jointRRP.frame_ia, Rod2.frame_a);

model Mechanics.MultiBody.Examples.Loops.EngineV6

Component	Modelica 4.0.0	Modelica 3.2.3
engineSpeed_rpm	Units.NonSI.AngularVelocity_rpm	SIunits.Conversions.NonSIunits.AngularVelocity_rpm
engineTorque	Units.SI.Torque	SIunits.Torque
filteredEngineTorque	Units.SI.Torque	SIunits.Torque
cylinder1	cylinderInclinationAngle=Cv.from_deg(-30)
cylinder1		cylinderInclination=Cv.from_deg(-30)
cylinder2	cylinderInclinationAngle=Cv.from_deg(30)
cylinder2		cylinderInclination=Cv.from_deg(30)
cylinder3	cylinderInclinationAngle=Cv.from_deg(-30)
cylinder3		cylinderInclination=Cv.from_deg(-30)
cylinder4	cylinderInclinationAngle=Cv.from_deg(30)
cylinder4		cylinderInclination=Cv.from_deg(30)
cylinder5	cylinderInclinationAngle=Cv.from_deg(-30)
cylinder5		cylinderInclination=Cv.from_deg(-30)
cylinder6	cylinderInclinationAngle=Cv.from_deg(30)
cylinder6		cylinderInclination=Cv.from_deg(30)

model Mechanics.MultiBody.Examples.Loops.EngineV6_analytic

Component	Modelica 4.0.0	Modelica 3.2.3
engineSpeed_rpm	Units.NonSI.AngularVelocity_rpm	SIunits.Conversions.NonSIunits.AngularVelocity_rpm
engineTorque	Units.SI.Torque	SIunits.Torque
filteredEngineTorque	Units.SI.Torque	SIunits.Torque

model Mechanics.MultiBody.Examples.Loops.Fourbar1

Component	Modelica 4.0.0	Modelica 3.2.3
j1_phi	Units.SI.Angle	SIunits.Angle
j2_s	Units.SI.Position	SIunits.Position
j1_w	Units.SI.AngularVelocity	SIunits.AngularVelocity
j2_v	Units.SI.Velocity	SIunits.Velocity

model Mechanics.MultiBody.Examples.Loops.Fourbar2

Component	Modelica 4.0.0	Modelica 3.2.3
j1_phi	Units.SI.Angle	SIunits.Angle
j2_s	Units.SI.Position	SIunits.Position
j1_w	Units.SI.AngularVelocity	SIunits.AngularVelocity
j2_v	Units.SI.Velocity	SIunits.Velocity

model Mechanics.MultiBody.Examples.Loops.Fourbar_analytic

Component	Modelica 4.0.0	Modelica 3.2.3
j1_phi	Units.SI.Angle	SIunits.Angle
j2_s	Units.SI.Position	SIunits.Position
j1_w	Units.SI.AngularVelocity	SIunits.AngularVelocity
j2_v	Units.SI.Velocity	SIunits.Velocity

model Mechanics.MultiBody.Examples.Loops.PlanarLoops_analytic

Component	Modelica 4.0.0	Modelica 3.2.3
rh	Units.SI.Length	SIunits.Length
rv	Units.SI.Length	SIunits.Length
r1b	Units.SI.Length	SIunits.Length
r1a	Units.SI.Length	SIunits.Length
r2b	Units.SI.Length	SIunits.Length
r2a	Units.SI.Length	SIunits.Length
r3b	Units.SI.Length	SIunits.Length
r3a	Units.SI.Length	SIunits.Length
sine	f=1
sine		freqHz=1

model Mechanics.MultiBody.Examples.Loops.Utilities.Cylinder

Component	Modelica 4.0.0	Modelica 3.2.3
cylinderTopPosition	Units.SI.Length	SIunits.Length
pistonLength	Units.SI.Length	SIunits.Length
rodLength	Units.SI.Length	SIunits.Length
crankLength	Units.SI.Length	SIunits.Length
crankPinOffset	Units.SI.Length	SIunits.Length
crankPinLength	Units.SI.Length	SIunits.Length
crankAngleOffset	Units.SI.Angle	SIunits.Angle
cylinderLength	Units.SI.Length	SIunits.Length
cylinderInclination	Mechanics.MultiBody.Parts.FixedRotation	SIunits.Angle
		parameter
	graphical
cylinderInclinationAngle	Present
piston	Present
piston
connectingRod	Present
connectingRod
b2	Present
b2
crank4	Present
crank4
crank3	Present
crank3
crank1	Present
crank1
crank2	Present
crank2
b1	Present
b1
mid	Present
mid
cylinder	Present
cylinder
mounting	Present
mounting
crankAngle1	Present
crankAngle1
crankAngle2	Present
crankAngle2
cylinderTop	Present
cylinderTop
Piston		Present
Piston
Rod		Present
Rod
B2		Present
B2
Crank4		Present
Crank4
Crank3		Present
Crank3
Crank1		Present
Crank1
Crank2		Present
Crank2
B1		Present
B1
Mid		Present
Mid
Cylinder		Present
Cylinder
Mounting		Present
Mounting
CylinderInclination		Present
CylinderInclination
CrankAngle1		Present
CrankAngle1
CrankAngle2		Present
CrankAngle2
CylinderTop		Present
CylinderTop

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
connect(b1.frame_a, mid.frame_b);	connect(B1.frame_a, Mid.frame_b);
connect(connectingRod.frame_a, b1.frame_b);	connect(Rod.frame_a, B1.frame_b);
connect(cylinder.frame_b, piston.frame_b);	connect(Cylinder.frame_b, Piston.frame_b);
connect(crank1.frame_a, crankAngle1.frame_b);	connect(Crank1.frame_a, CrankAngle1.frame_b);
connect(b2.frame_a, piston.frame_a);	connect(B2.frame_a, Piston.frame_a);
connect(connectingRod.frame_b, b2.frame_b);	connect(Rod.frame_b, B2.frame_b);
connect(crank4.frame_b, crankAngle2.frame_a);	connect(Crank4.frame_b, CrankAngle2.frame_a);
connect(cylinderInclination.frame_b, cylinderTop.frame_a);	connect(CylinderInclination.frame_b, CylinderTop.frame_a);
connect(crank1.frame_b, crank2.frame_a);	connect(Crank1.frame_b, Crank2.frame_a);
connect(crank3.frame_b, crank4.frame_a);	connect(Crank3.frame_b, Crank4.frame_a);
connect(crank3.frame_a, crank2.frame_b);	connect(Crank3.frame_a, Crank2.frame_b);
connect(crank2.frame_b, mid.frame_a);	connect(Crank2.frame_b, Mid.frame_a);
connect(cylinderTop.frame_b, cylinder.frame_a);	connect(CylinderTop.frame_b, Cylinder.frame_a);
connect(cylinderInclination.frame_a, cylinder_a);	connect(CylinderInclination.frame_a, cylinder_a);
connect(mounting.frame_a, cylinder_a);	connect(Mounting.frame_a, cylinder_a);
connect(mounting.frame_b, cylinder_b);	connect(Mounting.frame_b, cylinder_b);
connect(crankAngle1.frame_a, crank_a);	connect(CrankAngle1.frame_a, crank_a);
connect(crankAngle2.frame_b, crank_b);	connect(CrankAngle2.frame_b, crank_b);
connect(cylinder.axis, gasForce.flange_b);	connect(Cylinder.axis, gasForce.flange_b);
connect(cylinder.support, gasForce.flange_a);	connect(Cylinder.support, gasForce.flange_a);

model Mechanics.MultiBody.Examples.Loops.Utilities.GasForce2

Component	Modelica 4.0.0	Modelica 3.2.3
L	Units.SI.Length	SIunits.Length
d	Units.SI.Length	SIunits.Length
k0	Units.SI.Volume	SIunits.Volume
k1	Units.SI.Volume	SIunits.Volume
k	Units.SI.HeatCapacity	SIunits.HeatCapacity
dens	Units.SI.Density	SIunits.Density
press	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
V	Units.SI.Volume	SIunits.Volume
T	Units.SI.Temperature	SIunits.Temperature
v_rel	Units.SI.Velocity	SIunits.Velocity
R_air	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... pressV = kT;
assert(s_rel >= -1e-12, "flange_b.s - flange_a.s (= " + String(s_rel, significantDigits=14) + ") >= 0 required for GasForce2 component.\n" + "Most likely, the component has to be flipped.");	assert(s_rel >= -1e-12, "flange_b.s - flange_a.s (= " + String(s_rel, significantDigits=14) + ") >= 0 required for GasForce component.\n" + "Most likely, the component has to be flipped.");
assert(s_rel <= L + 1e-12, " flange_b.s - flange_a.s (= " + String(s_rel, significantDigits=14) + ") <= L (= " + String(L, significantDigits=14) + ") required for GasForce2 component.\n" + "Most likely, parameter L is not correct.");	assert(s_rel <= L + 1e-12, " flange_b.s - flange_a.s (= " + String(s_rel, significantDigits=14) + ") <= L (= " + String(L, significantDigits=14) + ") required for GasForce component.\n" + "Most likely, parameter L is not correct.");

model Mechanics.MultiBody.Examples.Loops.Utilities.CylinderBase

Component	Modelica 4.0.0	Modelica 3.2.3
cylinderTopPosition	Units.SI.Length	SIunits.Length
crankLength	Units.SI.Length	SIunits.Length
crankPinOffset	Units.SI.Length	SIunits.Length
crankPinLength	Units.SI.Length	SIunits.Length
crankAngleOffset	Units.NonSI.Angle_deg	SIunits.Conversions.NonSIunits.Angle_deg
pistonLength	Units.SI.Length	SIunits.Length
pistonCenterOfMass	Units.SI.Length	SIunits.Length
pistonMass	Units.SI.Mass	SIunits.Mass
pistonInertia_11	Units.SI.Inertia	SIunits.Inertia
pistonInertia_22	Units.SI.Inertia	SIunits.Inertia
pistonInertia_33	Units.SI.Inertia	SIunits.Inertia
rodLength	Units.SI.Length	SIunits.Length
rodCenterOfMass	Units.SI.Length	SIunits.Length
rodMass	Units.SI.Mass	SIunits.Mass
rodInertia_11	Units.SI.Inertia	SIunits.Inertia
rodInertia_22	Units.SI.Inertia	SIunits.Inertia
rodInertia_33	Units.SI.Inertia	SIunits.Inertia
cylinderLength	Units.SI.Length	SIunits.Length
cylinderInclination	Mechanics.MultiBody.Parts.FixedRotation	SIunits.Conversions.NonSIunits.Angle_deg
		parameter
	graphical
cylinderInclinationAngle	Present
mid	Present
mid
mounting	Present
mounting
crankAngle	Present
crankAngle
connectingRod	Present
connectingRod
piston	Present
piston
crank	Present
crank
Mid		Present
Mid
Mounting		Present
Mounting
CylinderInclination		Present
CylinderInclination
CrankAngle		Present
CrankAngle
Rod		Present
Rod
Piston		Present
Piston
Crank		Present
Crank

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
connect(jointRRP.frame_ia, connectingRod.frame_a);	connect(jointRRP.frame_ia, Rod.frame_a);
connect(mid.frame_b, jointRRP.frame_a);	connect(Mid.frame_b, jointRRP.frame_a);
connect(jointRRP.frame_ib, piston.frame_b);	connect(jointRRP.frame_ib, Piston.frame_b);
connect(jointRRP.frame_b, cylinderInclination.frame_b);	connect(jointRRP.frame_b, CylinderInclination.frame_b);
connect(crankAngle.frame_b, mid.frame_a);	connect(CrankAngle.frame_b, Mid.frame_a);
connect(cylinder_a, cylinderInclination.frame_a);	connect(cylinder_a, CylinderInclination.frame_a);
connect(cylinder_a, mounting.frame_a);	connect(cylinder_a, Mounting.frame_a);
connect(cylinder_b, mounting.frame_b);	connect(cylinder_b, Mounting.frame_b);
connect(crankAngle.frame_a, crank_a);	connect(CrankAngle.frame_a, crank_a);
connect(crank_a, crank.frame_a);	connect(crank_a, Crank.frame_a);
connect(crank.frame_b, crank_b);	connect(Crank.frame_b, crank_b);
connect(gasForce.flange_a, jointRRP.bearing); ...

model Mechanics.MultiBody.Examples.Loops.Utilities.Cylinder_analytic_CAD

Component	Modelica 4.0.0	Modelica 3.2.3
crankShape	Present
crankShape
CrankShape		Present
CrankShape

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
connect(crankShape.frame_a, crankAngle.frame_b);	connect(CrankShape.frame_a, CrankAngle.frame_b);

model Mechanics.MultiBody.Examples.Loops.Utilities.EngineV6_analytic

Component	Modelica 4.0.0	Modelica 3.2.3
cylinder1	cylinderInclinationAngle=-30
cylinder1		cylinderInclination=-30
cylinder2	cylinderInclinationAngle=30
cylinder2		cylinderInclination=30
cylinder3	cylinderInclinationAngle=-30
cylinder3		cylinderInclination=-30
cylinder4	cylinderInclinationAngle=30
cylinder4		cylinderInclination=30
cylinder5	cylinderInclinationAngle=-30
cylinder5		cylinderInclination=-30
cylinder6	cylinderInclinationAngle=30
cylinder6		cylinderInclination=30

model Mechanics.MultiBody.Examples.Rotational3DEffects.ActuatedDrive

Component	Modelica 4.0.0	Modelica 3.2.3
sine	f={1,1,1}
sine		freqHz={1,1,1}

model Mechanics.MultiBody.Examples.Rotational3DEffects.MovingActuatedDrive

Component	Modelica 4.0.0	Modelica 3.2.3
sine1	f={1,1,1}
sine1		freqHz={1,1,1}
sine2	f=1
sine2		freqHz=1

model Mechanics.MultiBody.Examples.Rotational3DEffects.GearConstraint

Component	Modelica 4.0.0	Modelica 3.2.3
sine	f={1,1,1}
sine		freqHz={1,1,1}

model Mechanics.MultiBody.Examples.Rotational3DEffects.BevelGear1D

Component	Modelica 4.0.0	Modelica 3.2.3
sine1	f=5
sine1		freqHz=5
sine2	f=6
sine2		freqHz=6
sine3	f=7
sine3		freqHz=7
sine4	f=8
sine4		freqHz=8
ws	Units.SI.AngularVelocity	SIunits.AngularVelocity
bevelGearPower	Units.SI.Power	SIunits.Power

model Mechanics.MultiBody.Forces.WorldForce

Component	Modelica 4.0.0	Modelica 3.2.3
arrow	r_head=-frame_b.f	r_head=-f_in_m
	headAtOrigin=true
	quantity=Modelica400.Mechanics.MultiBody.Types.VectorQuantity.Force
		diameter=diameter
		r_tail=f_in_m
N_to_m		Present
diameter		Present
f_in_m		Present

model Mechanics.MultiBody.Forces.WorldTorque

Component	Modelica 4.0.0	Modelica 3.2.3
arrow	r_head=-frame_b.t	r_head=-t_in_m
	quantity=Modelica400.Mechanics.MultiBody.Types.VectorQuantity.Torque
	headAtOrigin=true
		diameter=diameter
		r_tail=t_in_m
Nm_to_m		Present
diameter		Present
t_in_m		Present

model Mechanics.MultiBody.Forces.WorldForceAndTorque

Component	Modelica 4.0.0	Modelica 3.2.3
forceArrow	r_head=-frame_b.f	r_head=-f_in_m
	quantity=Modelica400.Mechanics.MultiBody.Types.VectorQuantity.Force
	headAtOrigin=true
		diameter=forceDiameter
		r_tail=f_in_m
torqueArrow	r_head=-frame_b.t	r_head=-t_in_m
	quantity=Modelica400.Mechanics.MultiBody.Types.VectorQuantity.Torque
	headAtOrigin=true
		diameter=torqueDiameter
		r_tail=t_in_m
N_to_m		Present
Nm_to_m		Present
forceDiameter		Present
torqueDiameter		Present
f_in_m		Present
t_in_m		Present

model Mechanics.MultiBody.Forces.Force

Component	Modelica 4.0.0	Modelica 3.2.3
connectionLineDiameter	Units.SI.Diameter	SIunits.Diameter
forceArrow	r_head=-frame_b.f	r_head=-f_in_m
	quantity=Modelica400.Mechanics.MultiBody.Types.VectorQuantity.Force
	headAtOrigin=true
		diameter=forceDiameter
		r_tail=f_in_m
N_to_m		Present
forceDiameter		Present
f_in_m		Present

model Mechanics.MultiBody.Forces.Torque

Component	Modelica 4.0.0	Modelica 3.2.3
connectionLineDiameter	Units.SI.Diameter	SIunits.Diameter
torqueArrow	r_head=-frame_b.t	r_head=-t_in_m
	quantity=Modelica400.Mechanics.MultiBody.Types.VectorQuantity.Torque
	headAtOrigin=true
		diameter=torqueDiameter
		r_tail=t_in_m
Nm_to_m		Present
torqueDiameter		Present
t_in_m		Present

model Mechanics.MultiBody.Forces.ForceAndTorque

Component	Modelica 4.0.0	Modelica 3.2.3
connectionLineDiameter	Units.SI.Diameter	SIunits.Diameter
forceArrow	r_head=-frame_b.f	r_head=-f_in_m
	quantity=Modelica400.Mechanics.MultiBody.Types.VectorQuantity.Force
	headAtOrigin=true
		diameter=forceDiameter
		color=forceColor
		r_tail=f_in_m
torqueArrow	r_head=-frame_b.t	r_head=-t_in_m
	quantity=Modelica400.Mechanics.MultiBody.Types.VectorQuantity.Torque
	headAtOrigin=true
		diameter=torqueDiameter
		r_tail=t_in_m
N_to_m		Present
Nm_to_m		Present
forceDiameter		Present
torqueDiameter		Present
f_in_m		Present
t_in_m		Present

model Mechanics.MultiBody.Forces.LineForceWithMass

Component	Modelica 4.0.0	Modelica 3.2.3
m	Units.SI.Mass	SIunits.Mass
lineShapeWidth	Units.SI.Length	SIunits.Length
lineShapeHeight	Units.SI.Length	SIunits.Length
fa	Units.SI.Force	SIunits.Force
fb	Units.SI.Force	SIunits.Force
r_CM_0	Units.SI.Position	SIunits.Position
v_CM_0	Units.SI.Velocity	SIunits.Velocity
ag_CM_0	Units.SI.Acceleration	SIunits.Acceleration

model Mechanics.MultiBody.Forces.LineForceWithTwoMasses

Component	Modelica 4.0.0	Modelica 3.2.3
m_a	Units.SI.Mass	SIunits.Mass
m_b	Units.SI.Mass	SIunits.Mass
L_a	Units.SI.Position	SIunits.Position
L_b	Units.SI.Position	SIunits.Position
cylinderDiameter_a	Units.SI.Diameter	SIunits.Diameter
cylinderLength_a	Units.SI.Length	SIunits.Length
cylinderLength_b	Units.SI.Length	SIunits.Length
fa	Units.SI.Force	SIunits.Force
fb	Units.SI.Force	SIunits.Force
r_CM1_0	Units.SI.Position	SIunits.Position
r_CM2_0	Units.SI.Position	SIunits.Position
v_CM1_0	Units.SI.Velocity	SIunits.Velocity
v_CM2_0	Units.SI.Velocity	SIunits.Velocity
ag_CM1_0	Units.SI.Acceleration	SIunits.Acceleration
ag_CM2_0	Units.SI.Acceleration	SIunits.Acceleration
aux1_0	Units.SI.Force	SIunits.Force
aux2_0	Units.SI.Force	SIunits.Force
cylinderDiameter_b	Units.SI.Length	SIunits.Length
massDiameter	Units.SI.Length	SIunits.Length

model Mechanics.MultiBody.Forces.Spring

Component	Modelica 4.0.0	Modelica 3.2.3
c	Units.SI.TranslationalSpringConstant	SIunits.TranslationalSpringConstant
s_unstretched	Units.SI.Length	SIunits.Length
m	Units.SI.Mass	SIunits.Mass
width	Units.SI.Distance	SIunits.Distance
coilWidth	Units.SI.Distance	SIunits.Distance
massDiameter	Units.SI.Diameter	SIunits.Diameter
s_small	Units.SI.Distance	SIunits.Distance
r_rel_a	Units.SI.Position	SIunits.Position
f	Units.SI.Force	SIunits.Force
length	Units.SI.Distance	SIunits.Distance
s	Units.SI.Position	SIunits.Position
r_rel_0	Units.SI.Position	SIunits.Position

model Mechanics.MultiBody.Forces.Damper

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.TranslationalDampingConstant	SIunits.TranslationalDampingConstant
length_a	Units.SI.Distance	SIunits.Distance
diameter_a	Units.SI.Diameter	SIunits.Diameter
diameter_b	Units.SI.Diameter	SIunits.Diameter
r0_b	Units.SI.Position	SIunits.Position

model Mechanics.MultiBody.Forces.SpringDamperParallel

Component	Modelica 4.0.0	Modelica 3.2.3
c	Units.SI.TranslationalSpringConstant	SIunits.TranslationalSpringConstant
s_unstretched	Units.SI.Length	SIunits.Length
d	Units.SI.TranslationalDampingConstant	SIunits.TranslationalDampingConstant
length_a	Units.SI.Distance	SIunits.Distance
diameter_a	Units.SI.Diameter	SIunits.Diameter
diameter_b	Units.SI.Diameter	SIunits.Diameter
width	Units.SI.Distance	SIunits.Distance
coilWidth	Units.SI.Distance	SIunits.Distance
f_d	Units.SI.Force	SIunits.Force

model Mechanics.MultiBody.Forces.SpringDamperSeries

Component	Modelica 4.0.0	Modelica 3.2.3
c	Units.SI.TranslationalSpringConstant	SIunits.TranslationalSpringConstant
s_unstretched	Units.SI.Length	SIunits.Length
d	Units.SI.TranslationalDampingConstant	SIunits.TranslationalDampingConstant
s_damper_start	Units.SI.Length	SIunits.Length
s_damper	Units.SI.Position	SIunits.Position
length_a	Units.SI.Distance	SIunits.Distance
diameter_a	Units.SI.Diameter	SIunits.Diameter
diameter_b	Units.SI.Diameter	SIunits.Diameter
width	Units.SI.Distance	SIunits.Distance
coilWidth	Units.SI.Distance	SIunits.Distance

model Mechanics.MultiBody.Forces.Internal.BasicForce

Component	Modelica 4.0.0	Modelica 3.2.3
r_0	Units.SI.Position	SIunits.Position
f_b_0	Units.SI.Force	SIunits.Force

model Mechanics.MultiBody.Forces.Internal.BasicTorque

Component	Modelica 4.0.0	Modelica 3.2.3
r_0	Units.SI.Position	SIunits.Position
t_b_0	Units.SI.Torque	SIunits.Torque

function Mechanics.MultiBody.Forces.Internal.standardGravityAcceleration

Component	Modelica 4.0.0	Modelica 3.2.3
g	Units.SI.Acceleration	SIunits.Acceleration
mu	Present
mue		Present

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
gravity := if gravityType == GravityTypes.UniformGravity then g else if gravityType == GravityTypes.PointGravity then -(mu/(rr))(r/ Modelica400.Math.Vectors.length(r)) else zeros(3);	gravity := if gravityType == GravityTypes.UniformGravity then g else if gravityType == GravityTypes.PointGravity then -(mue/(rr))(r/ Modelica323.Math.Vectors.length(r)) else zeros(3);

record Mechanics.MultiBody.Frames.Orientation

Component	Modelica 4.0.0	Modelica 3.2.3
w	Units.SI.AngularVelocity	SIunits.AngularVelocity

function Mechanics.MultiBody.Frames.angularVelocity1

Component	Modelica 4.0.0	Modelica 3.2.3
w	Units.SI.AngularVelocity	SIunits.AngularVelocity

function Mechanics.MultiBody.Frames.angularVelocity2

Component	Modelica 4.0.0	Modelica 3.2.3
w	Units.SI.AngularVelocity	SIunits.AngularVelocity

function Mechanics.MultiBody.Frames.planarRotation

Component	Modelica 4.0.0	Modelica 3.2.3
angle	Units.SI.Angle	SIunits.Angle
der_angle	Units.SI.AngularVelocity	SIunits.AngularVelocity

function Mechanics.MultiBody.Frames.planarRotationAngle

Component	Modelica 4.0.0	Modelica 3.2.3
angle	Units.SI.Angle	SIunits.Angle

function Mechanics.MultiBody.Frames.axisRotation

Component	Modelica 4.0.0	Modelica 3.2.3
angle	Units.SI.Angle	SIunits.Angle
der_angle	Units.SI.AngularVelocity	SIunits.AngularVelocity

function Mechanics.MultiBody.Frames.axesRotations

Component	Modelica 4.0.0	Modelica 3.2.3
angles	Units.SI.Angle	SIunits.Angle
der_angles	Units.SI.AngularVelocity	SIunits.AngularVelocity

function Mechanics.MultiBody.Frames.axesRotationsAngles

Component	Modelica 4.0.0	Modelica 3.2.3
guessAngle1	Units.SI.Angle	SIunits.Angle
angles	Units.SI.Angle	SIunits.Angle
angle_1a	Units.SI.Angle	SIunits.Angle
angle_1b	Units.SI.Angle	SIunits.Angle

function Mechanics.MultiBody.Frames.smallRotation

Component	Modelica 4.0.0	Modelica 3.2.3
phi	Units.SI.Angle	SIunits.Angle

function Mechanics.MultiBody.Frames.from_T

Component	Modelica 4.0.0	Modelica 3.2.3
w	Units.SI.AngularVelocity	SIunits.AngularVelocity

function Mechanics.MultiBody.Frames.from_T_inv

Component	Modelica 4.0.0	Modelica 3.2.3
w	Units.SI.AngularVelocity	SIunits.AngularVelocity

function Mechanics.MultiBody.Frames.from_Q

Component	Modelica 4.0.0	Modelica 3.2.3
w	Units.SI.AngularVelocity	SIunits.AngularVelocity

function Mechanics.MultiBody.Frames.Quaternions.angularVelocity1

Component	Modelica 4.0.0	Modelica 3.2.3
w	Units.SI.AngularVelocity	SIunits.AngularVelocity

function Mechanics.MultiBody.Frames.Quaternions.angularVelocity2

Component	Modelica 4.0.0	Modelica 3.2.3
w	Units.SI.AngularVelocity	SIunits.AngularVelocity

function Mechanics.MultiBody.Frames.Quaternions.planarRotation

Component	Modelica 4.0.0	Modelica 3.2.3
angle	Units.SI.Angle	SIunits.Angle

function Mechanics.MultiBody.Frames.Quaternions.smallRotation

Component	Modelica 4.0.0	Modelica 3.2.3
phi	Units.SI.Angle	SIunits.Angle

function Mechanics.MultiBody.Frames.TransformationMatrices.angularVelocity1

Component	Modelica 4.0.0	Modelica 3.2.3
w	Units.SI.AngularVelocity	SIunits.AngularVelocity

function Mechanics.MultiBody.Frames.TransformationMatrices.angularVelocity2

Component	Modelica 4.0.0	Modelica 3.2.3
w	Units.SI.AngularVelocity	SIunits.AngularVelocity

function Mechanics.MultiBody.Frames.TransformationMatrices.planarRotation

Component	Modelica 4.0.0	Modelica 3.2.3
angle	Units.SI.Angle	SIunits.Angle

function Mechanics.MultiBody.Frames.TransformationMatrices.planarRotationAngle

Component	Modelica 4.0.0	Modelica 3.2.3
angle	Units.SI.Angle	SIunits.Angle

function Mechanics.MultiBody.Frames.TransformationMatrices.axisRotation

Component	Modelica 4.0.0	Modelica 3.2.3
angle	Units.SI.Angle	SIunits.Angle

function Mechanics.MultiBody.Frames.TransformationMatrices.axesRotations

Component	Modelica 4.0.0	Modelica 3.2.3
angles	Units.SI.Angle	SIunits.Angle

function Mechanics.MultiBody.Frames.TransformationMatrices.axesRotationsAngles

Component	Modelica 4.0.0	Modelica 3.2.3
guessAngle1	Units.SI.Angle	SIunits.Angle
angles	Units.SI.Angle	SIunits.Angle
angle_1a	Units.SI.Angle	SIunits.Angle
angle_1b	Units.SI.Angle	SIunits.Angle

function Mechanics.MultiBody.Frames.TransformationMatrices.smallRotation

Component	Modelica 4.0.0	Modelica 3.2.3
phi	Units.SI.Angle	SIunits.Angle

function Mechanics.MultiBody.Frames.TransformationMatrices.from_nxy

Component	Modelica 4.0.0	Modelica 3.2.3
n_z_aux	=cross(e_x, e_y)	=cross(e_x, n_y)
n_y_aux	=if n_z_aux*n_z_aux > 1.0e-6 then e_y else if abs(e_x[1]) > 1.0e-6 then {0,1,0} else {1,0,0}	=if n_z_aux*n_z_aux > 1.0e-6 then n_y else (if abs(e_x[1]) > 1.0e-6 then {0,1,0} else {1,0,0})
e_y	Present

function Mechanics.MultiBody.Frames.TransformationMatrices.from_nxz

Component	Modelica 4.0.0	Modelica 3.2.3
n_y_aux	=cross(e_z, e_x)	=cross(n_z, e_x)
n_z_aux	=if n_y_aux*n_y_aux > 1.0e-6 then e_z else if abs(e_x[1]) > 1.0e-6 then {0,0,1} else {1,0,0}	=if n_y_aux*n_y_aux > 1.0e-6 then n_z else (if abs(e_x[1]) > 1.0e-6 then {0,0,1} else {1,0,0})
e_z	Present

connector Mechanics.MultiBody.Interfaces.Frame

Component	Modelica 4.0.0	Modelica 3.2.3
r_0	Units.SI.Position	SIunits.Position
f	Units.SI.Force	SIunits.Force
t	Units.SI.Torque	SIunits.Torque

model Mechanics.MultiBody.Interfaces.PartialForce

Component	Modelica 4.0.0	Modelica 3.2.3
r_rel_b	Units.SI.Position	SIunits.Position

model Mechanics.MultiBody.Interfaces.LineForceBase

Component	Modelica 4.0.0	Modelica 3.2.3
s_small	Units.SI.Distance	SIunits.Distance
length	Units.SI.Distance	SIunits.Distance
s	Units.SI.Position	SIunits.Position
r_rel_0	Units.SI.Position	SIunits.Position

model Mechanics.MultiBody.Interfaces.PartialLineForce

Component	Modelica 4.0.0	Modelica 3.2.3
r_rel_a	Units.SI.Position	SIunits.Position
f	Units.SI.Force	SIunits.Force

function Mechanics.MultiBody.Interfaces.partialGravityAcceleration

Component	Modelica 4.0.0	Modelica 3.2.3
r	Units.SI.Position	SIunits.Position
gravity	Units.SI.Acceleration	SIunits.Acceleration

function Mechanics.MultiBody.Interfaces.partialSurfaceCharacteristic

Component	Modelica 4.0.0	Modelica 3.2.3
X	Units.SI.Position	SIunits.Position
Y	Units.SI.Position	SIunits.Position
Z	Units.SI.Position	SIunits.Position

model Mechanics.MultiBody.Joints.Prismatic

Component	Modelica 4.0.0	Modelica 3.2.3
boxWidth	Units.SI.Distance	SIunits.Distance
boxHeight	Units.SI.Distance	SIunits.Distance
s	Units.SI.Position	SIunits.Position
v	Units.SI.Velocity	SIunits.Velocity
a	Units.SI.Acceleration	SIunits.Acceleration
f	Units.SI.Force	SIunits.Force
box	length=if noEvent(abs(s) > 1.e-6) then s else 1.e-6	length=if noEvent(abs(s + s_offset) > 1.e-6) then s + s_offset else 1.e-6
s_offset		Present

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... a = der(v);
frame_b.r_0 = frame_a.r_0 + Frames.resolve1(frame_a.R, e*s);	frame_b.r_0 = frame_a.r_0 + Frames.resolve1(frame_a.R, e*(s_offset + s));
frame_b.R = frame_a.R;
zeros(3) = frame_a.f + frame_b.f;
zeros(3) = frame_a.t + frame_b.t + cross(e*s, frame_b.f);	zeros(3) = frame_a.t + frame_b.t + cross(e*(s_offset + s), frame_b.f);
f = -e*frame_b.f; ...

model Mechanics.MultiBody.Joints.Revolute

Component	Modelica 4.0.0	Modelica 3.2.3
cylinderLength	Units.SI.Distance	SIunits.Distance
cylinderDiameter	Units.SI.Distance	SIunits.Distance
phi	Units.SI.Angle	SIunits.Angle
w	Units.SI.AngularVelocity	SIunits.AngularVelocity
a	Units.SI.AngularAcceleration	SIunits.AngularAcceleration
tau	Units.SI.Torque	SIunits.Torque
angle	Units.SI.Angle	SIunits.Angle
phi_offset		Present

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... assert(cardinality(frame_b) > 0, "Connector frame_b of revolute joint is not connected");
angle = phi;	angle = phi_offset + phi;
w = der(phi); ... if Connections.rooted(frame_a.R) then
R_rel = Frames.planarRotation(e, phi, w);	R_rel = Frames.planarRotation(e, phi_offset + phi, w);
frame_b.R = Frames.absoluteRotation(frame_a.R, R_rel); ... else
R_rel = Frames.planarRotation(-e, phi, w);	R_rel = Frames.planarRotation(-e, phi_offset + phi, w);
frame_a.R = Frames.absoluteRotation(frame_b.R, R_rel); ...

model Mechanics.MultiBody.Joints.RevolutePlanarLoopConstraint

Component	Modelica 4.0.0	Modelica 3.2.3
cylinderLength	Units.SI.Distance	SIunits.Distance
cylinderDiameter	Units.SI.Distance	SIunits.Distance
r_rel_a	Units.SI.Position	SIunits.Position
f_c	Units.SI.Force	SIunits.Force

model Mechanics.MultiBody.Joints.Cylindrical

Component	Modelica 4.0.0	Modelica 3.2.3
cylinderDiameter	Units.SI.Distance	SIunits.Distance
s	Units.SI.Position	SIunits.Position
phi	Units.SI.Angle	SIunits.Angle
v	Units.SI.Velocity	SIunits.Velocity
w	Units.SI.AngularVelocity	SIunits.AngularVelocity
a	Units.SI.Acceleration	SIunits.Acceleration
wd	Units.SI.AngularAcceleration	SIunits.AngularAcceleration

model Mechanics.MultiBody.Joints.Universal

Component	Modelica 4.0.0	Modelica 3.2.3
cylinderLength	Units.SI.Distance	SIunits.Distance
cylinderDiameter	Units.SI.Distance	SIunits.Distance
phi_a	Units.SI.Angle	SIunits.Angle
phi_b	Units.SI.Angle	SIunits.Angle
w_a	Units.SI.AngularVelocity	SIunits.AngularVelocity
w_b	Units.SI.AngularVelocity	SIunits.AngularVelocity
a_a	Units.SI.AngularAcceleration	SIunits.AngularAcceleration
a_b	Units.SI.AngularAcceleration	SIunits.AngularAcceleration

model Mechanics.MultiBody.Joints.Planar

Component	Modelica 4.0.0	Modelica 3.2.3
cylinderLength	Units.SI.Distance	SIunits.Distance
cylinderDiameter	Units.SI.Distance	SIunits.Distance
boxWidth	Units.SI.Distance	SIunits.Distance
boxHeight	Units.SI.Distance	SIunits.Distance
s_x	Units.SI.Position	SIunits.Position
s_y	Units.SI.Position	SIunits.Position
phi	Units.SI.Angle	SIunits.Angle
v_x	Units.SI.Velocity	SIunits.Velocity
v_y	Units.SI.Velocity	SIunits.Velocity
w	Units.SI.AngularVelocity	SIunits.AngularVelocity
a_x	Units.SI.Acceleration	SIunits.Acceleration
a_y	Units.SI.Acceleration	SIunits.Acceleration
wd	Units.SI.AngularAcceleration	SIunits.AngularAcceleration

model Mechanics.MultiBody.Joints.Spherical

Component	Modelica 4.0.0	Modelica 3.2.3
sphereDiameter	Units.SI.Distance	SIunits.Distance
angles_start	Units.SI.Angle	SIunits.Angle
w_rel_a_start	Units.SI.AngularVelocity	SIunits.AngularVelocity
z_rel_a_start	Units.SI.AngularAcceleration	SIunits.AngularAcceleration
phi_start	Units.SI.Angle	SIunits.Angle
phi	Units.SI.Angle	SIunits.Angle
phi_d	Units.SI.AngularVelocity	SIunits.AngularVelocity
phi_dd	Units.SI.AngularAcceleration	SIunits.AngularAcceleration
w_rel	Units.SI.AngularVelocity	SIunits.AngularVelocity

model Mechanics.MultiBody.Joints.FreeMotion

Component	Modelica 4.0.0	Modelica 3.2.3
r_rel_a	Units.SI.Position	SIunits.Position
v_rel_a	Units.SI.Velocity	SIunits.Velocity
a_rel_a	Units.SI.Acceleration	SIunits.Acceleration
angles_start	Units.SI.Angle	SIunits.Angle
w_rel_a_start	Units.SI.AngularVelocity	SIunits.AngularVelocity
z_rel_a_start	Units.SI.AngularAcceleration	SIunits.AngularAcceleration
arrow		diameter=arrowDiameter
phi_start	Units.SI.Angle	SIunits.Angle
phi	Units.SI.Angle	SIunits.Angle
phi_d	Units.SI.AngularVelocity	SIunits.AngularVelocity
phi_dd	Units.SI.AngularAcceleration	SIunits.AngularAcceleration
w_rel_b	Units.SI.AngularVelocity	SIunits.AngularVelocity
arrowDiameter		Present

model Mechanics.MultiBody.Joints.FreeMotionScalarInit

Component	Modelica 4.0.0	Modelica 3.2.3
zeroForceAndTorque1	Mechanics.MultiBody.Forces.Internal.ZeroForceAndTorque	Mechanics.MultiBody.Sensors.Internal.ZeroForceAndTorque
zeroForceAndTorque2	Mechanics.MultiBody.Forces.Internal.ZeroForceAndTorque	Mechanics.MultiBody.Sensors.Internal.ZeroForceAndTorque
arrow		diameter=arrowDiameter
arrowDiameter		Present

model Mechanics.MultiBody.Joints.SphericalSpherical

Component	Modelica 4.0.0	Modelica 3.2.3
rodLength	Units.SI.Length	SIunits.Length
m	Units.SI.Mass	SIunits.Mass
sphereDiameter	Units.SI.Diameter	SIunits.Diameter
rodDiameter	Units.SI.Diameter	SIunits.Diameter
massDiameter	Units.SI.Diameter	SIunits.Diameter
f_rod	Units.SI.Force	SIunits.Force
rRod_0	Units.SI.Position	SIunits.Position
rRod_a	Units.SI.Position	SIunits.Position
r_CM_0	Units.SI.Position	SIunits.Position
v_CM_0	Units.SI.Velocity	SIunits.Velocity
f_CM_a	Units.SI.Force	SIunits.Force
f_CM_e	Units.SI.Force	SIunits.Force
f_b_a1	Units.SI.Force	SIunits.Force
totalPower	Units.SI.Power	SIunits.Power

model Mechanics.MultiBody.Joints.UniversalSpherical

Component	Modelica 4.0.0	Modelica 3.2.3
rRod_ia	Units.SI.Position	SIunits.Position
sphereDiameter	Units.SI.Diameter	SIunits.Diameter
rodWidth	Units.SI.Distance	SIunits.Distance
rodHeight	Units.SI.Distance	SIunits.Distance
cylinderLength	Units.SI.Distance	SIunits.Distance
cylinderDiameter	Units.SI.Distance	SIunits.Distance
f_rod	Units.SI.Force	SIunits.Force
rodLength	Units.SI.Distance	SIunits.Distance
totalPower	Units.SI.Power	SIunits.Power
f_b_a1	Units.SI.Force	SIunits.Force
rRod_0	Units.SI.Position	SIunits.Position
rRod_a	Units.SI.Position	SIunits.Position
f_b_a	Units.SI.Force	SIunits.Force
f_ia_a	Units.SI.Force	SIunits.Force
t_ia_a	Units.SI.Torque	SIunits.Torque
w_rel_ia1	Units.SI.AngularVelocity	SIunits.AngularVelocity

model Mechanics.MultiBody.Joints.GearConstraint

Component	Modelica 4.0.0	Modelica 3.2.3
r_a	Units.SI.Position	SIunits.Position
r_b	Units.SI.Position	SIunits.Position
phi_b	Units.SI.Angle	SIunits.Angle
w_b	Units.SI.AngularVelocity	SIunits.AngularVelocity
a_b	Units.SI.AngularAcceleration	SIunits.AngularAcceleration
totalPower	Units.SI.Power	SIunits.Power

model Mechanics.MultiBody.Joints.RollingWheel

Component	Modelica 4.0.0	Modelica 3.2.3
x	Units.SI.Position	SIunits.Position
y	Units.SI.Position	SIunits.Position
z	Units.SI.Position	SIunits.Position
angles	Units.SI.Angle	SIunits.Angle
der_angles	Units.SI.AngularVelocity	SIunits.AngularVelocity
r_road_0	Units.SI.Position	SIunits.Position
f_wheel_0	Units.SI.Force	SIunits.Force
f_n	Units.SI.Force	SIunits.Force
f_lat	Units.SI.Force	SIunits.Force
f_long	Units.SI.Force	SIunits.Force
err	Units.SI.Position	SIunits.Position
delta_0	Units.SI.Position	SIunits.Position
s	Units.SI.Position	SIunits.Position
w	Units.SI.Position	SIunits.Position
v_0	Units.SI.Velocity	SIunits.Velocity
w_0	Units.SI.AngularVelocity	SIunits.AngularVelocity
vContact_0	Units.SI.Velocity	SIunits.Velocity
radius	Present
wheelRadius		Present

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... 0 = delta_0*e_long_0;
0 = radius - delta_0*cross(e_long_0, e_axis_0);	0 = wheelRadius - delta_0*cross(e_long_0, e_axis_0);
err = Modelica400.Math.Vectors.length(delta_0) - radius;	err = Modelica323.Math.Vectors.length(delta_0) - wheelRadius;
v_0 = der(frame_a.r_0); ...

model Mechanics.MultiBody.Joints.RollingWheelSet

Component	Modelica 4.0.0	Modelica 3.2.3
x	Units.SI.Position	SIunits.Position
y	Units.SI.Position	SIunits.Position
phi	Units.SI.Angle	SIunits.Angle
theta1	Units.SI.Angle	SIunits.Angle
theta2	Units.SI.Angle	SIunits.Angle
der_theta1	Units.SI.AngularVelocity	SIunits.AngularVelocity
der_theta2	Units.SI.AngularVelocity	SIunits.AngularVelocity
fixed	r={0,0,radius}	r={0,0,wheelRadius}
rod1	r={0,track/2,0}	r={0,wheelDistance/2,0}
rod2	r={0,-track/2,0}	r={0,-wheelDistance/2,0}
rolling1	radius=radius	radius=wheelRadius
rolling2	radius=radius	radius=wheelRadius
radius	Present
track	Present
wheelRadius		Present
wheelDistance		Present

model Mechanics.MultiBody.Joints.Assemblies.JointUPS

Component	Modelica 4.0.0	Modelica 3.2.3
nAxis_ia	Units.SI.Position	SIunits.Position
s_offset	Units.SI.Position	SIunits.Position
sphereDiameter	Units.SI.Diameter	SIunits.Diameter
axisDiameter	Units.SI.Diameter	SIunits.Diameter
cylinderLength	Units.SI.Distance	SIunits.Distance
cylinderDiameter	Units.SI.Distance	SIunits.Distance
s	Units.SI.Position	SIunits.Position
f	Units.SI.Force	SIunits.Force
axisLength	Units.SI.Length	SIunits.Length
totalPower	Units.SI.Power	SIunits.Power
f_c_a	Units.SI.Force	SIunits.Force
t_cd_a	Units.SI.Torque	SIunits.Torque
f_bd_a	Units.SI.Force	SIunits.Force
rAxis_0	Units.SI.Position	SIunits.Position
rAxis_a	Units.SI.Position	SIunits.Position
w_rel_ia1	Units.SI.AngularVelocity	SIunits.AngularVelocity

model Mechanics.MultiBody.Joints.Assemblies.JointUSR

Component	Modelica 4.0.0	Modelica 3.2.3
rRod1_ia	Units.SI.Position	SIunits.Position
rRod2_ib	Units.SI.Position	SIunits.Position
phi_offset	Units.NonSI.Angle_deg	SIunits.Conversions.NonSIunits.Angle_deg
phi_guess	Units.NonSI.Angle_deg	SIunits.Conversions.NonSIunits.Angle_deg
sphereDiameter	Units.SI.Diameter	SIunits.Diameter
rod1Diameter	Units.SI.Diameter	SIunits.Diameter
rod2Diameter	Units.SI.Diameter	SIunits.Diameter
revoluteDiameter	Units.SI.Diameter	SIunits.Diameter
revoluteLength	Units.SI.Distance	SIunits.Distance
cylinderLength	Units.SI.Distance	SIunits.Distance
cylinderDiameter	Units.SI.Distance	SIunits.Distance
rod1Length	Units.SI.Distance	SIunits.Distance
totalPower	Units.SI.Power	SIunits.Power
aux	Units.SI.Position	SIunits.Position
f_rod	Units.SI.Force	SIunits.Force

model Mechanics.MultiBody.Joints.Assemblies.JointUSP

Component	Modelica 4.0.0	Modelica 3.2.3
rRod1_ia	Units.SI.Position	SIunits.Position
rRod2_ib	Units.SI.Position	SIunits.Position
s_offset	Units.SI.Position	SIunits.Position
s_guess	Units.SI.Position	SIunits.Position
sphereDiameter	Units.SI.Diameter	SIunits.Diameter
rod1Diameter	Units.SI.Diameter	SIunits.Diameter
rod2Diameter	Units.SI.Diameter	SIunits.Diameter
boxWidth	Units.SI.Distance	SIunits.Distance
boxHeight	Units.SI.Distance	SIunits.Distance
cylinderLength	Units.SI.Distance	SIunits.Distance
cylinderDiameter	Units.SI.Distance	SIunits.Distance
rod1Length	Units.SI.Distance	SIunits.Distance
f_rod	Units.SI.Force	SIunits.Force
totalPower	Units.SI.Power	SIunits.Power

model Mechanics.MultiBody.Joints.Assemblies.JointSSR

Component	Modelica 4.0.0	Modelica 3.2.3
rod1Length	Units.SI.Length	SIunits.Length
rod1Mass	Units.SI.Mass	SIunits.Mass
rRod2_ib	Units.SI.Position	SIunits.Position
phi_offset	Units.NonSI.Angle_deg	SIunits.Conversions.NonSIunits.Angle_deg
phi_guess	Units.NonSI.Angle_deg	SIunits.Conversions.NonSIunits.Angle_deg
sphereDiameter	Units.SI.Diameter	SIunits.Diameter
rod1Diameter	Units.SI.Diameter	SIunits.Diameter
rod2Diameter	Units.SI.Diameter	SIunits.Diameter
revoluteDiameter	Units.SI.Diameter	SIunits.Diameter
revoluteLength	Units.SI.Distance	SIunits.Distance
aux	Units.SI.Position	SIunits.Position
f_rod	Units.SI.Force	SIunits.Force
totalPower	Units.SI.Power	SIunits.Power

model Mechanics.MultiBody.Joints.Assemblies.JointSSP

Component	Modelica 4.0.0	Modelica 3.2.3
rod1Length	Units.SI.Length	SIunits.Length
rod1Mass	Units.SI.Mass	SIunits.Mass
rRod2_ib	Units.SI.Position	SIunits.Position
s_offset	Units.SI.Position	SIunits.Position
s_guess	Units.SI.Position	SIunits.Position
sphereDiameter	Units.SI.Diameter	SIunits.Diameter
rod1Diameter	Units.SI.Diameter	SIunits.Diameter
rod2Diameter	Units.SI.Diameter	SIunits.Diameter
boxWidth	Units.SI.Distance	SIunits.Distance
boxHeight	Units.SI.Distance	SIunits.Distance
f_rod	Units.SI.Force	SIunits.Force
totalPower	Units.SI.Power	SIunits.Power

model Mechanics.MultiBody.Joints.Assemblies.JointRRR

Component	Modelica 4.0.0	Modelica 3.2.3
rRod1_ia	Units.SI.Position	SIunits.Position
rRod2_ib	Units.SI.Position	SIunits.Position
phi_offset	Units.NonSI.Angle_deg	SIunits.Conversions.NonSIunits.Angle_deg
phi_guess	Units.NonSI.Angle_deg	SIunits.Conversions.NonSIunits.Angle_deg
cylinderLength	Units.SI.Distance	SIunits.Distance
cylinderDiameter	Units.SI.Distance	SIunits.Distance
rodDiameter	Units.SI.Diameter	SIunits.Diameter
totalPower	Units.SI.Power	SIunits.Power

model Mechanics.MultiBody.Joints.Assemblies.JointRRP

Component	Modelica 4.0.0	Modelica 3.2.3
rRod1_ia	Units.SI.Position	SIunits.Position
rRod2_ib	Units.SI.Position	SIunits.Position
s_offset	Units.SI.Position	SIunits.Position
s_guess	Units.SI.Position	SIunits.Position
cylinderLength	Units.SI.Distance	SIunits.Distance
cylinderDiameter	Units.SI.Distance	SIunits.Distance
boxWidth	Units.SI.Distance	SIunits.Distance
boxHeight	Units.SI.Distance	SIunits.Distance
rodDiameter	Units.SI.Diameter	SIunits.Diameter
totalPower	Units.SI.Power	SIunits.Power

model Mechanics.MultiBody.Joints.Constraints.Prismatic

Component	Modelica 4.0.0	Modelica 3.2.3
sphereDiameter	Units.SI.Distance	SIunits.Distance
r_rel_a	Units.SI.Position	SIunits.Position
P	Units.SI.InstantaneousPower	SIunits.InstantaneousPower

model Mechanics.MultiBody.Joints.Constraints.Revolute

Component	Modelica 4.0.0	Modelica 3.2.3
sphereDiameter	Units.SI.Distance	SIunits.Distance
r_rel_a	Units.SI.Position	SIunits.Position
P	Units.SI.InstantaneousPower	SIunits.InstantaneousPower

model Mechanics.MultiBody.Joints.Constraints.Spherical

Component	Modelica 4.0.0	Modelica 3.2.3
sphereDiameter	Units.SI.Distance	SIunits.Distance
r_rel_a	Units.SI.Position	SIunits.Position
P	Units.SI.InstantaneousPower	SIunits.InstantaneousPower

model Mechanics.MultiBody.Joints.Constraints.Universal

Component	Modelica 4.0.0	Modelica 3.2.3
sphereDiameter	Units.SI.Distance	SIunits.Distance
r_rel_a	Units.SI.Position	SIunits.Position
P	Units.SI.InstantaneousPower	SIunits.InstantaneousPower

model Mechanics.MultiBody.Joints.Internal.RevoluteWithLengthConstraint

Component	Modelica 4.0.0	Modelica 3.2.3
lengthConstraint	Units.SI.Position	SIunits.Position
phi_offset	Units.NonSI.Angle_deg	SIunits.Conversions.NonSIunits.Angle_deg
phi_guess	Units.NonSI.Angle_deg	SIunits.Conversions.NonSIunits.Angle_deg
cylinderLength	Units.SI.Distance	SIunits.Distance
cylinderDiameter	Units.SI.Distance	SIunits.Distance
phi	Units.SI.Angle	SIunits.Angle
angle	Units.SI.Angle	SIunits.Angle
tau	Units.SI.Torque	SIunits.Torque
r_a	Units.SI.Position	SIunits.Position
r_b	Units.SI.Position	SIunits.Position

model Mechanics.MultiBody.Joints.Internal.PrismaticWithLengthConstraint

Component	Modelica 4.0.0	Modelica 3.2.3
length	Units.SI.Position	SIunits.Position
s_offset	Units.SI.Position	SIunits.Position
s_guess	Units.SI.Position	SIunits.Position
boxWidth	Units.SI.Distance	SIunits.Distance
boxHeight	Units.SI.Distance	SIunits.Distance
s	Units.SI.Position	SIunits.Position
distance	Units.SI.Position	SIunits.Position
r_rel_a	Units.SI.Position	SIunits.Position
f	Units.SI.Force	SIunits.Force
r_a	Units.SI.Position	SIunits.Position
r_b	Units.SI.Position	SIunits.Position
rbra	Units.SI.Position	SIunits.Position

model Mechanics.MultiBody.Joints.Internal.RollingConstraintVerticalWheel

Component	Modelica 4.0.0	Modelica 3.2.3
radius	Units.SI.Radius	SIunits.Radius
f_wheel_0	Units.SI.Force	SIunits.Force
f_lat	Units.SI.Force	SIunits.Force
f_long	Units.SI.Force	SIunits.Force
rContact_0	Units.SI.Position	SIunits.Position
v_0	Units.SI.Velocity	SIunits.Velocity
w_0	Units.SI.AngularVelocity	SIunits.AngularVelocity
vContact_0	Units.SI.Velocity	SIunits.Velocity

model Mechanics.MultiBody.Joints.Internal.InitPosition

Component	Modelica 4.0.0	Modelica 3.2.3
r_a_0	Units.SI.Position	SIunits.Position
r_b_0	Units.SI.Position	SIunits.Position

model Mechanics.MultiBody.Parts.Fixed

Component	Modelica 4.0.0	Modelica 3.2.3
r	Units.SI.Position	SIunits.Position
r_shape	Units.SI.Position	SIunits.Position
length	Units.SI.Length	SIunits.Length
width	Units.SI.Distance	SIunits.Distance
height	Units.SI.Distance	SIunits.Distance

model Mechanics.MultiBody.Parts.FixedTranslation

Component	Modelica 4.0.0	Modelica 3.2.3
r	Units.SI.Position	SIunits.Position
r_shape	Units.SI.Position	SIunits.Position
length	Units.SI.Length	SIunits.Length
width	Units.SI.Distance	SIunits.Distance
height	Units.SI.Distance	SIunits.Distance

model Mechanics.MultiBody.Parts.FixedRotation

Component	Modelica 4.0.0	Modelica 3.2.3
r	Units.SI.Position	SIunits.Position
angle	Units.NonSI.Angle_deg	SIunits.Conversions.NonSIunits.Angle_deg
angles	Units.NonSI.Angle_deg	SIunits.Conversions.NonSIunits.Angle_deg
r_shape	Units.SI.Position	SIunits.Position
length	Units.SI.Length	SIunits.Length
width	Units.SI.Distance	SIunits.Distance
height	Units.SI.Distance	SIunits.Distance

model Mechanics.MultiBody.Parts.Body

Component	Modelica 4.0.0	Modelica 3.2.3
r_CM	Units.SI.Position	SIunits.Position
m	Units.SI.Mass	SIunits.Mass
I_11	Units.SI.Inertia	SIunits.Inertia
I_22	Units.SI.Inertia	SIunits.Inertia
I_33	Units.SI.Inertia	SIunits.Inertia
I_21	Units.SI.Inertia	SIunits.Inertia
I_31	Units.SI.Inertia	SIunits.Inertia
I_32	Units.SI.Inertia	SIunits.Inertia
r_0	Units.SI.Position	SIunits.Position
v_0	Units.SI.Velocity	SIunits.Velocity
a_0	Units.SI.Acceleration	SIunits.Acceleration
angles_start	Units.SI.Angle	SIunits.Angle
w_0_start	Units.SI.AngularVelocity	SIunits.AngularVelocity
z_0_start	Units.SI.AngularAcceleration	SIunits.AngularAcceleration
sphereDiameter	Units.SI.Diameter	SIunits.Diameter
cylinderDiameter	Units.SI.Diameter	SIunits.Diameter
I	Units.SI.Inertia	SIunits.Inertia
w_a	Units.SI.AngularVelocity	SIunits.AngularVelocity
z_a	Units.SI.AngularAcceleration	SIunits.AngularAcceleration
g_0	Units.SI.Acceleration	SIunits.Acceleration
phi_start	Units.SI.Angle	SIunits.Angle
phi	Units.SI.Angle	SIunits.Angle
phi_d	Units.SI.AngularVelocity	SIunits.AngularVelocity
phi_dd	Units.SI.AngularAcceleration	SIunits.AngularAcceleration
z_a_start		Present

model Mechanics.MultiBody.Parts.BodyShape

Component	Modelica 4.0.0	Modelica 3.2.3
r	Units.SI.Position	SIunits.Position
r_CM	Units.SI.Position	SIunits.Position
m	Units.SI.Mass	SIunits.Mass
I_11	Units.SI.Inertia	SIunits.Inertia
I_22	Units.SI.Inertia	SIunits.Inertia
I_33	Units.SI.Inertia	SIunits.Inertia
I_21	Units.SI.Inertia	SIunits.Inertia
I_31	Units.SI.Inertia	SIunits.Inertia
I_32	Units.SI.Inertia	SIunits.Inertia
r_0	Units.SI.Position	SIunits.Position
v_0	Units.SI.Velocity	SIunits.Velocity
a_0	Units.SI.Acceleration	SIunits.Acceleration
angles_start	Units.SI.Angle	SIunits.Angle
w_0_start	Units.SI.AngularVelocity	SIunits.AngularVelocity
z_0_start	Units.SI.AngularAcceleration	SIunits.AngularAcceleration
r_shape	Units.SI.Position	SIunits.Position
length	Units.SI.Length	SIunits.Length
width	Units.SI.Distance	SIunits.Distance
height	Units.SI.Distance	SIunits.Distance
sphereDiameter	Units.SI.Diameter	SIunits.Diameter

model Mechanics.MultiBody.Parts.BodyBox

Component	Modelica 4.0.0	Modelica 3.2.3
r	Units.SI.Position	SIunits.Position
r_shape	Units.SI.Position	SIunits.Position
length	Units.SI.Length	SIunits.Length
width	Units.SI.Distance	SIunits.Distance
height	Units.SI.Distance	SIunits.Distance
innerWidth	Units.SI.Distance	SIunits.Distance
innerHeight	Units.SI.Distance	SIunits.Distance
density	Units.SI.Density	SIunits.Density
r_0	Units.SI.Position	SIunits.Position
v_0	Units.SI.Velocity	SIunits.Velocity
a_0	Units.SI.Acceleration	SIunits.Acceleration
angles_start	Units.SI.Angle	SIunits.Angle
w_0_start	Units.SI.AngularVelocity	SIunits.AngularVelocity
z_0_start	Units.SI.AngularAcceleration	SIunits.AngularAcceleration
mo	Units.SI.Mass	SIunits.Mass
mi	Units.SI.Mass	SIunits.Mass
m	Units.SI.Mass	SIunits.Mass
r_CM	Units.SI.Position	SIunits.Position
I	Units.SI.Inertia	SIunits.Inertia

model Mechanics.MultiBody.Parts.BodyCylinder

Component	Modelica 4.0.0	Modelica 3.2.3
r	Units.SI.Position	SIunits.Position
r_shape	Units.SI.Position	SIunits.Position
length	Units.SI.Length	SIunits.Length
diameter	Units.SI.Distance	SIunits.Distance
innerDiameter	Units.SI.Distance	SIunits.Distance
density	Units.SI.Density	SIunits.Density
r_0	Units.SI.Position	SIunits.Position
v_0	Units.SI.Velocity	SIunits.Velocity
a_0	Units.SI.Acceleration	SIunits.Acceleration
angles_start	Units.SI.Angle	SIunits.Angle
w_0_start	Units.SI.AngularVelocity	SIunits.AngularVelocity
z_0_start	Units.SI.AngularAcceleration	SIunits.AngularAcceleration
radius	Units.SI.Distance	SIunits.Distance
innerRadius	Units.SI.Distance	SIunits.Distance
mo	Units.SI.Mass	SIunits.Mass
mi	Units.SI.Mass	SIunits.Mass
I22	Units.SI.Inertia	SIunits.Inertia
m	Units.SI.Mass	SIunits.Mass
r_CM	Units.SI.Position	SIunits.Position
I	Units.SI.Inertia	SIunits.Inertia

model Mechanics.MultiBody.Parts.PointMass

Component	Modelica 4.0.0	Modelica 3.2.3
m	Units.SI.Mass	SIunits.Mass
sphereDiameter	Units.SI.Diameter	SIunits.Diameter
r_0	Units.SI.Position	SIunits.Position
v_0	Units.SI.Velocity	SIunits.Velocity
a_0	Units.SI.Acceleration	SIunits.Acceleration

model Mechanics.MultiBody.Parts.Mounting1D

Component	Modelica 4.0.0	Modelica 3.2.3
phi0	Units.SI.Angle	SIunits.Angle

model Mechanics.MultiBody.Parts.Rotor1D

Component	Modelica 4.0.0	Modelica 3.2.3
J	Units.SI.Inertia	SIunits.Inertia
r_center	Units.SI.Position	SIunits.Position
cylinderLength	Units.SI.Distance	SIunits.Distance
cylinderDiameter	Units.SI.Distance	SIunits.Distance
phi	Units.SI.Angle	SIunits.Angle
w	Units.SI.AngularVelocity	SIunits.AngularVelocity
a	Units.SI.AngularAcceleration	SIunits.AngularAcceleration

model Mechanics.MultiBody.Parts.RollingWheel

Component	Modelica 4.0.0	Modelica 3.2.3
x	Units.SI.Position	SIunits.Position
y	Units.SI.Position	SIunits.Position
angles	Units.SI.Angle	SIunits.Angle
der_angles	Units.SI.AngularVelocity	SIunits.AngularVelocity
width	Units.SI.Distance	SIunits.Distance
body	final m=m	final m=wheelMass
	final I_11=I_long	final I_11=wheel_I_long
	final I_22=I_axis	final I_22=wheel_I_axis
	final I_33=I_long	final I_33=wheel_I_long
rollingWheel	radius=radius
rollingWheel		wheelRadius=wheelRadius
fixedShape	final width=2*radius	final width=2*wheelRadius
	final height=2*radius	final height=2*wheelRadius
	final color=color	final color=wheelColor
radius	Present
m	Present
I_axis	Present
I_long	Present
color	Present
wheelRadius		Present
wheelMass		Present
wheel_I_axis		Present
wheel_I_long		Present
wheelColor		Present

model Mechanics.MultiBody.Parts.RollingWheelSet

Component	Modelica 4.0.0	Modelica 3.2.3
x	Units.SI.Position	SIunits.Position
y	Units.SI.Position	SIunits.Position
phi	Units.SI.Angle	SIunits.Angle
theta1	Units.SI.Angle	SIunits.Angle
theta2	Units.SI.Angle	SIunits.Angle
der_theta1	Units.SI.AngularVelocity	SIunits.AngularVelocity
der_theta2	Units.SI.AngularVelocity	SIunits.AngularVelocity
body2	final m=m_wheel	final m=wheelMass
	final I_11=I_wheelLong	final I_11=wheel_I_long
	final I_22=I_wheelAxis	final I_22=wheel_I_axis
	final I_33=I_wheelLong	final I_33=wheel_I_long
shape2	final color=color	final color=wheelColor
	final r_shape={0,-width_wheel,0}	final r_shape={0,-wheelWidth,0}
	final length=2*width_wheel	final length=2*wheelWidth
	final width=2*R_wheel	final width=2*wheelRadius
	final height=2*R_wheel	final height=2*wheelRadius
body1	final m=m_wheel	final m=wheelMass
	final I_11=I_wheelLong	final I_11=wheel_I_long
	final I_22=I_wheelAxis	final I_22=wheel_I_axis
	final I_33=I_wheelLong	final I_33=wheel_I_long
shape1	final color=color	final color=wheelColor
	final r_shape={0,-width_wheel,0}	final r_shape={0,-wheelWidth,0}
	final length=2*width_wheel	final length=2*wheelWidth
	final width=2*R_wheel	final width=2*wheelRadius
	final height=2*R_wheel	final height=2*wheelRadius
wheelSetJoint	radius=R_wheel
	track=track
		wheelRadius=wheelRadius
		wheelDistance=wheelDistance
R_wheel	Present
m_wheel	Present
I_wheelAxis	Present
I_wheelLong	Present
track	Present
width_wheel	Present
color	Present
wheelRadius		Present
wheelMass		Present
wheel_I_axis		Present
wheel_I_long		Present
wheelDistance		Present
wheelWidth		Present
wheelColor		Present

model Mechanics.MultiBody.Sensors.AbsoluteSensor

Component	Modelica 4.0.0	Modelica 3.2.3
guessAngle1	Units.SI.Angle	SIunits.Angle
arrow		diameter=arrowDiameter
zeroForce1	Mechanics.MultiBody.Forces.Internal.ZeroForceAndTorque	Mechanics.MultiBody.Sensors.Internal.ZeroForceAndTorque
zeroForce2	Mechanics.MultiBody.Forces.Internal.ZeroForceAndTorque	Mechanics.MultiBody.Sensors.Internal.ZeroForceAndTorque
arrowDiameter		Present

model Mechanics.MultiBody.Sensors.RelativeSensor

Component	Modelica 4.0.0	Modelica 3.2.3
guessAngle1	Units.SI.Angle	SIunits.Angle
zeroForce1	Mechanics.MultiBody.Forces.Internal.ZeroForceAndTorque	Mechanics.MultiBody.Sensors.Internal.ZeroForceAndTorque
zeroForce2	Mechanics.MultiBody.Forces.Internal.ZeroForceAndTorque	Mechanics.MultiBody.Sensors.Internal.ZeroForceAndTorque
zeroForce3	Mechanics.MultiBody.Forces.Internal.ZeroForceAndTorque	Mechanics.MultiBody.Sensors.Internal.ZeroForceAndTorque
arrow		diameter=arrowDiameter
arrowDiameter		Present

model Mechanics.MultiBody.Sensors.AbsoluteVelocity

Component	Modelica 4.0.0	Modelica 3.2.3
transformAbsoluteVector	Present
transformAbsoluteVector
tansformAbsoluteVector		Present
tansformAbsoluteVector

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... connect(position.frame_a, frame_a);
connect(der1.y, transformAbsoluteVector.r_in);	connect(der1.y, tansformAbsoluteVector.r_in);
connect(transformAbsoluteVector.r_out, v);	connect(tansformAbsoluteVector.r_out, v);
connect(zeroPosition.frame_resolve, position.frame_resolve);
connect(transformAbsoluteVector.frame_a, frame_a);	connect(tansformAbsoluteVector.frame_a, frame_a);
connect(transformAbsoluteVector.frame_resolve, zeroPosition1.frame_resolve);	connect(tansformAbsoluteVector.frame_resolve, zeroPosition1.frame_resolve);
connect(transformAbsoluteVector.frame_resolve, frame_resolve);	connect(tansformAbsoluteVector.frame_resolve, frame_resolve);

model Mechanics.MultiBody.Sensors.AbsoluteAngles

Component	Modelica 4.0.0	Modelica 3.2.3
guessAngle1	Units.SI.Angle	SIunits.Angle

model Mechanics.MultiBody.Sensors.RelativeVelocity

Component	Modelica 4.0.0	Modelica 3.2.3
transformRelativeVector	Present
transformRelativeVector
tansformRelativeVector		Present
tansformRelativeVector

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... connect(relativePosition.r_rel, der_r_rel.u);
connect(der_r_rel.y, transformRelativeVector.r_in);	connect(der_r_rel.y, tansformRelativeVector.r_in);
connect(transformRelativeVector.r_out, v_rel);	connect(tansformRelativeVector.r_out, v_rel);
connect(transformRelativeVector.frame_a, frame_a);	connect(tansformRelativeVector.frame_a, frame_a);
connect(transformRelativeVector.frame_b, frame_b);	connect(tansformRelativeVector.frame_b, frame_b);
connect(transformRelativeVector.frame_resolve, frame_resolve);	connect(tansformRelativeVector.frame_resolve, frame_resolve);
connect(zeroPosition.frame_resolve, transformRelativeVector.frame_resolve);	connect(zeroPosition.frame_resolve, tansformRelativeVector.frame_resolve);

model Mechanics.MultiBody.Sensors.RelativeAngles

Component	Modelica 4.0.0	Modelica 3.2.3
guessAngle1	Units.SI.Angle	SIunits.Angle

model Mechanics.MultiBody.Sensors.Distance

Component	Modelica 4.0.0	Modelica 3.2.3
s_small	Units.SI.Position	SIunits.Position
arrow		diameter=arrowDiameter
r_rel_0	Units.SI.Position	SIunits.Position
L2	Units.SI.Area	SIunits.Area
s_small2	Units.SI.Area	SIunits.Area
arrowDiameter		Present

model Mechanics.MultiBody.Sensors.CutForce

Component	Modelica 4.0.0	Modelica 3.2.3
forceArrow	r_head=-frame_a.f*(if positiveSign then +1 else -1)	r_head=-f_in_m
	headAtOrigin=true
	quantity=Modelica400.Mechanics.MultiBody.Types.VectorQuantity.Force
		diameter=forceDiameter
		r_tail=f_in_m
N_to_m		Present
forceDiameter		Present
f_in_m		Present

model Mechanics.MultiBody.Sensors.CutTorque

Component	Modelica 4.0.0	Modelica 3.2.3
torqueArrow	r_head=-frame_a.t*(if positiveSign then +1 else -1)	r_head=-t_in_m
	quantity=Modelica400.Mechanics.MultiBody.Types.VectorQuantity.Torque
	headAtOrigin=true
		diameter=torqueDiameter
		r_tail=t_in_m
Nm_to_m		Present
torqueDiameter		Present
t_in_m		Present

model Mechanics.MultiBody.Sensors.CutForceAndTorque

Component	Modelica 4.0.0	Modelica 3.2.3
forceArrow	r_head=-frame_a.f*csign	r_head=-f_in_m
	headAtOrigin=true
	quantity=Modelica400.Mechanics.MultiBody.Types.VectorQuantity.Force
		diameter=forceDiameter
		r_tail=f_in_m
torqueArrow	r_head=-frame_a.t*csign	r_head=-t_in_m
	quantity=Modelica400.Mechanics.MultiBody.Types.VectorQuantity.Torque
	headAtOrigin=true
		diameter=torqueDiameter
		r_tail=t_in_m
N_to_m		Present
Nm_to_m		Present
forceDiameter		Present
torqueDiameter		Present
f_in_m		Present
t_in_m		Present

model Mechanics.MultiBody.Visualizers.FixedShape

Component	Modelica 4.0.0	Modelica 3.2.3
r_shape	Units.SI.Position	SIunits.Position
length	Units.SI.Distance	SIunits.Distance
width	Units.SI.Distance	SIunits.Distance
height	Units.SI.Distance	SIunits.Distance

model Mechanics.MultiBody.Visualizers.FixedShape2

Component	Modelica 4.0.0	Modelica 3.2.3
r	Units.SI.Position	SIunits.Position
r_shape	Units.SI.Position	SIunits.Position
length	Units.SI.Length	SIunits.Length
width	Units.SI.Distance	SIunits.Distance
height	Units.SI.Distance	SIunits.Distance

model Mechanics.MultiBody.Visualizers.FixedFrame

Component	Modelica 4.0.0	Modelica 3.2.3
length	Units.SI.Distance	SIunits.Distance
diameter	Units.SI.Distance	SIunits.Distance
headLength	Units.SI.Length	SIunits.Length
headWidth	Units.SI.Length	SIunits.Length
lineLength	Units.SI.Length	SIunits.Length
lineWidth	Units.SI.Length	SIunits.Length
scaledLabel	Units.SI.Length	SIunits.Length
labelStart	Units.SI.Length	SIunits.Length

model Mechanics.MultiBody.Visualizers.FixedArrow

Component	Modelica 4.0.0	Modelica 3.2.3
r_tail	Units.SI.Position	SIunits.Position
length	Units.SI.Length	SIunits.Length
arrowLine	Mechanics.MultiBody.Visualizers.Advanced.Vector	Mechanics.MultiBody.Visualizers.Advanced.Shape
quantity	Present
headAtOrigin	Present
diameter		Present
headLength		Present
headWidth		Present
lineLength		Present
arrowHead		Present

model Mechanics.MultiBody.Visualizers.SignalArrow

Component	Modelica 4.0.0	Modelica 3.2.3
r_tail	Units.SI.Position	SIunits.Position
r_head		each final quantity="Length"
r_head		each final unit="m"
arrow	quantity=quantity
	headAtOrigin=headAtOrigin
		diameter=diameter
quantity	Present
headAtOrigin	Present
diameter		Present

model Mechanics.MultiBody.Visualizers.Torus

Component	Modelica 4.0.0	Modelica 3.2.3
opening	Units.SI.Angle	SIunits.Angle
startAngle	Units.SI.Angle	SIunits.Angle
stopAngle	Units.SI.Angle	SIunits.Angle
surface	redeclare function surfaceCharacteristic = Modelica400.Mechanics.MultiBody.Visualizers.Advanced.SurfaceCharacteristics.torus (R=R, r=r, opening=opening, startAngle=startAngle, stopAngle=stopAngle)	redeclare function surfaceCharacteristic = Modelica323.Mechanics.MultiBody.Visualizers.Advanced.SurfaceCharacteristics.torus (ri=ri, ro=ro, opening=opening, startAngle=startAngle, stopAngle=stopAngle)
	nu=n_R	nu=n_ri
	nv=n_r	nv=n_ro
R	Present
r	Present
n_R	Present
n_r	Present
ri		Present
ro		Present
n_ri		Present
n_ro		Present

model Mechanics.MultiBody.Visualizers.VoluminousWheel

Component	Modelica 4.0.0	Modelica 3.2.3
rTire	Units.SI.Radius	SIunits.Radius
rRim	Units.SI.Radius	SIunits.Radius
width	Units.SI.Radius	SIunits.Radius
rCurvature	Units.SI.Radius	SIunits.Radius
rw	Units.SI.Radius	SIunits.Radius
rCurvature2	Units.SI.Radius	SIunits.Radius
h	Units.SI.Radius	SIunits.Radius
ri	Units.SI.Length	SIunits.Radius
rRim2	Units.SI.Radius	SIunits.Radius
torus	redeclare function surfaceCharacteristic = Modelica400.Mechanics.MultiBody.Visualizers.Advanced.SurfaceCharacteristics.torus (R=ri, r=rCurvature2, opening=Modelica400.Constants.pi - Modelica400.Math.asin(kw))	redeclare function surfaceCharacteristic = Modelica323.Mechanics.MultiBody.Visualizers.Advanced.SurfaceCharacteristics.torus (ri=ri, ro=rCurvature2, opening=Modelica323.Constants.pi - Modelica323.Math.asin(rw/rCurvature2))
kw	Present

model Mechanics.MultiBody.Visualizers.PipeWithScalarField

Component	Modelica 4.0.0	Modelica 3.2.3
rOuter	Units.SI.Radius	SIunits.Radius
length	Units.SI.Length	SIunits.Length

model Mechanics.MultiBody.Visualizers.Rectangle

Component	Modelica 4.0.0	Modelica 3.2.3
length_u	Units.SI.Distance	SIunits.Distance
length_v	Units.SI.Distance	SIunits.Distance
zeroForceAndTorque	Mechanics.MultiBody.Forces.Internal.ZeroForceAndTorque	Mechanics.MultiBody.Sensors.Internal.ZeroForceAndTorque

model Mechanics.MultiBody.Visualizers.Advanced.Arrow

Component	Modelica 4.0.0	Modelica 3.2.3
r	Units.SI.Position	SIunits.Position
r_tail	Units.SI.Position	SIunits.Position
r_head	Real	SIunits.Position
rvisobj	Units.SI.Position	SIunits.Position
arrowLine	Mechanics.MultiBody.Visualizers.Advanced.Vector	Mechanics.MultiBody.Visualizers.Advanced.Shape
quantity	Present
headAtOrigin	Present
diameter		Present
length		Present
e_x		Present
rxvisobj		Present
arrowLength		Present
arrowHead		Present

model Mechanics.MultiBody.Visualizers.Advanced.DoubleArrow

Component	Modelica 4.0.0	Modelica 3.2.3
r	Units.SI.Position	SIunits.Position
r_tail	Units.SI.Position	SIunits.Position
r_head	Real	SIunits.Position
rvisobj	Units.SI.Position	SIunits.Position
arrowLine	Mechanics.MultiBody.Visualizers.Advanced.Vector	Mechanics.MultiBody.Visualizers.Advanced.Shape
quantity	Present
headAtOrigin	Present
diameter		Present
length		Present
e_x		Present
rxvisobj		Present
headLength		Present
headWidth		Present
arrowLength		Present
arrowHead1		Present
arrowHead2		Present

model Mechanics.MultiBody.Visualizers.Advanced.PipeWithScalarField

Component	Modelica 4.0.0	Modelica 3.2.3
r_0	Units.SI.Position	SIunits.Position
rOuter	Units.SI.Radius	SIunits.Radius
length	Units.SI.Length	SIunits.Length

function Mechanics.MultiBody.Visualizers.Advanced.SurfaceCharacteristics.torus

Component	Modelica 4.0.0	Modelica 3.2.3
opening	Units.SI.Angle	SIunits.Angle
startAngle	Units.SI.Angle	SIunits.Angle
stopAngle	Units.SI.Angle	SIunits.Angle
alpha	Units.SI.Angle	SIunits.Angle
beta	Units.SI.Angle	SIunits.Angle
phi_start	Units.SI.Angle	SIunits.Angle
phi_stop	Units.SI.Angle	SIunits.Angle
R	Present
r	Present
ri		Present
ro		Present

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... beta = phi_start + (phi_stop-phi_start)*(j-1)/(nv-1);
X[i, j] = (R + rModelica400.Math.cos(beta))Modelica400.Math.sin(alpha);	X[i, j] = (ri + roModelica323.Math.cos(beta))Modelica323.Math.sin(alpha);
Y[i, j] = r*Modelica400.Math.sin(beta);	Y[i, j] = ro*Modelica323.Math.sin(beta);
Z[i, j] = (R + rModelica400.Math.cos(beta))Modelica400.Math.cos(alpha);	Z[i, j] = (ri + roModelica323.Math.cos(beta))Modelica323.Math.cos(alpha);
end for; ...

function Mechanics.MultiBody.Visualizers.Advanced.SurfaceCharacteristics.pipeWithScalarField

Component	Modelica 4.0.0	Modelica 3.2.3
rOuter	Units.SI.Radius	SIunits.Radius
length	Units.SI.Length	SIunits.Length
xsi	Units.SI.Position	SIunits.Position

function Mechanics.MultiBody.Visualizers.Advanced.SurfaceCharacteristics.rectangle

Component	Modelica 4.0.0	Modelica 3.2.3
lu	Units.SI.Distance	SIunits.Distance
lv	Units.SI.Distance	SIunits.Distance

model Mechanics.MultiBody.Visualizers.Internal.FixedLines

Component	Modelica 4.0.0	Modelica 3.2.3
lines	Units.SI.Position	SIunits.Position
diameter	Units.SI.Distance	SIunits.Distance
r_lines	Units.SI.Position	SIunits.Position

model Mechanics.MultiBody.Visualizers.Internal.Lines

Component	Modelica 4.0.0	Modelica 3.2.3
r	Units.SI.Position	SIunits.Position
r_lines	Units.SI.Position	SIunits.Position
lines	Units.SI.Position	SIunits.Position
diameter	Units.SI.Length	SIunits.Length
r_abs	Units.SI.Position	SIunits.Position

model Mechanics.Rotational.Examples.First

Component	Modelica 4.0.0	Modelica 3.2.3
amplitude	Units.SI.Torque	SIunits.Torque
Jmotor	Units.SI.Inertia	SIunits.Inertia
Jload	Units.SI.Inertia	SIunits.Inertia
sine	f=f
sine		freqHz=freqHz
f	Present
freqHz		Present

model Mechanics.Rotational.Examples.FirstGrounded

Component	Modelica 4.0.0	Modelica 3.2.3
amplitude	Units.SI.Torque	SIunits.Torque
Jmotor	Units.SI.Inertia	SIunits.Inertia
Jload	Units.SI.Inertia	SIunits.Inertia
sine	f=f
sine		freqHz=freqHz
f	Present
freqHz		Present

model Mechanics.Rotational.Examples.Friction

Component	Modelica 4.0.0	Modelica 3.2.3
startTime	Units.SI.Time	SIunits.Time
tMotor	Units.SI.Torque	SIunits.Torque
tClutch	Units.SI.Torque	SIunits.Torque
tBrake	Units.SI.Torque	SIunits.Torque
tSpring	Units.SI.Torque	SIunits.Torque
sine	f=50/pi
sine		freqHz=50/pi

model Mechanics.Rotational.Examples.CoupledClutches

Component	Modelica 4.0.0	Modelica 3.2.3
T2	Units.SI.Time	SIunits.Time
T3	Units.SI.Time	SIunits.Time
sin1	f=5
sin1		freqHz=5
sin2	f=f
sin2		freqHz=freqHz
f	Present
freqHz		Present

model Mechanics.Rotational.Examples.LossyGearDemo1

Component	Modelica 4.0.0	Modelica 3.2.3
PowerLoss	Units.SI.Power	SIunits.Power
DriveSine	f=1
DriveSine		freqHz=1

model Mechanics.Rotational.Examples.LossyGearDemo2

Component	Modelica 4.0.0	Modelica 3.2.3
PowerLoss	Units.SI.Power	SIunits.Power
DriveSine	f=1
DriveSine		freqHz=1

model Mechanics.Rotational.Examples.HeatLosses

Component	Modelica 4.0.0	Modelica 3.2.3
sine	f=5
sine		freqHz=5
sine2	f=0.2
sine2		freqHz=0.2

model Mechanics.Rotational.Examples.SimpleGearShift

Component	Modelica 4.0.0	Modelica 3.2.3
wEngine	Units.SI.AngularVelocity	SIunits.AngularVelocity
wLoad	Units.SI.AngularVelocity	SIunits.AngularVelocity

model Mechanics.Rotational.Examples.GenerationOfFMUs

Component	Modelica 4.0.0	Modelica 3.2.3
sine1	f=2
sine1		freqHz=2

model Mechanics.Rotational.Examples.OneWayClutch

Component	Modelica 4.0.0	Modelica 3.2.3
signalTorque	f=3
signalTorque		freqHz=3

model Mechanics.Rotational.Examples.OneWayClutchDisengaged

Component	Modelica 4.0.0	Modelica 3.2.3
signalTorque	f=2
signalTorque		freqHz=2

model Mechanics.Rotational.Examples.Utilities.DirectInertia

Component	Modelica 4.0.0	Modelica 3.2.3
J	Units.SI.Inertia	SIunits.Inertia

model Mechanics.Rotational.Examples.Utilities.InverseInertia

Component	Modelica 4.0.0	Modelica 3.2.3
J	Units.SI.Inertia	SIunits.Inertia

model Mechanics.Rotational.Examples.Utilities.SpringDamper

Component	Modelica 4.0.0	Modelica 3.2.3
c	Units.SI.RotationalSpringConstant	SIunits.RotationalSpringConstant
d	Units.SI.RotationalDampingConstant	SIunits.RotationalDampingConstant
phi_rel0	Units.SI.Angle	SIunits.Angle

model Mechanics.Rotational.Examples.Utilities.Spring

Component	Modelica 4.0.0	Modelica 3.2.3
c	Units.SI.RotationalSpringConstant	SIunits.RotationalSpringConstant
phi_rel0	Units.SI.Angle	SIunits.Angle

model Mechanics.Rotational.Examples.Utilities.SpringDamperNoRelativeStates

Component	Modelica 4.0.0	Modelica 3.2.3
c	Units.SI.RotationalSpringConstant	SIunits.RotationalSpringConstant
d	Units.SI.RotationalDampingConstant	SIunits.RotationalDampingConstant
phi_rel0	Units.SI.Angle	SIunits.Angle
w_rel	Units.SI.AngularVelocity	SIunits.AngularVelocity
tau_c	Units.SI.Torque	SIunits.Torque
tau_d	Units.SI.Torque	SIunits.Torque

model Mechanics.Rotational.Components.Fixed

Component	Modelica 4.0.0	Modelica 3.2.3
phi0	Units.SI.Angle	SIunits.Angle

model Mechanics.Rotational.Components.Inertia

Component	Modelica 4.0.0	Modelica 3.2.3
J	Units.SI.Inertia	SIunits.Inertia
phi	Units.SI.Angle	SIunits.Angle
w	Units.SI.AngularVelocity	SIunits.AngularVelocity
a	Units.SI.AngularAcceleration	SIunits.AngularAcceleration

model Mechanics.Rotational.Components.Disc

Component	Modelica 4.0.0	Modelica 3.2.3
deltaPhi	Units.SI.Angle	SIunits.Angle
phi	Units.SI.Angle	SIunits.Angle

model Mechanics.Rotational.Components.Spring

Component	Modelica 4.0.0	Modelica 3.2.3
c	Units.SI.RotationalSpringConstant	SIunits.RotationalSpringConstant
phi_rel0	Units.SI.Angle	SIunits.Angle

model Mechanics.Rotational.Components.Damper

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.RotationalDampingConstant	SIunits.RotationalDampingConstant

model Mechanics.Rotational.Components.SpringDamper

Component	Modelica 4.0.0	Modelica 3.2.3
c	Units.SI.RotationalSpringConstant	SIunits.RotationalSpringConstant
d	Units.SI.RotationalDampingConstant	SIunits.RotationalDampingConstant
phi_rel0	Units.SI.Angle	SIunits.Angle
tau_c	Units.SI.Torque	SIunits.Torque
tau_d	Units.SI.Torque	SIunits.Torque

model Mechanics.Rotational.Components.ElastoBacklash

Component	Modelica 4.0.0	Modelica 3.2.3
c	Units.SI.RotationalSpringConstant	SIunits.RotationalSpringConstant
d	Units.SI.RotationalDampingConstant	SIunits.RotationalDampingConstant
b	Units.SI.Angle	SIunits.Angle
phi_rel0	Units.SI.Angle	SIunits.Angle
bMax	Units.SI.Angle	SIunits.Angle
bMin	Units.SI.Angle	SIunits.Angle
tau_c	Units.SI.Torque	SIunits.Torque
tau_d	Units.SI.Torque	SIunits.Torque
phi_diff	Units.SI.Angle	SIunits.Angle
bEps	Units.SI.Angle	SIunits.Angle

model Mechanics.Rotational.Components.ElastoBacklash2

Component	Modelica 4.0.0	Modelica 3.2.3
c	Units.SI.RotationalSpringConstant	SIunits.RotationalSpringConstant
d	Units.SI.RotationalDampingConstant	SIunits.RotationalDampingConstant
b	Units.SI.Angle	SIunits.Angle
phi_rel0	Units.SI.Angle	SIunits.Angle
bMax	Units.SI.Angle	SIunits.Angle
bMin	Units.SI.Angle	SIunits.Angle
tau_c	Units.SI.Torque	SIunits.Torque
tau_d	Units.SI.Torque	SIunits.Torque
phi_diff	Units.SI.Angle	SIunits.Angle
bEps	Units.SI.Angle	SIunits.Angle

model Mechanics.Rotational.Components.BearingFriction

Component	Modelica 4.0.0	Modelica 3.2.3
phi	Units.SI.Angle	SIunits.Angle
tau	Units.SI.Torque	SIunits.Torque
w	Units.SI.AngularVelocity	SIunits.AngularVelocity
a	Units.SI.AngularAcceleration	SIunits.AngularAcceleration

model Mechanics.Rotational.Components.Brake

Component	Modelica 4.0.0	Modelica 3.2.3
fn_max	Units.SI.Force	SIunits.Force
phi	Units.SI.Angle	SIunits.Angle
tau	Units.SI.Torque	SIunits.Torque
w	Units.SI.AngularVelocity	SIunits.AngularVelocity
a	Units.SI.AngularAcceleration	SIunits.AngularAcceleration
fn	Units.SI.Force	SIunits.Force
mu_pos	Present
mu0	Present
mue_pos		Present
mue0		Present

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
mu0 = Modelica400.Math.Vectors.interpolate( mu_pos[:, 1], mu_pos[:, 2], 0, 1);	mue0 = Modelica323.Math.Vectors.interpolate( mue_pos[:, 1], mue_pos[:, 2], 0, 1);
phi = flange_a.phi - phi_support; ... fn = fn_max*f_normalized;
tau0 = mu0cgeofn;	tau0 = mue0cgeofn;
tau0_max = peak*tau0;
free = fn <= 0;
tau = if locked then saunitTorque else if free then 0 else cgeofn*(if startForward then Modelica400.Math.Vectors.interpolate( mu_pos[:, 1], mu_pos[:, 2], w, 1) else if startBackward then -Modelica400.Math.Vectors.interpolate( mu_pos[:, 1], mu_pos[:, 2], -w, 1) else if pre(mode) == Forward then Modelica400.Math.Vectors.interpolate( mu_pos[:, 1], mu_pos[:, 2], w, 1) else -Modelica400.Math.Vectors.interpolate( mu_pos[:, 1], mu_pos[:, 2], -w, 1));	tau = if locked then saunitTorque else if free then 0 else cgeofn*(if startForward then Modelica323.Math.Vectors.interpolate( mue_pos[:, 1], mue_pos[:, 2], w, 1) else if startBackward then -Modelica323.Math.Vectors.interpolate( mue_pos[:, 1], mue_pos[:, 2], -w, 1) else if pre(mode) == Forward then Modelica323.Math.Vectors.interpolate( mue_pos[:, 1], mue_pos[:, 2], w, 1) else -Modelica323.Math.Vectors.interpolate( mue_pos[:, 1], mue_pos[:, 2], -w, 1));
lossPower = tau*w_relfric;

model Mechanics.Rotational.Components.Clutch

Component	Modelica 4.0.0	Modelica 3.2.3
fn_max	Units.SI.Force	SIunits.Force
fn	Units.SI.Force	SIunits.Force
mu_pos	Present
mu0	Present
mue_pos		Present
mue0		Present

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
mu0 = Modelica400.Math.Vectors.interpolate( mu_pos[:, 1], mu_pos[:, 2], 0, 1);	mue0 = Modelica323.Math.Vectors.interpolate( mue_pos[:, 1], mue_pos[:, 2], 0, 1);
w_relfric = w_rel; ... free = fn <= 0;
tau0 = mu0cgeofn;	tau0 = mue0cgeofn;
tau0_max = peak*tau0;
tau = if locked then saunitTorque else if free then 0 else cgeofn*(if startForward then Modelica400.Math.Vectors.interpolate( mu_pos[:, 1], mu_pos[:, 2], w_rel, 1) else if startBackward then -Modelica400.Math.Vectors.interpolate( mu_pos[:, 1], mu_pos[:, 2], w_rel, 1) else if pre(mode) == Forward then Modelica400.Math.Vectors.interpolate( mu_pos[:, 1], mu_pos[:, 2], w_rel, 1) else -Modelica400.Math.Vectors.interpolate( mu_pos[:, 1], mu_pos[:, 2], -w_rel, 1));	tau = if locked then saunitTorque else if free then 0 else cgeofn*(if startForward then Modelica323.Math.Vectors.interpolate( mue_pos[:, 1], mue_pos[:, 2], w_rel, 1) else if startBackward then -Modelica323.Math.Vectors.interpolate( mue_pos[:, 1], mue_pos[:, 2], w_rel, 1) else if pre(mode) == Forward then Modelica323.Math.Vectors.interpolate( mue_pos[:, 1], mue_pos[:, 2], w_rel, 1) else -Modelica323.Math.Vectors.interpolate( mue_pos[:, 1], mue_pos[:, 2], -w_rel, 1));
lossPower = tau*w_relfric;

model Mechanics.Rotational.Components.OneWayClutch

Component	Modelica 4.0.0	Modelica 3.2.3
fn_max	Units.SI.Force	SIunits.Force
w_small	Units.SI.AngularVelocity	SIunits.AngularVelocity
fn	Units.SI.Force	SIunits.Force
tau0	Units.SI.Torque	SIunits.Torque
tau0_max	Units.SI.Torque	SIunits.Torque
tau0_max_low	Units.SI.Torque	SIunits.Torque
unitAngularAcceleration	Units.SI.AngularAcceleration	SIunits.AngularAcceleration
unitTorque	Units.SI.Torque	SIunits.Torque
mu_pos	Present
mu0	Present
mue_pos		Present
mue0		Present

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
mu0 = Modelica400.Math.Vectors.interpolate( mu_pos[:, 1], mu_pos[:, 2], 0, 1);	mue0 = Modelica323.Math.Vectors.interpolate( mue_pos[:, 1], mue_pos[:, 2], 0, 1);
tau0_max_low = eps0mu0cgeo*fn_max;	tau0_max_low = eps0mue0cgeo*fn_max;
u = f_normalized; ... fn = if free then 0 else fn_max*u;
tau0 = mu0cgeofn;	tau0 = mue0cgeofn;
tau0_max = if free then tau0_max_low else peak2tau0; ... a_rel = unitAngularAcceleration(if locked then 0 else sa - tau0/ unitTorque);
tau = if locked then saunitTorque else (if free then 0 else cgeofn* Modelica400.Math.Vectors.interpolate( mu_pos[:, 1], mu_pos[:, 2], w_rel, 1));	tau = if locked then saunitTorque else (if free then 0 else cgeofn* Modelica323.Math.Vectors.interpolate( mue_pos[:, 1], mue_pos[:, 2], w_rel, 1));
stuck = locked or w_rel <= 0; ...

model Mechanics.Rotational.Components.IdealGear

Component	Modelica 4.0.0	Modelica 3.2.3
phi_a	Units.SI.Angle	SIunits.Angle
phi_b	Units.SI.Angle	SIunits.Angle

model Mechanics.Rotational.Components.LossyGear

Component	Modelica 4.0.0	Modelica 3.2.3
phi_a	Units.SI.Angle	SIunits.Angle
phi_b	Units.SI.Angle	SIunits.Angle
w_a	Units.SI.AngularVelocity	SIunits.AngularVelocity
a_a	Units.SI.AngularAcceleration	SIunits.AngularAcceleration
tau_bf_a	Units.SI.Torque	SIunits.Torque
tau_eta	Units.SI.Torque	SIunits.Torque
tau_bf1	Units.SI.Torque	SIunits.Torque
tau_bf2	Units.SI.Torque	SIunits.Torque
quadrant1	Units.SI.Torque	SIunits.Torque
quadrant2	Units.SI.Torque	SIunits.Torque
quadrant3	Units.SI.Torque	SIunits.Torque
quadrant4	Units.SI.Torque	SIunits.Torque
quadrant1_p	Units.SI.Torque	SIunits.Torque
quadrant2_p	Units.SI.Torque	SIunits.Torque
quadrant3_m	Units.SI.Torque	SIunits.Torque
quadrant4_m	Units.SI.Torque	SIunits.Torque
tauLoss	Units.SI.Torque	SIunits.Torque
tauLossMax	Units.SI.Torque	SIunits.Torque
tauLossMin	Units.SI.Torque	SIunits.Torque
tauLossMax_p	Units.SI.Torque	SIunits.Torque
tauLossMin_m	Units.SI.Torque	SIunits.Torque
tau_eta_p	Units.SI.Torque	SIunits.Torque
tau_eta_m	Units.SI.Torque	SIunits.Torque
unitAngularAcceleration	Units.SI.AngularAcceleration	SIunits.AngularAcceleration
unitTorque	Units.SI.Torque	SIunits.Torque
tau_bf1_0	Units.SI.Torque	SIunits.Torque
tau_bf2_0	Units.SI.Torque	SIunits.Torque
tau_bf_a_0	Units.SI.Torque	SIunits.Torque

model Mechanics.Rotational.Components.Gearbox

Component	Modelica 4.0.0	Modelica 3.2.3
c	Units.SI.RotationalSpringConstant	SIunits.RotationalSpringConstant
d	Units.SI.RotationalDampingConstant	SIunits.RotationalDampingConstant
b	Units.SI.Angle	SIunits.Angle
phi_rel	Units.SI.Angle	SIunits.Angle
w_rel	Units.SI.AngularVelocity	SIunits.AngularVelocity
a_rel	Units.SI.AngularAcceleration	SIunits.AngularAcceleration

model Mechanics.Rotational.Components.IdealRollingWheel

Component	Modelica 4.0.0	Modelica 3.2.3
radius	Units.SI.Distance	SIunits.Distance

model Mechanics.Rotational.Components.InitializeFlange

Component	Modelica 4.0.0	Modelica 3.2.3
phi_flange	Units.SI.Angle	SIunits.Angle
w_flange	Units.SI.AngularVelocity	SIunits.AngularVelocity

model Mechanics.Rotational.Components.RelativeStates

Component	Modelica 4.0.0	Modelica 3.2.3
phi_nominal	Units.SI.Angle	SIunits.Angle
phi_rel	Units.SI.Angle	SIunits.Angle
w_rel	Units.SI.AngularVelocity	SIunits.AngularVelocity
a_rel	Units.SI.AngularAcceleration	SIunits.AngularAcceleration

model Mechanics.Rotational.Components.TorqueToAngleAdaptor

Component	Modelica 4.0.0	Modelica 3.2.3
w_internal	unit="rad/s"
a_internal	unit="rad/s2"

model Mechanics.Rotational.Sensors.AccSensor

Component	Modelica 4.0.0	Modelica 3.2.3
w	Units.SI.AngularVelocity	SIunits.AngularVelocity

model Mechanics.Rotational.Sensors.RelSpeedSensor

Component	Modelica 4.0.0	Modelica 3.2.3
phi_rel	Units.SI.Angle	SIunits.Angle

model Mechanics.Rotational.Sensors.RelAccSensor

Component	Modelica 4.0.0	Modelica 3.2.3
phi_rel	Units.SI.Angle	SIunits.Angle
w_rel	Units.SI.AngularVelocity	SIunits.AngularVelocity

model Mechanics.Rotational.Sources.Position

Component	Modelica 4.0.0	Modelica 3.2.3
f_crit	Units.SI.Frequency	SIunits.Frequency
phi	Units.SI.Angle	SIunits.Angle
w	Units.SI.AngularVelocity	SIunits.AngularVelocity
a	Units.SI.AngularAcceleration	SIunits.AngularAcceleration
w_crit	Units.SI.AngularFrequency	SIunits.AngularFrequency

model Mechanics.Rotational.Sources.Speed

Component	Modelica 4.0.0	Modelica 3.2.3
f_crit	Units.SI.Frequency	SIunits.Frequency
phi	Units.SI.Angle	SIunits.Angle
w	Units.SI.AngularVelocity	SIunits.AngularVelocity
a	Units.SI.AngularAcceleration	SIunits.AngularAcceleration
w_crit	Units.SI.AngularFrequency	SIunits.AngularFrequency

model Mechanics.Rotational.Sources.Accelerate

Component	Modelica 4.0.0	Modelica 3.2.3
phi	Units.SI.Angle	SIunits.Angle
w	Units.SI.AngularVelocity	SIunits.AngularVelocity
a	Units.SI.AngularAcceleration	SIunits.AngularAcceleration

model Mechanics.Rotational.Sources.Move

Component	Modelica 4.0.0	Modelica 3.2.3
phi	Units.SI.Angle	SIunits.Angle

model Mechanics.Rotational.Sources.LinearSpeedDependentTorque

Component	Modelica 4.0.0	Modelica 3.2.3
tau_nominal	Units.SI.Torque	SIunits.Torque
w_nominal	Units.SI.AngularVelocity	SIunits.AngularVelocity
w	Units.SI.AngularVelocity	SIunits.AngularVelocity
tau	Units.SI.Torque	SIunits.Torque

model Mechanics.Rotational.Sources.QuadraticSpeedDependentTorque

Component	Modelica 4.0.0	Modelica 3.2.3
tau_nominal	Units.SI.Torque	SIunits.Torque
w_nominal	Units.SI.AngularVelocity	SIunits.AngularVelocity
w	Units.SI.AngularVelocity	SIunits.AngularVelocity
tau	Units.SI.Torque	SIunits.Torque

model Mechanics.Rotational.Sources.ConstantTorque

Component	Modelica 4.0.0	Modelica 3.2.3
tau_constant	Units.SI.Torque	SIunits.Torque
w	Units.SI.AngularVelocity	SIunits.AngularVelocity
tau	Units.SI.Torque	SIunits.Torque

model Mechanics.Rotational.Sources.SignTorque

Component	Modelica 4.0.0	Modelica 3.2.3
w0	Units.SI.AngularVelocity	SIunits.AngularVelocity
w	Units.SI.AngularVelocity	SIunits.AngularVelocity
tau	Units.SI.Torque	SIunits.Torque
tau_nominal	Present
tau_constant		Present

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... if reg == Modelica400.Blocks.Types.Regularization.Exp then
tau = tau_nominal(2/(1 + Modelica400.Math.exp(-w/(0.01w0))) - 1);	tau = tau_constant(2/(1 + Modelica323.Math.exp(-w/(0.01w0))) - 1);
elseif reg == Modelica400.Blocks.Types.Regularization.Sine then
tau = tau_nominalsmooth(1, (if abs(w) >= w0 then sign(w) else Modelica400.Math.sin(pi/2w/w0)));	tau = tau_constantsmooth(1, (if abs(w) >= w0 then sign(w) else Modelica323.Math.sin(pi/2w/w0)));
elseif reg == Modelica400.Blocks.Types.Regularization.Linear then
tau = tau_nominal*(if abs(w)>=w0 then sign(w) else (w/w0));	tau = tau_constant*(if abs(w)>=w0 then sign(w) else (w/w0));
else
tau = tau_nominal(if abs(w) >= w0 then sign(w) else sign(w)(1 - Modelica400.Math.cos(pi/2*w/w0)));	tau = tau_constant(if abs(w) >= w0 then sign(w) else sign(w)(1 - Modelica323.Math.cos(pi/2*w/w0)));
end if;

model Mechanics.Rotational.Sources.ConstantSpeed

Component	Modelica 4.0.0	Modelica 3.2.3
w	Units.SI.AngularVelocity	SIunits.AngularVelocity
w_fixed	Units.SI.AngularVelocity	SIunits.AngularVelocity

model Mechanics.Rotational.Sources.TorqueStep

Component	Modelica 4.0.0	Modelica 3.2.3
stepTorque	Units.SI.Torque	SIunits.Torque
offsetTorque	Units.SI.Torque	SIunits.Torque
startTime	Units.SI.Time	SIunits.Time
tau	Units.SI.Torque	SIunits.Torque

model Mechanics.Rotational.Sources.EddyCurrentTorque

Component	Modelica 4.0.0	Modelica 3.2.3
tau_nominal	Units.SI.Torque	SIunits.Torque
w_nominal	Units.SI.AngularVelocity	SIunits.AngularVelocity
TRef	Units.SI.Temperature	SIunits.Temperature
tau	Units.SI.Torque	SIunits.Torque
w	Units.SI.AngularVelocity	SIunits.AngularVelocity

connector Mechanics.Rotational.Interfaces.Flange

Component	Modelica 4.0.0	Modelica 3.2.3
phi	Units.SI.Angle	SIunits.Angle
tau	Units.SI.Torque	SIunits.Torque

model Mechanics.Rotational.Interfaces.InternalSupport

Component	Modelica 4.0.0	Modelica 3.2.3
tau	Units.SI.Torque	SIunits.Torque
phi	Units.SI.Angle	SIunits.Angle

model Mechanics.Rotational.Interfaces.PartialCompliant

Component	Modelica 4.0.0	Modelica 3.2.3
phi_rel	Units.SI.Angle	SIunits.Angle
tau	Units.SI.Torque	SIunits.Torque

model Mechanics.Rotational.Interfaces.PartialCompliantWithRelativeStates

Component	Modelica 4.0.0	Modelica 3.2.3
phi_rel	Units.SI.Angle	SIunits.Angle
w_rel	Units.SI.AngularVelocity	SIunits.AngularVelocity
a_rel	Units.SI.AngularAcceleration	SIunits.AngularAcceleration
tau	Units.SI.Torque	SIunits.Torque
phi_nominal	Units.SI.Angle	SIunits.Angle

model Mechanics.Rotational.Interfaces.PartialElementaryOneFlangeAndSupport2

Component	Modelica 4.0.0	Modelica 3.2.3
phi_support	Units.SI.Angle	SIunits.Angle

model Mechanics.Rotational.Interfaces.PartialElementaryTwoFlangesAndSupport2

Component	Modelica 4.0.0	Modelica 3.2.3
phi_support	Units.SI.Angle	SIunits.Angle

model Mechanics.Rotational.Interfaces.PartialTorque

Component	Modelica 4.0.0	Modelica 3.2.3
phi	Units.SI.Angle	SIunits.Angle

model Mechanics.Rotational.Interfaces.PartialFriction

Component	Modelica 4.0.0	Modelica 3.2.3
w_small	Units.SI.AngularVelocity	SIunits.AngularVelocity
w_relfric	Units.SI.AngularVelocity	SIunits.AngularVelocity
a_relfric	Units.SI.AngularAcceleration	SIunits.AngularAcceleration
tau0	Units.SI.Torque	SIunits.Torque
tau0_max	Units.SI.Torque	SIunits.Torque
unitAngularAcceleration	Units.SI.AngularAcceleration	SIunits.AngularAcceleration
unitTorque	Units.SI.Torque	SIunits.Torque

model Mechanics.Translational.Examples.Oscillator

Component	Modelica 4.0.0	Modelica 3.2.3
sine1	f=15.9155
sine1		freqHz=15.9155
sine2	f=15.9155
sine2		freqHz=15.9155

model Mechanics.Translational.Examples.Sensors

Component	Modelica 4.0.0	Modelica 3.2.3
sineForce	f=4
sineForce		freqHz=4

model Mechanics.Translational.Examples.Friction

Component	Modelica 4.0.0	Modelica 3.2.3
sineForce	f=0.25
sineForce		freqHz=0.25

model Mechanics.Translational.Examples.PreLoad

Component	Modelica 4.0.0	Modelica 3.2.3
sineForce	f=0.01
sineForce		freqHz=0.01

model Mechanics.Translational.Examples.ElastoGap

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.TranslationalDampingConstant	SIunits.TranslationalDampingConstant

model Mechanics.Translational.Examples.HeatLosses

Component	Modelica 4.0.0	Modelica 3.2.3
sine1	f=1
sine1		freqHz=1
sine2	f=2
sine2		freqHz=2

model Mechanics.Translational.Examples.GenerationOfFMUs

Component	Modelica 4.0.0	Modelica 3.2.3
sine1	f=2
sine1		freqHz=2

function Mechanics.Translational.Examples.Utilities.GenerateStribeckFrictionTable

Component	Modelica 4.0.0	Modelica 3.2.3
F_Coulomb	Units.SI.Force	SIunits.Force
F_Stribeck	Units.SI.Force	SIunits.Force

model Mechanics.Translational.Examples.Utilities.DirectMass

Component	Modelica 4.0.0	Modelica 3.2.3
m	Units.SI.Mass	SIunits.Mass

model Mechanics.Translational.Examples.Utilities.InverseMass

Component	Modelica 4.0.0	Modelica 3.2.3
m	Units.SI.Mass	SIunits.Mass

model Mechanics.Translational.Examples.Utilities.SpringDamper

Component	Modelica 4.0.0	Modelica 3.2.3
c	Units.SI.TranslationalSpringConstant	SIunits.TranslationalSpringConstant
d	Units.SI.TranslationalDampingConstant	SIunits.TranslationalDampingConstant
s_rel0	Units.SI.Length	SIunits.Length

model Mechanics.Translational.Examples.Utilities.Spring

Component	Modelica 4.0.0	Modelica 3.2.3
c	Units.SI.TranslationalSpringConstant	SIunits.TranslationalSpringConstant
s_rel0	Units.SI.Length	SIunits.Length

model Mechanics.Translational.Examples.Utilities.SpringDamperNoRelativeStates

Component	Modelica 4.0.0	Modelica 3.2.3
c	Units.SI.TranslationalSpringConstant	SIunits.TranslationalSpringConstant
d	Units.SI.TranslationalDampingConstant	SIunits.TranslationalDampingConstant
s_rel0	Units.SI.Length	SIunits.Length
v_rel	Units.SI.Velocity	SIunits.Velocity
f_c	Units.SI.Force	SIunits.Force
f_d	Units.SI.Force	SIunits.Force

model Mechanics.Translational.Components.Fixed

Component	Modelica 4.0.0	Modelica 3.2.3
s0	Units.SI.Position	SIunits.Position

model Mechanics.Translational.Components.Mass

Component	Modelica 4.0.0	Modelica 3.2.3
m	Units.SI.Mass	SIunits.Mass
v	Units.SI.Velocity	SIunits.Velocity
a	Units.SI.Acceleration	SIunits.Acceleration

model Mechanics.Translational.Components.Spring

Component	Modelica 4.0.0	Modelica 3.2.3
c	Units.SI.TranslationalSpringConstant	SIunits.TranslationalSpringConstant
s_rel0	Units.SI.Distance	SIunits.Distance

model Mechanics.Translational.Components.Damper

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.TranslationalDampingConstant	SIunits.TranslationalDampingConstant

model Mechanics.Translational.Components.SpringDamper

Component	Modelica 4.0.0	Modelica 3.2.3
c	Units.SI.TranslationalSpringConstant	SIunits.TranslationalSpringConstant
d	Units.SI.TranslationalDampingConstant	SIunits.TranslationalDampingConstant
s_rel0	Units.SI.Position	SIunits.Position
f_c	Units.SI.Force	SIunits.Force
f_d	Units.SI.Force	SIunits.Force

model Mechanics.Translational.Components.ElastoGap

Component	Modelica 4.0.0	Modelica 3.2.3
c	Units.SI.TranslationalSpringConstant	SIunits.TranslationalSpringConstant
d	Units.SI.TranslationalDampingConstant	SIunits.TranslationalDampingConstant
s_rel0	Units.SI.Position	SIunits.Position
f_c	Units.SI.Force	SIunits.Force
f_d2	Units.SI.Force	SIunits.Force
f_d	Units.SI.Force	SIunits.Force

model Mechanics.Translational.Components.SupportFriction

Component	Modelica 4.0.0	Modelica 3.2.3
s	Units.SI.Position	SIunits.Position
f	Units.SI.Force	SIunits.Force
v	Units.SI.Velocity	SIunits.Velocity
a	Units.SI.Acceleration	SIunits.Acceleration

model Mechanics.Translational.Components.Brake

Component	Modelica 4.0.0	Modelica 3.2.3
fn_max	Units.SI.Force	SIunits.Force
s	Units.SI.Position	SIunits.Position
f	Units.SI.Force	SIunits.Force
v	Units.SI.Velocity	SIunits.Velocity
a	Units.SI.Acceleration	SIunits.Acceleration
fn	Units.SI.Force	SIunits.Force
mu_pos	Present
mu0	Present
mue_pos		Present
mue0		Present

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
mu0 = Modelica400.Math.Vectors.interpolate( mu_pos[:, 1], mu_pos[:, 2], 0, 1);	mue0 = Modelica323.Math.Vectors.interpolate( mue_pos[:, 1], mue_pos[:, 2], 0, 1);
s = s_a; ... fn = fn_max*f_normalized;
f0 = mu0cgeofn;	f0 = mue0cgeofn;
f0_max = peak*f0;
free = fn <= 0;
f = if locked then saunitForce else if free then 0 else cgeofn*(if startForward then Modelica400.Math.Vectors.interpolate( mu_pos[:, 1], mu_pos[:, 2], v, 1) else if startBackward then -Modelica400.Math.Vectors.interpolate( mu_pos[:, 1], mu_pos[:, 2], -v, 1) else if pre(mode) == Forward then Modelica400.Math.Vectors.interpolate( mu_pos[:, 1], mu_pos[:, 2], v, 1) else -Modelica400.Math.Vectors.interpolate( mu_pos[:, 1], mu_pos[:, 2], -v, 1));	f = if locked then saunitForce else if free then 0 else cgeofn*(if startForward then Modelica323.Math.Vectors.interpolate( mue_pos[:, 1], mue_pos[:, 2], v, 1) else if startBackward then -Modelica323.Math.Vectors.interpolate( mue_pos[:, 1], mue_pos[:, 2], -v, 1) else if pre(mode) == Forward then Modelica323.Math.Vectors.interpolate( mue_pos[:, 1], mue_pos[:, 2], v, 1) else -Modelica323.Math.Vectors.interpolate( mue_pos[:, 1], mue_pos[:, 2], -v, 1));
lossPower = f*v_relfric;

model Mechanics.Translational.Components.InitializeFlange

Component	Modelica 4.0.0	Modelica 3.2.3
s_flange	Units.SI.Position	SIunits.Position
v_flange	Units.SI.Velocity	SIunits.Velocity

model Mechanics.Translational.Components.MassWithStopAndFriction

Component	Modelica 4.0.0	Modelica 3.2.3
v	Units.SI.Velocity	SIunits.Velocity
a	Units.SI.Acceleration	SIunits.Acceleration
m	Units.SI.Mass	SIunits.Mass
F_Coulomb	Units.SI.Force	SIunits.Force
F_Stribeck	Units.SI.Force	SIunits.Force

model Mechanics.Translational.Components.RelativeStates

Component	Modelica 4.0.0	Modelica 3.2.3
s_rel	Units.SI.Position	SIunits.Position
v_rel	Units.SI.Velocity	SIunits.Velocity
a_rel	Units.SI.Acceleration	SIunits.Acceleration

model Mechanics.Translational.Sensors.AccSensor

Component	Modelica 4.0.0	Modelica 3.2.3
v	Units.SI.Velocity	SIunits.Velocity

model Mechanics.Translational.Sensors.RelSpeedSensor

Component	Modelica 4.0.0	Modelica 3.2.3
s_rel	Units.SI.Position	SIunits.Position

model Mechanics.Translational.Sensors.RelAccSensor

Component	Modelica 4.0.0	Modelica 3.2.3
s_rel	Units.SI.Position	SIunits.Position
v_rel	Units.SI.Velocity	SIunits.Velocity

model Mechanics.Translational.Sources.Position

Component	Modelica 4.0.0	Modelica 3.2.3
f_crit	Units.SI.Frequency	SIunits.Frequency
v	Units.SI.Velocity	SIunits.Velocity
a	Units.SI.Acceleration	SIunits.Acceleration
w_crit	Units.SI.AngularFrequency	SIunits.AngularFrequency

model Mechanics.Translational.Sources.Speed

Component	Modelica 4.0.0	Modelica 3.2.3
f_crit	Units.SI.Frequency	SIunits.Frequency
v	Units.SI.Velocity	SIunits.Velocity
a	Units.SI.Acceleration	SIunits.Acceleration
w_crit	Units.SI.AngularFrequency	SIunits.AngularFrequency

model Mechanics.Translational.Sources.Accelerate

Component	Modelica 4.0.0	Modelica 3.2.3
v	Units.SI.Velocity	SIunits.Velocity
a	Units.SI.Acceleration	SIunits.Acceleration

model Mechanics.Translational.Sources.LinearSpeedDependentForce

Component	Modelica 4.0.0	Modelica 3.2.3
f_nominal	Units.SI.Force	SIunits.Force
v_nominal	Units.SI.Velocity	SIunits.Velocity
v	Units.SI.Velocity	SIunits.Velocity

model Mechanics.Translational.Sources.QuadraticSpeedDependentForce

Component	Modelica 4.0.0	Modelica 3.2.3
f_nominal	Units.SI.Force	SIunits.Force
v_nominal	Units.SI.Velocity	SIunits.Velocity
v	Units.SI.Velocity	SIunits.Velocity

model Mechanics.Translational.Sources.ConstantForce

Component	Modelica 4.0.0	Modelica 3.2.3
f_constant	Units.SI.Force	SIunits.Force

model Mechanics.Translational.Sources.SignForce

Component	Modelica 4.0.0	Modelica 3.2.3
f_nominal	Units.SI.Force	SIunits.Force
v0	Units.SI.Velocity	SIunits.Velocity
v	Units.SI.Velocity	SIunits.Velocity

model Mechanics.Translational.Sources.ConstantSpeed

Component	Modelica 4.0.0	Modelica 3.2.3
v_fixed	Units.SI.Velocity	SIunits.Velocity
v	Units.SI.Velocity	SIunits.Velocity

model Mechanics.Translational.Sources.ForceStep

Component	Modelica 4.0.0	Modelica 3.2.3
stepForce	Units.SI.Force	SIunits.Force
offsetForce	Units.SI.Force	SIunits.Force
startTime	Units.SI.Time	SIunits.Time

model Mechanics.Translational.Sources.EddyCurrentForce

Component	Modelica 4.0.0	Modelica 3.2.3
f_nominal	Units.SI.Force	SIunits.Force
v_nominal	Units.SI.Velocity	SIunits.Velocity
TRef	Units.SI.Temperature	SIunits.Temperature
v	Units.SI.Velocity	SIunits.Velocity

connector Mechanics.Translational.Interfaces.Flange

Component	Modelica 4.0.0	Modelica 3.2.3
s	Units.SI.Position	SIunits.Position
f	Units.SI.Force	SIunits.Force

model Mechanics.Translational.Interfaces.InternalSupport

Component	Modelica 4.0.0	Modelica 3.2.3
f	Units.SI.Force	SIunits.Force
s	Units.SI.Position	SIunits.Position

model Mechanics.Translational.Interfaces.PartialTwoFlangesAndSupport

Component	Modelica 4.0.0	Modelica 3.2.3
flange_a		Present
flange_a
flange_b		Present
flange_b

model Mechanics.Translational.Interfaces.PartialRigid

Component	Modelica 4.0.0	Modelica 3.2.3
s	Units.SI.Position	SIunits.Position
L	Units.SI.Length	SIunits.Length
flange_a		Present
flange_a
flange_b		Present
flange_b

model Mechanics.Translational.Interfaces.PartialCompliant

Component	Modelica 4.0.0	Modelica 3.2.3
s_rel	Units.SI.Position	SIunits.Position
f	Units.SI.Force	SIunits.Force
flange_a		Present
flange_a
flange_b		Present
flange_b

model Mechanics.Translational.Interfaces.PartialCompliantWithRelativeStates

Component	Modelica 4.0.0	Modelica 3.2.3
s_nominal	Units.SI.Distance	SIunits.Distance
s_rel	Units.SI.Position	SIunits.Position
v_rel	Units.SI.Velocity	SIunits.Velocity
f	Units.SI.Force	SIunits.Force
flange_a		Present
flange_a
flange_b		Present
flange_b

model Mechanics.Translational.Interfaces.PartialElementaryOneFlangeAndSupport2

Component	Modelica 4.0.0	Modelica 3.2.3
s	Units.SI.Length	SIunits.Length
s_support	Units.SI.Length	SIunits.Length

model Mechanics.Translational.Interfaces.PartialElementaryTwoFlangesAndSupport2

Component	Modelica 4.0.0	Modelica 3.2.3
s_a	Units.SI.Length	SIunits.Length
s_b	Units.SI.Length	SIunits.Length
s_support	Units.SI.Length	SIunits.Length
flange_a		Present
flange_a
flange_b		Present
flange_b

model Mechanics.Translational.Interfaces.PartialForce

Component	Modelica 4.0.0	Modelica 3.2.3
f	Units.SI.Force	SIunits.Force

model Mechanics.Translational.Interfaces.PartialRelativeSensor

Component	Modelica 4.0.0	Modelica 3.2.3
flange_a		Present
flange_a
flange_b		Present
flange_b

model Mechanics.Translational.Interfaces.PartialFriction

Component	Modelica 4.0.0	Modelica 3.2.3
v_small	Units.SI.Velocity	SIunits.Velocity
v_relfric	Units.SI.Velocity	SIunits.Velocity
a_relfric	Units.SI.Acceleration	SIunits.Acceleration
f0	Units.SI.Force	SIunits.Force
f0_max	Units.SI.Force	SIunits.Force
unitAcceleration	Units.SI.Acceleration	SIunits.Acceleration
unitForce	Units.SI.Force	SIunits.Force

model Fluid.Examples.PumpingSystem

Component	Modelica 4.0.0	Modelica 3.2.3
source	T=Modelica400.Units.Conversions.from_degC(20)	T=Modelica323.SIunits.Conversions.from_degC(20)
pumps	checkValveHomotopy=Modelica400.Fluid.Types.CheckValveHomotopyType.Closed
reservoir	T_start=Modelica400.Units.Conversions.from_degC(20)	T_start=Modelica323.SIunits.Conversions.from_degC(20)

model Fluid.Examples.HeatingSystem

Component	Modelica 4.0.0	Modelica 3.2.3
tank	T_start=Modelica400.Units.Conversions.from_degC(20)	T_start=Modelica323.SIunits.Conversions.from_degC(20)
pump	T_start=Modelica400.Units.Conversions.from_degC(40)	T_start=Modelica323.SIunits.Conversions.from_degC(40)
m_flow	unit="kg/s"
heater	T_start=Modelica400.Units.Conversions.from_degC(80)	T_start=Modelica323.SIunits.Conversions.from_degC(80)
radiator	T_start=Modelica400.Units.Conversions.from_degC(40)	T_start=Modelica323.SIunits.Conversions.from_degC(40)
T_forward	unit="K"
T_return	unit="K"
tankLevel	unit="m"
pipe	T_start=Modelica400.Units.Conversions.from_degC(80)	T_start=Modelica323.SIunits.Conversions.from_degC(80)

model Fluid.Examples.DrumBoiler.BaseClasses.EquilibriumDrumBoiler

Component	Modelica 4.0.0	Modelica 3.2.3
m_D	Units.SI.Mass	SIunits.Mass
V_t	Units.SI.Volume	SIunits.Volume
V_l_start	Units.SI.Volume	SIunits.Volume
V_v	Units.SI.Volume	SIunits.Volume
V_l	Units.SI.Volume	SIunits.Volume
m	Units.SI.Mass	SIunits.Mass
U	Units.SI.Energy	SIunits.Energy
q_F	Units.SI.HeatFlowRate	SIunits.HeatFlowRate
qm_W	Units.SI.MassFlowRate	SIunits.MassFlowRate
qm_S	Units.SI.MassFlowRate	SIunits.MassFlowRate

model Fluid.Examples.ControlledTankSystem.ControlledTanks

Component	Modelica 4.0.0	Modelica 3.2.3
start	Blocks.Sources.RadioButtonSource	Fluid.Examples.ControlledTankSystem.Utilities.RadioButton
stop	Blocks.Sources.RadioButtonSource	Fluid.Examples.ControlledTankSystem.Utilities.RadioButton
shut	Blocks.Sources.RadioButtonSource	Fluid.Examples.ControlledTankSystem.Utilities.RadioButton

model Fluid.Examples.ControlledTankSystem.Utilities.TankController

Component	Modelica 4.0.0	Modelica 3.2.3
maxLevel	Units.SI.Height	SIunits.Height
minLevel	Units.SI.Height	SIunits.Height
waitTime	Units.SI.Time	SIunits.Time
s1	nOut=1
s2	nIn=1
emptyTanks	nIn=1
emptyTanks	nOut=1

model Fluid.Examples.ControlledTankSystem.Utilities.NormalOperation

Component	Modelica 4.0.0	Modelica 3.2.3
maxLevel	Units.SI.Height	SIunits.Height
minLevel	Units.SI.Height	SIunits.Height
waitTime	Units.SI.Time	SIunits.Time
fillTank1	nIn=1
fillTank1	nOut=1
fillTank2	nIn=1
fillTank2	nOut=1
emptyTank2	nIn=1
emptyTank2	nOut=1
wait1	nIn=1
wait1	nOut=1
wait2	nIn=1
wait2	nOut=1

model Fluid.Examples.AST_BatchPlant.BatchPlant_StandardWater

Component	Modelica 4.0.0	Modelica 3.2.3
pipeDiameter	Units.SI.Length	SIunits.Length
V12	Fluid.Valves.ValveDiscreteRamp	Fluid.Valves.ValveDiscrete
V15	Fluid.Valves.ValveDiscreteRamp	Fluid.Valves.ValveDiscrete
V11	Fluid.Valves.ValveDiscreteRamp	Fluid.Valves.ValveDiscrete
V8	Fluid.Valves.ValveDiscreteRamp	Fluid.Valves.ValveDiscrete
V9	Fluid.Valves.ValveDiscreteRamp	Fluid.Valves.ValveDiscrete
V2	Fluid.Valves.ValveDiscreteRamp	Fluid.Valves.ValveDiscrete
V4	Fluid.Valves.ValveDiscreteRamp	Fluid.Valves.ValveDiscrete
V3	Fluid.Valves.ValveDiscreteRamp	Fluid.Valves.ValveDiscrete
V6	Fluid.Valves.ValveDiscreteRamp	Fluid.Valves.ValveDiscrete
V23	Fluid.Valves.ValveDiscreteRamp	Fluid.Valves.ValveDiscrete
V1	Fluid.Valves.ValveDiscreteRamp	Fluid.Valves.ValveDiscrete
V22	Fluid.Valves.ValveDiscreteRamp	Fluid.Valves.ValveDiscrete
V5	Fluid.Valves.ValveDiscreteRamp	Fluid.Valves.ValveDiscrete
V24	Fluid.Valves.ValveDiscreteRamp	Fluid.Valves.ValveDiscrete
V25	Fluid.Valves.ValveDiscreteRamp	Fluid.Valves.ValveDiscrete
V20	Fluid.Valves.ValveDiscreteRamp	Fluid.Valves.ValveDiscrete
V19	Fluid.Valves.ValveDiscreteRamp	Fluid.Valves.ValveDiscrete
V10	Fluid.Valves.ValveDiscreteRamp	Fluid.Valves.ValveDiscrete
V21	Fluid.Valves.ValveDiscreteRamp	Fluid.Valves.ValveDiscrete
V18	Fluid.Valves.ValveDiscreteRamp	Fluid.Valves.ValveDiscrete
system	dp_small=1000
P1_on	rising=0.3	rising=0
P2_on	rising=0.3	rising=0

model Fluid.Examples.AST_BatchPlant.BaseClasses.TankWith3InletOutletArraysWithEvaporatorCondensor

Component	Modelica 4.0.0	Modelica 3.2.3
crossArea	Units.SI.Area	SIunits.Area
top_pipeArea	Units.SI.Area	SIunits.Area
side_pipeArea	Units.SI.Area	SIunits.Area
bottom_pipeArea	Units.SI.Area	SIunits.Area
height	Units.SI.Height	SIunits.Height
V0	Units.SI.Volume	SIunits.Volume
g	Units.SI.Acceleration	SIunits.Acceleration
side_heights	Units.SI.Height	Real
bottom_heights	Units.SI.Height	Real
top_heights	Units.SI.Height	Real
level_start	Units.SI.Height	SIunits.Height
level	Units.SI.Height	SIunits.Height
V	Units.SI.Volume	SIunits.Volume
U	Units.SI.Energy	SIunits.Energy
min_level_for_heating	Units.SI.Height	Real
sat	Media.Water.WaterIF97_base.SaturationProperties	Media.Interfaces.Types.SaturationProperties

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... assert(level < height, "Tank is overflowing.");
assert(not (heatPort.Q_flow > 0.0 and level <= min_level_for_heating), "Attempting to heat an empty tank.");	assert(not (heatPort.Q_flow > 0.0 and level <= min_level_for_heating), " Attempting to heat an empty tank ");
initial equation ...

model Fluid.Examples.AST_BatchPlant.BaseClasses.InnerTank

Component	Modelica 4.0.0	Modelica 3.2.3
g	Units.SI.Acceleration	SIunits.Acceleration

model Fluid.Examples.AST_BatchPlant.BaseClasses.Controller

Component	Modelica 4.0.0	Modelica 3.2.3
InitialStep1	nIn=1
InitialStep1	nOut=1
Step1	nIn=1
Step1	nOut=1
Step2	nIn=1
Step2	nOut=1
Step3	nIn=1
Step3	nOut=1
Step4	nIn=1
Step4	nOut=1
Step5	nIn=1
Step5	nOut=1
Step6	nIn=1
Step6	nOut=1
Step7	nIn=1
Step7	nOut=1
Step8	nIn=1
Step8	nOut=1
Step9	nIn=1
Step9	nOut=1
Step10	nOut=1
Step10	nIn=1
Step11	nIn=1
Step11	nOut=1
Step12	nIn=1
Step12	nOut=1
Step14	nIn=1
Step14	nOut=1
Step13	nIn=1
Step13	nOut=1
Step13b	Present
Step13b
Transition13b	Present
Transition13b
Step10b	Present
Step10b
Transition10b	Present
Transition10b

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... T7_idle = not actuators.V15 and not actuators.V18 and not actuators. T7_Cooling and sensors.LIS_701 < 0.01;
actuators.P1 = Step10.active or Step10b.active;	actuators.P1 = Step10.active;
actuators.P2 = Step13.active or Step13b.active;	actuators.P2 = Step13.active;
actuators.T5_Heater = Step6.active; ... actuators.T6_Cooling = Step12.active;
actuators.V1 = Step10.active or Step10b.active;	actuators.V1 = Step10.active;
actuators.V2 = false; ... actuators.V4 = false;
actuators.V5 =Step13.active or Step13b.active;	actuators.V5 = Step13.active;
actuators.V6 =Step13.active; ... actuators.V21 = false;
actuators.V22 = Step10.active or Step10b.active;	actuators.V22 = Step10.active;
actuators.V23 = Step10.active or Step10b.active;	actuators.V23 = Step10.active;
actuators.V25 =Step13.active or Step13b.active;	actuators.V25 = Step13.active;
actuators.V24 =Step13.active or Step13b.active;	actuators.V24 = Step13.active;
connect(InitialStep1.outPort[1], Transition1.inPort); ... connect(Step12.outPort[1], Transition12.inPort);
connect(Transition12.outPort, Step13b.inPort[1]);	connect(Transition12.outPort, Step13.inPort[1]);
	connect(Step13.outPort[1], Transition13.inPort);
connect(Transition13.outPort, Step14.inPort[1]); ... connect(Step9.outPort[1], Transition10.inPort);
	connect(Transition10.outPort, Step10.inPort[1]);
connect(Step10.outPort[1], Transition11.inPort); ... connect(BooleanExpression1.y, TransitionWithSignal1.condition);
connect(Step13b.outPort[1], Transition13b.inPort); connect(Transition13b.outPort, Step13.inPort[1]); connect(Step13.outPort[1], Transition13.inPort); connect(Transition10.outPort, Step10b.inPort[1]); connect(Step10b.outPort[1], Transition10b.inPort); connect(Transition10b.outPort, Step10.inPort[1]);

class Fluid.Examples.AST_BatchPlant.BaseClasses.ControllerUtilities.Block_Recipe_TBD

Component	Modelica 4.0.0	Modelica 3.2.3
w_concentrate	Present
w_concentrat		Present

model Fluid.Examples.AST_BatchPlant.BaseClasses.TankWithTopPorts

Component	Modelica 4.0.0	Modelica 3.2.3
level	Units.SI.Length	SIunits.Length
height	Units.SI.Height	SIunits.Height
crossArea	Units.SI.Area	SIunits.Area
V0	Units.SI.Volume	SIunits.Volume
level_start	Units.SI.Height	SIunits.Height
m_flow_small	Units.SI.MassFlowRate	SIunits.MassFlowRate
V	Units.SI.Volume	SIunits.Volume
bottomArea	Units.SI.Area	SIunits.Area
ports_emptyPipeHysteresis	Units.SI.Diameter	SIunits.Diameter
levelAbovePort	Units.SI.Length	SIunits.Length

model Fluid.Examples.AST_BatchPlant.Test.TwoTanks

Component	Modelica 4.0.0	Modelica 3.2.3
tank1	T_start=Modelica400.Units.Conversions.from_degC(50)	T_start=Modelica323.SIunits.Conversions.from_degC(50)
tank2	T_start=Modelica400.Units.Conversions.from_degC(100)	T_start=Modelica323.SIunits.Conversions.from_degC(100)

model Fluid.Examples.IncompressibleFluidNetwork

Component	Modelica 4.0.0	Modelica 3.2.3
filteredValveOpening		Present

model Fluid.Examples.HeatExchanger.BaseClasses.BasicHX

Component	Modelica 4.0.0	Modelica 3.2.3
length	Units.SI.Length	SIunits.Length
crossArea_1	Units.SI.Area	SIunits.Area
crossArea_2	Units.SI.Area	SIunits.Area
perimeter_1	Units.SI.Length	SIunits.Length
perimeter_2	Units.SI.Length	SIunits.Length
area_h_1	Units.SI.Area	SIunits.Area
area_h_2	Units.SI.Area	SIunits.Area
s_wall	Units.SI.Length	SIunits.Length
k_wall	Units.SI.ThermalConductivity	SIunits.ThermalConductivity
c_wall	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity
rho_wall	Units.SI.Density	SIunits.Density
area_h	Units.SI.Area	SIunits.Area
m_wall	Units.SI.Mass	SIunits.Mass
Twall_start	Units.SI.Temperature	SIunits.Temperature
dT	Units.SI.TemperatureDifference	SIunits.Temperature
roughness_1	Fluid.Types.Roughness	SIunits.Length
roughness_2	Fluid.Types.Roughness	SIunits.Length
Q_flow_1	Units.SI.HeatFlowRate	SIunits.HeatFlowRate
Q_flow_2	Units.SI.HeatFlowRate	SIunits.HeatFlowRate

model Fluid.Examples.HeatExchanger.BaseClasses.WallConstProps

Component	Modelica 4.0.0	Modelica 3.2.3
s	Units.SI.Length	SIunits.Length
area_h	Units.SI.Area	SIunits.Area
rho_wall	Units.SI.Density	SIunits.Density
c_wall	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity
k_wall	Units.SI.ThermalConductivity	SIunits.ThermalConductivity
m	Units.SI.Mass	SIunits.Mass
T_start	Units.SI.Temperature	SIunits.Temperature
dT	Units.SI.Temperature	SIunits.Temperature
Tb	Units.SI.Temperature	SIunits.Temperature
Ta	Units.SI.Temperature	SIunits.Temperature
T	Units.SI.Temperature	SIunits.Temperature

model Fluid.Examples.TraceSubstances.RoomCO2WithControls

Component	Modelica 4.0.0	Modelica 3.2.3
numberOfPeople	Present
numberOfPeople
NumberOfPeople		Present
NumberOfPeople

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... connect(ductOut.port_b, boundary4.ports[1]);
connect(numberOfPeople.y[1], gain.u);	connect(NumberOfPeople.y[1], gain.u);
connect(gain.y, peopleSource.m_flow_in); ...

model Fluid.Examples.Explanatory.MeasuringTemperature

Component	Modelica 4.0.0	Modelica 3.2.3
sine	f=1
sine		freqHz=1

model Fluid.Examples.Explanatory.MomentumBalanceFittings

Component	Modelica 4.0.0	Modelica 3.2.3
leftAdaptor	diameter_b=1e60	diameter_b=Modelica323.Constants.inf
rightAdaptor	diameter_b=1e60	diameter_b=Modelica323.Constants.inf

model Fluid.System

Component	Modelica 4.0.0	Modelica 3.2.3
p_ambient	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
T_ambient	Units.SI.Temperature	SIunits.Temperature
g	Units.SI.Acceleration	SIunits.Acceleration
m_flow_start	Units.SI.MassFlowRate	SIunits.MassFlowRate
p_start	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
T_start	Units.SI.Temperature	SIunits.Temperature
m_flow_nominal	Units.SI.MassFlowRate	SIunits.MassFlowRate
dp_small	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
m_flow_small	Units.SI.MassFlowRate	SIunits.MassFlowRate

model Fluid.Vessels.ClosedVolume

Component	Modelica 4.0.0	Modelica 3.2.3
V	Units.SI.Volume	SIunits.Volume

model Fluid.Vessels.OpenTank

Component	Modelica 4.0.0	Modelica 3.2.3
level	Units.SI.Height	SIunits.Height
V	Units.SI.Volume	SIunits.Volume
height	Units.SI.Height	SIunits.Height
crossArea	Units.SI.Area	SIunits.Area
level_start	Units.SI.Height	SIunits.Height
level_start_eps	Units.SI.Height	SIunits.Height

model Fluid.Vessels.BaseClasses.PartialLumpedVessel

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow_small	Units.SI.MassFlowRate	SIunits.MassFlowRate
portVelocities	Units.SI.Velocity	SIunits.Velocity
ports_E_flow	Units.SI.EnergyFlowRate	SIunits.EnergyFlowRate
portAreas	Units.SI.Area	SIunits.Area
Re_turbulent	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
m_flow_turbulent	Units.SI.MassFlowRate	SIunits.MassFlowRate
fluidLevel	Units.SI.Height	SIunits.Height
fluidLevel_max	Units.SI.Height	SIunits.Height
vesselArea	Units.SI.Area	SIunits.Area

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... if use_portsData then
ports[i].p = vessel_ps_static[i] + (0.5/portAreas[i]^2Utilities.regSquare2(ports[i].m_flow, m_flow_turbulent[i], (portsData_zeta_in[i] - 1 + portAreas[i]^2/vesselArea^2)/portInDensities[i]ports_penetration[i], (portsData_zeta_out[i] + 1 - portAreas[i]^2/vesselArea^2)/medium.d/ports_penetration[i]));	ports[i].p = homotopy(vessel_ps_static[i] + (0.5/portAreas[i]^2Utilities.regSquare2(ports[i].m_flow, m_flow_turbulent[i], (portsData_zeta_in[i] - 1 + portAreas[i]^2/vesselArea^2)/portInDensities[i]ports_penetration[i], (portsData_zeta_out[i] + 1 - portAreas[i]^2/vesselArea^2)/medium.d/ports_penetration[i])), vessel_ps_static[i]);
else ...

model Fluid.Vessels.BaseClasses.HeatTransfer.ConstantHeatTransfer

Component	Modelica 4.0.0	Modelica 3.2.3
alpha0	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer

record Fluid.Vessels.BaseClasses.VesselPortsData

Component	Modelica 4.0.0	Modelica 3.2.3
diameter	Units.SI.Diameter	SIunits.Diameter
height	Units.SI.Height	SIunits.Height

model Fluid.Pipes.BaseClasses.PartialStraightPipe

Component	Modelica 4.0.0	Modelica 3.2.3
length	Units.SI.Length	SIunits.Length
diameter	Units.SI.Diameter	SIunits.Diameter
crossArea	Units.SI.Area	SIunits.Area
perimeter	Units.SI.Length	SIunits.Length
roughness	Fluid.Types.Roughness	SIunits.Height
V	Units.SI.Volume	SIunits.Volume
height_ab	Units.SI.Length	SIunits.Length

model Fluid.Pipes.BaseClasses.PartialTwoPortFlow

Component	Modelica 4.0.0	Modelica 3.2.3
lengths	Units.SI.Length	SIunits.Length
crossAreas	Units.SI.Area	SIunits.Area
dimensions	Units.SI.Length	SIunits.Length
roughnesses	Fluid.Types.Roughness	SIunits.Height
dheights	Units.SI.Length	SIunits.Length
vs	Units.SI.Velocity	SIunits.Velocity
pathLengths	Units.SI.Length	SIunits.Length
dheightsFM	Units.SI.Length	SIunits.Length
crossAreasFM	Units.SI.Area	SIunits.Area
vsFM	Units.SI.Velocity	SIunits.Velocity
dimensionsFM	Units.SI.Length	SIunits.Length
roughnessesFM	Fluid.Types.Roughness	SIunits.Height

model Fluid.Pipes.BaseClasses.FlowModels.PartialStaggeredFlowModel

Component	Modelica 4.0.0	Modelica 3.2.3
vs	Units.SI.Velocity	SIunits.Velocity
crossAreas	Units.SI.Area	SIunits.Area
dimensions	Units.SI.Length	SIunits.Length
roughnesses	Fluid.Types.Roughness	SIunits.Height
dheights	Units.SI.Length	SIunits.Length
g	Units.SI.Acceleration	SIunits.Acceleration
dps_fg	Units.SI.Pressure	SIunits.Pressure
Re_turbulent	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Res	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
rho_nominal	Units.SI.Density	SIunits.Density
mu_nominal	Units.SI.DynamicViscosity	SIunits.DynamicViscosity

model Fluid.Pipes.BaseClasses.FlowModels.NominalLaminarFlow

Component	Modelica 4.0.0	Modelica 3.2.3
dp_nominal	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
m_flow_nominal	Units.SI.MassFlowRate	SIunits.MassFlowRate
pathLengths_nominal	Units.SI.Length	SIunits.Length

model Fluid.Pipes.BaseClasses.FlowModels.PartialGenericPipeFlow

Component	Modelica 4.0.0	Modelica 3.2.3
pathLengths_internal	Units.SI.Length	SIunits.Length
Res_turbulent_internal	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
dp_nominal	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
m_flow_nominal	Units.SI.MassFlowRate	SIunits.MassFlowRate
m_flow_small	Units.SI.MassFlowRate	SIunits.MassFlowRate
dp_small	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
diameters	Units.SI.Length	SIunits.Length
dp_fric_nominal	Units.SI.AbsolutePressure	SIunits.AbsolutePressure

model Fluid.Pipes.BaseClasses.FlowModels.NominalTurbulentPipeFlow

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow_turbulent	Units.SI.MassFlowRate	SIunits.MassFlowRate
pathLengths_nominal	Units.SI.Length	SIunits.Length
Res_turbulent_nominal	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber

model Fluid.Pipes.BaseClasses.HeatTransfer.PartialFlowHeatTransfer

Component	Modelica 4.0.0	Modelica 3.2.3
vs	Units.SI.Velocity	SIunits.Velocity
lengths	Units.SI.Length	SIunits.Length
dimensions	Units.SI.Length	SIunits.Length
roughnesses	Fluid.Types.Roughness	SIunits.Height

model Fluid.Pipes.BaseClasses.HeatTransfer.ConstantFlowHeatTransfer

Component	Modelica 4.0.0	Modelica 3.2.3
alpha0	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer

model Fluid.Pipes.BaseClasses.HeatTransfer.PartialPipeFlowHeatTransfer

Component	Modelica 4.0.0	Modelica 3.2.3
alpha0	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer
alphas	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer
diameters	Units.SI.Length	SIunits.Length

function Fluid.Pipes.BaseClasses.CharacteristicNumbers.ReynoldsNumber

Component	Modelica 4.0.0	Modelica 3.2.3
v	Units.SI.Velocity	SIunits.Velocity
rho	Units.SI.Density	SIunits.Density
mu	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
D	Units.SI.Length	SIunits.Length
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber

function Fluid.Pipes.BaseClasses.CharacteristicNumbers.ReynoldsNumber_m_flow

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate
mu	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
D	Units.SI.Length	SIunits.Length
A	Units.SI.Area	SIunits.Area
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber

function Fluid.Pipes.BaseClasses.CharacteristicNumbers.NusseltNumber

Component	Modelica 4.0.0	Modelica 3.2.3
alpha	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer
D	Units.SI.Length	SIunits.Length
lambda	Units.SI.ThermalConductivity	SIunits.ThermalConductivity
Nu	Units.SI.NusseltNumber	SIunits.NusseltNumber

function Fluid.Pipes.BaseClasses.WallFriction.PartialWallFriction.massFlowRate_dp

Component	Modelica 4.0.0	Modelica 3.2.3
dp	Units.SI.Pressure	SIunits.Pressure
rho_a	Units.SI.Density	SIunits.Density
rho_b	Units.SI.Density	SIunits.Density
mu_a	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
mu_b	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
length	Units.SI.Length	SIunits.Length
diameter	Units.SI.Diameter	SIunits.Diameter
crossArea	Units.SI.Area	SIunits.Area
roughness	Fluid.Types.Roughness	SIunits.Length
dp_small	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
Re_turbulent	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate

function Fluid.Pipes.BaseClasses.WallFriction.PartialWallFriction.massFlowRate_dp_staticHead

Component	Modelica 4.0.0	Modelica 3.2.3
dp	Units.SI.Pressure	SIunits.Pressure
rho_a	Units.SI.Density	SIunits.Density
rho_b	Units.SI.Density	SIunits.Density
mu_a	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
mu_b	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
length	Units.SI.Length	SIunits.Length
diameter	Units.SI.Diameter	SIunits.Diameter
g_times_height_ab	unit="m2/s2"
crossArea	Units.SI.Area	SIunits.Area
roughness	Fluid.Types.Roughness	SIunits.Length
dp_small	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
Re_turbulent	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate

function Fluid.Pipes.BaseClasses.WallFriction.PartialWallFriction.pressureLoss_m_flow

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate
rho_a	Units.SI.Density	SIunits.Density
rho_b	Units.SI.Density	SIunits.Density
mu_a	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
mu_b	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
length	Units.SI.Length	SIunits.Length
diameter	Units.SI.Diameter	SIunits.Diameter
crossArea	Units.SI.Area	SIunits.Area
roughness	Fluid.Types.Roughness	SIunits.Length
m_flow_small	Units.SI.MassFlowRate	SIunits.MassFlowRate
Re_turbulent	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
dp	Units.SI.Pressure	SIunits.Pressure

function Fluid.Pipes.BaseClasses.WallFriction.PartialWallFriction.pressureLoss_m_flow_staticHead

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate
rho_a	Units.SI.Density	SIunits.Density
rho_b	Units.SI.Density	SIunits.Density
mu_a	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
mu_b	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
length	Units.SI.Length	SIunits.Length
diameter	Units.SI.Diameter	SIunits.Diameter
g_times_height_ab	unit="m2/s2"
crossArea	Units.SI.Area	SIunits.Area
roughness	Fluid.Types.Roughness	SIunits.Length
m_flow_small	Units.SI.MassFlowRate	SIunits.MassFlowRate
Re_turbulent	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
dp	Units.SI.Pressure	SIunits.Pressure

function Fluid.Pipes.BaseClasses.WallFriction.Laminar.massFlowRate_dp_staticHead

Component	Modelica 4.0.0	Modelica 3.2.3
dp_grav_a	Units.SI.Pressure	Real
dp_grav_b	Units.SI.Pressure	Real
m_flow_a	Units.SI.MassFlowRate	SIunits.MassFlowRate
m_flow_b	Units.SI.MassFlowRate	SIunits.MassFlowRate
m_flow_zero	Units.SI.MassFlowRate	SIunits.MassFlowRate
dp_zero	Units.SI.Pressure	SIunits.Pressure

function Fluid.Pipes.BaseClasses.WallFriction.Laminar.pressureLoss_m_flow_staticHead

Component	Modelica 4.0.0	Modelica 3.2.3
dp_grav_a	Units.SI.Pressure	Real
dp_grav_b	Units.SI.Pressure	Real
m_flow_a	Units.SI.MassFlowRate	Real
m_flow_b	Units.SI.MassFlowRate	Real
dp_a	Units.SI.Pressure	SIunits.Pressure
dp_b	Units.SI.Pressure	SIunits.Pressure
m_flow_zero	Units.SI.MassFlowRate	SIunits.MassFlowRate
dp_zero	Units.SI.Pressure	SIunits.Pressure

function Fluid.Pipes.BaseClasses.WallFriction.QuadraticTurbulent.massFlowRate_dp_staticHead

Component	Modelica 4.0.0	Modelica 3.2.3
dp_grav_a	Units.SI.Pressure	SIunits.Pressure
dp_grav_b	Units.SI.Pressure	SIunits.Pressure
m_flow_a	Units.SI.MassFlowRate	SIunits.MassFlowRate
m_flow_b	Units.SI.MassFlowRate	SIunits.MassFlowRate
dm_flow_ddp_fric_a	Units.SI.MassFlowRate	SIunits.MassFlowRate
dm_flow_ddp_fric_b	Units.SI.MassFlowRate	SIunits.MassFlowRate
m_flow_zero	Units.SI.MassFlowRate	SIunits.MassFlowRate
dp_zero	Units.SI.Pressure	SIunits.Pressure

function Fluid.Pipes.BaseClasses.WallFriction.QuadraticTurbulent.pressureLoss_m_flow_staticHead

Component	Modelica 4.0.0	Modelica 3.2.3
dp_grav_a	Units.SI.Pressure	SIunits.Pressure
dp_grav_b	Units.SI.Pressure	SIunits.Pressure
m_flow_a	Units.SI.MassFlowRate	Real
m_flow_b	Units.SI.MassFlowRate	Real
dp_a	Units.SI.Pressure	SIunits.Pressure
dp_b	Units.SI.Pressure	SIunits.Pressure
m_flow_zero	Units.SI.MassFlowRate	SIunits.MassFlowRate
dp_zero	Units.SI.Pressure	SIunits.Pressure

function Fluid.Pipes.BaseClasses.WallFriction.LaminarAndQuadraticTurbulent.massFlowRate_dp

Component	Modelica 4.0.0	Modelica 3.2.3
dp_turbulent	Units.SI.AbsolutePressure	SIunits.AbsolutePressure

function Fluid.Pipes.BaseClasses.WallFriction.LaminarAndQuadraticTurbulent.pressureLoss_m_flow

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow_turbulent	Units.SI.MassFlowRate	SIunits.MassFlowRate

function Fluid.Pipes.BaseClasses.WallFriction.LaminarAndQuadraticTurbulent.massFlowRate_dp_staticHead

Component	Modelica 4.0.0	Modelica 3.2.3
Delta	min=0
Re1	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re2	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
dp_a	Units.SI.Pressure	SIunits.Pressure
dp_b	Units.SI.Pressure	SIunits.Pressure
m_flow_a	Units.SI.MassFlowRate	SIunits.MassFlowRate
m_flow_b	Units.SI.MassFlowRate	SIunits.MassFlowRate
dm_flow_ddp_fric_a	Units.SI.MassFlowRate	SIunits.MassFlowRate
dm_flow_ddp_fric_b	Units.SI.MassFlowRate	SIunits.MassFlowRate
dp_grav_a	Units.SI.Pressure	SIunits.Pressure
dp_grav_b	Units.SI.Pressure	SIunits.Pressure
m_flow_zero	Units.SI.MassFlowRate	SIunits.MassFlowRate
dp_zero	Units.SI.Pressure	SIunits.Pressure

function Fluid.Pipes.BaseClasses.WallFriction.LaminarAndQuadraticTurbulent.pressureLoss_m_flow_staticHead

Component	Modelica 4.0.0	Modelica 3.2.3
Delta	min=0
Re1	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re2	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
m_flow_a	Units.SI.MassFlowRate	SIunits.MassFlowRate
m_flow_b	Units.SI.MassFlowRate	SIunits.MassFlowRate
dp_a	Units.SI.Pressure	SIunits.Pressure
dp_b	Units.SI.Pressure	SIunits.Pressure
dp_grav_a	Units.SI.Pressure	SIunits.Pressure
dp_grav_b	Units.SI.Pressure	SIunits.Pressure
m_flow_zero	Units.SI.MassFlowRate	SIunits.MassFlowRate
dp_zero	Units.SI.Pressure	SIunits.Pressure

function Fluid.Pipes.BaseClasses.WallFriction.LaminarAndQuadraticTurbulent.Internal.m_flow_of_dp_fric

Component	Modelica 4.0.0	Modelica 3.2.3
dp_fric	Units.SI.Pressure	SIunits.Pressure
rho_a	Units.SI.Density	SIunits.Density
rho_b	Units.SI.Density	SIunits.Density
mu_a	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
mu_b	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
length	Units.SI.Length	SIunits.Length
diameter	Units.SI.Diameter	SIunits.Diameter
crossArea	Units.SI.Area	SIunits.Area
Re1	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re2	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Delta	min=0
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate
mu	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
rho	Units.SI.Density	SIunits.Density
dp_fric_turbulent	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
dp_fric_laminar	Units.SI.AbsolutePressure	SIunits.AbsolutePressure

function Fluid.Pipes.BaseClasses.WallFriction.LaminarAndQuadraticTurbulent.Internal.dp_fric_of_m_flow

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate
rho_a	Units.SI.Density	SIunits.Density
rho_b	Units.SI.Density	SIunits.Density
mu_a	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
mu_b	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
length	Units.SI.Length	SIunits.Length
diameter	Units.SI.Diameter	SIunits.Diameter
crossArea	Units.SI.Area	SIunits.Area
Re1	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re2	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Delta	min=0
dp_fric	Units.SI.Pressure	SIunits.Pressure
mu	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
rho	Units.SI.Density	SIunits.Density
m_flow_turbulent	Units.SI.MassFlowRate	SIunits.MassFlowRate
m_flow_laminar	Units.SI.MassFlowRate	SIunits.MassFlowRate

function Fluid.Pipes.BaseClasses.WallFriction.Detailed.massFlowRate_dp

Component	Modelica 4.0.0	Modelica 3.2.3
Delta	min=0
Re1	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re2	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
mu	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
rho	Units.SI.Density	SIunits.Density
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber

function Fluid.Pipes.BaseClasses.WallFriction.Detailed.pressureLoss_m_flow

Component	Modelica 4.0.0	Modelica 3.2.3
Delta	min=0
Re1	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re2	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
mu	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
rho	Units.SI.Density	SIunits.Density
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber

function Fluid.Pipes.BaseClasses.WallFriction.Detailed.massFlowRate_dp_staticHead

Component	Modelica 4.0.0	Modelica 3.2.3
Delta	min=0
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re1	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re2	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
dp_a	Units.SI.Pressure	SIunits.Pressure
dp_b	Units.SI.Pressure	SIunits.Pressure
m_flow_a	Units.SI.MassFlowRate	SIunits.MassFlowRate
m_flow_b	Units.SI.MassFlowRate	SIunits.MassFlowRate
dm_flow_ddp_fric_a	Units.SI.MassFlowRate	SIunits.MassFlowRate
dm_flow_ddp_fric_b	Units.SI.MassFlowRate	SIunits.MassFlowRate
dp_grav_a	Units.SI.Pressure	SIunits.Pressure
dp_grav_b	Units.SI.Pressure	SIunits.Pressure
m_flow_zero	Units.SI.MassFlowRate	SIunits.MassFlowRate
dp_zero	Units.SI.Pressure	SIunits.Pressure

function Fluid.Pipes.BaseClasses.WallFriction.Detailed.pressureLoss_m_flow_staticHead

Component	Modelica 4.0.0	Modelica 3.2.3
Delta	min=0
Re1	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re2	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
m_flow_a	Units.SI.MassFlowRate	SIunits.MassFlowRate
m_flow_b	Units.SI.MassFlowRate	SIunits.MassFlowRate
dp_a	Units.SI.Pressure	SIunits.Pressure
dp_b	Units.SI.Pressure	SIunits.Pressure
dp_grav_a	Units.SI.Pressure	SIunits.Pressure
dp_grav_b	Units.SI.Pressure	SIunits.Pressure
m_flow_zero	Units.SI.MassFlowRate	SIunits.MassFlowRate
dp_zero	Units.SI.Pressure	SIunits.Pressure

function Fluid.Pipes.BaseClasses.WallFriction.Detailed.Internal.m_flow_of_dp_fric

Component	Modelica 4.0.0	Modelica 3.2.3
dp_fric	Units.SI.Pressure	SIunits.Pressure
rho_a	Units.SI.Density	SIunits.Density
rho_b	Units.SI.Density	SIunits.Density
mu_a	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
mu_b	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
length	Units.SI.Length	SIunits.Length
diameter	Units.SI.Diameter	SIunits.Diameter
crossArea	Units.SI.Area	SIunits.Area
Re1	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re2	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Delta	min=0
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate
mu	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
rho	Units.SI.Density	SIunits.Density
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber

function Fluid.Pipes.BaseClasses.WallFriction.Detailed.Internal.dp_fric_of_m_flow

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate
rho_a	Units.SI.Density	SIunits.Density
rho_b	Units.SI.Density	SIunits.Density
mu_a	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
mu_b	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
length	Units.SI.Length	SIunits.Length
diameter	Units.SI.Diameter	SIunits.Diameter
crossArea	Units.SI.Area	SIunits.Area
Re1	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re2	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Delta	min=0
dp_fric	Units.SI.Pressure	SIunits.Pressure
mu	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
rho	Units.SI.Density	SIunits.Density
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber

model Fluid.Machines.SweptVolume

Component	Modelica 4.0.0	Modelica 3.2.3
pistonCrossArea	Units.SI.Area	SIunits.Area
clearance	Units.SI.Volume	SIunits.Volume
V	Units.SI.Volume	SIunits.Volume

model Fluid.Machines.Pump

Component	Modelica 4.0.0	Modelica 3.2.3
phi	Units.SI.Angle	SIunits.Angle
omega	Units.SI.AngularVelocity	SIunits.AngularVelocity

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... omega = der(phi);
N = Modelica400.Units.Conversions.to_rpm(omega);	N = Modelica323.SIunits.Conversions.to_rpm(omega);
W_single = omega*shaft.tau;

model Fluid.Machines.ControlledPump

Component	Modelica 4.0.0	Modelica 3.2.3
V_flow_op	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate
head_op	Units.SI.Position	SIunits.Height
m_flow_set	unit="kg/s"
p_set	unit="Pa"
m_flow_set_internal	unit="kg/s"
p_set_internal	unit="Pa"

model Fluid.Machines.PrescribedPump

Component	Modelica 4.0.0	Modelica 3.2.3
N_const	Units.NonSI.AngularVelocity_rpm	SIunits.Conversions.NonSIunits.AngularVelocity_rpm

model Fluid.Machines.BaseClasses.PartialPump

Component	Modelica 4.0.0	Modelica 3.2.3
V_flow_single_init	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate
delta_head_init	Units.SI.Position	SIunits.Height
N_nominal	Units.NonSI.AngularVelocity_rpm	SIunits.Conversions.NonSIunits.AngularVelocity_rpm
V	Units.SI.Volume	SIunits.Volume
g	Units.SI.Acceleration	SIunits.Acceleration
dp_pump	Units.SI.Pressure	SIunits.Pressure
head	Units.SI.Position	SIunits.Height
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate
m_flow_single	Units.SI.MassFlowRate	SIunits.MassFlowRate
V_flow	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate
V_flow_single	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate
N	Units.NonSI.AngularVelocity_rpm	SIunits.Conversions.NonSIunits.AngularVelocity_rpm
W_single	Units.SI.Power	SIunits.Power
W_total	Units.SI.Power	SIunits.Power
unitHead	Units.SI.Position	SIunits.Height
unitMassFlowRate	Units.SI.MassFlowRate	SIunits.MassFlowRate
checkValveHomotopy	Present
show_NPSHa		Present

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... if not checkValve then
head = homotopy((N/N_nominal)^2flowCharacteristic(V_flow_singleN_nominal/N), N/N_nominal(flowCharacteristic(V_flow_single_init)+(V_flow_single-V_flow_single_init)noEvent(if abs(V_flow_single_init)>0 then delta_head_init/(0.1*V_flow_single_init) else 0)));	head = homotopy((N/N_nominal)^2flowCharacteristic(V_flow_singleN_nominal/N), N/N_nominal(flowCharacteristic(0)+V_flow_singlenoEvent(if abs(V_flow_single_init)>0 then delta_head_init/V_flow_single_init else 0)));
s = 0;
else
if checkValveHomotopy == Types.CheckValveHomotopyType.NoHomotopy then	head = homotopy(if s > 0 then (N/N_nominal)^2flowCharacteristic(V_flow_singleN_nominal/N) else (N/N_nominal)^2flowCharacteristic(0) - sunitHead, N/N_nominal(flowCharacteristic(0)+V_flow_singlenoEvent(if abs(V_flow_single_init)>0 then delta_head_init/V_flow_single_init else 0)));
head = if s > 0 then (N/N_nominal)^2flowCharacteristic(V_flow_singleN_nominal/N) else (N/N_nominal)^2flowCharacteristic(0) - sunitHead;	V_flow_single = homotopy(if s > 0 then sunitMassFlowRate/rho else 0, sunitMassFlowRate/rho_nominal);
V_flow_single = if s > 0 then sunitMassFlowRate/rho else 0; else head = homotopy(if s > 0 then (N/N_nominal)^2flowCharacteristic(V_flow_singleN_nominal/N) else (N/N_nominal)^2flowCharacteristic(0) - sunitHead, if checkValveHomotopy == Types.CheckValveHomotopyType.Open then N/N_nominal(flowCharacteristic(V_flow_single_init)+(V_flow_single-V_flow_single_init)noEvent(if abs(V_flow_single_init)>0 then delta_head_init/(0.1V_flow_single_init) else 0)) else N/N_nominalflowCharacteristic(0) - sunitHead); V_flow_single = homotopy(if s > 0 then sunitMassFlowRate/rho else 0, if checkValveHomotopy == Types.CheckValveHomotopyType.Open then sunitMassFlowRate/rho_nominal else 0);
end if;
end if;
if use_powerCharacteristic then ... port_b.h_outflow = medium.h;
port_b.p = medium.p "Outlet pressure is equal to medium pressure, which includes Wb_flow";	port_b.p = medium.p "outlet pressure is equal to medium pressure, which includes Wb_flow";
mb_flow = port_a.m_flow + port_b.m_flow; ...

function Fluid.Machines.BaseClasses.PumpCharacteristics.baseFlow

Component	Modelica 4.0.0	Modelica 3.2.3
V_flow	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate
head	Units.SI.Position	SIunits.Height

function Fluid.Machines.BaseClasses.PumpCharacteristics.basePower

Component	Modelica 4.0.0	Modelica 3.2.3
V_flow	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate
consumption	Units.SI.Power	SIunits.Power

function Fluid.Machines.BaseClasses.PumpCharacteristics.baseEfficiency

Component	Modelica 4.0.0	Modelica 3.2.3
V_flow	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate

function Fluid.Machines.BaseClasses.PumpCharacteristics.linearFlow

Component	Modelica 4.0.0	Modelica 3.2.3
V_flow_nominal	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate
head_nominal	Units.SI.Position	SIunits.Height

function Fluid.Machines.BaseClasses.PumpCharacteristics.quadraticFlow

Component	Modelica 4.0.0	Modelica 3.2.3
V_flow_nominal	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate
head_nominal	Units.SI.Position	SIunits.Height
V_flow_min	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate
V_flow_max	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate

function Fluid.Machines.BaseClasses.PumpCharacteristics.polynomialFlow

Component	Modelica 4.0.0	Modelica 3.2.3
V_flow_nominal	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate
head_nominal	Units.SI.Position	SIunits.Height
V_flow_min	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate
V_flow_max	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate

function Fluid.Machines.BaseClasses.PumpCharacteristics.linearPower

Component	Modelica 4.0.0	Modelica 3.2.3
V_flow_nominal	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate
W_nominal	Units.SI.Power	SIunits.Power

function Fluid.Machines.BaseClasses.PumpCharacteristics.quadraticPower

Component	Modelica 4.0.0	Modelica 3.2.3
V_flow_nominal	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate
W_nominal	Units.SI.Power	SIunits.Power

model Fluid.Machines.BaseClasses.PumpMonitoring.PumpMonitoringNPSH

Component	Modelica 4.0.0	Modelica 3.2.3
NPSHa	Units.SI.Position	SIunits.Length
NPSPa	Units.SI.Pressure	SIunits.Pressure
NPDPa	Units.SI.Pressure	SIunits.Pressure

function Fluid.Machines.BaseClasses.PumpMonitoring.assertPositiveDifference

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
p_sat	Units.SI.Pressure	SIunits.Pressure
dp	Units.SI.Pressure	SIunits.Pressure

model Fluid.Valves.ValveIncompressible

Component	Modelica 4.0.0	Modelica 3.2.3
Re_turbulent	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
dp_turbulent	Units.SI.AbsolutePressure	SIunits.AbsolutePressure

model Fluid.Valves.ValveVaporizing

Component	Modelica 4.0.0	Modelica 3.2.3
dpEff	Units.SI.Pressure	SIunits.Pressure
Re_turbulent	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
dp_turbulent	Units.SI.AbsolutePressure	SIunits.AbsolutePressure

model Fluid.Valves.ValveCompressible

Component	Modelica 4.0.0	Modelica 3.2.3
Re_turbulent	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
dp_turbulent	Units.SI.AbsolutePressure	SIunits.AbsolutePressure

model Fluid.Valves.ValveLinear

Component	Modelica 4.0.0	Modelica 3.2.3
dp_nominal	Units.SI.AbsolutePressure	SIunits.AbsolutePressure

model Fluid.Valves.ValveDiscrete

Component	Modelica 4.0.0	Modelica 3.2.3
dp_nominal	Units.SI.AbsolutePressure	SIunits.AbsolutePressure

model Fluid.Valves.BaseClasses.PartialValve

Component	Modelica 4.0.0	Modelica 3.2.3
Av	Units.SI.Area	SIunits.Area
dp_nominal	Units.SI.Pressure	SIunits.Pressure
riseTime	Units.SI.Time	SIunits.Time
dp_small	Units.SI.Pressure	SIunits.Pressure
Kv2Av	Units.SI.Area	SIunits.Area
Cv2Av	Units.SI.Area	SIunits.Area

model Fluid.Fittings.SimpleGenericOrifice

Component	Modelica 4.0.0	Modelica 3.2.3
diameter	Units.SI.Diameter	SIunits.Diameter
m_flow_nominal	Units.SI.MassFlowRate	SIunits.MassFlowRate
dp_nominal	Units.SI.Pressure	SIunits.Pressure
dp_fg	Units.SI.Pressure	SIunits.Pressure
A_mean	Units.SI.Area	SIunits.Area
Re_turbulent	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
m_flow_turbulent	Units.SI.MassFlowRate	SIunits.MassFlowRate
dp_turbulent	Units.SI.AbsolutePressure	SIunits.AbsolutePressure

model Fluid.Fittings.SharpEdgedOrifice

Component	Modelica 4.0.0	Modelica 3.2.3
length	Units.SI.Length	SIunits.Length
diameter	Units.SI.Diameter	SIunits.Diameter
leastDiameter	Units.SI.Diameter	SIunits.Diameter
alpha	Units.NonSI.Angle_deg	SIunits.Conversions.NonSIunits.Angle_deg

model Fluid.Fittings.AbruptAdaptor

Component	Modelica 4.0.0	Modelica 3.2.3
diameter_a	Units.SI.Diameter	SIunits.Diameter
diameter_b	Units.SI.Diameter	SIunits.Diameter

model Fluid.Fittings.TeeJunctionVolume

Component	Modelica 4.0.0	Modelica 3.2.3
V	Units.SI.Volume	SIunits.Volume

function Fluid.Fittings.BaseClasses.lossConstant_D_zeta

Component	Modelica 4.0.0	Modelica 3.2.3
D	Units.SI.Diameter	SIunits.Diameter

record Fluid.Fittings.BaseClasses.QuadraticTurbulent.LossFactorData

Component	Modelica 4.0.0	Modelica 3.2.3
diameter_a	Units.SI.Diameter	SIunits.Diameter
diameter_b	Units.SI.Diameter	SIunits.Diameter
Re_turbulent	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
D_Re	Units.SI.Diameter	SIunits.Diameter

function Fluid.Fittings.BaseClasses.QuadraticTurbulent.massFlowRate_dp

Component	Modelica 4.0.0	Modelica 3.2.3
dp	Units.SI.Pressure	SIunits.Pressure
rho_a	Units.SI.Density	SIunits.Density
rho_b	Units.SI.Density	SIunits.Density
dp_small	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate

function Fluid.Fittings.BaseClasses.QuadraticTurbulent.massFlowRate_dp_and_Re

Component	Modelica 4.0.0	Modelica 3.2.3
dp	Units.SI.Pressure	SIunits.Pressure
rho_a	Units.SI.Density	SIunits.Density
rho_b	Units.SI.Density	SIunits.Density
mu_a	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
mu_b	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate
dp_turbulent	Units.SI.AbsolutePressure	SIunits.AbsolutePressure

function Fluid.Fittings.BaseClasses.QuadraticTurbulent.pressureLoss_m_flow

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate
rho_a	Units.SI.Density	SIunits.Density
rho_b	Units.SI.Density	SIunits.Density
m_flow_small	Units.SI.MassFlowRate	SIunits.MassFlowRate
dp	Units.SI.Pressure	SIunits.Pressure

function Fluid.Fittings.BaseClasses.QuadraticTurbulent.pressureLoss_m_flow_and_Re

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate
rho_a	Units.SI.Density	SIunits.Density
rho_b	Units.SI.Density	SIunits.Density
mu_a	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
mu_b	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
dp	Units.SI.Pressure	SIunits.Pressure
m_flow_turbulent	Units.SI.MassFlowRate	SIunits.MassFlowRate

model Fluid.Fittings.BaseClasses.QuadraticTurbulent.BaseModel

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow_nominal	Units.SI.MassFlowRate	SIunits.MassFlowRate
dp_nominal	Units.SI.Pressure	SIunits.Pressure
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
dp_fg	Units.SI.Pressure	SIunits.Pressure
A_mean	Units.SI.Area	SIunits.Area

model Fluid.Fittings.BaseClasses.QuadraticTurbulent.BaseModelNonconstantCrossSectionArea

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow_nominal	Units.SI.MassFlowRate	SIunits.MassFlowRate
dp_nominal	Units.SI.Pressure	SIunits.Pressure
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
p_total_a	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
p_total_b	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
v_a	Units.SI.Velocity	SIunits.Velocity
v_b	Units.SI.Velocity	SIunits.Velocity
dp_fg	Units.SI.Pressure	SIunits.Pressure
A_mean	Units.SI.Area	SIunits.Area

function Fluid.Fittings.BaseClasses.QuadraticTurbulent.pressureLoss_m_flow_totalPressure

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate
rho_a_des	Units.SI.Density	SIunits.Density
rho_b_des	Units.SI.Density	SIunits.Density
rho_b_nondes	Units.SI.Density	SIunits.Density
rho_a_nondes	Units.SI.Density	SIunits.Density
m_flow_small	Units.SI.MassFlowRate	SIunits.MassFlowRate
dp	Units.SI.Pressure	SIunits.Pressure
A_a	Units.SI.Area	SIunits.Area
A_b	Units.SI.Area	SIunits.Area

function Fluid.Fittings.BaseClasses.Bends.CurvedBend.massFlowRate

Component	Modelica 4.0.0	Modelica 3.2.3
dp	Units.SI.Pressure	SIunits.Pressure
d_a	Units.SI.Density	SIunits.Density
d_b	Units.SI.Density	SIunits.Density
eta_a	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
eta_b	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
dp_small	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
m_flow_small	Units.SI.MassFlowRate	SIunits.MassFlowRate
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate

function Fluid.Fittings.BaseClasses.Bends.CurvedBend.pressureLoss

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate
d_a	Units.SI.Density	SIunits.Density
d_b	Units.SI.Density	SIunits.Density
eta_a	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
eta_b	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
dp_small	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
m_flow_small	Units.SI.MassFlowRate	SIunits.MassFlowRate
dp	Units.SI.Pressure	SIunits.Pressure

record Fluid.Fittings.BaseClasses.Bends.CurvedBend.Geometry

Component	Modelica 4.0.0	Modelica 3.2.3
d_hyd	Units.SI.Diameter	SIunits.Diameter
R_0	Units.SI.Radius	SIunits.Radius
delta	Units.SI.Angle	SIunits.Angle

function Fluid.Fittings.BaseClasses.Bends.EdgedBend.massFlowRate

Component	Modelica 4.0.0	Modelica 3.2.3
dp	Units.SI.Pressure	SIunits.Pressure
d_a	Units.SI.Density	SIunits.Density
d_b	Units.SI.Density	SIunits.Density
eta_a	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
eta_b	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
dp_small	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
m_flow_small	Units.SI.MassFlowRate	SIunits.MassFlowRate
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate

function Fluid.Fittings.BaseClasses.Bends.EdgedBend.pressureLoss

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate
d_a	Units.SI.Density	SIunits.Density
d_b	Units.SI.Density	SIunits.Density
eta_a	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
eta_b	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
dp_small	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
m_flow_small	Units.SI.MassFlowRate	SIunits.MassFlowRate
dp	Units.SI.Pressure	SIunits.Pressure

record Fluid.Fittings.BaseClasses.Bends.EdgedBend.Geometry

Component	Modelica 4.0.0	Modelica 3.2.3
d_hyd	Units.SI.Diameter	SIunits.Diameter
delta	Units.SI.Angle	SIunits.Angle

function Fluid.Fittings.BaseClasses.Orifices.ThickEdgedOrifice.massFlowRate

Component	Modelica 4.0.0	Modelica 3.2.3
dp	Units.SI.Pressure	SIunits.Pressure
d_a	Units.SI.Density	SIunits.Density
d_b	Units.SI.Density	SIunits.Density
eta_a	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
eta_b	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
dp_small	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
m_flow_small	Units.SI.MassFlowRate	SIunits.MassFlowRate
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate

function Fluid.Fittings.BaseClasses.Orifices.ThickEdgedOrifice.pressureLoss

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate
d_a	Units.SI.Density	SIunits.Density
d_b	Units.SI.Density	SIunits.Density
eta_a	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
eta_b	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
dp_small	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
m_flow_small	Units.SI.MassFlowRate	SIunits.MassFlowRate
dp	Units.SI.Pressure	SIunits.Pressure

record Fluid.Fittings.BaseClasses.Orifices.ThickEdgedOrifice.Geometry

Component	Modelica 4.0.0	Modelica 3.2.3
crossArea	Units.SI.Area	SIunits.Area
perimeter	Units.SI.Length	SIunits.Length
venaCrossArea	Units.SI.Area	SIunits.Area
venaPerimeter	Units.SI.Length	SIunits.Length
venaLength	Units.SI.Length	SIunits.Length

function Fluid.Fittings.BaseClasses.Orifices.ThickEdgedOrifice.Choices.circular

Component	Modelica 4.0.0	Modelica 3.2.3
diameter	Units.SI.Diameter	SIunits.Diameter
venaDiameter	Units.SI.Diameter	SIunits.Diameter
venaLength	Units.SI.Length	SIunits.Length

function Fluid.Fittings.BaseClasses.Orifices.ThickEdgedOrifice.Choices.rectangular

Component	Modelica 4.0.0	Modelica 3.2.3
width	Units.SI.Length	SIunits.Length
height	Units.SI.Length	SIunits.Length
venaWidth	Units.SI.Length	SIunits.Length
venaHeight	Units.SI.Length	SIunits.Length
venaLength	Units.SI.Length	SIunits.Length

function Fluid.Fittings.BaseClasses.Orifices.ThickEdgedOrifice.Choices.general

Component	Modelica 4.0.0	Modelica 3.2.3
crossArea	Units.SI.Area	SIunits.Area
perimeter	Units.SI.Length	SIunits.Length
venaCrossArea	Units.SI.Area	SIunits.Area
venaPerimeter	Units.SI.Length	SIunits.Length
venaLength	Units.SI.Length	SIunits.Length

function Fluid.Fittings.BaseClasses.GenericResistances.VolumeFlowRate.massFlowRate

Component	Modelica 4.0.0	Modelica 3.2.3
dp	Units.SI.Pressure	SIunits.Pressure
d_a	Units.SI.Density	SIunits.Density
d_b	Units.SI.Density	SIunits.Density
dp_small	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
m_flow_small	Units.SI.MassFlowRate	SIunits.MassFlowRate
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate

function Fluid.Fittings.BaseClasses.GenericResistances.VolumeFlowRate.pressureLoss

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate
d_a	Units.SI.Density	SIunits.Density
d_b	Units.SI.Density	SIunits.Density
dp_small	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
m_flow_small	Units.SI.MassFlowRate	SIunits.MassFlowRate
dp	Units.SI.Pressure	SIunits.Pressure

model Fluid.Sources.Boundary_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p_in	unit="Pa"
T_in	unit="K"
X_in	each unit="1"
p_in_internal	unit="Pa"
T_in_internal	unit="K"
X_in_internal	each unit="1"

model Fluid.Sources.Boundary_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p_in	unit="Pa"
h_in	unit="J/kg"
X_in	each unit="1"
p_in_internal	unit="Pa"
h_in_internal	unit="J/kg"
X_in_internal	each unit="1"

model Fluid.Sources.MassFlowSource_T

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow_in	unit="kg/s"
T_in	unit="K"
X_in	each unit="1"
m_flow_in_internal	unit="kg/s"
T_in_internal	unit="K"
X_in_internal	each unit="1"

model Fluid.Sources.MassFlowSource_h

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow_in	unit="kg/s"
h_in	unit="J/kg"
X_in	each unit="1"
m_flow_in_internal	unit="kg/s"
h_in_internal	unit="J/kg"
X_in_internal	each unit="1"

model Fluid.Interfaces.PartialTwoPortTransport

Component	Modelica 4.0.0	Modelica 3.2.3
dp	Units.SI.Pressure	SIunits.Pressure
V_flow	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate

model Fluid.Interfaces.PartialHeatTransfer

Component	Modelica 4.0.0	Modelica 3.2.3
surfaceAreas	Units.SI.Area	SIunits.Area
Q_flows	Units.SI.HeatFlowRate	SIunits.HeatFlowRate
k	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer
T_ambient	Units.SI.Temperature	SIunits.Temperature
Ts	Units.SI.Temperature	SIunits.Temperature

model Fluid.Interfaces.PartialLumpedVolume

Component	Modelica 4.0.0	Modelica 3.2.3
fluidVolume	Units.SI.Volume	SIunits.Volume
medium	preferredMediumStates=(if energyDynamics == Dynamics.SteadyState and massDynamics == Dynamics.SteadyState then false else true)	preferredMediumStates=true
U	Units.SI.Energy	SIunits.Energy
m	Units.SI.Mass	SIunits.Mass
mXi	Units.SI.Mass	SIunits.Mass
mC	Units.SI.Mass	SIunits.Mass
mb_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate
mbXi_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate
Hb_flow	Units.SI.EnthalpyFlowRate	SIunits.EnthalpyFlowRate
Qb_flow	Units.SI.HeatFlowRate	SIunits.HeatFlowRate
Wb_flow	Units.SI.Power	SIunits.Power

model Fluid.Interfaces.PartialLumpedFlow

Component	Modelica 4.0.0	Modelica 3.2.3
pathLength	Units.SI.Length	SIunits.Length
I	Units.SI.Momentum	SIunits.Momentum
Ib_flow	Units.SI.Force	SIunits.Force
F_p	Units.SI.Force	SIunits.Force
F_fg	Units.SI.Force	SIunits.Force

model Fluid.Interfaces.PartialDistributedVolume

Component	Modelica 4.0.0	Modelica 3.2.3
fluidVolumes	Units.SI.Volume	SIunits.Volume
Us	Units.SI.Energy	SIunits.Energy
ms	Units.SI.Mass	SIunits.Mass
mXis	Units.SI.Mass	SIunits.Mass
mCs	Units.SI.Mass	SIunits.Mass
mCs_scaled	Units.SI.Mass	SIunits.Mass
Hb_flows	Units.SI.EnthalpyFlowRate	SIunits.EnthalpyFlowRate
Qb_flows	Units.SI.HeatFlowRate	SIunits.HeatFlowRate
Wb_flows	Units.SI.Power	SIunits.Power

model Fluid.Interfaces.PartialDistributedFlow

Component	Modelica 4.0.0	Modelica 3.2.3
pathLengths	Units.SI.Length	SIunits.Length
Is	Units.SI.Momentum	SIunits.Momentum
Ib_flows	Units.SI.Force	SIunits.Force
Fs_p	Units.SI.Force	SIunits.Force
Fs_fg	Units.SI.Force	SIunits.Force

function Fluid.Dissipation.HeatTransfer.Channel.kc_evenGapLaminar

Component	Modelica 4.0.0	Modelica 3.2.3
kc	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer
Pr	Units.SI.PrandtlNumber	SIunits.PrandtlNumber
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Nu	Units.SI.NusseltNumber	SIunits.NusseltNumber
A_cross	Units.SI.Area	SIunits.Area
d_hyd	Units.SI.Diameter	SIunits.Diameter
velocity	Units.SI.Velocity	SIunits.Velocity

function Fluid.Dissipation.HeatTransfer.Channel.kc_evenGapLaminar_KC

Component	Modelica 4.0.0	Modelica 3.2.3
kc	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer
A_cross	Units.SI.Area	SIunits.Area
d_hyd	Units.SI.Diameter	SIunits.Diameter
velocity	Units.SI.Velocity	SIunits.Velocity
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Pr	Units.SI.PrandtlNumber	SIunits.PrandtlNumber
Nu_1	Units.SI.NusseltNumber	SIunits.NusseltNumber
Nu_2	Units.SI.NusseltNumber	SIunits.NusseltNumber
Nu_3	Units.SI.NusseltNumber	SIunits.NusseltNumber
Nu	Units.SI.NusseltNumber	SIunits.NusseltNumber

function Fluid.Dissipation.HeatTransfer.Channel.kc_evenGapOverall

Component	Modelica 4.0.0	Modelica 3.2.3
kc	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer
Pr	Units.SI.PrandtlNumber	SIunits.PrandtlNumber
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Nu	Units.SI.NusseltNumber	SIunits.NusseltNumber
A_cross	Units.SI.Area	SIunits.Area
d_hyd	Units.SI.Diameter	SIunits.Diameter
velocity	Units.SI.Velocity	SIunits.Velocity

function Fluid.Dissipation.HeatTransfer.Channel.kc_evenGapOverall_KC

Component	Modelica 4.0.0	Modelica 3.2.3
kc	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer
A_cross	Units.SI.Area	SIunits.Area
d_hyd	Units.SI.Diameter	SIunits.Diameter
velocity	Units.SI.Velocity	SIunits.Velocity
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Pr	Units.SI.PrandtlNumber	SIunits.PrandtlNumber

record Fluid.Dissipation.HeatTransfer.Channel.kc_evenGapOverall_IN_var

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate

function Fluid.Dissipation.HeatTransfer.Channel.kc_evenGapTurbulent

Component	Modelica 4.0.0	Modelica 3.2.3
kc	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer
Pr	Units.SI.PrandtlNumber	SIunits.PrandtlNumber
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Nu	Units.SI.NusseltNumber	SIunits.NusseltNumber
A_cross	Units.SI.Area	SIunits.Area
d_hyd	Units.SI.Diameter	SIunits.Diameter
velocity	Units.SI.Velocity	SIunits.Velocity

function Fluid.Dissipation.HeatTransfer.Channel.kc_evenGapTurbulent_KC

Component	Modelica 4.0.0	Modelica 3.2.3
kc	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer
A_cross	Units.SI.Area	SIunits.Area
d_hyd	Units.SI.Diameter	SIunits.Diameter
velocity	Units.SI.Velocity	SIunits.Velocity
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Pr	Units.SI.PrandtlNumber	SIunits.PrandtlNumber
Nu	Units.SI.NusseltNumber	SIunits.NusseltNumber

function Fluid.Dissipation.HeatTransfer.General.kc_approxForcedConvection

Component	Modelica 4.0.0	Modelica 3.2.3
kc	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer
Pr	Units.SI.PrandtlNumber	SIunits.PrandtlNumber
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Nu	Units.SI.NusseltNumber	SIunits.NusseltNumber
d_hyd	Units.SI.Diameter	SIunits.Diameter

function Fluid.Dissipation.HeatTransfer.General.kc_approxForcedConvection_KC

Component	Modelica 4.0.0	Modelica 3.2.3
kc	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer
d_hyd	Units.SI.Diameter	SIunits.Diameter
Pr	Units.SI.PrandtlNumber	SIunits.PrandtlNumber
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber

record Fluid.Dissipation.HeatTransfer.General.kc_approxForcedConvection_IN_var

Component	Modelica 4.0.0	Modelica 3.2.3
eta_wall	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate

function Fluid.Dissipation.HeatTransfer.HeatExchanger.kc_flatTube

Component	Modelica 4.0.0	Modelica 3.2.3
kc	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer
Pr	Units.SI.PrandtlNumber	SIunits.PrandtlNumber
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Nu	Units.SI.NusseltNumber	SIunits.NusseltNumber
A_c	Units.SI.Area	SIunits.Area
h	Units.SI.Length	SIunits.Length
l	Units.SI.Length	SIunits.Length
s	Units.SI.Length	SIunits.Length
t	Units.SI.Length	SIunits.Length

function Fluid.Dissipation.HeatTransfer.HeatExchanger.kc_flatTube_KC

Component	Modelica 4.0.0	Modelica 3.2.3
kc	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer
Re_Dh	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_Lp	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Pr	Units.SI.PrandtlNumber	SIunits.PrandtlNumber
A_c	Units.SI.Area	SIunits.Area
h	Units.SI.Length	SIunits.Length
l	Units.SI.Length	SIunits.Length
s	Units.SI.Length	SIunits.Length
t	Units.SI.Length	SIunits.Length

record Fluid.Dissipation.HeatTransfer.HeatExchanger.kc_flatTube_IN_con

Component	Modelica 4.0.0	Modelica 3.2.3
A_fr	Units.SI.Area	SIunits.Area
D_h	Units.SI.Length	SIunits.Length
D_m	Units.SI.Length	SIunits.Length
F_l	Units.SI.Length	SIunits.Length
F_p	Units.SI.Length	SIunits.Length
L_l	Units.SI.Length	SIunits.Length
L_p	Units.SI.Length	SIunits.Length
T_d	Units.SI.Length	SIunits.Length
T_p	Units.SI.Length	SIunits.Length
delta_f	Units.SI.Length	SIunits.Length
Phi	Units.SI.Angle	SIunits.Angle

record Fluid.Dissipation.HeatTransfer.HeatExchanger.kc_flatTube_IN_var

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate

function Fluid.Dissipation.HeatTransfer.HeatExchanger.kc_roundTube

Component	Modelica 4.0.0	Modelica 3.2.3
kc	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer
Pr	Units.SI.PrandtlNumber	SIunits.PrandtlNumber
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Nu	Units.SI.NusseltNumber	SIunits.NusseltNumber
A_c	Units.SI.Area	SIunits.Area
A_tot	Units.SI.Area	SIunits.Area
D_h	Units.SI.Length	SIunits.Length

function Fluid.Dissipation.HeatTransfer.HeatExchanger.kc_roundTube_KC

Component	Modelica 4.0.0	Modelica 3.2.3
kc	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer
Re_Dc	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_i	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Pr	Units.SI.PrandtlNumber	SIunits.PrandtlNumber
A_c	Units.SI.Area	SIunits.Area
A_tot	Units.SI.Area	SIunits.Area
D_h	Units.SI.Length	SIunits.Length

record Fluid.Dissipation.HeatTransfer.HeatExchanger.kc_roundTube_IN_con

Component	Modelica 4.0.0	Modelica 3.2.3
A_fr	Units.SI.Area	SIunits.Area
D_c	Units.SI.Length	SIunits.Length
F_p	Units.SI.Length	SIunits.Length
L	Units.SI.Length	SIunits.Length
L_h	Units.SI.Length	SIunits.Length
L_p	Units.SI.Length	SIunits.Length
P_d	Units.SI.Length	SIunits.Length
P_l	Units.SI.Length	SIunits.Length
P_t	Units.SI.Length	SIunits.Length
S_h	Units.SI.Length	SIunits.Length
S_p	Units.SI.Length	SIunits.Length
X_f	Units.SI.Length	SIunits.Length
delta_f	Units.SI.Length	SIunits.Length

record Fluid.Dissipation.HeatTransfer.HeatExchanger.kc_roundTube_IN_var

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate

function Fluid.Dissipation.HeatTransfer.HelicalPipe.kc_laminar

Component	Modelica 4.0.0	Modelica 3.2.3
kc	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer
Pr	Units.SI.PrandtlNumber	SIunits.PrandtlNumber
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Nu	Units.SI.NusseltNumber	SIunits.NusseltNumber
d_hyd	Units.SI.Diameter	SIunits.Diameter
A_cross	Units.SI.Area	SIunits.Area
d_s	Units.SI.Diameter	SIunits.Diameter
d_w	Units.SI.Diameter	SIunits.Diameter
d_coil	Units.SI.Diameter	SIunits.Diameter
Re_crit	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
velocity	Units.SI.Velocity	SIunits.Velocity

function Fluid.Dissipation.HeatTransfer.HelicalPipe.kc_laminar_KC

Component	Modelica 4.0.0	Modelica 3.2.3
kc	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer
d_hyd	Units.SI.Diameter	SIunits.Diameter
A_cross	Units.SI.Area	SIunits.Area
d_s	Units.SI.Diameter	SIunits.Diameter
d_w	Units.SI.Diameter	SIunits.Diameter
d_coil	Units.SI.Diameter	SIunits.Diameter
velocity	Units.SI.Velocity	SIunits.Velocity
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Pr	Units.SI.PrandtlNumber	SIunits.PrandtlNumber

function Fluid.Dissipation.HeatTransfer.HelicalPipe.kc_overall

Component	Modelica 4.0.0	Modelica 3.2.3
kc	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer
Pr	Units.SI.PrandtlNumber	SIunits.PrandtlNumber
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Nu	Units.SI.NusseltNumber	SIunits.NusseltNumber
A_cross	Units.SI.Area	SIunits.Area
velocity	Units.SI.Velocity	SIunits.Velocity

function Fluid.Dissipation.HeatTransfer.HelicalPipe.kc_overall_KC

Component	Modelica 4.0.0	Modelica 3.2.3
kc	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer
A_cross	Units.SI.Area	SIunits.Area
d_s	Units.SI.Diameter	SIunits.Diameter
d_w	Units.SI.Diameter	SIunits.Diameter
d_coil	Units.SI.Diameter	SIunits.Diameter
Re_crit	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
velocity	Units.SI.Velocity	SIunits.Velocity
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Pr	Units.SI.PrandtlNumber	SIunits.PrandtlNumber

record Fluid.Dissipation.HeatTransfer.HelicalPipe.kc_overall_IN_var

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate

function Fluid.Dissipation.HeatTransfer.HelicalPipe.kc_turbulent

Component	Modelica 4.0.0	Modelica 3.2.3
kc	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer
Pr	Units.SI.PrandtlNumber	SIunits.PrandtlNumber
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Nu	Units.SI.NusseltNumber	SIunits.NusseltNumber
A_cross	Units.SI.Area	SIunits.Area
velocity	Units.SI.Velocity	SIunits.Velocity

function Fluid.Dissipation.HeatTransfer.HelicalPipe.kc_turbulent_KC

Component	Modelica 4.0.0	Modelica 3.2.3
kc	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer
d_hyd	Units.SI.Diameter	SIunits.Diameter
A_cross	Units.SI.Area	SIunits.Area
d_s	Units.SI.Diameter	SIunits.Diameter
d_w	Units.SI.Diameter	SIunits.Diameter
d_coil	Units.SI.Diameter	SIunits.Diameter
velocity	Units.SI.Velocity	SIunits.Velocity
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Pr	Units.SI.PrandtlNumber	SIunits.PrandtlNumber

function Fluid.Dissipation.HeatTransfer.Plate.kc_laminar

Component	Modelica 4.0.0	Modelica 3.2.3
kc	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer
Pr	Units.SI.PrandtlNumber	SIunits.PrandtlNumber
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Nu	Units.SI.NusseltNumber	SIunits.NusseltNumber

function Fluid.Dissipation.HeatTransfer.Plate.kc_laminar_KC

Component	Modelica 4.0.0	Modelica 3.2.3
kc	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer
L	Units.SI.Length	SIunits.Length
cp	Units.SI.SpecificHeatCapacityAtConstantPressure	SIunits.SpecificHeatCapacityAtConstantPressure
eta	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
lambda	Units.SI.ThermalConductivity	SIunits.ThermalConductivity
rho	Units.SI.Density	SIunits.Density
velocity	Units.SI.Velocity	SIunits.Velocity
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Pr	Units.SI.PrandtlNumber	SIunits.PrandtlNumber

function Fluid.Dissipation.HeatTransfer.Plate.kc_overall

Component	Modelica 4.0.0	Modelica 3.2.3
kc	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer
Pr	Units.SI.PrandtlNumber	SIunits.PrandtlNumber
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Nu	Units.SI.NusseltNumber	SIunits.NusseltNumber

function Fluid.Dissipation.HeatTransfer.Plate.kc_overall_KC

Component	Modelica 4.0.0	Modelica 3.2.3
kc	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer
kc_lam	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer
kc_turb	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer

record Fluid.Dissipation.HeatTransfer.Plate.kc_overall_IN_var

Component	Modelica 4.0.0	Modelica 3.2.3
velocity	Units.SI.Velocity	SIunits.Velocity

function Fluid.Dissipation.HeatTransfer.Plate.kc_turbulent

Component	Modelica 4.0.0	Modelica 3.2.3
kc	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer
Pr	Units.SI.PrandtlNumber	SIunits.PrandtlNumber
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Nu	Units.SI.NusseltNumber	SIunits.NusseltNumber

function Fluid.Dissipation.HeatTransfer.Plate.kc_turbulent_KC

Component	Modelica 4.0.0	Modelica 3.2.3
kc	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer
L	Units.SI.Length	SIunits.Length
cp	Units.SI.SpecificHeatCapacityAtConstantPressure	SIunits.SpecificHeatCapacityAtConstantPressure
eta	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
lambda	Units.SI.ThermalConductivity	SIunits.ThermalConductivity
rho	Units.SI.Density	SIunits.Density
velocity	Units.SI.Velocity	SIunits.Velocity
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Pr	Units.SI.PrandtlNumber	SIunits.PrandtlNumber

function Fluid.Dissipation.HeatTransfer.StraightPipe.kc_laminar

Component	Modelica 4.0.0	Modelica 3.2.3
kc	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer
Pr	Units.SI.PrandtlNumber	SIunits.PrandtlNumber
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Nu	Units.SI.NusseltNumber	SIunits.NusseltNumber
A_cross	Units.SI.Area	SIunits.Area
velocity	Units.SI.Velocity	SIunits.Velocity

function Fluid.Dissipation.HeatTransfer.StraightPipe.kc_laminar_KC

Component	Modelica 4.0.0	Modelica 3.2.3
kc	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer
A_cross	Units.SI.Area	SIunits.Area
velocity	Units.SI.Velocity	SIunits.Velocity
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Pr	Units.SI.PrandtlNumber	SIunits.PrandtlNumber
Nu2	Units.SI.NusseltNumber	SIunits.NusseltNumber
Nu3	Units.SI.NusseltNumber	SIunits.NusseltNumber
Nu	Units.SI.NusseltNumber	SIunits.NusseltNumber

function Fluid.Dissipation.HeatTransfer.StraightPipe.kc_overall

Component	Modelica 4.0.0	Modelica 3.2.3
kc	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer
Pr	Units.SI.PrandtlNumber	SIunits.PrandtlNumber
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Nu	Units.SI.NusseltNumber	SIunits.NusseltNumber
A_cross	Units.SI.Area	SIunits.Area
velocity	Units.SI.Velocity	SIunits.Velocity

function Fluid.Dissipation.HeatTransfer.StraightPipe.kc_overall_KC

Component	Modelica 4.0.0	Modelica 3.2.3
kc	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer
A_cross	Units.SI.Area	SIunits.Area
velocity	Units.SI.Velocity	SIunits.Velocity
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Pr	Units.SI.PrandtlNumber	SIunits.PrandtlNumber

record Fluid.Dissipation.HeatTransfer.StraightPipe.kc_overall_IN_var

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate

function Fluid.Dissipation.HeatTransfer.StraightPipe.kc_turbulent

Component	Modelica 4.0.0	Modelica 3.2.3
kc	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer
Pr	Units.SI.PrandtlNumber	SIunits.PrandtlNumber
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Nu	Units.SI.NusseltNumber	SIunits.NusseltNumber
A_cross	Units.SI.Area	SIunits.Area
velocity	Units.SI.Velocity	SIunits.Velocity

function Fluid.Dissipation.HeatTransfer.StraightPipe.kc_turbulent_KC

Component	Modelica 4.0.0	Modelica 3.2.3
kc	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer
A_cross	Units.SI.Area	SIunits.Area
velocity	Units.SI.Velocity	SIunits.Velocity
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Pr	Units.SI.PrandtlNumber	SIunits.PrandtlNumber

record Fluid.Dissipation.HeatTransfer.StraightPipe.kc_turbulent_IN_con

Component	Modelica 4.0.0	Modelica 3.2.3
K	Units.SI.Length	SIunits.Length

function Fluid.Dissipation.HeatTransfer.StraightPipe.kc_twoPhaseOverall_KC

Component	Modelica 4.0.0	Modelica 3.2.3
kc	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer

function Fluid.Dissipation.PressureLoss.Bend.dp_curvedOverall_DP

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate
DP	Units.SI.Pressure	SIunits.Pressure
d_hyd	Units.SI.Diameter	SIunits.Diameter
A_cross	Units.SI.Area	SIunits.Area
L	Units.SI.Length	SIunits.Length
Re_min	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_lam_max	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_turb_min	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_turb_max	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_turb_const	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_lam_leave	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
m_flow_smooth	Units.SI.MassFlowRate	SIunits.MassFlowRate

function Fluid.Dissipation.PressureLoss.Bend.dp_curvedOverall_MFLOW

Component	Modelica 4.0.0	Modelica 3.2.3
dp	Units.SI.Pressure	SIunits.Pressure
M_FLOW	Units.SI.MassFlowRate	SIunits.MassFlowRate
d_hyd	Units.SI.Diameter	SIunits.Diameter
A_cross	Units.SI.Area	SIunits.Area
L	Units.SI.Length	SIunits.Length
Re_min	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_lam_max	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_turb_min	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_turb_max	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_turb_const	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_lam_leave	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
dp_lam_max	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
dp_turb_min	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
dp_turb_max	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
dp_turb_const	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
v_lam	Units.SI.Velocity	SIunits.Velocity
v_tra	Units.SI.Velocity	SIunits.Velocity
v_turb	Units.SI.Velocity	SIunits.Velocity
v_turb_const	Units.SI.Velocity	SIunits.Velocity
v_smooth	Units.SI.Velocity	SIunits.Velocity
Re_smooth	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
velocity	Units.SI.Velocity	SIunits.Velocity

function Fluid.Dissipation.PressureLoss.Bend.dp_edgedOverall_DP

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate
DP	Units.SI.Pressure	SIunits.Pressure
d_hyd	Units.SI.Diameter	SIunits.Diameter
A_cross	Units.SI.Area	SIunits.Area
Re_min	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_lam_min	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_lam_max	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_turb_min	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_turb_max	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_turb_const	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_lam_leave	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
velocity	Units.SI.Velocity	SIunits.Velocity
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber

function Fluid.Dissipation.PressureLoss.Bend.dp_edgedOverall_MFLOW

Component	Modelica 4.0.0	Modelica 3.2.3
dp	Units.SI.Pressure	SIunits.Pressure
M_FLOW	Units.SI.MassFlowRate	SIunits.MassFlowRate
d_hyd	Units.SI.Diameter	SIunits.Diameter
A_cross	Units.SI.Area	SIunits.Area
Re_min	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_lam_min	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_lam_max	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_turb_min	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_turb_max	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_turb_const	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_lam_leave	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
v_min	Units.SI.Velocity	SIunits.Velocity
dp_min	Units.SI.Pressure	SIunits.Pressure
v_lam_min	Units.SI.Velocity	SIunits.Velocity
v_lam_leave	Units.SI.Velocity	SIunits.Velocity
dp_lam_min	Units.SI.Pressure	SIunits.Pressure
dp_lam_leave	Units.SI.Pressure	SIunits.Pressure
v_turb_min	Units.SI.Velocity	SIunits.Velocity
v_turb_max	Units.SI.Velocity	SIunits.Velocity
dp_turb_min	Units.SI.Pressure	SIunits.Pressure
dp_turb_max	Units.SI.Pressure	SIunits.Pressure
v_turb	Units.SI.Velocity	SIunits.Velocity
v_lam	Units.SI.Velocity	SIunits.Velocity
v_smooth	Units.SI.Velocity	SIunits.Velocity
Re_smooth	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
velocity	Units.SI.Velocity	SIunits.Velocity

function Fluid.Dissipation.PressureLoss.Channel.dp_internalFlowOverall_DP

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate
DP	Units.SI.Pressure	SIunits.Pressure
A_cross	Units.SI.Area	SIunits.Area
perimeter	Units.SI.Length	SIunits.Length
d_hyd	Units.SI.Diameter	SIunits.Diameter
Re_lam_min	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_lam_max	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_lam_leave	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
m_flow_turb	Units.SI.MassFlowRate	SIunits.MassFlowRate
velocity	Units.SI.Velocity	SIunits.Velocity
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber

function Fluid.Dissipation.PressureLoss.Channel.dp_internalFlowOverall_MFLOW

Component	Modelica 4.0.0	Modelica 3.2.3
dp	Units.SI.Pressure	SIunits.Pressure
M_FLOW	Units.SI.MassFlowRate	SIunits.MassFlowRate
A_cross	Units.SI.Area	SIunits.Area
perimeter	Units.SI.Length	SIunits.Length
d_hyd	Units.SI.Diameter	SIunits.Diameter
Re_lam_min	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_lam_max	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_turb_min	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_lam_leave	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_lam	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_turb	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_check	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_trans	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber

function Fluid.Dissipation.PressureLoss.General.dp_idealGas_DP

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate
DP	Units.SI.Pressure	SIunits.Pressure
rho_internal	Units.SI.Density	SIunits.Density
V_flow	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate
V_flow_min	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate

function Fluid.Dissipation.PressureLoss.General.dp_idealGas_MFLOW

Component	Modelica 4.0.0	Modelica 3.2.3
dp	Units.SI.Pressure	SIunits.Pressure
M_FLOW	Units.SI.MassFlowRate	SIunits.MassFlowRate
rho_internal	Units.SI.Density	SIunits.Density

record Fluid.Dissipation.PressureLoss.General.dp_idealGas_IN_con

Component	Modelica 4.0.0	Modelica 3.2.3
dp_smooth	Units.SI.Pressure	SIunits.Pressure

function Fluid.Dissipation.PressureLoss.General.dp_nominalDensityViscosity_DP

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate
DP	Units.SI.Pressure	SIunits.Pressure
m_flow_smooth	Units.SI.MassFlowRate	SIunits.MassFlowRate

function Fluid.Dissipation.PressureLoss.General.dp_nominalDensityViscosity_MFLOW

Component	Modelica 4.0.0	Modelica 3.2.3
dp	Units.SI.Pressure	SIunits.Pressure
M_FLOW	Units.SI.MassFlowRate	SIunits.MassFlowRate

function Fluid.Dissipation.PressureLoss.General.dp_nominalPressureLossLawDensity_DP

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate
DP	Units.SI.Pressure	SIunits.Pressure
m_flow_nom	Units.SI.MassFlowRate	SIunits.MassFlowRate
m_flow_linear	Units.SI.MassFlowRate	SIunits.MassFlowRate

function Fluid.Dissipation.PressureLoss.General.dp_nominalPressureLossLawDensity_MFLOW

Component	Modelica 4.0.0	Modelica 3.2.3
dp	Units.SI.Pressure	SIunits.Pressure
M_FLOW	Units.SI.MassFlowRate	SIunits.MassFlowRate
m_flow_nom	Units.SI.MassFlowRate	SIunits.MassFlowRate

record Fluid.Dissipation.PressureLoss.General.dp_nominalPressureLossLawDensity_IN_var

Component	Modelica 4.0.0	Modelica 3.2.3
rho	Units.SI.Density	SIunits.Density

function Fluid.Dissipation.PressureLoss.General.dp_pressureLossCoefficient_DP

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate
DP	Units.SI.Pressure	SIunits.Pressure

function Fluid.Dissipation.PressureLoss.General.dp_pressureLossCoefficient_MFLOW

Component	Modelica 4.0.0	Modelica 3.2.3
dp	Units.SI.Pressure	SIunits.Pressure
M_FLOW	Units.SI.MassFlowRate	SIunits.MassFlowRate

record Fluid.Dissipation.PressureLoss.General.dp_pressureLossCoefficient_IN_con

Component	Modelica 4.0.0	Modelica 3.2.3
A_cross	Units.SI.Area	SIunits.Area
dp_smooth	Units.SI.Pressure	SIunits.Pressure

record Fluid.Dissipation.PressureLoss.General.dp_pressureLossCoefficient_IN_var

Component	Modelica 4.0.0	Modelica 3.2.3
rho	Units.SI.Density	SIunits.Density

function Fluid.Dissipation.PressureLoss.General.dp_volumeFlowRate_DP

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate
DP	Units.SI.Pressure	SIunits.Pressure
a	=abs(IN_con.a)	=max(Modelica323.Constants.eps, abs(IN_con.a))
b	=abs(IN_con.b)	=max(Modelica323.Constants.eps, abs(IN_con.b))
V_flow	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate
dp_min	Units.SI.Pressure	SIunits.Pressure
V_flow_smooth	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
assert(a+b>0, "Please provide non-zero factors for either a or b of function dp=aV_flow^2 + bV_flow");	DP := aDissipation.Utilities.Functions.General.SmoothPower( V_flow, V_flow_smooth, 2) + bV_flow;
DP = a(if a>0 and b<=0 then Dissipation.Utilities.Functions.General.SmoothPower( V_flow, V_flow_smooth, 2) elseif a>0 and b>0 then V_flowabs(V_flow) else 0) + b*V_flow;

function Fluid.Dissipation.PressureLoss.General.dp_volumeFlowRate_MFLOW

Component	Modelica 4.0.0	Modelica 3.2.3
dp	Units.SI.Pressure	SIunits.Pressure
M_FLOW	Units.SI.MassFlowRate	SIunits.MassFlowRate
a	=abs(IN_con.a)	=max(Modelica323.Constants.eps, abs(IN_con.a))
b	=abs(IN_con.b)	=max(Modelica323.Constants.eps, abs(IN_con.b))
dp_min	Units.SI.Pressure	SIunits.Pressure

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
assert(a+b>0, "Please provide non-zero factors for either a or b of function dp=aV_flow^2 + bV_flow");	M_FLOW := IN_var.rho(-b/(2a) + Modelica323.Fluid.Dissipation.Utilities.Functions.General.SmoothPower( (b/(2a))^2 + (1/a)dp, (b/(2a))^2 + (1/a)dp_min, 0.5));
M_FLOW = IN_var.rho(if a > 0 and b <= 0 then Modelica400.Fluid.Dissipation.Utilities.Functions.General.SmoothPower( (1/a)dp, (1/a)dp_min, 0.5) elseif a > 0 and b > 0 then sign(dp)(-b/(2a) + sqrt((b/(2a))^2 + (1/a) abs(dp))) else bdp);

record Fluid.Dissipation.PressureLoss.General.dp_volumeFlowRate_IN_con

Component	Modelica 4.0.0	Modelica 3.2.3
dp_min	Units.SI.Pressure	SIunits.Pressure

record Fluid.Dissipation.PressureLoss.General.dp_volumeFlowRate_IN_var

Component	Modelica 4.0.0	Modelica 3.2.3
rho	Units.SI.Density	SIunits.Density

function Fluid.Dissipation.PressureLoss.Orifice.dp_suddenChange_DP

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate
DP	Units.SI.Pressure	SIunits.Pressure
Re_min	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
A_1	Units.SI.Area	SIunits.Area
A_2	Units.SI.Area	SIunits.Area
C_1	Units.SI.Length	SIunits.Length
C_2	Units.SI.Length	SIunits.Length
d_hyd	Units.SI.Diameter	SIunits.Diameter
velocity_1	Units.SI.Velocity	SIunits.Velocity
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber

function Fluid.Dissipation.PressureLoss.Orifice.dp_suddenChange_MFLOW

Component	Modelica 4.0.0	Modelica 3.2.3
dp	Units.SI.Pressure	SIunits.Pressure
M_FLOW	Units.SI.MassFlowRate	SIunits.MassFlowRate
dp_min	Units.SI.Pressure	SIunits.Pressure
A_1	Units.SI.Area	SIunits.Area
A_2	Units.SI.Area	SIunits.Area

function Fluid.Dissipation.PressureLoss.Orifice.dp_thickEdgedOverall_DP

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate
DP	Units.SI.Pressure	SIunits.Pressure
Re_min	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_lim	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
A_0	Units.SI.Area	SIunits.Area
A_1	Units.SI.Area	SIunits.Area
d_hyd_0	Units.SI.Diameter	SIunits.Diameter
d_hyd_1	Units.SI.Diameter	SIunits.Diameter
l	Units.SI.Length	SIunits.Length
v_0	Units.SI.Velocity	SIunits.Velocity
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber

function Fluid.Dissipation.PressureLoss.Orifice.dp_thickEdgedOverall_MFLOW

Component	Modelica 4.0.0	Modelica 3.2.3
dp	Units.SI.Pressure	SIunits.Pressure
M_FLOW	Units.SI.MassFlowRate	SIunits.MassFlowRate
Re_lim	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
A_0	Units.SI.Area	SIunits.Area
A_1	Units.SI.Area	SIunits.Area
d_hyd_0	Units.SI.Diameter	SIunits.Diameter
d_hyd_1	Units.SI.Diameter	SIunits.Diameter
l	Units.SI.Length	SIunits.Length

record Fluid.Dissipation.PressureLoss.Orifice.dp_thickEdgedOverall_IN_con

Component	Modelica 4.0.0	Modelica 3.2.3
dp_smooth	Units.SI.Pressure	SIunits.Pressure

function Fluid.Dissipation.PressureLoss.StraightPipe.dp_laminar_DP

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate
DP	Units.SI.Pressure	SIunits.Pressure
d_hyd	Units.SI.Diameter	SIunits.Diameter
A_cross	Units.SI.Area	SIunits.Area
velocity	Units.SI.Velocity	SIunits.Velocity

function Fluid.Dissipation.PressureLoss.StraightPipe.dp_laminar_MFLOW

Component	Modelica 4.0.0	Modelica 3.2.3
dp	Units.SI.Pressure	SIunits.Pressure
M_FLOW	Units.SI.MassFlowRate	SIunits.MassFlowRate
d_hyd	Units.SI.Diameter	SIunits.Diameter
A_cross	Units.SI.Area	SIunits.Area

function Fluid.Dissipation.PressureLoss.StraightPipe.dp_overall_DP

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate
DP	Units.SI.Pressure	SIunits.Pressure
d_hyd	Units.SI.Diameter	SIunits.Diameter
A_cross	Units.SI.Area	SIunits.Area
perimeter	Units.SI.Length	SIunits.Length
Re_lam_min	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_lam_max	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_lam_leave	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber

function Fluid.Dissipation.PressureLoss.StraightPipe.dp_overall_MFLOW

Component	Modelica 4.0.0	Modelica 3.2.3
dp	Units.SI.Pressure	SIunits.Pressure
M_FLOW	Units.SI.MassFlowRate	SIunits.MassFlowRate
d_hyd	Units.SI.Diameter	SIunits.Diameter
A_cross	Units.SI.Area	SIunits.Area
Re_lam_min	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_lam_max	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_turb_min	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_lam_leave	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_lam	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_turb	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_check	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_trans	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber

function Fluid.Dissipation.PressureLoss.StraightPipe.dp_turbulent_DP

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate
DP	Units.SI.Pressure	SIunits.Pressure
Re_min	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
v_min	Units.SI.Velocity	SIunits.Velocity
d_hyd	Units.SI.Diameter	SIunits.Diameter
A_cross	Units.SI.Area	SIunits.Area
Re_lam_min	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_lam_max	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_turb_min	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_lam_leave	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
velocity	Units.SI.Velocity	SIunits.Velocity
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
lambda_FRI_calc	=if Re < Re_lam_leave then 64/Re else if Re > Re_turb_min then lambda_FRI/Re^2 else Modelica400.Fluid.Dissipation.Utilities.Functions.General.CubicInterpolation_lambda(Re, Re_lam_leave, Re_turb_min, k)/Re^2	=if Re < Re_lam_leave then 64/Re else if Re > Re_turb_min then lambda_FRI/Re^2 else Modelica323.Fluid.Dissipation.Utilities.Functions.General.CubicInterpolation_MFLOW(Re, Re_lam_leave, Re_turb_min, k)/Re^2

function Fluid.Dissipation.PressureLoss.StraightPipe.dp_turbulent_MFLOW

Component	Modelica 4.0.0	Modelica 3.2.3
dp	Units.SI.Pressure	SIunits.Pressure
M_FLOW	Units.SI.MassFlowRate	SIunits.MassFlowRate
Re_min	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
d_hyd	Units.SI.Diameter	SIunits.Diameter
A_cross	Units.SI.Area	SIunits.Area
Re_lam_min	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_lam_max	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_turb_min	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_lam_leave	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_lam	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_turb	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_check	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_trans	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
velocity	Units.SI.Velocity	SIunits.Velocity

record Fluid.Dissipation.PressureLoss.StraightPipe.dp_turbulent_IN_con

Component	Modelica 4.0.0	Modelica 3.2.3
K	Units.SI.Length	SIunits.Length

function Fluid.Dissipation.PressureLoss.StraightPipe.dp_twoPhaseOverall_DP

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate
DP	Units.SI.Pressure	SIunits.Pressure
A_cross	Units.SI.Area	SIunits.Area
d_hyd	Units.SI.Diameter	SIunits.Diameter
DP_fric	Units.SI.Pressure	SIunits.Pressure
DP_mom	Units.SI.Pressure	SIunits.Pressure
DP_geo	Units.SI.Pressure	SIunits.Pressure

record Fluid.Dissipation.PressureLoss.StraightPipe.dp_twoPhaseOverall_IN_con

Component	Modelica 4.0.0	Modelica 3.2.3
phi	Units.SI.Angle	SIunits.Angle

function Fluid.Dissipation.PressureLoss.Valve.dp_severalGeometryOverall_DP

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate
DP	Units.SI.Pressure	SIunits.Pressure
Av	Units.SI.Area	SIunits.Area
m_flow_small	Units.SI.MassFlowRate	SIunits.MassFlowRate

function Fluid.Dissipation.PressureLoss.Valve.dp_severalGeometryOverall_MFLOW

Component	Modelica 4.0.0	Modelica 3.2.3
dp	Units.SI.Pressure	SIunits.Pressure
M_FLOW	Units.SI.MassFlowRate	SIunits.MassFlowRate
Av	Units.SI.Area	SIunits.Area

record Fluid.Dissipation.PressureLoss.Valve.dp_severalGeometryOverall_IN_con

Component	Modelica 4.0.0	Modelica 3.2.3
dp_nominal	Units.SI.Pressure	SIunits.Pressure
m_flow_nominal	Units.SI.MassFlowRate	SIunits.MassFlowRate
rho_nominal	Units.SI.Density	SIunits.Density
dp_small	Units.SI.Pressure	SIunits.Pressure

record Fluid.Dissipation.PressureLoss.Valve.dp_severalGeometryOverall_IN_var

Component	Modelica 4.0.0	Modelica 3.2.3
eta	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
rho	Units.SI.Density	SIunits.Density

function Fluid.Dissipation.Utilities.Functions.PressureLoss.TwoPhase.dp_twoPhaseChisholm_DP

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate
DP	Units.SI.Pressure	SIunits.Pressure

function Fluid.Dissipation.Utilities.Functions.PressureLoss.TwoPhase.dp_twoPhaseFriedel_DP

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate
DP	Units.SI.Pressure	SIunits.Pressure
A_cross	Units.SI.Area	SIunits.Area
d_hyd	Units.SI.Diameter	SIunits.Diameter
Re_liq	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_lam_leave	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_turb	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_smooth	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
DP_liq	Units.SI.Pressure	SIunits.Pressure

function Fluid.Dissipation.Utilities.Functions.PressureLoss.TwoPhase.dp_twoPhaseGeodetic_DP

Component	Modelica 4.0.0	Modelica 3.2.3
length	Units.SI.Length	SIunits.Length
phi	Units.SI.Angle	SIunits.Angle
rho_g	Units.SI.Density	SIunits.Density
rho_l	Units.SI.Density	SIunits.Density
DP_geo	Units.SI.Pressure	SIunits.Pressure

function Fluid.Dissipation.Utilities.Functions.PressureLoss.TwoPhase.dp_twoPhaseMomentum_DP

Component	Modelica 4.0.0	Modelica 3.2.3
A_cross	Units.SI.Area	SIunits.Area
perimeter	Units.SI.Length	SIunits.Length
rho_g	Units.SI.Density	SIunits.Density
rho_l	Units.SI.Density	SIunits.Density
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate
DP_mom	Units.SI.Pressure	SIunits.Pressure
Across	Units.SI.Area	SIunits.Area
d_hyd	Units.SI.Diameter	SIunits.Diameter
rho_end	Units.SI.Density	SIunits.Density
rho_sta	Units.SI.Density	SIunits.Density
meanVelEnd	Units.SI.Velocity	SIunits.Velocity
meanVelSta	Units.SI.Velocity	SIunits.Velocity
deltaVelEnd	Units.SI.Velocity	SIunits.Velocity
deltaVelSta	Units.SI.Velocity	SIunits.Velocity
mdotCorEnd	Units.SI.MassFlowRate	SIunits.MassFlowRate
mdotCorSta	Units.SI.MassFlowRate	SIunits.MassFlowRate
dp_mom_cor	Units.SI.Pressure	SIunits.Pressure

function Fluid.Dissipation.Utilities.Functions.PressureLoss.TwoPhase.TwoPhaseMultiplierFriedel

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate
A_cross	Units.SI.Area	SIunits.Area
d_hyd	Units.SI.Diameter	SIunits.Diameter
Fr_l	Units.SI.FroudeNumber	SIunits.FroudeNumber
Re_g	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_l	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
We_l	Units.SI.WeberNumber	SIunits.WeberNumber
Re_lam_max	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Re_turb_min	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber

function Fluid.Dissipation.Utilities.Functions.PressureLoss.TwoPhase.TwoPhaseMultiplierChisholm

Component	Modelica 4.0.0	Modelica 3.2.3
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate
A_cross	Units.SI.Area	SIunits.Area
d_hyd	Units.SI.Diameter	SIunits.Diameter

function Fluid.Dissipation.Utilities.Functions.PressureLoss.TwoPhase.TwoPhaseDensity

Component	Modelica 4.0.0	Modelica 3.2.3
rho_g	Units.SI.Density	SIunits.Density
rho_l	Units.SI.Density	SIunits.Density
rho_2ph	Units.SI.Density	SIunits.Density
rho_hom	Units.SI.Density	SIunits.Density
rho_mom	Units.SI.Density	SIunits.Density
rho_kin	Units.SI.Density	SIunits.Density

function Fluid.Dissipation.Utilities.Functions.PressureLoss.TwoPhase.VoidFraction

Component	Modelica 4.0.0	Modelica 3.2.3
rho_g	Units.SI.Density	SIunits.Density
rho_l	Units.SI.Density	SIunits.Density

function Fluid.Dissipation.Utilities.Functions.PressureLoss.TwoPhase.SlipRatio

Component	Modelica 4.0.0	Modelica 3.2.3
rho_g	Units.SI.Density	SIunits.Density
rho_l	Units.SI.Density	SIunits.Density

function Fluid.Dissipation.Utilities.Functions.HeatTransfer.TwoPhase.kc_twoPhase_condensationHorizontal_KC

Component	Modelica 4.0.0	Modelica 3.2.3
kc	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer
A_cross	Units.SI.Area	SIunits.Area
d_hyd	Units.SI.Diameter	SIunits.Diameter
velocity	Units.SI.Velocity	SIunits.Velocity
Re_l	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Pr_l	Units.SI.PrandtlNumber	SIunits.PrandtlNumber
kc_1ph	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer

function Fluid.Dissipation.Utilities.Functions.HeatTransfer.TwoPhase.kc_twoPhase_boilingVertical_KC

Component	Modelica 4.0.0	Modelica 3.2.3
kc	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer
A_cross	Units.SI.Area	SIunits.Area
d_hyd	Units.SI.Diameter	SIunits.Diameter
mdot_l	Units.SI.MassFlowRate	SIunits.MassFlowRate
velocity_l	Units.SI.Velocity	SIunits.Velocity
Re_l	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Pr_l	Units.SI.PrandtlNumber	SIunits.PrandtlNumber
kc_fc	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer
kc_nb	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer

function Fluid.Dissipation.Utilities.Functions.HeatTransfer.TwoPhase.kc_twoPhase_boilingHorizontal_KC

Component	Modelica 4.0.0	Modelica 3.2.3
kc	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer
A_cross	Units.SI.Area	SIunits.Area
d_hyd	Units.SI.Diameter	SIunits.Diameter
mdot_l	Units.SI.MassFlowRate	SIunits.MassFlowRate
velocity_l	Units.SI.Velocity	SIunits.Velocity
Re_l	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
Pr_l	Units.SI.PrandtlNumber	SIunits.PrandtlNumber
Fr_l	Units.SI.FroudeNumber	SIunits.FroudeNumber
kc_fc	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer
kc_nb	Units.SI.CoefficientOfHeatTransfer	SIunits.CoefficientOfHeatTransfer

function Fluid.Dissipation.Utilities.Functions.General.PrandtlNumber

Component	Modelica 4.0.0	Modelica 3.2.3
cp	Units.SI.SpecificHeatCapacityAtConstantPressure	SIunits.SpecificHeatCapacityAtConstantPressure
eta	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
lambda	Units.SI.ThermalConductivity	SIunits.ThermalConductivity
Pr	Units.SI.PrandtlNumber	SIunits.PrandtlNumber

function Fluid.Dissipation.Utilities.Functions.General.ReynoldsNumber

Component	Modelica 4.0.0	Modelica 3.2.3
A_cross	Units.SI.Area	SIunits.Area
perimeter	Units.SI.Length	SIunits.Length
rho	Units.SI.Density	SIunits.Density
eta	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate
Re	Units.SI.ReynoldsNumber	SIunits.ReynoldsNumber
velocity	Units.SI.Velocity	SIunits.Velocity
d_hyd	Units.SI.Diameter	SIunits.Diameter

record Fluid.Dissipation.Utilities.Records.General.PressureLoss

Component	Modelica 4.0.0	Modelica 3.2.3
eta	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
rho	Units.SI.Density	SIunits.Density

record Fluid.Dissipation.Utilities.Records.General.FluidProperties

Component	Modelica 4.0.0	Modelica 3.2.3
cp	Units.SI.SpecificHeatCapacityAtConstantPressure	SIunits.SpecificHeatCapacityAtConstantPressure
eta	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
lambda	Units.SI.ThermalConductivity	SIunits.ThermalConductivity
rho	Units.SI.Density	SIunits.Density

record Fluid.Dissipation.Utilities.Records.General.IdealGas_con

Component	Modelica 4.0.0	Modelica 3.2.3
R_s	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

record Fluid.Dissipation.Utilities.Records.General.IdealGas_var

Component	Modelica 4.0.0	Modelica 3.2.3
rho_m	Units.SI.Density	SIunits.Density
T_m	Units.SI.Temperature	SIunits.Temp_K
p_m	Units.SI.Pressure	SIunits.Pressure

record Fluid.Dissipation.Utilities.Records.General.NominalDensityViscosity

Component	Modelica 4.0.0	Modelica 3.2.3
dp_nom	Units.SI.Pressure	SIunits.Pressure
m_flow_nom	Units.SI.MassFlowRate	SIunits.MassFlowRate
rho_nom	Units.SI.Density	SIunits.Density
eta_nom	Units.SI.DynamicViscosity	SIunits.DynamicViscosity

record Fluid.Dissipation.Utilities.Records.General.NominalPressureLossLawDensity_con

Component	Modelica 4.0.0	Modelica 3.2.3
A_cross	Units.SI.Area	SIunits.Area
A_cross_nom	Units.SI.Area	SIunits.Area
dp_nom	Units.SI.Pressure	SIunits.Pressure
m_flow_nom	Units.SI.MassFlowRate	SIunits.MassFlowRate
V_flow_nom	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate
rho_nom	Units.SI.Density	SIunits.Density

record Fluid.Dissipation.Utilities.Records.General.TwoPhaseFlow_con

Component	Modelica 4.0.0	Modelica 3.2.3
A_cross	Units.SI.Area	SIunits.Area
perimeter	Units.SI.Length	SIunits.Length
length	Units.SI.Length	SIunits.Length

record Fluid.Dissipation.Utilities.Records.General.TwoPhaseFlow_var

Component	Modelica 4.0.0	Modelica 3.2.3
rho_g	Units.SI.Density	SIunits.Density
rho_l	Units.SI.Density	SIunits.Density
eta_g	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
eta_l	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
sigma	Units.SI.SurfaceTension	SIunits.SurfaceTension

record Fluid.Dissipation.Utilities.Records.General.IdealGas

Component	Modelica 4.0.0	Modelica 3.2.3
R_s	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity
rho_m	Units.SI.Density	SIunits.Density
T_m	Units.SI.Temperature	SIunits.Temp_K
p_m	Units.SI.Pressure	SIunits.Pressure

record Fluid.Dissipation.Utilities.Records.General.NominalPressureLossLawDensity

Component	Modelica 4.0.0	Modelica 3.2.3
A_cross	Units.SI.Area	SIunits.Area
A_cross_nom	Units.SI.Area	SIunits.Area
dp_nom	Units.SI.Pressure	SIunits.Pressure
m_flow_nom	Units.SI.MassFlowRate	SIunits.MassFlowRate
V_flow_nom	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate
rho_nom	Units.SI.Density	SIunits.Density

record Fluid.Dissipation.Utilities.Records.General.TwoPhaseFlow

Component	Modelica 4.0.0	Modelica 3.2.3
rho_l	Units.SI.Density	SIunits.Density
rho_g	Units.SI.Density	SIunits.Density
eta_l	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
eta_g	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
x	Units.SI.MassFraction	SIunits.MassFraction
sigma	Units.SI.SurfaceTension	SIunits.SurfaceTension

record Fluid.Dissipation.Utilities.Records.HeatTransfer.EvenGap

Component	Modelica 4.0.0	Modelica 3.2.3
h	Units.SI.Length	SIunits.Length
s	Units.SI.Length	SIunits.Length
L	Units.SI.Length	SIunits.Length

record Fluid.Dissipation.Utilities.Records.HeatTransfer.General

Component	Modelica 4.0.0	Modelica 3.2.3
A_cross	Units.SI.Area	SIunits.Area
perimeter	Units.SI.Length	SIunits.Length

record Fluid.Dissipation.Utilities.Records.HeatTransfer.HelicalPipe

Component	Modelica 4.0.0	Modelica 3.2.3
d_hyd	Units.SI.Diameter	SIunits.Diameter
h	Units.SI.Length	SIunits.Length
L	Units.SI.Length	SIunits.Length

record Fluid.Dissipation.Utilities.Records.HeatTransfer.Plate

Component	Modelica 4.0.0	Modelica 3.2.3
L	Units.SI.Length	SIunits.Length

record Fluid.Dissipation.Utilities.Records.HeatTransfer.StraightPipe

Component	Modelica 4.0.0	Modelica 3.2.3
d_hyd	Units.SI.Diameter	SIunits.Diameter
L	Units.SI.Length	SIunits.Length

record Fluid.Dissipation.Utilities.Records.HeatTransfer.TwoPhaseFlowHT_IN_con

Component	Modelica 4.0.0	Modelica 3.2.3
A_cross	Units.SI.Area	SIunits.Area
perimeter	Units.SI.Length	SIunits.Length
p_crit	Units.SI.Pressure	SIunits.Pressure

record Fluid.Dissipation.Utilities.Records.HeatTransfer.TwoPhaseFlowHT_IN_var

Component	Modelica 4.0.0	Modelica 3.2.3
cp_l	Units.SI.SpecificHeatCapacityAtConstantPressure	SIunits.SpecificHeatCapacityAtConstantPressure
lambda_l	Units.SI.ThermalConductivity	SIunits.ThermalConductivity
rho_g	Units.SI.Density	SIunits.Density
rho_l	Units.SI.Density	SIunits.Density
eta_g	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
eta_l	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
pressure	Units.SI.Pressure	SIunits.Pressure
dh_lg	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate
qdot_A	Units.SI.HeatFlux	SIunits.HeatFlux

record Fluid.Dissipation.Utilities.Records.PressureLoss.Bend

Component	Modelica 4.0.0	Modelica 3.2.3
R_0	Units.SI.Radius	SIunits.Radius

record Fluid.Dissipation.Utilities.Records.PressureLoss.Geometry

Component	Modelica 4.0.0	Modelica 3.2.3
K	Units.SI.Length	SIunits.Length
L	Units.SI.Length	SIunits.Length
d_ann	Units.SI.Diameter	SIunits.Diameter
D_ann	Units.SI.Diameter	SIunits.Diameter
d_cir	Units.SI.Diameter	SIunits.Diameter
a_ell	Units.SI.Length	SIunits.Length
b_ell	Units.SI.Length	SIunits.Length
a_rec	Units.SI.Length	SIunits.Length
b_rec	Units.SI.Length	SIunits.Length
a_tri	Units.SI.Length	SIunits.Length
h_tri	Units.SI.Length	SIunits.Length
beta	Units.SI.Angle	SIunits.Angle

record Fluid.Dissipation.Utilities.Records.PressureLoss.Orifice

Component	Modelica 4.0.0	Modelica 3.2.3
A_0	Units.SI.Area	SIunits.Area
C_0	Units.SI.Length	SIunits.Length
A_1	Units.SI.Area	SIunits.Area
C_1	Units.SI.Length	SIunits.Length
L	Units.SI.Length	SIunits.Length

record Fluid.Dissipation.Utilities.Records.PressureLoss.PressureLossInput

Component	Modelica 4.0.0	Modelica 3.2.3
dp	Units.SI.Pressure	SIunits.Pressure
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate

record Fluid.Dissipation.Utilities.Records.PressureLoss.StraightPipe

Component	Modelica 4.0.0	Modelica 3.2.3
d_hyd	Units.SI.Diameter	SIunits.Diameter
L	Units.SI.Length	SIunits.Length

record Fluid.Dissipation.Utilities.Records.PressureLoss.Tjunction

Component	Modelica 4.0.0	Modelica 3.2.3
d_hyd	Units.SI.Diameter	SIunits.Diameter
m_flow_min	Units.SI.MassFlowRate	SIunits.MassFlowRate
v_max	Units.SI.Velocity	SIunits.Velocity
united_converging_cross_section	Present
united_converging_crossection		Present

record Fluid.Dissipation.Utilities.Records.PressureLoss.Diffuser

Component	Modelica 4.0.0	Modelica 3.2.3
alpha	Units.SI.Angle	SIunits.Angle
A_1	Units.SI.Area	SIunits.Area
A_2	Units.SI.Area	SIunits.Area
C_1	Units.SI.Length	SIunits.Length
C_2	Units.SI.Length	SIunits.Length
L_1	Units.SI.Length	SIunits.Length
L_2	Units.SI.Length	SIunits.Length
L_d	Units.SI.Length	SIunits.Length
dp_small	Units.SI.Pressure	SIunits.Pressure

record Fluid.Dissipation.Utilities.Records.PressureLoss.EdgedBend

Component	Modelica 4.0.0	Modelica 3.2.3
d_hyd	Units.SI.Diameter	SIunits.Diameter
delta	Units.SI.Angle	SIunits.Angle
K	Units.SI.Length	SIunits.Length

record Fluid.Dissipation.Utilities.Records.PressureLoss.SuddenChange

Component	Modelica 4.0.0	Modelica 3.2.3
A_1	Units.SI.Area	SIunits.Area
A_2	Units.SI.Area	SIunits.Area
C_1	Units.SI.Length	SIunits.Length
C_2	Units.SI.Length	SIunits.Length

function Fluid.Utilities.regRoot2

Component	Modelica 4.0.0	Modelica 3.2.3
sqrt_k1	Present
sqrt_k2	Present

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
y := smooth(2, if x >= x_small then sqrt_k1sqrt(x) else if x <= -x_small then -sqrt_k2sqrt(abs(x)) else if k1 >= k2 then regRoot2_utility(x,x_small,k1,k2,use_yd0,yd0) else -regRoot2_utility(-x,x_small,k2,k1,use_yd0,yd0));	y := smooth(2, if x >= x_small then sqrt(k1x) else if x <= -x_small then -sqrt(k2abs(x)) else if k1 >= k2 then regRoot2_utility(x,x_small,k1,k2,use_yd0,yd0) else -regRoot2_utility(-x,x_small,k2,k1,use_yd0,yd0));

model Media.Examples.SimpleLiquidWater

Component	Modelica 4.0.0	Modelica 3.2.3
V	Units.SI.Volume	SIunits.Volume
H_flow_ext	Units.SI.EnthalpyFlowRate	SIunits.EnthalpyFlowRate
m	Units.SI.Mass	SIunits.Mass
U	Units.SI.InternalEnergy	SIunits.InternalEnergy

model Media.Examples.WaterIF97

Component	Modelica 4.0.0	Modelica 3.2.3
V	Units.SI.Volume	SIunits.Volume
dV	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate
m	Units.SI.Mass	SIunits.Mass
U	Units.SI.InternalEnergy	SIunits.InternalEnergy

model Media.Examples.MixtureGases

Component	Modelica 4.0.0	Modelica 3.2.3
V	Units.SI.Volume	SIunits.Volume
m_flow_ext	Units.SI.MassFlowRate	SIunits.MassFlowRate
H_flow_ext	Units.SI.EnthalpyFlowRate	SIunits.EnthalpyFlowRate
U1	Units.SI.InternalEnergy	SIunits.InternalEnergy
U2	Units.SI.InternalEnergy	SIunits.InternalEnergy

model Media.Examples.MoistAir

Component	Modelica 4.0.0	Modelica 3.2.3
unitTime	Units.SI.Time	SIunits.Time

model Media.Examples.PsychrometricData

Component	Modelica 4.0.0	Modelica 3.2.3
p_const	Units.SI.Pressure	SIunits.Pressure
T_min	Units.SI.Temperature	SIunits.Temperature
T_step	Units.SI.Temperature	SIunits.Temperature
h_min	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
h_step	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
x_min	Units.SI.MassFraction	SIunits.MassFraction
x_max	Units.SI.MassFraction	SIunits.MassFraction
t	Units.SI.Time	SIunits.Time
T_const	Units.SI.Temperature	SIunits.Temperature
h_const	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
x_start	Units.SI.MassFraction	SIunits.MassFraction
x	Units.SI.MassFraction	SIunits.MassFraction
hx_T	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
hx_h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
hx_phi	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
y_T	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
y_h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
y_phi	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
ps_phi	Units.SI.Pressure	SIunits.Pressure
T_phi	Units.SI.Temperature	SIunits.Temperature
pd	Units.SI.Pressure	SIunits.Pressure

model Media.Examples.TwoPhaseWater.TestTwoPhaseStates

Component	Modelica 4.0.0	Modelica 3.2.3
dh	unit="J/(kg.s)"
dh	displayUnit="kJ/(kg.s)"
dp	unit="Pa/s"
dp	displayUnit="bar/s"

model Media.Examples.ReferenceAir.MoistAir

Component	Modelica 4.0.0	Modelica 3.2.3
T_start	Units.SI.Temperature	SIunits.Temperature
p_start	Units.SI.Pressure	SIunits.Pressure
unitTime	Units.SI.Time	SIunits.Time

model Media.Examples.ReferenceAir.Inverse_sh_T

Component	Modelica 4.0.0	Modelica 3.2.3
T_min	Units.SI.Temperature	SIunits.Temperature
T_max	Units.SI.Temperature	SIunits.Temperature
p	Units.SI.Pressure	SIunits.Pressure
h_min	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
h_max	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
s_min	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
s_max	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
h1	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
h2	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
s1	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
s2	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
Th	Units.SI.Temperature	SIunits.Temperature
Ts	Units.SI.Temperature	SIunits.Temperature
timeUnit	Units.SI.Time	SIunits.Time

model Media.Examples.ReferenceAir.Inverse_sh_TX

Component	Modelica 4.0.0	Modelica 3.2.3
T_min	Units.SI.Temperature	SIunits.Temperature
T_max	Units.SI.Temperature	SIunits.Temperature
p	Units.SI.Pressure	SIunits.Pressure
X	Units.SI.MassFraction	SIunits.MassFraction
h_min	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
h_max	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
s_min	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
s_max	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
h1	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
h2	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
s1	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
s2	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
Th	Units.SI.Temperature	SIunits.Temperature
Ts	Units.SI.Temperature	SIunits.Temperature
timeUnit	Units.SI.Time	SIunits.Time

model Media.Examples.SolveOneNonlinearEquation.Inverse_sine

Component	Modelica 4.0.0	Modelica 3.2.3
data		Present

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
x_zero = Modelica400.Math.Nonlinear.solveOneNonlinearEquation( function f_nonlinear( A=A, w=w, s=-y_zero), x_min, x_max);	x_zero = Inverse_sine_definition.solve( y_zero, x_min, x_max, f_nonlinear_data=data);
print("x_zero = " + String(x_zero) + ", y_zero = " + String(y_zero) + ", Asin(wx_zero) = " + String(AModelica400.Math.sin(wx_zero)));	print("x_zero = " + String(x_zero) + ", y_zero = " + String(y_zero) + ", Asin(wx_zero) = " + String(data.AModelica323.Math.sin(data.wx_zero)));

model Media.Examples.SolveOneNonlinearEquation.Inverse_sh_T

Component	Modelica 4.0.0	Modelica 3.2.3
T_min	Units.SI.Temperature	SIunits.Temperature
T_max	Units.SI.Temperature	SIunits.Temperature
p	Units.SI.Pressure	SIunits.Pressure
h_min	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
h_max	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
s_min	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
s_max	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
h1	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
h2	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
s1	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
s2	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
Th	Units.SI.Temperature	SIunits.Temperature
Ts	Units.SI.Temperature	SIunits.Temperature
timeUnit	Units.SI.Time	SIunits.Time

model Media.Examples.SolveOneNonlinearEquation.InverseIncompressible_sh_T

Component	Modelica 4.0.0	Modelica 3.2.3
T_min	Units.SI.Temperature	SIunits.Temperature
T_max	Units.SI.Temperature	SIunits.Temperature
p	Units.SI.Pressure	SIunits.Pressure
h_min	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
h_max	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
s_min	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
s_max	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
h1	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
h2	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
s1	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
s2	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
Th	Units.SI.Temperature	SIunits.Temperature
Ts	Units.SI.Temperature	SIunits.Temperature
timeUnit	Units.SI.Time	SIunits.Time

model Media.Examples.SolveOneNonlinearEquation.Inverse_sh_TX

Component	Modelica 4.0.0	Modelica 3.2.3
T_min	Units.SI.Temperature	SIunits.Temperature
T_max	Units.SI.Temperature	SIunits.Temperature
p	Units.SI.Pressure	SIunits.Pressure
h_min	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
h_max	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
s_min	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
s_max	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
h1	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
h2	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
s1	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
s2	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
Th	Units.SI.Temperature	SIunits.Temperature
Ts	Units.SI.Temperature	SIunits.Temperature
X	Units.SI.MassFraction	SIunits.MassFraction
timeUnit	Units.SI.Time	SIunits.Time

model Media.Examples.Utilities.PortVolume

Component	Modelica 4.0.0	Modelica 3.2.3
V	Units.SI.Volume	SIunits.Volume
T_start	=Modelica400.Units.Conversions.from_degC(20)	=Modelica323.SIunits.Conversions.from_degC(20)
U	Units.SI.Energy	SIunits.Energy
m	Units.SI.Mass	SIunits.Mass
mXi	Units.SI.Mass	SIunits.Mass

model Media.Examples.Utilities.FixedMassFlowRate

Component	Modelica 4.0.0	Modelica 3.2.3
T_ambient	=Modelica400.Units.Conversions.from_degC(20)	=Modelica323.SIunits.Conversions.from_degC(20)

model Media.Examples.Utilities.FixedAmbient

Component	Modelica 4.0.0	Modelica 3.2.3
T_ambient	=Modelica400.Units.Conversions.from_degC(20)	=Modelica323.SIunits.Conversions.from_degC(20)

model Media.Examples.Utilities.ShortPipe

Component	Modelica 4.0.0	Modelica 3.2.3
dp	Units.SI.Pressure	SIunits.Pressure

model Media.Examples.Utilities.PartialTestModel

Component	Modelica 4.0.0	Modelica 3.2.3
p_start	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
T_start	Units.SI.Temperature	SIunits.Temperature
h_start	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

model Media.Examples.Utilities.PartialTestModel2

Component	Modelica 4.0.0	Modelica 3.2.3
p_start	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
T_start	Units.SI.Temperature	SIunits.Temperature
h_start	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

model Media.Interfaces.TemplateMedium.BaseProperties

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... MM = 0.024;
R_s = Modelica400.Constants.R/MM;	R = 8.3144/MM;
state.p = p; ...

package Media.Interfaces.PartialMedium

Component	Modelica 4.0.0	Modelica 3.2.3
T_default	=Modelica400.Units.Conversions.from_degC(20)	=Modelica323.SIunits.Conversions.from_degC(20)

model Media.Interfaces.PartialMedium.BaseProperties

Component	Modelica 4.0.0	Modelica 3.2.3
T_degC	Units.NonSI.Temperature_degC	SIunits.Conversions.NonSIunits.Temperature_degC
p_bar	Units.NonSI.Pressure_bar	SIunits.Conversions.NonSIunits.Pressure_bar
R_s	Present
R		Present

function Media.Interfaces.PartialMedium.isothermalCompressibility

Component	Modelica 4.0.0	Modelica 3.2.3
kappa	Units.SI.IsothermalCompressibility	SIunits.IsothermalCompressibility

package Media.Interfaces.PartialLinearFluid

Component	Modelica 4.0.0	Modelica 3.2.3
kappa_const	Units.SI.IsothermalCompressibility	SIunits.IsothermalCompressibility

model Media.Interfaces.PartialLinearFluid.BaseProperties

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... MM = MM_const;
R_s = Modelica400.Constants.R/MM;	R = 8.3144/MM;

function Media.Interfaces.PartialMixtureMedium.gasConstant

Component	Modelica 4.0.0	Modelica 3.2.3
R_s	Present
R		Present

function Media.Interfaces.PartialMixtureMedium.moleToMassFractions

Component	Modelica 4.0.0	Modelica 3.2.3
moleFractions	Units.SI.MoleFraction	SIunits.MoleFraction
X	Units.SI.MassFraction	SIunits.MassFraction

function Media.Interfaces.PartialMixtureMedium.massToMoleFractions

Component	Modelica 4.0.0	Modelica 3.2.3
X	Units.SI.MassFraction	SIunits.MassFraction
MMX	Units.SI.MolarMass	SIunits.MolarMass
moleFractions	Units.SI.MoleFraction	SIunits.MoleFraction
Mmix	Units.SI.MolarMass	SIunits.MolarMass

function Media.Interfaces.PartialTwoPhaseMedium.bubbleEnthalpy

Component	Modelica 4.0.0	Modelica 3.2.3
hl	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Interfaces.PartialTwoPhaseMedium.dewEnthalpy

Component	Modelica 4.0.0	Modelica 3.2.3
hv	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Interfaces.PartialTwoPhaseMedium.bubbleEntropy

Component	Modelica 4.0.0	Modelica 3.2.3
sl	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Interfaces.PartialTwoPhaseMedium.dewEntropy

Component	Modelica 4.0.0	Modelica 3.2.3
sv	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

model Media.Interfaces.PartialSimpleMedium.BaseProperties

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... d = d_const;
R_s = 0;	R = 0;
MM = MM_const; ...

model Media.Interfaces.PartialSimpleIdealGasMedium.BaseProperties

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... h = specificEnthalpy_pTX( p, T, X);
u = h - R_s*T;	u = h - R*T;
R_s = R_gas;	R = R_gas;
d = p/(R_s*T);	d = p/(R*T);
MM = MM_const; ...

package Media.Common

Component	Modelica 4.0.0	Modelica 3.2.3
AMIN	Units.SI.Area	SIunits.Area
AMAX	Units.SI.Area	SIunits.Area
ANOM	Units.SI.Area	SIunits.Area
MOLMIN	Units.SI.AmountOfSubstance	SIunits.AmountOfSubstance
MOLMAX	Units.SI.AmountOfSubstance	SIunits.AmountOfSubstance
MOLNOM	Units.SI.AmountOfSubstance	SIunits.AmountOfSubstance
DMIN	Units.SI.Density	SIunits.Density
DMAX	Units.SI.Density	SIunits.Density
DNOM	Units.SI.Density	SIunits.Density
LAMMIN	Units.SI.ThermalConductivity	SIunits.ThermalConductivity
LAMNOM	Units.SI.ThermalConductivity	SIunits.ThermalConductivity
LAMMAX	Units.SI.ThermalConductivity	SIunits.ThermalConductivity
ETAMIN	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
ETAMAX	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
ETANOM	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
EMIN	Units.SI.Energy	SIunits.Energy
EMAX	Units.SI.Energy	SIunits.Energy
ENOM	Units.SI.Energy	SIunits.Energy
SMIN	Units.SI.Entropy	SIunits.Entropy
SMAX	Units.SI.Entropy	SIunits.Entropy
SNOM	Units.SI.Entropy	SIunits.Entropy
MDOTMIN	Units.SI.MassFlowRate	SIunits.MassFlowRate
MDOTMAX	Units.SI.MassFlowRate	SIunits.MassFlowRate
MDOTNOM	Units.SI.MassFlowRate	SIunits.MassFlowRate
MASSXMIN	Units.SI.MassFraction	SIunits.MassFraction
MASSXMAX	Units.SI.MassFraction	SIunits.MassFraction
MASSXNOM	Units.SI.MassFraction	SIunits.MassFraction
MMIN	Units.SI.Mass	SIunits.Mass
MMAX	Units.SI.Mass	SIunits.Mass
MNOM	Units.SI.Mass	SIunits.Mass
MMMIN	Units.SI.MolarMass	SIunits.MolarMass
MMMAX	Units.SI.MolarMass	SIunits.MolarMass
MMNOM	Units.SI.MolarMass	SIunits.MolarMass
MOLEYMIN	Units.SI.MoleFraction	SIunits.MoleFraction
MOLEYMAX	Units.SI.MoleFraction	SIunits.MoleFraction
MOLEYNOM	Units.SI.MoleFraction	SIunits.MoleFraction
GMIN	Units.SI.MomentumFlux	SIunits.MomentumFlux
GMAX	Units.SI.MomentumFlux	SIunits.MomentumFlux
GNOM	Units.SI.MomentumFlux	SIunits.MomentumFlux
POWMIN	Units.SI.Power	SIunits.Power
POWMAX	Units.SI.Power	SIunits.Power
POWNOM	Units.SI.Power	SIunits.Power
PMIN	Units.SI.Pressure	SIunits.Pressure
PMAX	Units.SI.Pressure	SIunits.Pressure
PNOM	Units.SI.Pressure	SIunits.Pressure
COMPPMIN	Units.SI.Pressure	SIunits.Pressure
COMPPMAX	Units.SI.Pressure	SIunits.Pressure
COMPPNOM	Units.SI.Pressure	SIunits.Pressure
KAPPAMIN	Units.SI.RatioOfSpecificHeatCapacities	SIunits.RatioOfSpecificHeatCapacities
KAPPAMAX	Units.SI.RatioOfSpecificHeatCapacities	SIunits.RatioOfSpecificHeatCapacities
KAPPANOM	Units.SI.RatioOfSpecificHeatCapacities	SIunits.RatioOfSpecificHeatCapacities
SEMIN	Units.SI.SpecificEnergy	SIunits.SpecificEnergy
SEMAX	Units.SI.SpecificEnergy	SIunits.SpecificEnergy
SENOM	Units.SI.SpecificEnergy	SIunits.SpecificEnergy
SHMIN	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
SHMAX	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
SHNOM	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
SSMIN	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
SSMAX	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
SSNOM	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
CPMIN	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity
CPMAX	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity
CPNOM	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity
TMIN	Units.SI.Temperature	SIunits.Temperature
TMAX	Units.SI.Temperature	SIunits.Temperature
TNOM	Units.SI.Temperature	SIunits.Temperature
LMIN	Units.SI.ThermalConductivity	SIunits.ThermalConductivity
LMAX	Units.SI.ThermalConductivity	SIunits.ThermalConductivity
LNOM	Units.SI.ThermalConductivity	SIunits.ThermalConductivity
VELMIN	Units.SI.Velocity	SIunits.Velocity
VELMAX	Units.SI.Velocity	SIunits.Velocity
VELNOM	Units.SI.Velocity	SIunits.Velocity
VMIN	Units.SI.Volume	SIunits.Volume
VMAX	Units.SI.Volume	SIunits.Volume
VNOM	Units.SI.Volume	SIunits.Volume

record Media.Common.ThermoFluidSpecial.FixedIGProperties

Component	Modelica 4.0.0	Modelica 3.2.3
MM	Units.SI.MolarMass	SIunits.MolarMass
Hf	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
H0	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
R_s	Present
R		Present

record Media.Common.ThermoFluidSpecial.ThermoBaseVars

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
d	Units.SI.Density	SIunits.Density
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
kappa	Units.SI.RatioOfSpecificHeatCapacities	SIunits.RatioOfSpecificHeatCapacities
M	Units.SI.Mass	SIunits.Mass
U	Units.SI.Energy	SIunits.Energy
dM	Units.SI.MassFlowRate	SIunits.MassFlowRate
dU	Units.SI.Power	SIunits.Power
V	Units.SI.Volume	SIunits.Volume
mass_x	Units.SI.MassFraction	SIunits.MassFraction
mole_y	Units.SI.MoleFraction	SIunits.MoleFraction
M_x	Units.SI.Mass	SIunits.Mass
dM_x	Units.SI.MassFlowRate	SIunits.MassFlowRate
MM	Units.SI.MolarMass	SIunits.MolarMass
Moles	Units.SI.AmountOfSubstance	SIunits.AmountOfSubstance
Moles_z	Units.SI.AmountOfSubstance	SIunits.AmountOfSubstance

record Media.Common.ThermoFluidSpecial.ThermoProperties

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature
d	Units.SI.Density	SIunits.Density
p	Units.SI.Pressure	SIunits.Pressure
V	Units.SI.Volume	SIunits.Volume
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
u	Units.SI.SpecificEnergy	SIunits.SpecificEnergy
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
g	Units.SI.SpecificGibbsFreeEnergy	SIunits.SpecificGibbsFreeEnergy
cp	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity
cv	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity
MM	Units.SI.MolarMass	SIunits.MolarMass
mass_x	Units.SI.MassFraction	SIunits.MassFraction
mole_y	Units.SI.MoleFraction	SIunits.MoleFraction
kappa	Units.SI.RatioOfSpecificHeatCapacities	SIunits.RatioOfSpecificHeatCapacities
ddTp	Units.SI.DerDensityByTemperature	SIunits.DerDensityByTemperature
ddpT	Units.SI.DerDensityByPressure	SIunits.DerDensityByPressure
duTp	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity
ddx	Units.SI.SpecificEnergy	SIunits.SpecificEnergy
compu	Units.SI.SpecificEnergy	SIunits.SpecificEnergy
compp	Units.SI.Pressure	SIunits.Pressure
a	Units.SI.Velocity	SIunits.Velocity
dUTZ	Units.SI.HeatCapacity	SIunits.HeatCapacity
dUZT	Units.SI.MolarInternalEnergy	SIunits.MolarInternalEnergy
dHMxT	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
R_s	Present
R		Present

record Media.Common.ThermoFluidSpecial.ThermoProperties_ph

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature
d	Units.SI.Density	SIunits.Density
u	Units.SI.SpecificEnergy	SIunits.SpecificEnergy
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
cp	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity
cv	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity
kappa	Units.SI.RatioOfSpecificHeatCapacities	SIunits.RatioOfSpecificHeatCapacities
a	Units.SI.Velocity	SIunits.Velocity
ddhp	Units.SI.DerDensityByEnthalpy	SIunits.DerDensityByEnthalpy
ddph	Units.SI.DerDensityByPressure	SIunits.DerDensityByPressure
R_s	Present
R		Present

record Media.Common.ThermoFluidSpecial.ThermoProperties_pT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
u	Units.SI.SpecificEnergy	SIunits.SpecificEnergy
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
cp	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity
cv	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity
kappa	Units.SI.RatioOfSpecificHeatCapacities	SIunits.RatioOfSpecificHeatCapacities
a	Units.SI.Velocity	SIunits.Velocity
ddTp	Units.SI.DerDensityByTemperature	SIunits.DerDensityByTemperature
ddpT	Units.SI.DerDensityByPressure	SIunits.DerDensityByPressure
duTp	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity
R_s	Present
R		Present

record Media.Common.ThermoFluidSpecial.ThermoProperties_dT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
u	Units.SI.SpecificEnergy	SIunits.SpecificEnergy
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
cp	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity
cv	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity
kappa	Units.SI.RatioOfSpecificHeatCapacities	SIunits.RatioOfSpecificHeatCapacities
a	Units.SI.Velocity	SIunits.Velocity
R_s	Present
R		Present

record Media.Common.ThermoFluidSpecial.TransportProps

Component	Modelica 4.0.0	Modelica 3.2.3
eta	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
lam	Units.SI.ThermalConductivity	SIunits.ThermalConductivity

function Media.Common.ThermoFluidSpecial.gibbsToProps_ph

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... pro.T := g.T;
pro.R_s = g.R_s;	pro.R = g.R;
pro.d = g.p/(pro.R_spro.Tg.pi*g.gpi);	pro.d = g.p/(pro.Rpro.Tg.pi*g.gpi);
pro.u = g.Tg.R_s(g.taug.gtau - g.pig.gpi);	pro.u = g.Tg.R(g.taug.gtau - g.pig.gpi);
pro.s = pro.R_s(g.taug.gtau - g.g);	pro.s = pro.R(g.taug.gtau - g.g);
pro.cp = -pro.R_sg.taug.tau*g.gtautau;	pro.cp = -pro.Rg.taug.tau*g.gtautau;
pro.cv = pro.R_s(-g.taug.taug.gtautau + (g.gpi - g.taug.gtaupi)(g.gpi - g.taug.gtaupi)/(g.gpipi));	pro.cv = pro.R(-g.taug.taug.gtautau + (g.gpi - g.taug.gtaupi)(g.gpi - g.taug.gtaupi)/(g.gpipi));
pro.a = abs(g.R_sg.T(g.gpig.gpi/((g.gpi - g.taug.gtaupi)(g.gpi - g.tau g.gtaupi)/(g.taug.taug.gtautau) - g.gpipi)))^0.5;	pro.a = abs(g.Rg.T(g.gpig.gpi/((g.gpi - g.taug.gtaupi)(g.gpi - g.tau g.gtaupi)/(g.taug.taug.gtautau) - g.gpipi)))^0.5;
vt = g.R_s/g.p(g.pig.gpi - g.taug.pig.gtaupi);	vt = g.R/g.p(g.pig.gpi - g.taug.pig.gtaupi);
vp = g.R_sg.T/(g.pg.p)g.pig.pi*g.gpipi;	vp = g.Rg.T/(g.pg.p)g.pig.pi*g.gpipi;
pro.kappa = -1/(pro.dg.p)pro.cp/(vppro.cp + vtvt*g.T); ...

function Media.Common.ThermoFluidSpecial.gibbsToBoundaryProps

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
sat.d := g.p/(g.R_sg.Tg.pi*g.gpi);	sat.d := g.p/(g.Rg.Tg.pi*g.gpi);
sat.h = g.R_sg.Tg.tau*g.gtau;	sat.h = g.Rg.Tg.tau*g.gtau;
sat.u = g.Tg.R_s(g.taug.gtau - g.pig.gpi);	sat.u = g.Tg.R(g.taug.gtau - g.pig.gpi);
sat.s = g.R_s(g.taug.gtau - g.g);	sat.s = g.R(g.taug.gtau - g.g);
sat.cp = -g.R_sg.taug.tau*g.gtautau;	sat.cp = -g.Rg.taug.tau*g.gtautau;
sat.cv = g.R_s(-g.taug.taug.gtautau + (g.gpi - g.taug.gtaupi)(g.gpi - g.taug.gtaupi)/(g.gpipi));	sat.cv = g.R(-g.taug.taug.gtautau + (g.gpi - g.taug.gtaupi)(g.gpi - g.taug.gtaupi)/(g.gpipi));
vt = g.R_s/g.p(g.pig.gpi - g.taug.pig.gtaupi);	vt = g.R/g.p(g.pig.gpi - g.taug.pig.gtaupi);
vp = g.R_sg.T/(g.pg.p)g.pig.pi*g.gpipi;	vp = g.Rg.T/(g.pg.p)g.pig.pi*g.gpipi;
sat.pt = -g.p/g.T(g.gpi - g.taug.gtaupi)/(g.gpipi*g.pi);
sat.pd = -g.R_sg.Tg.gpi*g.gpi/(g.gpipi);	sat.pd = -g.Rg.Tg.gpi*g.gpi/(g.gpipi);

function Media.Common.ThermoFluidSpecial.gibbsToProps_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
pro.R_s := g.R_s;	pro.R := g.R;
pro.p = g.p;
pro.u = g.Tg.R_s(g.taug.gtau - g.pig.gpi);	pro.u = g.Tg.R(g.taug.gtau - g.pig.gpi);
pro.h = g.R_sg.Tg.tau*g.gtau;	pro.h = g.Rg.Tg.tau*g.gtau;
pro.s = pro.R_s(g.taug.gtau - g.g);	pro.s = pro.R(g.taug.gtau - g.g);
pro.cp = -pro.R_sg.taug.tau*g.gtautau;	pro.cp = -pro.Rg.taug.tau*g.gtautau;
pro.cv = pro.R_s(-g.taug.taug.gtautau + (g.gpi - g.taug.gtaupi)(g.gpi - g.taug.gtaupi)/g.gpipi);	pro.cv = pro.R(-g.taug.taug.gtautau + (g.gpi - g.taug.gtaupi)(g.gpi - g.taug.gtaupi)/g.gpipi);
vt = g.R_s/g.p(g.pig.gpi - g.taug.pig.gtaupi);	vt = g.R/g.p(g.pig.gpi - g.taug.pig.gtaupi);
vp = g.R_sg.T/(g.pg.p)g.pig.pi*g.gpipi;	vp = g.Rg.T/(g.pg.p)g.pig.pi*g.gpipi;
pro.kappa = -1/((g.p/(pro.R_sg.Tg.pig.gpi))g.p)pro.cp/(vppro.cp + vt vtg.T);	pro.kappa = -1/((g.p/(pro.Rg.Tg.pig.gpi))g.p)pro.cp/(vppro.cp + vt vtg.T);
pro.a = abs(g.R_sg.T(g.gpig.gpi/((g.gpi - g.taug.gtaupi)(g.gpi - g.tau g.gtaupi)/(g.taug.taug.gtautau) - g.gpipi)))^0.5;	pro.a = abs(g.Rg.T(g.gpig.gpi/((g.gpi - g.taug.gtaupi)(g.gpi - g.tau g.gtaupi)/(g.taug.taug.gtautau) - g.gpipi)))^0.5;
d = g.p/(pro.R_sg.Tg.pi*g.gpi);	d = g.p/(pro.Rg.Tg.pi*g.gpi);
pro.dudT = (pro.p - g.Tvt/vp)/(dd); ...

function Media.Common.ThermoFluidSpecial.gibbsToProps_pT

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
pro.R_s := g.R_s;	pro.R := g.R;
pro.d = g.p/(pro.R_sg.Tg.pi*g.gpi);	pro.d = g.p/(pro.Rg.Tg.pi*g.gpi);
pro.u = g.Tg.R_s(g.taug.gtau - g.pig.gpi);	pro.u = g.Tg.R(g.taug.gtau - g.pig.gpi);
pro.h = g.R_sg.Tg.tau*g.gtau;	pro.h = g.Rg.Tg.tau*g.gtau;
pro.s = pro.R_s(g.taug.gtau - g.g);	pro.s = pro.R(g.taug.gtau - g.g);
pro.cp = -pro.R_sg.taug.tau*g.gtautau;	pro.cp = -pro.Rg.taug.tau*g.gtautau;
pro.cv = pro.R_s(-g.taug.taug.gtautau + (g.gpi - g.taug.gtaupi)(g.gpi - g.taug.gtaupi)/g.gpipi);	pro.cv = pro.R(-g.taug.taug.gtautau + (g.gpi - g.taug.gtaupi)(g.gpi - g.taug.gtaupi)/g.gpipi);
vt = g.R_s/g.p(g.pig.gpi - g.taug.pig.gtaupi);	vt = g.R/g.p(g.pig.gpi - g.taug.pig.gtaupi);
vp = g.R_sg.T/(g.pg.p)g.pig.pi*g.gpipi;	vp = g.Rg.T/(g.pg.p)g.pig.pi*g.gpipi;
pro.kappa = -1/(pro.dg.p)pro.cp/(vppro.cp + vtvt*g.T);
pro.a = abs(g.R_sg.T(g.gpig.gpi/((g.gpi - g.taug.gtaupi)(g.gpi - g.tau g.gtaupi)/(g.taug.taug.gtautau) - g.gpipi)))^0.5;	pro.a = abs(g.Rg.T(g.gpig.gpi/((g.gpi - g.taug.gtaupi)(g.gpi - g.tau g.gtaupi)/(g.taug.taug.gtautau) - g.gpipi)))^0.5;
pro.ddpT = -(pro.dpro.d)vp; ...

function Media.Common.ThermoFluidSpecial.helmholtzToProps_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... pro.T = f.T;
pro.R_s = f.R_s;	pro.R = f.R;
pro.s = f.R_s(f.tauf.ftau - f.f);	pro.s = f.R(f.tauf.ftau - f.f);
pro.u = f.R_sf.Tf.tau*f.ftau;	pro.u = f.Rf.Tf.tau*f.ftau;
p = pro.dpro.R_spro.Tf.deltaf.fdelta;	p = pro.dpro.Rpro.Tf.deltaf.fdelta;
pd = f.R_sf.Tf.delta(2.0f.fdelta + f.delta*f.fdeltadelta);	pd = f.Rf.Tf.delta(2.0f.fdelta + f.delta*f.fdeltadelta);
pt = f.R_sf.df.delta(f.fdelta - f.tauf.fdeltatau);	pt = f.Rf.df.delta(f.fdelta - f.tauf.fdeltatau);
pv = -pdf.df.d;
pro.cp = f.R_s(-f.tauf.tauf.ftautau + (f.deltaf.fdelta - f.deltaf.tau f.fdeltatau)^2/(2f.deltaf.fdelta + f.deltaf.deltaf.fdeltadelta));	pro.cp = f.R(-f.tauf.tauf.ftautau + (f.deltaf.fdelta - f.deltaf.tau f.fdeltatau)^2/(2f.deltaf.fdelta + f.deltaf.deltaf.fdeltadelta));
pro.cv = f.R_s(-f.tauf.tau*f.ftautau);	pro.cv = f.R(-f.tauf.tau*f.ftautau);
pro.kappa = 1/(f.df.R_sf.df.Tf.deltaf.fdelta)((-pvpro.cv + ptpt*f.T) /(pro.cv));	pro.kappa = 1/(f.df.Rf.df.Tf.deltaf.fdelta)((-pvpro.cv + ptpt*f.T) /(pro.cv));
pro.a = abs(f.R_sf.T(2f.deltaf.fdelta + f.deltaf.deltaf.fdeltadelta - ((f.deltaf.fdelta - f.deltaf.tauf.fdeltatau)(f.deltaf.fdelta - f.deltaf.tauf.fdeltatau))/(f.tauf.tau*f.ftautau)))^0.5;	pro.a = abs(f.Rf.T(2f.deltaf.fdelta + f.deltaf.deltaf.fdeltadelta - ((f.deltaf.fdelta - f.deltaf.tauf.fdeltatau)(f.deltaf.fdelta - f.deltaf.tauf.fdeltatau))/(f.tauf.tau*f.ftautau)))^0.5;
pro.ddph = (f.d(pro.cvf.d + pt))/(f.df.dpdpro.cv + f.Tpt*pt); ...

function Media.Common.ThermoFluidSpecial.helmholtzToProps_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... pro.d := f.d;
pro.R_s = f.R_s;	pro.R = f.R;
pro.s = f.R_s(f.tauf.ftau - f.f);	pro.s = f.R(f.tauf.ftau - f.f);
pro.h = f.R_sf.T(f.tauf.ftau + f.deltaf.fdelta);	pro.h = f.Rf.T(f.tauf.ftau + f.deltaf.fdelta);
pro.u = f.R_sf.Tf.tau*f.ftau;	pro.u = f.Rf.Tf.tau*f.ftau;
pd = f.R_sf.Tf.delta(2.0f.fdelta + f.delta*f.fdeltadelta);	pd = f.Rf.Tf.delta(2.0f.fdelta + f.delta*f.fdeltadelta);
pt = f.R_sf.df.delta(f.fdelta - f.tauf.fdeltatau);	pt = f.Rf.df.delta(f.fdelta - f.tauf.fdeltatau);
pv = -(f.df.d)pd; ... gamma = -f.d/pv;
p = f.R_sf.df.Tf.deltaf.fdelta;	p = f.Rf.df.Tf.deltaf.fdelta;
pro.cp = f.R_s(-f.tauf.tauf.ftautau + (f.deltaf.fdelta - f.deltaf.tau f.fdeltatau)^2/(2f.deltaf.fdelta + f.deltaf.deltaf.fdeltadelta));	pro.cp = f.R(-f.tauf.tauf.ftautau + (f.deltaf.fdelta - f.deltaf.tau f.fdeltatau)^2/(2f.deltaf.fdelta + f.deltaf.deltaf.fdeltadelta));
pro.cv = f.R_s(-f.tauf.tau*f.ftautau);	pro.cv = f.R(-f.tauf.tau*f.ftautau);
pro.kappa = 1/(f.df.R_sf.df.Tf.deltaf.fdelta)((-pvpro.cv + ptpt*f.T) /(pro.cv));	pro.kappa = 1/(f.df.Rf.df.Tf.deltaf.fdelta)((-pvpro.cv + ptpt*f.T) /(pro.cv));
pro.a = abs(f.R_sf.T(2f.deltaf.fdelta + f.deltaf.deltaf.fdeltadelta - ((f.deltaf.fdelta - f.deltaf.tauf.fdeltatau)(f.deltaf.fdelta - f.deltaf.tauf.fdeltatau))/(f.tauf.tau*f.ftautau)))^0.5;	pro.a = abs(f.Rf.T(2f.deltaf.fdelta + f.deltaf.deltaf.fdeltadelta - ((f.deltaf.fdelta - f.deltaf.tauf.fdeltatau)(f.deltaf.fdelta - f.deltaf.tauf.fdeltatau))/(f.tauf.tau*f.ftautau)))^0.5;
pro.ddTp = -pt/pd; ...

function Media.Common.ThermoFluidSpecial.helmholtzToProps_dT

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
pro.p := f.R_sf.df.Tf.deltaf.fdelta;	pro.p := f.Rf.df.Tf.deltaf.fdelta;
pro.R_s = f.R_s;	pro.R = f.R;
pro.s = f.R_s(f.tauf.ftau - f.f);	pro.s = f.R(f.tauf.ftau - f.f);
pro.h = f.R_sf.T(f.tauf.ftau + f.deltaf.fdelta);	pro.h = f.Rf.T(f.tauf.ftau + f.deltaf.fdelta);
pro.u = f.R_sf.Tf.tau*f.ftau;	pro.u = f.Rf.Tf.tau*f.ftau;
pv = -(f.df.d)f.R_sf.Tf.delta(2.0f.fdelta + f.delta*f.fdeltadelta);	pv = -(f.df.d)f.Rf.Tf.delta(2.0f.fdelta + f.delta*f.fdeltadelta);
pt = f.R_sf.df.delta(f.fdelta - f.tauf.fdeltatau);	pt = f.Rf.df.delta(f.fdelta - f.tauf.fdeltatau);
pro.cp = f.R_s(-f.tauf.tauf.ftautau + (f.deltaf.fdelta - f.deltaf.tau f.fdeltatau)^2/(2f.deltaf.fdelta + f.deltaf.deltaf.fdeltadelta));	pro.cp = f.R(-f.tauf.tauf.ftautau + (f.deltaf.fdelta - f.deltaf.tau f.fdeltatau)^2/(2f.deltaf.fdelta + f.deltaf.deltaf.fdeltadelta));
pro.cv = f.R_s(-f.tauf.tau*f.ftautau);	pro.cv = f.R(-f.tauf.tau*f.ftautau);
pro.kappa = 1/(f.dpro.p)((-pvpro.cv + ptpt*f.T)/(pro.cv));
pro.a = abs(f.R_sf.T(2f.deltaf.fdelta + f.deltaf.deltaf.fdeltadelta - ((f.deltaf.fdelta - f.deltaf.tauf.fdeltatau)(f.deltaf.fdelta - f.deltaf.tauf.fdeltatau))/(f.tauf.tau*f.ftautau)))^0.5;	pro.a = abs(f.Rf.T(2f.deltaf.fdelta + f.deltaf.deltaf.fdeltadelta - ((f.deltaf.fdelta - f.deltaf.tauf.fdeltatau)(f.deltaf.fdelta - f.deltaf.tauf.fdeltatau))/(f.tauf.tau*f.ftautau)))^0.5;
pro.dudT = (pro.p - f.Tpt)/(f.df.d); ...

function Media.Common.ThermoFluidSpecial.TwoPhaseToProps_ph

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... pro.cv = sat.cv;
pro.R_s = sat.R_s;	pro.R = sat.R;
pro.cp = Modelica400.Constants.inf; ...

function Media.Common.ThermoFluidSpecial.TwoPhaseToProps_dT

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... pro.cp = Modelica400.Constants.inf;
pro.R_s = sat.R_s;	pro.R = sat.R;
pro.kappa = -1/(sat.dsat.p)sat.dpTsat.dpTsat.T/sat.cv; ...

record Media.Common.SaturationProperties

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temp_K
d	Units.SI.Density	SIunits.Density
p	Units.SI.Pressure	SIunits.Pressure
u	Units.SI.SpecificEnergy	SIunits.SpecificEnergy
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
cp	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity
cv	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity
kappa	Units.SI.RatioOfSpecificHeatCapacities	SIunits.RatioOfSpecificHeatCapacities
x	Units.SI.MassFraction	SIunits.MassFraction
R_s	Present
R		Present

record Media.Common.SaturationBoundaryProperties

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temp_K
dl	Units.SI.Density	SIunits.Density
dv	Units.SI.Density	SIunits.Density
hl	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
hv	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
x	Units.SI.MassFraction	SIunits.MassFraction

record Media.Common.IF97BaseTwoPhase

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
cp	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity
cv	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity
rho	Units.SI.Density	SIunits.Density
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
R_s	Present
R		Present

record Media.Common.IF97PhaseBoundaryProperties

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature
d	Units.SI.Density	SIunits.Density
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
cp	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity
cv	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity
R_s	Present
R		Present

record Media.Common.GibbsDerivs

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
R_s	Present
R		Present

record Media.Common.HelmholtzDerivs

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
R_s	Present
R		Present

record Media.Common.TwoPhaseTransportProps

Component	Modelica 4.0.0	Modelica 3.2.3
d_vap	Units.SI.Density	SIunits.Density
d_liq	Units.SI.Density	SIunits.Density
eta_vap	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
eta_liq	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
lam_vap	Units.SI.ThermalConductivity	SIunits.ThermalConductivity
lam_liq	Units.SI.ThermalConductivity	SIunits.ThermalConductivity
cp_vap	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity
cp_liq	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity
x	Units.SI.MassFraction	SIunits.MassFraction

record Media.Common.PhaseBoundaryProperties

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
u	Units.SI.SpecificEnergy	SIunits.SpecificEnergy
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
cp	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity
cv	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

record Media.Common.NewtonDerivatives_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

record Media.Common.NewtonDerivatives_ps

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

record Media.Common.NewtonDerivatives_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure

record Media.Common.BridgmansTables

Component	Modelica 4.0.0	Modelica 3.2.3
v	Units.SI.SpecificVolume	SIunits.SpecificVolume
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
cp	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

record Media.Common.FundamentalConstants

Component	Modelica 4.0.0	Modelica 3.2.3
R_bar	Units.SI.MolarHeatCapacity	SIunits.MolarHeatCapacity
MM	Units.SI.MolarMass	SIunits.MolarMass
rhored	Units.SI.MolarDensity	SIunits.MolarDensity
Tred	Units.SI.Temperature	SIunits.Temperature
pred	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
h_off	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
s_off	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
R_s	Present
R		Present

record Media.Common.AuxiliaryProperties

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
cp	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity
cv	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity
rho	Units.SI.Density	SIunits.Density
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
pt	Units.SI.DerPressureByTemperature	SIunits.DerPressureByTemperature
pd	Units.SI.DerPressureByDensity	SIunits.DerPressureByDensity
R_s	Present
R		Present

record Media.Common.GibbsDerivs2

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
R_s	Present
R		Present

record Media.Common.NewtonDerivatives_dT

Component	Modelica 4.0.0	Modelica 3.2.3
v	Units.SI.SpecificVolume	SIunits.SpecificVolume

function Media.Common.gibbsToBridgmansTables

Component	Modelica 4.0.0	Modelica 3.2.3
v	Units.SI.SpecificVolume	SIunits.SpecificVolume
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
cp	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
vt := g.R_s/g.p(g.pig.gpi - g.taug.pig.gtaupi);	vt := g.R/g.p(g.pig.gpi - g.taug.pig.gtaupi);
vp = g.R_sg.T/(g.pg.p)g.pig.pi*g.gpipi;	vp = g.Rg.T/(g.pg.p)g.pig.pi*g.gpipi;
v = (g.R_sg.Tg.pi*g.gpi)/g.p;	v = (g.Rg.Tg.pi*g.gpi)/g.p;
s = g.R_s(g.taug.gtau - g.g);	s = g.R(g.taug.gtau - g.g);
cp = -g.R_sg.taug.tau*g.gtautau;	cp = -g.Rg.taug.tau*g.gtautau;
alpha = vt/v; ...

function Media.Common.helmholtzToBridgmansTables

Component	Modelica 4.0.0	Modelica 3.2.3
v	Units.SI.SpecificVolume	SIunits.SpecificVolume
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
cp	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity
cv	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
p := f.R_sf.df.Tf.deltaf.fdelta;	p := f.Rf.df.Tf.deltaf.fdelta;
pv = -(f.df.d)f.R_sf.Tf.delta(2.0f.fdelta + f.delta*f.fdeltadelta);	pv = -(f.df.d)f.Rf.Tf.delta(2.0f.fdelta + f.delta*f.fdeltadelta);
pt = f.R_sf.df.delta(f.fdelta - f.tauf.fdeltatau);	pt = f.Rf.df.delta(f.fdelta - f.tauf.fdeltatau);
s = f.R_s(f.tauf.ftau - f.f);	s = f.R(f.tauf.ftau - f.f);
alpha = -f.d*pt/pv;
gamma = -f.d/pv;
cp = f.R_s(-f.tauf.tauf.ftautau + (f.deltaf.fdelta - f.deltaf.tauf.fdeltatau) ^2/(2f.deltaf.fdelta + f.deltaf.deltaf.fdeltadelta));	cp = f.R(-f.tauf.tauf.ftautau + (f.deltaf.fdelta - f.deltaf.tauf.fdeltatau) ^2/(2f.deltaf.fdelta + f.deltaf.deltaf.fdeltadelta));

function Media.Common.gibbsToBoundaryProps

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
sat.d := g.p/(g.R_sg.Tg.pi*g.gpi);	sat.d := g.p/(g.Rg.Tg.pi*g.gpi);
sat.h = g.R_sg.Tg.tau*g.gtau;	sat.h = g.Rg.Tg.tau*g.gtau;
sat.u = g.Tg.R_s(g.taug.gtau - g.pig.gpi);	sat.u = g.Tg.R(g.taug.gtau - g.pig.gpi);
sat.s = g.R_s(g.taug.gtau - g.g);	sat.s = g.R(g.taug.gtau - g.g);
sat.cp = -g.R_sg.taug.tau*g.gtautau;	sat.cp = -g.Rg.taug.tau*g.gtautau;
sat.cv = g.R_s(-g.taug.taug.gtautau + (g.gpi - g.taug.gtaupi)(g.gpi - g.tau g.gtaupi)/(g.gpipi));	sat.cv = g.R(-g.taug.taug.gtautau + (g.gpi - g.taug.gtaupi)(g.gpi - g.tau g.gtaupi)/(g.gpipi));
vt = g.R_s/g.p(g.pig.gpi - g.taug.pig.gtaupi);	vt = g.R/g.p(g.pig.gpi - g.taug.pig.gtaupi);
vp = g.R_sg.T/(g.pg.p)g.pig.pi*g.gpipi;	vp = g.Rg.T/(g.pg.p)g.pig.pi*g.gpipi;
sat.pt = -g.p/g.T(g.gpi - g.taug.gtaupi)/(g.gpipi*g.pi);
sat.pd = -g.R_sg.Tg.gpi*g.gpi/(g.gpipi);	sat.pd = -g.Rg.Tg.gpi*g.gpi/(g.gpipi);

function Media.Common.helmholtzToBoundaryProps

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
p := f.R_sf.df.Tf.deltaf.fdelta;	p := f.Rf.df.Tf.deltaf.fdelta;
sat.d = f.d;
sat.h = f.R_sf.T(f.tauf.ftau + f.deltaf.fdelta);	sat.h = f.Rf.T(f.tauf.ftau + f.deltaf.fdelta);
sat.s = f.R_s(f.tauf.ftau - f.f);	sat.s = f.R(f.tauf.ftau - f.f);
sat.u = f.R_sf.Tf.tau*f.ftau;	sat.u = f.Rf.Tf.tau*f.ftau;
sat.cp = f.R_s(-f.tauf.tauf.ftautau + (f.deltaf.fdelta - f.deltaf.tauf.fdeltatau) ^2/(2f.deltaf.fdelta + f.deltaf.deltaf.fdeltadelta));	sat.cp = f.R(-f.tauf.tauf.ftautau + (f.deltaf.fdelta - f.deltaf.tauf.fdeltatau) ^2/(2f.deltaf.fdelta + f.deltaf.deltaf.fdeltadelta));
sat.cv = f.R_s(-f.tauf.tau*f.ftautau);	sat.cv = f.R(-f.tauf.tau*f.ftautau);
sat.pt = f.R_sf.df.delta(f.fdelta - f.tauf.fdeltatau);	sat.pt = f.Rf.df.delta(f.fdelta - f.tauf.fdeltatau);
sat.pd = f.R_sf.Tf.delta(2.0f.fdelta + f.delta*f.fdeltadelta);	sat.pd = f.Rf.Tf.delta(2.0f.fdelta + f.delta*f.fdeltadelta);

function Media.Common.cv2Phase

Component	Modelica 4.0.0	Modelica 3.2.3
x	Units.SI.MassFraction	SIunits.MassFraction
T	Units.SI.Temperature	SIunits.Temperature
p	Units.SI.Pressure	SIunits.Pressure
cv	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

function Media.Common.cvdpT2Phase

Component	Modelica 4.0.0	Modelica 3.2.3
x	Units.SI.MassFraction	SIunits.MassFraction
T	Units.SI.Temperature	SIunits.Temperature
p	Units.SI.Pressure	SIunits.Pressure
cv	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

function Media.Common.gibbsToExtraDerivs

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
v	Units.SI.SpecificVolume	SIunits.SpecificVolume
cv	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity
cp	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
d := g.p/(g.R_sg.Tg.pi*g.gpi);	d := g.p/(g.Rg.Tg.pi*g.gpi);
v = 1/d;
vt = g.R_s/g.p(g.pig.gpi - g.taug.pig.gtaupi);	vt = g.R/g.p(g.pig.gpi - g.taug.pig.gtaupi);
vp = g.R_sg.T/(g.pg.p)g.pig.pi*g.gpipi;	vp = g.Rg.T/(g.pg.p)g.pig.pi*g.gpipi;
cp = -g.R_sg.taug.tau*g.gtautau;	cp = -g.Rg.taug.tau*g.gtautau;
cv = g.R_s(-g.taug.taug.gtautau + (g.gpi - g.taug.gtaupi)(g.gpi - g.tau g.gtaupi)/g.gpipi);	cv = g.R(-g.taug.taug.gtautau + (g.gpi - g.taug.gtaupi)(g.gpi - g.tau g.gtaupi)/g.gpipi);
dpro.kappa = -1/(dg.p)cp/(vpcp + vtvt*g.T); ...

function Media.Common.helmholtzToExtraDerivs

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
v	Units.SI.SpecificVolume	SIunits.SpecificVolume
cv	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... v := 1/f.d;
p = f.R_sf.df.Tf.deltaf.fdelta;	p = f.Rf.df.Tf.deltaf.fdelta;
pv = -(f.df.d)f.R_sf.Tf.delta(2.0f.fdelta + f.delta*f.fdeltadelta);	pv = -(f.df.d)f.Rf.Tf.delta(2.0f.fdelta + f.delta*f.fdeltadelta);
pt = f.R_sf.df.delta(f.fdelta - f.tauf.fdeltatau);	pt = f.Rf.df.delta(f.fdelta - f.tauf.fdeltatau);
cv = f.R_s(-f.tauf.tau*f.ftautau);	cv = f.R(-f.tauf.tau*f.ftautau);
dpro.kappa = 1/(f.dp)((-pvcv + ptpt*f.T)/(cv)); ...

function Media.Common.Helmholtz_ph

Component	Modelica 4.0.0	Modelica 3.2.3
cv	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
cv := -f.R_s(f.tauf.tau*f.ftautau);	cv := -f.R(f.tauf.tau*f.ftautau);
nderivs.p = f.df.R_sf.Tf.deltaf.fdelta;	nderivs.p = f.df.Rf.Tf.deltaf.fdelta;
nderivs.h = f.R_sf.T(f.tauf.ftau + f.deltaf.fdelta);	nderivs.h = f.Rf.T(f.tauf.ftau + f.deltaf.fdelta);
nderivs.pd = f.R_sf.Tf.delta(2.0f.fdelta + f.delta*f.fdeltadelta);	nderivs.pd = f.Rf.Tf.delta(2.0f.fdelta + f.delta*f.fdeltadelta);
nderivs.pt = f.R_sf.df.delta(f.fdelta - f.tauf.fdeltatau);	nderivs.pt = f.Rf.df.delta(f.fdelta - f.tauf.fdeltatau);
nderivs.ht = cv + nderivs.pt/f.d; ...

function Media.Common.Helmholtz_pT

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
nderivs.p := f.df.R_sf.Tf.deltaf.fdelta;	nderivs.p := f.df.Rf.Tf.deltaf.fdelta;
nderivs.pd = f.R_sf.Tf.delta(2.0f.fdelta + f.delta*f.fdeltadelta);	nderivs.pd = f.Rf.Tf.delta(2.0f.fdelta + f.delta*f.fdeltadelta);

function Media.Common.Helmholtz_ps

Component	Modelica 4.0.0	Modelica 3.2.3
cv	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
cv := -f.R_s(f.tauf.tau*f.ftautau);	cv := -f.R(f.tauf.tau*f.ftautau);
nderivs.p = f.df.R_sf.Tf.deltaf.fdelta;	nderivs.p = f.df.Rf.Tf.deltaf.fdelta;
nderivs.s = f.R_s(f.tauf.ftau - f.f);	nderivs.s = f.R(f.tauf.ftau - f.f);
nderivs.pd = f.R_sf.Tf.delta(2.0f.fdelta + f.delta*f.fdeltadelta);	nderivs.pd = f.Rf.Tf.delta(2.0f.fdelta + f.delta*f.fdeltadelta);
nderivs.pt = f.R_sf.df.delta(f.fdelta - f.tauf.fdeltatau);	nderivs.pt = f.Rf.df.delta(f.fdelta - f.tauf.fdeltatau);
nderivs.st = cv/f.T; ...

function Media.Air.DryAirNasa.dynamicViscosity

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
eta := 1e-6*Polynomials.evaluateWithRange( {9.7391102886305869E-15,-3.1353724870333906E-11,4.3004876595642225E-08, -3.8228016291758240E-05,5.0427874367180762E-02,1.7239260139242528E+01}, Cv.to_degC(123.15), Cv.to_degC(1273.15), Cv.to_degC(state.T));	eta := 1e-6*Polynomials_Temp.evaluateWithRange( {9.7391102886305869E-15,-3.1353724870333906E-11,4.3004876595642225E-08, -3.8228016291758240E-05,5.0427874367180762E-02,1.7239260139242528E+01}, Cv.to_degC(123.15), Cv.to_degC(1273.15), Cv.to_degC(state.T));

function Media.Air.DryAirNasa.thermalConductivity

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
lambda := 1e-3*Polynomials.evaluateWithRange( {6.5691470817717812E-15,-3.4025961923050509E-11,5.3279284846303157E-08, -4.5340839289219472E-05,7.6129675309037664E-02,2.4169481088097051E+01}, Cv.to_degC(123.15), Cv.to_degC(1273.15), Cv.to_degC(state.T));	lambda := 1e-3*Polynomials_Temp.evaluateWithRange( {6.5691470817717812E-15,-3.4025961923050509E-11,5.3279284846303157E-08, -4.5340839289219472E-05,7.6129675309037664E-02,2.4169481088097051E+01}, Cv.to_degC(123.15), Cv.to_degC(1273.15), Cv.to_degC(state.T));

model Media.Air.ReferenceAir.Air_Base.BaseProperties

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
MM = Air_Utilities.Basic.Constants.MM;	MM = ReferenceAir.Air_Utilities.Basic.Constants.MM;
if dT_explicit then ... u = h - p/d;
R_s = Air_Utilities.Basic.Constants.R_s;	R = Constants.R;
h = state.h; ...

package Media.Air.ReferenceAir.Air_Utilities.Basic

Component	Modelica 4.0.0	Modelica 3.2.3
Constants	final R_s=287.117
Constants		final R=287.117

function Media.Air.ReferenceAir.Air_Utilities.Basic.Helmholtz

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... f.T = T;
f.R_s = ReferenceAir.Air_Utilities.Basic.Constants.R_s;	f.R = ReferenceAir.Air_Utilities.Basic.Constants.R;
f.delta = d/(ReferenceAir.Air_Utilities.Basic.Constants.MM* ReferenceAir.Air_Utilities.Basic.Constants.rhored); ...

function Media.Air.ReferenceAir.Air_Utilities.Inverses.dofpT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
delp	Units.SI.Pressure	SIunits.Pressure
d	Units.SI.Density	SIunits.Density
deld	Units.SI.Density	SIunits.Density

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
d := p/(ReferenceAir.Air_Utilities.Basic.Constants.R_s*T);	d := p/(ReferenceAir.Air_Utilities.Basic.Constants.R*T);
while ((i < 100) and not found) loop ...

function Media.Air.ReferenceAir.Air_Utilities.Inverses.dTofph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
delp	Units.SI.Pressure	SIunits.Pressure
delh	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
Tguess	Units.SI.Temperature	SIunits.Temperature
dguess	Units.SI.Density	SIunits.Density

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... T := h/1000 + 273.15;
d = p/(ReferenceAir.Air_Utilities.Basic.Constants.R_s*T);	d = p/(ReferenceAir.Air_Utilities.Basic.Constants.R*T);
i = 0; ...

function Media.Air.ReferenceAir.Air_Utilities.Inverses.dTofps

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
delp	Units.SI.Pressure	SIunits.Pressure
dels	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
Tguess	Units.SI.Temperature	SIunits.Temperature
dguess	Units.SI.Density	SIunits.Density

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... T := 273.15;
d = p/(ReferenceAir.Air_Utilities.Basic.Constants.R_s*T);	d = p/(ReferenceAir.Air_Utilities.Basic.Constants.R*T);
i = 0; ...

function Media.Air.ReferenceAir.Air_Utilities.Transport.eta_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
eta	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
eta_0	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
eta_r	Units.SI.DynamicViscosity	SIunits.DynamicViscosity

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
Omega := exp(Modelica400.Math.Polynomials.evaluate({b[5],b[4],b[3],b[2],b[1]}, log(T/103.3)));	Omega := exp( Modelica323.Media.Incompressible.TableBased.Polynomials_Temp.evaluate({b[5],b[ 4],b[3],b[2],b[1]}, log(T/103.3)));
eta_0 = 0.0266958sqrt(1000ReferenceAir.Air_Utilities.Basic.Constants.MM T)/(0.36^2Omega); ...

function Media.Air.ReferenceAir.Air_Utilities.Transport.lambda_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
lambda	Units.SI.ThermalConductivity	SIunits.ThermalConductivity
lambda_0	Units.SI.ThermalConductivity	SIunits.ThermalConductivity
lambda_r	Units.SI.ThermalConductivity	SIunits.ThermalConductivity
lambda_c	Units.SI.ThermalConductivity	SIunits.ThermalConductivity
eta_0	Units.SI.DynamicViscosity	SIunits.DynamicViscosity

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... f = Basic.Helmholtz(d, T);
Omega = exp(Modelica400.Math.Polynomials.evaluate({b[5],b[4],b[3],b[2],b[1]}, log(T/103.3)));	Omega = exp( Modelica323.Media.Incompressible.TableBased.Polynomials_Temp.evaluate({b[5],b[ 4],b[3],b[2],b[1]}, log(T/103.3)));
eta_0 = 0.0266958sqrt(1000ReferenceAir.Air_Utilities.Basic.Constants.MM T)/(0.36^2Omega); ... end for;
pddT = ReferenceAir.Air_Utilities.Basic.Constants.R_sT(1 + 2f.delta (f.fdelta - 1/f.delta) + f.delta^2*(f.fdeltadelta + 1/f.delta^2));	pddT = ReferenceAir.Air_Utilities.Basic.Constants.RT(1 + 2f.delta (f.fdelta - 1/f.delta) + f.delta^2*(f.fdeltadelta + 1/f.delta^2));
xi = ReferenceAir.Air_Utilities.Basic.Constants.pred(d/ReferenceAir.Air_Utilities.Basic.Constants.MM) /ReferenceAir.Air_Utilities.Basic.Constants.rhored^2/(pddT ReferenceAir.Air_Utilities.Basic.Constants.MM); ... xi = 0.11*(xi/0.055)^(0.63/1.2415);
pdTp = ReferenceAir.Air_Utilities.Basic.Constants.R_sd(1 + f.delta (f.fdelta - 1/f.delta) - f.deltaf.tau*f.fdeltatau);	pdTp = ReferenceAir.Air_Utilities.Basic.Constants.Rd(1 + f.delta (f.fdelta - 1/f.delta) - f.deltaf.tau*f.fdeltatau);
cv = ReferenceAir.Air_Utilities.Basic.Constants.R_s(-f.tauf.tau*f.ftautau);	cv = ReferenceAir.Air_Utilities.Basic.Constants.R(-f.tauf.tau*f.ftautau);
cp = cv + TpdTppdTp/(ddpddT); ...

function Media.Air.ReferenceAir.Air_Utilities.airBaseProp_ps

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... aux.s = s;
aux.R_s = ReferenceAir.Air_Utilities.Basic.Constants.R_s;	aux.R = ReferenceAir.Air_Utilities.Basic.Constants.R;
(aux.rho,aux.T) = Inverses.dTofps( p=p, s=s, delp=iter.delp, dels=iter.dels);
f = Basic.Helmholtz(aux.rho, aux.T);
aux.h = aux.R_saux.T(f.tauf.ftau + f.deltaf.fdelta) - ReferenceAir.Air_Utilities.Basic.Constants.h_off;	aux.h = aux.Raux.T(f.tauf.ftau + f.deltaf.fdelta) - ReferenceAir.Air_Utilities.Basic.Constants.h_off;
aux.pd = aux.R_saux.Tf.delta(2f.fdelta + f.delta*f.fdeltadelta);	aux.pd = aux.Raux.Tf.delta(2f.fdelta + f.delta*f.fdeltadelta);
aux.pt = aux.R_saux.rhof.delta(f.fdelta - f.tauf.fdeltatau);	aux.pt = aux.Raux.rhof.delta(f.fdelta - f.tauf.fdeltatau);
aux.cv = aux.R_s(-f.tauf.tau*f.ftautau);	aux.cv = aux.R(-f.tauf.tau*f.ftautau);
aux.cp = aux.cv + aux.Taux.ptaux.pt/(aux.rhoaux.rhoaux.pd); ...

function Media.Air.ReferenceAir.Air_Utilities.rho_props_ps

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
rho	Units.SI.Density	SIunits.Density

function Media.Air.ReferenceAir.Air_Utilities.rho_ps

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
rho	Units.SI.Density	SIunits.Density

function Media.Air.ReferenceAir.Air_Utilities.T_props_ps

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
T	Units.SI.Temperature	SIunits.Temperature

function Media.Air.ReferenceAir.Air_Utilities.T_ps

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
T	Units.SI.Temperature	SIunits.Temperature

function Media.Air.ReferenceAir.Air_Utilities.h_props_ps

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Air.ReferenceAir.Air_Utilities.h_ps

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Air.ReferenceAir.Air_Utilities.airBaseProp_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... aux.h = h;
aux.R_s = ReferenceAir.Air_Utilities.Basic.Constants.R_s;	aux.R = ReferenceAir.Air_Utilities.Basic.Constants.R;
(aux.rho,aux.T) = Inverses.dTofph( p, h, delp=iter.delp, delh=iter.delh);
f = Basic.Helmholtz(aux.rho, aux.T);
aux.s = aux.R_s(f.tauf.ftau - f.f) - ReferenceAir.Air_Utilities.Basic.Constants.s_off;	aux.s = aux.R(f.tauf.ftau - f.f) - ReferenceAir.Air_Utilities.Basic.Constants.s_off;
aux.pd = aux.R_saux.Tf.delta(2f.fdelta + f.delta*f.fdeltadelta);	aux.pd = aux.Raux.Tf.delta(2f.fdelta + f.delta*f.fdeltadelta);
aux.pt = aux.R_saux.rhof.delta(f.fdelta - f.tauf.fdeltatau);	aux.pt = aux.Raux.rhof.delta(f.fdelta - f.tauf.fdeltatau);
aux.cv = aux.R_s(-f.tauf.tau*f.ftautau);	aux.cv = aux.R(-f.tauf.tau*f.ftautau);
aux.cp = aux.cv + aux.Taux.ptaux.pt/(aux.rhoaux.rhoaux.pd); ...

function Media.Air.ReferenceAir.Air_Utilities.rho_props_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
rho	Units.SI.Density	SIunits.Density

function Media.Air.ReferenceAir.Air_Utilities.rho_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
rho	Units.SI.Density	SIunits.Density

function Media.Air.ReferenceAir.Air_Utilities.rho_ph_der

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Air.ReferenceAir.Air_Utilities.T_props_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
T	Units.SI.Temperature	SIunits.Temperature

function Media.Air.ReferenceAir.Air_Utilities.T_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
T	Units.SI.Temperature	SIunits.Temperature

function Media.Air.ReferenceAir.Air_Utilities.T_ph_der

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Air.ReferenceAir.Air_Utilities.s_props_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Air.ReferenceAir.Air_Utilities.s_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Air.ReferenceAir.Air_Utilities.s_ph_der

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Air.ReferenceAir.Air_Utilities.cv_props_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
cv	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

function Media.Air.ReferenceAir.Air_Utilities.cv_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
cv	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

function Media.Air.ReferenceAir.Air_Utilities.cp_props_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
cp	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

function Media.Air.ReferenceAir.Air_Utilities.cp_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
cp	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

function Media.Air.ReferenceAir.Air_Utilities.beta_props_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
beta	Units.SI.RelativePressureCoefficient	SIunits.RelativePressureCoefficient

function Media.Air.ReferenceAir.Air_Utilities.beta_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
beta	Units.SI.RelativePressureCoefficient	SIunits.RelativePressureCoefficient

function Media.Air.ReferenceAir.Air_Utilities.kappa_props_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
kappa	Units.SI.IsothermalCompressibility	SIunits.IsothermalCompressibility

function Media.Air.ReferenceAir.Air_Utilities.kappa_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
kappa	Units.SI.IsothermalCompressibility	SIunits.IsothermalCompressibility

function Media.Air.ReferenceAir.Air_Utilities.velocityOfSound_props_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
a	Units.SI.Velocity	SIunits.Velocity

function Media.Air.ReferenceAir.Air_Utilities.velocityOfSound_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
a	Units.SI.Velocity	SIunits.Velocity

function Media.Air.ReferenceAir.Air_Utilities.isentropicExponent_props_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Air.ReferenceAir.Air_Utilities.isentropicExponent_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Air.ReferenceAir.Air_Utilities.ddph_props

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
ddph	Units.SI.DerDensityByPressure	SIunits.DerDensityByPressure

function Media.Air.ReferenceAir.Air_Utilities.ddph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
ddph	Units.SI.DerDensityByPressure	SIunits.DerDensityByPressure

function Media.Air.ReferenceAir.Air_Utilities.ddhp_props

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
ddhp	Units.SI.DerDensityByEnthalpy	SIunits.DerDensityByEnthalpy

function Media.Air.ReferenceAir.Air_Utilities.ddhp

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
ddhp	Units.SI.DerDensityByEnthalpy	SIunits.DerDensityByEnthalpy

function Media.Air.ReferenceAir.Air_Utilities.airBaseProp_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... aux.T = T;
aux.R_s = ReferenceAir.Air_Utilities.Basic.Constants.R_s;	aux.R = ReferenceAir.Air_Utilities.Basic.Constants.R;
(aux.rho) = Inverses.dofpT( p=p, T=T, delp=iter.delp);
f = Basic.Helmholtz(aux.rho, T);
aux.h = aux.R_sT(f.tauf.ftau + f.deltaf.fdelta) - ReferenceAir.Air_Utilities.Basic.Constants.h_off;	aux.h = aux.RT(f.tauf.ftau + f.deltaf.fdelta) - ReferenceAir.Air_Utilities.Basic.Constants.h_off;
aux.s = aux.R_s(f.tauf.ftau - f.f) - ReferenceAir.Air_Utilities.Basic.Constants.s_off;	aux.s = aux.R(f.tauf.ftau - f.f) - ReferenceAir.Air_Utilities.Basic.Constants.s_off;
aux.pd = aux.R_sTf.delta(2f.fdelta + f.delta*f.fdeltadelta);	aux.pd = aux.RTf.delta(2f.fdelta + f.delta*f.fdeltadelta);
aux.pt = aux.R_saux.rhof.delta(f.fdelta - f.tauf.fdeltatau);	aux.pt = aux.Raux.rhof.delta(f.fdelta - f.tauf.fdeltatau);
aux.cv = aux.R_s(-f.tauf.tau*f.ftautau);	aux.cv = aux.R(-f.tauf.tau*f.ftautau);
aux.cp = aux.cv + aux.Taux.ptaux.pt/(aux.rhoaux.rhoaux.pd); ...

function Media.Air.ReferenceAir.Air_Utilities.rho_props_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
rho	Units.SI.Density	SIunits.Density

function Media.Air.ReferenceAir.Air_Utilities.rho_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
rho	Units.SI.Density	SIunits.Density

function Media.Air.ReferenceAir.Air_Utilities.rho_pT_der

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature

function Media.Air.ReferenceAir.Air_Utilities.h_props_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Air.ReferenceAir.Air_Utilities.h_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Air.ReferenceAir.Air_Utilities.h_pT_der

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature

function Media.Air.ReferenceAir.Air_Utilities.s_props_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Air.ReferenceAir.Air_Utilities.s_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Air.ReferenceAir.Air_Utilities.cv_props_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
cv	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

function Media.Air.ReferenceAir.Air_Utilities.cv_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
cv	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

function Media.Air.ReferenceAir.Air_Utilities.cp_props_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
cp	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

function Media.Air.ReferenceAir.Air_Utilities.cp_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
cp	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

function Media.Air.ReferenceAir.Air_Utilities.beta_props_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
beta	Units.SI.RelativePressureCoefficient	SIunits.RelativePressureCoefficient

function Media.Air.ReferenceAir.Air_Utilities.beta_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
beta	Units.SI.RelativePressureCoefficient	SIunits.RelativePressureCoefficient

function Media.Air.ReferenceAir.Air_Utilities.kappa_props_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
kappa	Units.SI.IsothermalCompressibility	SIunits.IsothermalCompressibility

function Media.Air.ReferenceAir.Air_Utilities.kappa_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
kappa	Units.SI.IsothermalCompressibility	SIunits.IsothermalCompressibility

function Media.Air.ReferenceAir.Air_Utilities.velocityOfSound_props_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
a	Units.SI.Velocity	SIunits.Velocity

function Media.Air.ReferenceAir.Air_Utilities.velocityOfSound_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
a	Units.SI.Velocity	SIunits.Velocity

function Media.Air.ReferenceAir.Air_Utilities.isentropicExponent_props_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature

function Media.Air.ReferenceAir.Air_Utilities.isentropicExponent_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature

function Media.Air.ReferenceAir.Air_Utilities.airBaseProp_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... aux.T = T;
aux.R_s = ReferenceAir.Air_Utilities.Basic.Constants.R_s;	aux.R = ReferenceAir.Air_Utilities.Basic.Constants.R;
f = Basic.Helmholtz(d, T);
aux.p = aux.R_sdTf.deltaf.fdelta;	aux.p = aux.RdTf.deltaf.fdelta;
aux.h = aux.R_sT(f.tauf.ftau + f.deltaf.fdelta) - ReferenceAir.Air_Utilities.Basic.Constants.h_off;	aux.h = aux.RT(f.tauf.ftau + f.deltaf.fdelta) - ReferenceAir.Air_Utilities.Basic.Constants.h_off;
aux.s = aux.R_s(f.tauf.ftau - f.f) - ReferenceAir.Air_Utilities.Basic.Constants.s_off;	aux.s = aux.R(f.tauf.ftau - f.f) - ReferenceAir.Air_Utilities.Basic.Constants.s_off;
aux.pd = aux.R_sTf.delta(2f.fdelta + f.delta*f.fdeltadelta);	aux.pd = aux.RTf.delta(2f.fdelta + f.delta*f.fdeltadelta);
aux.pt = aux.R_sdf.delta(f.fdelta - f.tauf.fdeltatau);	aux.pt = aux.Rdf.delta(f.fdelta - f.tauf.fdeltatau);
aux.cv = aux.R_s(-f.tauf.tau*f.ftautau);	aux.cv = aux.R(-f.tauf.tau*f.ftautau);
aux.cp = aux.cv + aux.Taux.ptaux.pt/(ddaux.pd); ...

function Media.Air.ReferenceAir.Air_Utilities.h_props_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Air.ReferenceAir.Air_Utilities.h_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Air.ReferenceAir.Air_Utilities.h_dT_der

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature

function Media.Air.ReferenceAir.Air_Utilities.p_props_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
p	Units.SI.Pressure	SIunits.Pressure

function Media.Air.ReferenceAir.Air_Utilities.p_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
p	Units.SI.Pressure	SIunits.Pressure

function Media.Air.ReferenceAir.Air_Utilities.p_dT_der

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature

function Media.Air.ReferenceAir.Air_Utilities.s_props_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Air.ReferenceAir.Air_Utilities.s_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Air.ReferenceAir.Air_Utilities.cv_props_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
cv	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

function Media.Air.ReferenceAir.Air_Utilities.cv_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
cv	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

function Media.Air.ReferenceAir.Air_Utilities.cp_props_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
cp	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

function Media.Air.ReferenceAir.Air_Utilities.cp_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
cp	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

function Media.Air.ReferenceAir.Air_Utilities.beta_props_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
beta	Units.SI.RelativePressureCoefficient	SIunits.RelativePressureCoefficient

function Media.Air.ReferenceAir.Air_Utilities.beta_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
beta	Units.SI.RelativePressureCoefficient	SIunits.RelativePressureCoefficient

function Media.Air.ReferenceAir.Air_Utilities.kappa_props_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
kappa	Units.SI.IsothermalCompressibility	SIunits.IsothermalCompressibility

function Media.Air.ReferenceAir.Air_Utilities.kappa_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
kappa	Units.SI.IsothermalCompressibility	SIunits.IsothermalCompressibility

function Media.Air.ReferenceAir.Air_Utilities.velocityOfSound_props_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
a	Units.SI.Velocity	SIunits.Velocity

function Media.Air.ReferenceAir.Air_Utilities.velocityOfSound_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
a	Units.SI.Velocity	SIunits.Velocity

function Media.Air.ReferenceAir.Air_Utilities.isentropicExponent_props_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature

function Media.Air.ReferenceAir.Air_Utilities.isentropicExponent_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature

function Media.Air.ReferenceAir.Air_Utilities.ThermoFluidSpecial.air_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
T	Units.SI.Temperature	SIunits.Temperature
d	Units.SI.Density	SIunits.Density

function Media.Air.ReferenceAir.Air_Utilities.ThermoFluidSpecial.air_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
p	Units.SI.Pressure	SIunits.Pressure

function Media.Air.ReferenceAir.Air_Utilities.ThermoFluidSpecial.air_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
d	Units.SI.Density	SIunits.Density

package Media.Air.MoistAir

Component	Modelica 4.0.0	Modelica 3.2.3
MMX	Units.SI.MolarMass	SIunits.MolarMass

model Media.Air.MoistAir.BaseProperties

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... h = specificEnthalpy_pTX( p, T, Xi);
R_s = dryair.R_s(X_air/(1 - X_liquid)) + steam.R_sX_steam/(1 - X_liquid);	R = dryair.R(X_air/(1 - X_liquid)) + steam.RX_steam/(1 - X_liquid);
u = h - R_s*T;	u = h - R*T;
d = p/(R_s*T);	d = p/(R*T);
state.p = p; ...

function Media.Air.MoistAir.setState_dTX

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
state := if size(X, 1) == nX then ThermodynamicState( p=d({steam.R_s,dryair.R_s}X)T, T=T, X=X) else ThermodynamicState( p=d({steam.R_s,dryair.R_s}cat( 1, X, {1 - sum(X)}))T, T=T, X=cat( 1, X, {1 - sum(X)}));	state := if size(X, 1) == nX then ThermodynamicState( p=d({steam.R,dryair.R}X)T, T=T, X=X) else ThermodynamicState( p=d({steam.R,dryair.R}cat( 1, X, {1 - sum(X)}))T, T=T, X=cat( 1, X, {1 - sum(X)}));

function Media.Air.MoistAir.xsaturation_pT

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature

function Media.Air.MoistAir.relativeHumidity_pTX

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
X	Units.SI.MassFraction	SIunits.MassFraction
p_steam_sat	Units.SI.Pressure	SIunits.Pressure
X_air	Units.SI.MassFraction	SIunits.MassFraction

function Media.Air.MoistAir.gasConstant

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
R_s := dryair.R_s(1 - state.X[Water]) + steam.R_sstate.X[Water];	R := dryair.R(1 - state.X[Water]) + steam.Rstate.X[Water];

function Media.Air.MoistAir.gasConstant_X

Component	Modelica 4.0.0	Modelica 3.2.3
X	Units.SI.MassFraction	SIunits.MassFraction
R_s	Present
R		Present

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
R_s := dryair.R_s(1 - X[Water]) + steam.R_sX[Water];	R := dryair.R(1 - X[Water]) + steam.RX[Water];

function Media.Air.MoistAir.saturationPressureLiquid

Component	Modelica 4.0.0	Modelica 3.2.3
Tsat	Units.SI.Temperature	SIunits.Temperature
psat	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
Tcritical	Units.SI.Temperature	SIunits.Temperature
pcritical	Units.SI.AbsolutePressure	SIunits.AbsolutePressure

function Media.Air.MoistAir.saturationPressureLiquid_der

Component	Modelica 4.0.0	Modelica 3.2.3
Tsat	Units.SI.Temperature	SIunits.Temperature
Tcritical	Units.SI.Temperature	SIunits.Temperature
pcritical	Units.SI.AbsolutePressure	SIunits.AbsolutePressure

function Media.Air.MoistAir.sublimationPressureIce

Component	Modelica 4.0.0	Modelica 3.2.3
Tsat	Units.SI.Temperature	SIunits.Temperature
psat	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
Ttriple	Units.SI.Temperature	SIunits.Temperature
ptriple	Units.SI.AbsolutePressure	SIunits.AbsolutePressure

function Media.Air.MoistAir.sublimationPressureIce_der

Component	Modelica 4.0.0	Modelica 3.2.3
Tsat	Units.SI.Temperature	SIunits.Temperature
Ttriple	Units.SI.Temperature	SIunits.Temperature
ptriple	Units.SI.AbsolutePressure	SIunits.AbsolutePressure

function Media.Air.MoistAir.saturationTemperature

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T_min	Units.SI.Temperature	SIunits.Temperature
T_max	Units.SI.Temperature	SIunits.Temperature
T	Units.SI.Temperature	SIunits.Temperature

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
T := Modelica400.Math.Nonlinear.solveOneNonlinearEquation( function f_nonlinear(p=p), T_min, T_max);	T := Internal.solve( p, T_min, T_max, f_nonlinear_data=Internal.f_nonlinear_Data());

function Media.Air.MoistAir.enthalpyOfWater

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Air.MoistAir.enthalpyOfWater_der

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature

function Media.Air.MoistAir.T_phX

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
T := Modelica400.Math.Nonlinear.solveOneNonlinearEquation( function f_nonlinear( p=p, h=h, X=X[1:nXi]), 190, 647);	T := Internal.solve( h, 190, 647, p, X[1:nXi], steam);

function Media.Air.MoistAir.h_pTX

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
X	Units.SI.MassFraction	SIunits.MassFraction
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
p_steam_sat	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
X_sat	Units.SI.MassFraction	SIunits.MassFraction
X_liquid	Units.SI.MassFraction	SIunits.MassFraction
X_steam	Units.SI.MassFraction	SIunits.MassFraction
X_air	Units.SI.MassFraction	SIunits.MassFraction

function Media.Air.MoistAir.h_pTX_der

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
X	Units.SI.MassFraction	SIunits.MassFraction
p_steam_sat	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
X_sat	Units.SI.MassFraction	SIunits.MassFraction
X_liquid	Units.SI.MassFraction	SIunits.MassFraction
X_steam	Units.SI.MassFraction	SIunits.MassFraction
X_air	Units.SI.MassFraction	SIunits.MassFraction
x_sat	Units.SI.MassFraction	SIunits.MassFraction

function Media.Air.MoistAir.specificInternalEnergy

Component	Modelica 4.0.0	Modelica 3.2.3
u		Present

function Media.Air.MoistAir.specificInternalEnergy_pTX

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
X	Units.SI.MassFraction	SIunits.MassFraction
u	Units.SI.SpecificInternalEnergy	SIunits.SpecificInternalEnergy
p_steam_sat	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
X_liquid	Units.SI.MassFraction	SIunits.MassFraction
X_steam	Units.SI.MassFraction	SIunits.MassFraction
X_air	Units.SI.MassFraction	SIunits.MassFraction
X_sat	Units.SI.MassFraction	SIunits.MassFraction
R_gas	Units.SI.SpecificHeatCapacity	Real

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... X_air = 1 - X[Water];
R_gas = dryair.R_sX_air/(1 - X_liquid) + steam.R_sX_steam/(1 - X_liquid);	R_gas = dryair.RX_air/(1 - X_liquid) + steam.RX_steam/(1 - X_liquid);
u = X_steamModelica400.Media.IdealGases.Common.Functions.h_Tlow( data=steam, T=T, refChoice=ReferenceEnthalpy.UserDefined, h_off=46479.819 + 2501014.5) + X_air Modelica400.Media.IdealGases.Common.Functions.h_Tlow( data=dryair, T=T, refChoice=ReferenceEnthalpy.UserDefined, h_off=25104.684) + enthalpyOfWater(T)X_liquid - R_gasT; ...

function Media.Air.MoistAir.specificInternalEnergy_pTX_der

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
X	Units.SI.MassFraction	SIunits.MassFraction
p_steam_sat	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
X_liquid	Units.SI.MassFraction	SIunits.MassFraction
X_steam	Units.SI.MassFraction	SIunits.MassFraction
X_air	Units.SI.MassFraction	SIunits.MassFraction
X_sat	Units.SI.MassFraction	SIunits.MassFraction
R_gas	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity
x_sat	Units.SI.MassFraction	SIunits.MassFraction

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... X_air = 1 - X[Water];
R_gas = steam.R_sX_steam/(1 - X_liquid) + dryair.R_sX_air/(1 - X_liquid);	R_gas = steam.RX_steam/(1 - X_liquid) + dryair.RX_air/(1 - X_liquid);
dX_air = -dX[Water]; ... dX_steam = dX[Water] - dX_liq;
dR_gas = (steam.R_s(dX_steam(1 - X_liquid) + dX_liqX_steam) + dryair.R_s (dX_air(1 - X_liquid) + dX_liqX_air))/(1 - X_liquid)/(1 - X_liquid);	dR_gas = (steam.R(dX_steam(1 - X_liquid) + dX_liqX_steam) + dryair.R (dX_air(1 - X_liquid) + dX_liqX_air))/(1 - X_liquid)/(1 - X_liquid);
u_der = X_steamModelica400.Media.IdealGases.Common.Functions.h_Tlow_der( data=steam, T=T, refChoice=ReferenceEnthalpy.UserDefined, h_off=46479.819 + 2501014.5, dT=dT) + dX_steamModelica400.Media.IdealGases.Common.Functions.h_Tlow( data=steam, T=T, refChoice=ReferenceEnthalpy.UserDefined, h_off=46479.819 + 2501014.5) + X_air* Modelica400.Media.IdealGases.Common.Functions.h_Tlow_der( data=dryair, T=T, refChoice=ReferenceEnthalpy.UserDefined, h_off=25104.684, dT=dT) + dX_airModelica400.Media.IdealGases.Common.Functions.h_Tlow( data=dryair, T=T, refChoice=ReferenceEnthalpy.UserDefined, h_off=25104.684) + X_liquidenthalpyOfWater_der(T=T, dT=dT) + dX_liq* enthalpyOfWater(T) - dR_gasT - R_gasdT; ...

function Media.Air.MoistAir.dynamicViscosity

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
eta := 1e-6*Polynomials.evaluateWithRange( {9.7391102886305869E-15,-3.1353724870333906E-11,4.3004876595642225E-08, -3.8228016291758240E-05,5.0427874367180762E-02,1.7239260139242528E+01}, Cv.to_degC(123.15), Cv.to_degC(1273.15), Cv.to_degC(state.T));	eta := 1e-6*Polynomials_Temp.evaluateWithRange( {9.7391102886305869E-15,-3.1353724870333906E-11,4.3004876595642225E-08, -3.8228016291758240E-05,5.0427874367180762E-02,1.7239260139242528E+01}, Cv.to_degC(123.15), Cv.to_degC(1273.15), Cv.to_degC(state.T));

function Media.Air.MoistAir.thermalConductivity

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
lambda := 1e-3*Polynomials.evaluateWithRange( {6.5691470817717812E-15,-3.4025961923050509E-11,5.3279284846303157E-08, -4.5340839289219472E-05,7.6129675309037664E-02,2.4169481088097051E+01}, Cv.to_degC(123.15), Cv.to_degC(1273.15), Cv.to_degC(state.T));	lambda := 1e-3*Polynomials_Temp.evaluateWithRange( {6.5691470817717812E-15,-3.4025961923050509E-11,5.3279284846303157E-08, -4.5340839289219472E-05,7.6129675309037664E-02,2.4169481088097051E+01}, Cv.to_degC(123.15), Cv.to_degC(1273.15), Cv.to_degC(state.T));

function Media.Air.MoistAir.density_derX

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
dddX[Water] := - pressure(state)(steam.R_s - dryair.R_s)/(((steam.R_s - dryair.R_s) state.X[Water] + dryair.R_s)^2*temperature(state));	dddX[Water] := pressure(state)(steam.R - dryair.R)/((steam.R - dryair.R) state.X[Water]temperature(state) + dryair.Rtemperature(state))^2;
dddX[Air] = - pressure(state)(dryair.R_s - steam.R_s)/((steam.R_s + (dryair.R_s - steam.R_s) state.X[Air])^2*temperature(state));	dddX[Air] = pressure(state)(dryair.R - steam.R)/((dryair.R - steam.R) state.X[Air]temperature(state) + steam.Rtemperature(state))^2;

function Media.Air.MoistAir.T_psX

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
T := Modelica400.Math.Nonlinear.solveOneNonlinearEquation( function f_nonlinear( p=p, s=s, X=X[1:nX]), 190, 647);	T := Internal.solve( s, 190, 647, p, X[1:nX], steam);

function Media.Air.MoistAir.s_pTX

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
X	Units.SI.MassFraction	SIunits.MassFraction
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
s := Modelica400.Media.IdealGases.Common.Functions.s0_Tlow(dryair, T)(1 - X[ Water]) + Modelica400.Media.IdealGases.Common.Functions.s0_Tlow(steam, T)X[ Water] - Modelica400.Constants.R(Utilities.smoothMax( X[Water]/MMX[Water], 0.0, 1e-9)Modelica400.Math.log(max(Y[Water], Modelica400.Constants.eps)p/ reference_p) + Utilities.smoothMax( (1 - X[Water])/MMX[Air], 0.0, 1e-9)Modelica400.Math.log(max(Y[Air], Modelica400.Constants.eps)*p/ reference_p));	s := Modelica323.Media.IdealGases.Common.Functions.s0_Tlow(dryair, T)(1 - X[ Water]) + Modelica323.Media.IdealGases.Common.Functions.s0_Tlow(steam, T)X[ Water] - Modelica323.Constants.R(Utilities.smoothMax( X[Water]/MMX[Water]Modelica323.Math.log(max(Y[Water], Modelica323.Constants.eps) p/reference_p), 0.0, 1e-9) - Utilities.smoothMax( (1 - X[Water])/MMX[Air]Modelica323.Math.log(max(Y[Air], Modelica323.Constants.eps) *p/reference_p), 0.0, 1e-9));

function Media.Air.MoistAir.s_pTX_der

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
X	Units.SI.MassFraction	SIunits.MassFraction
MM	Present

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
MM := MMX[Water]MMX[Air]/(X[Water]MMX[Air] + X[Air]*MMX[Water]);	ds := Modelica323.Media.IdealGases.Common.Functions.s0_Tlow_der( dryair, T, dT)(1 - X[Water]) + Modelica323.Media.IdealGases.Common.Functions.s0_Tlow_der( steam, T, dT)X[Water] + Modelica323.Media.IdealGases.Common.Functions.s0_Tlow(dryair, T)dX[Air] + Modelica323.Media.IdealGases.Common.Functions.s0_Tlow(steam, T) dX[Water] - Modelica323.Constants.R(1/MMX[Water]Utilities.smoothMax_der( X[Water]Modelica323.Math.log(max(Y[Water], Modelica323.Constants.eps)p/ reference_p), 0.0, 1e-9, (Modelica323.Math.log(max(Y[Water], Modelica323.Constants.eps)p/reference_p) + (X[Water]/Y[Water](X[Air]MMX[Water]/(X[Air]MMX[Water] + X[Water]MMX[ Air])^2)))dX[Water] + X[Water]reference_p/pdp, 0, 0) - 1/MMX[Air]Utilities.smoothMax_der( (1 - X[Water])Modelica323.Math.log(max(Y[Air], Modelica323.Constants.eps)p/ reference_p), 0.0, 1e-9, (Modelica323.Math.log(max(Y[Air], Modelica323.Constants.eps)p/reference_p) + (X[Air]/Y[Air](X[Water]MMX[Air]/(X[Air]MMX[Water] + X[Water]MMX[Air]) ^2)))dX[Air] + X[Air]reference_p/p*dp, 0, 0));
ds = IdealGases.Common.Functions.s0_Tlow_der( dryair, T, dT)(1 - X[Water]) + IdealGases.Common.Functions.s0_Tlow_der( steam, T, dT)X[Water] + Modelica400.Media.IdealGases.Common.Functions.s0_Tlow(dryair, T)dX[Air] + Modelica400.Media.IdealGases.Common.Functions.s0_Tlow(steam, T) dX[Water] - Modelica400.Constants.R(1/MMX[Water](Utilities.smoothMax_der( X[Water], 0.0, 1e-9, dX[Water], 0.0, 0.0)(Modelica400.Math.log(max(Y[Water], Modelica400.Constants.eps)p/ reference_p) + MM/MMX[Air]) + dp/pUtilities.smoothMax( X[Water], 0.0, 1e-9)) + 1/MMX[Air](Utilities.smoothMax_der( X[Air], 0.0, 1e-9, dX[Air], 0.0, 0.0)(Modelica400.Math.log(max(Y[Air], Modelica400.Constants.eps)p/ reference_p) + MM/MMX[Water]) + dp/p*Utilities.smoothMax( X[Air], 0.0, 1e-9)));

package Media.Air.ReferenceMoistAir

Component	Modelica 4.0.0	Modelica 3.2.3
MMX	Units.SI.MolarMass	SIunits.MolarMass

model Media.Air.ReferenceMoistAir.BaseProperties

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... h = specificEnthalpy_pTX( p, T, Xi);
R_s = dryair.R_s(X_air/(1 - X_liquid)) + steam.R_sX_steam/(1 - X_liquid);	R = dryair.R(X_air/(1 - X_liquid)) + steam.RX_steam/(1 - X_liquid);
u = Modelica400.Media.Air.ReferenceMoistAir.Utilities.u_pTX( p, T, Xi); ...

function Media.Air.ReferenceMoistAir.gasConstant

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
R_s := dryair.R_s(1 - state.X[Water]) + steam.R_sstate.X[Water];	R := dryair.R(1 - state.X[Water]) + steam.Rstate.X[Water];

function Media.Air.ReferenceMoistAir.enthalpyOfWater

Component	Modelica 4.0.0	Modelica 3.2.3
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Air.ReferenceMoistAir.enthalpyOfWaterNonVapor

Component	Modelica 4.0.0	Modelica 3.2.3
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Air.ReferenceMoistAir.Utilities.Inverses.T_phX

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
X	Units.SI.MassFraction	SIunits.MassFraction
T	Units.SI.Temperature	SIunits.Temperature

function Media.Air.ReferenceMoistAir.Utilities.Inverses.T_psX

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
X	Units.SI.MassFraction	SIunits.MassFraction
T	Units.SI.Temperature	SIunits.Temperature

function Media.Air.ReferenceMoistAir.Utilities.Inverses.p_dTX

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
X	Units.SI.MassFraction	SIunits.MassFraction
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure

function Media.Air.ReferenceMoistAir.Utilities.Transport.eta_pTX

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
T	Units.SI.Temperature	SIunits.Temperature
X	Units.SI.MassFraction	SIunits.MassFraction
eta	Units.SI.DynamicViscosity	SIunits.DynamicViscosity

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... if (T < 273.16) then
dd = pd/(Modelica400.Media.Air.ReferenceMoistAir.steam.R_s*T);	dd = pd/(Modelica323.Media.Air.ReferenceMoistAir.steam.R*T);
ya = da/(da + dd); ... if (T < 273.16) then
dd = pd/(Modelica400.Media.Air.ReferenceMoistAir.steam.R_s*T);	dd = pd/(Modelica323.Media.Air.ReferenceMoistAir.steam.R*T);
ya = da/(da + dd); ...

function Media.Air.ReferenceMoistAir.Utilities.Transport.lambda_pTX

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
T	Units.SI.Temperature	SIunits.Temperature
X	Units.SI.MassFraction	SIunits.MassFraction
lambda	Units.SI.ThermalConductivity	SIunits.ThermalConductivity

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... if (T < 273.16) then
dd = pd/(Modelica400.Media.Air.ReferenceMoistAir.steam.R_s*T);	dd = pd/(Modelica323.Media.Air.ReferenceMoistAir.steam.R*T);
ya = da/(da + dd); ... if (T < 273.16) then
dd = pd/(Modelica400.Media.Air.ReferenceMoistAir.steam.R_s*T);	dd = pd/(Modelica323.Media.Air.ReferenceMoistAir.steam.R*T);
df = Modelica400.Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.rho_pT(p, T); ...

function Media.Air.ReferenceMoistAir.Utilities.VirialCoefficients.Baa_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
baa	Units.SI.MolarVolume	SIunits.MolarVolume

function Media.Air.ReferenceMoistAir.Utilities.VirialCoefficients.Baw_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
baw	Units.SI.MolarVolume	SIunits.MolarVolume

function Media.Air.ReferenceMoistAir.Utilities.VirialCoefficients.Bww_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
bww	Units.SI.MolarVolume	SIunits.MolarVolume

function Media.Air.ReferenceMoistAir.Utilities.VirialCoefficients.Caaa_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
caaa	Units.SI.MolarVolume	SIunits.MolarVolume

function Media.Air.ReferenceMoistAir.Utilities.VirialCoefficients.Caaw_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature

function Media.Air.ReferenceMoistAir.Utilities.VirialCoefficients.Caww_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature

function Media.Air.ReferenceMoistAir.Utilities.VirialCoefficients.Cwww_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
cwww	Units.SI.MolarVolume	SIunits.MolarVolume

package Media.Air.ReferenceMoistAir.Utilities.ReactionIndices

Component	Modelica 4.0.0	Modelica 3.2.3
BB	Units.SI.Temperature	SIunits.Temperature
CC	Units.SI.MolarHeatCapacity	SIunits.MolarHeatCapacity
DD	Units.SI.MolarInternalEnergy	SIunits.MolarInternalEnergy
p0	Units.SI.AbsolutePressure	SIunits.AbsolutePressure

function Media.Air.ReferenceMoistAir.Utilities.ReactionIndices.U2

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
T	Units.SI.Temperature	SIunits.Temperature
moleFraction	Units.SI.MoleFraction	SIunits.MoleFraction

function Media.Air.ReferenceMoistAir.Utilities.ReactionIndices.U3

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
T	Units.SI.Temperature	SIunits.Temperature
moleFraction	Units.SI.MoleFraction	SIunits.MoleFraction

function Media.Air.ReferenceMoistAir.Utilities.ReactionIndices.U4

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
T	Units.SI.Temperature	SIunits.Temperature
moleFraction	Units.SI.MoleFraction	SIunits.MoleFraction

function Media.Air.ReferenceMoistAir.Utilities.ReactionIndices.U5

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
T	Units.SI.Temperature	SIunits.Temperature
moleFraction	Units.SI.MoleFraction	SIunits.MoleFraction

function Media.Air.ReferenceMoistAir.Utilities.ReactionIndices.U6

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
T	Units.SI.Temperature	SIunits.Temperature
moleFraction	Units.SI.MoleFraction	SIunits.MoleFraction

function Media.Air.ReferenceMoistAir.Utilities.ReactionIndices.V2

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature
v	Units.SI.MolarHeatCapacity	SIunits.MolarHeatCapacity

function Media.Air.ReferenceMoistAir.Utilities.ReactionIndices.V3

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature
v	Units.SI.MolarHeatCapacity	SIunits.MolarHeatCapacity

function Media.Air.ReferenceMoistAir.Utilities.ReactionIndices.V4

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature
v	Units.SI.MolarHeatCapacity	SIunits.MolarHeatCapacity

function Media.Air.ReferenceMoistAir.Utilities.ReactionIndices.V5

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature
v	Units.SI.MolarHeatCapacity	SIunits.MolarHeatCapacity

function Media.Air.ReferenceMoistAir.Utilities.ReactionIndices.V6

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature
v	Units.SI.MolarHeatCapacity	SIunits.MolarHeatCapacity

function Media.Air.ReferenceMoistAir.Utilities.ReactionIndices.U2_der

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
T	Units.SI.Temperature	SIunits.Temperature
moleFraction	Units.SI.MoleFraction	SIunits.MoleFraction

function Media.Air.ReferenceMoistAir.Utilities.ReactionIndices.U3_der

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
T	Units.SI.Temperature	SIunits.Temperature
moleFraction	Units.SI.MoleFraction	SIunits.MoleFraction

function Media.Air.ReferenceMoistAir.Utilities.ReactionIndices.U4_der

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
T	Units.SI.Temperature	SIunits.Temperature
moleFraction	Units.SI.MoleFraction	SIunits.MoleFraction

function Media.Air.ReferenceMoistAir.Utilities.ReactionIndices.U5_der

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
T	Units.SI.Temperature	SIunits.Temperature
moleFraction	Units.SI.MoleFraction	SIunits.MoleFraction

function Media.Air.ReferenceMoistAir.Utilities.ReactionIndices.U6_der

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
T	Units.SI.Temperature	SIunits.Temperature
moleFraction	Units.SI.MoleFraction	SIunits.MoleFraction

function Media.Air.ReferenceMoistAir.Utilities.ReactionIndices.V2_der

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature

function Media.Air.ReferenceMoistAir.Utilities.ReactionIndices.V3_der

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature

function Media.Air.ReferenceMoistAir.Utilities.ReactionIndices.V4_der

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature

function Media.Air.ReferenceMoistAir.Utilities.ReactionIndices.V5_der

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature

function Media.Air.ReferenceMoistAir.Utilities.ReactionIndices.V6_der

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature

function Media.Air.ReferenceMoistAir.Utilities.IF97_new.g2

Component	Modelica 4.0.0	Modelica 3.2.3
function	shortClass
p		Present
T		Present
g		Present
tau2		Present
o		Present

Equations in Modelica 4.0.0

Equations in Modelica 3.2.3

algorithm

g.p := p;
g.T = T;
g.R = Modelica323.Media.Water.IF97_Utilities.BaseIF97.data.RH2O;
g.pi = p/Modelica323.Media.Water.IF97_Utilities.BaseIF97.data.PSTAR2;
g.tau = Modelica323.Media.Water.IF97_Utilities.BaseIF97.data.TSTAR2/T;
tau2 = -0.5 + g.tau;
o[1] = tau2*tau2;
o[2] = o[1]*tau2;
o[3] = -0.050325278727930*o[2];
o[4] = -0.057581259083432 + o[3];
o[5] = o[4]*tau2;
o[6] = -0.045996013696365 + o[5];
o[7] = o[6]*tau2;
o[8] = -0.0178348622923580 + o[7];
o[9] = o[8]*tau2;
o[10] = o[1]*o[1];
o[11] = o[10]*o[10];
o[12] = o[11]*o[11];
o[13] = o[10]*o[11]*o[12]*tau2;
o[14] = o[1]*o[10]*tau2;
o[15] = o[10]*o[11]*tau2;
o[16] = o[1]*o[12]*tau2;
o[17] = o[1]*o[11]*tau2;
o[18] = o[1]*o[10]*o[11];
o[19] = o[10]*o[11]*o[12];
o[20] = o[1]*o[10];
o[21] = g.pi*g.pi;
o[22] = o[21]*o[21];
o[23] = o[21]*o[22];
o[24] = o[10]*o[12]*tau2;
o[25] = o[12]*o[12];
o[26] = o[11]*o[12]*o[25]*tau2;
o[27] = o[10]*o[12];
o[28] = o[1]*o[10]*o[11]*tau2;
o[29] = o[10]*o[12]*o[25]*tau2;
o[30] = o[1]*o[10]*o[25]*tau2;
o[31] = o[1]*o[11]*o[12];
o[32] = o[1]*o[12];
o[33] = g.tau*g.tau;
o[34] = o[33]*o[33];
o[35] = -0.000053349095828174*o[13];
o[36] = -0.087594591301146 + o[35];
o[37] = o[2]*o[36];
o[38] = -0.0078785554486710 + o[37];
o[39] = o[1]*o[38];
o[40] = -0.00037897975032630 + o[39];
o[41] = o[40]*tau2;
o[42] = -0.000066065283340406 + o[41];
o[43] = o[42]*tau2;
o[44] = 5.7870447262208e-6*tau2;
o[45] = -0.301951672367580*o[2];
o[46] = -0.172743777250296 + o[45];
o[47] = o[46]*tau2;
o[48] = -0.091992027392730 + o[47];
o[49] = o[48]*tau2;
o[50] = o[1]*o[11];
o[51] = o[10]*o[11];
o[52] = o[11]*o[12]*o[25];
o[53] = o[10]*o[12]*o[25];
o[54] = o[1]*o[10]*o[25];
o[55] = o[11]*o[12]*tau2;
g.g = g.pi*(-0.00177317424732130 + o[9] + g.pi*(tau2*(-0.000033032641670203 + (
  -0.000189489875163150 + o[1]*(-0.0039392777243355 + (-0.043797295650573 -
  0.0000266745479140870*o[13])*o[2]))*tau2) + g.pi*(2.04817376923090e-8 + (
  4.3870667284435e-7 + o[1]*(-0.000032277677238570 + (-0.00150339245421480 -
  0.040668253562649*o[13])*o[2]))*tau2 + g.pi*(g.pi*(2.29220763376610e-6*o[14]
   + g.pi*((-1.67147664510610e-11 + o[15]*(-0.00211714723213550 -
  23.8957419341040*o[16]))*o[2] + g.pi*(-5.9059564324270e-18 + o[17]*(-1.26218088991010e-6
   - 0.038946842435739*o[18]) + g.pi*(o[11]*(1.12562113604590e-11 -
  8.2311340897998*o[19]) + g.pi*(1.98097128020880e-8*o[15] + g.pi*(o[10]*(
  1.04069652101740e-19 + (-1.02347470959290e-13 - 1.00181793795110e-9*o[10])*o[
  20]) + o[23]*(o[13]*(-8.0882908646985e-11 + 0.106930318794090*o[24]) + o[21]*
  (-0.33662250574171*o[26] + o[21]*(o[27]*(8.9185845355421e-25 + (
  3.06293168762320e-13 - 4.2002467698208e-6*o[15])*o[28]) + g.pi*(-5.9056029685639e-26
  *o[24] + g.pi*(3.7826947613457e-6*o[29] + g.pi*(-1.27686089346810e-15*o[30]
   + o[31]*(7.3087610595061e-29 + o[18]*(5.5414715350778e-17 -
  9.4369707241210e-7*o[32]))*g.pi)))))))))))) + tau2*(-7.8847309559367e-10 + (
  1.27907178522850e-8 + 4.8225372718507e-7*tau2)*tau2))))) + (-0.0056087911830200
   + g.tau*(0.071452738814550 + g.tau*(-0.40710498239280 + g.tau*(
  1.42408197144400 + g.tau*(-4.3839511194500 + g.tau*(-9.6927686002170 + g.tau*
  (10.0866556801800 + (-0.284086326077200 + 0.0212684635330700*g.tau)*g.tau) +
  Modelica323.Math.log(g.pi)))))))/(o[34]*g.tau);
g.gpi = (1.00000000000000 + g.pi*(-0.00177317424732130 + o[9] + g.pi*(
    o[43] + g.pi*(6.1445213076927e-8 + (1.31612001853305e-6 + o[1]*(-0.000096833031715710
     + (-0.0045101773626444 - 0.122004760687947*o[13])*o[2]))*tau2 + g.pi
    *(g.pi*(0.0000114610381688305*o[14] + g.pi*((-1.00288598706366e-10 +
    o[15]*(-0.0127028833928130 - 143.374451604624*o[16]))*o[2] + g.pi*(-4.1341695026989e-17
     + o[17]*(-8.8352662293707e-6 - 0.272627897050173*o[18]) + g.pi*(o[11]
    *(9.0049690883672e-11 - 65.849072718398*o[19]) + g.pi*(
    1.78287415218792e-7*o[15] + g.pi*(o[10]*(1.04069652101740e-18 + (-1.02347470959290e-12
     - 1.00181793795110e-8*o[10])*o[20]) + o[23]*(o[13]*(-1.29412653835176e-9
     + 1.71088510070544*o[24]) + o[21]*(-6.0592051033508*o[26] + o[21]*(o[
    27]*(1.78371690710842e-23 + (6.1258633752464e-12 -
    0.000084004935396416*o[15])*o[28]) + g.pi*(-1.24017662339842e-24*o[24]
     + g.pi*(0.000083219284749605*o[29] + g.pi*(-2.93678005497663e-14*o[
    30] + o[31]*(1.75410265428146e-27 + o[18]*(1.32995316841867e-15 -
    0.0000226487297378904*o[32]))*g.pi)))))))))))) + tau2*(-3.15389238237468e-9
     + (5.1162871409140e-8 + 1.92901490874028e-6*tau2)*tau2))))))/g.pi;
g.gpipi = (-1.00000000000000 + o[21]*(o[43] + g.pi*(
    1.22890426153854e-7 + (2.63224003706610e-6 + o[1]*(-0.000193666063431420
     + (-0.0090203547252888 - 0.244009521375894*o[13])*o[2]))*tau2 + g.pi
    *(g.pi*(0.000045844152675322*o[14] + g.pi*((-5.0144299353183e-10 + o[
    15]*(-0.063514416964065 - 716.87225802312*o[16]))*o[2] + g.pi*(-2.48050170161934e-16
     + o[17]*(-0.000053011597376224 - 1.63576738230104*o[18]) + g.pi*(o[
    11]*(6.3034783618570e-10 - 460.94350902879*o[19]) + g.pi*(
    1.42629932175034e-6*o[15] + g.pi*(o[10]*(9.3662686891566e-18 + (-9.2112723863361e-12
     - 9.0163614415599e-8*o[10])*o[20]) + o[23]*(o[13]*(-1.94118980752764e-8
     + 25.6632765105816*o[24]) + o[21]*(-103.006486756963*o[26] + o[21]*(
    o[27]*(3.3890621235060e-22 + (1.16391404129682e-10 -
    0.00159609377253190*o[15])*o[28]) + g.pi*(-2.48035324679684e-23*o[24]
     + g.pi*(0.00174760497974171*o[29] + g.pi*(-6.4609161209486e-13*o[30]
     + o[31]*(4.0344361048474e-26 + o[18]*(3.05889228736295e-14 -
    0.00052092078397148*o[32]))*g.pi)))))))))))) + tau2*(-9.4616771471240e-9
     + (1.53488614227420e-7 + o[44])*tau2)))))/o[21];
g.gtau = (0.0280439559151000 + g.tau*(-0.285810955258200 + g.tau*(
    1.22131494717840 + g.tau*(-2.84816394288800 + g.tau*(4.3839511194500
     + o[33]*(10.0866556801800 + (-0.56817265215440 + 0.063805390599210*g.tau)
    *g.tau))))))/(o[33]*o[34]) + g.pi*(-0.0178348622923580 + o[49] + g.pi
    *(-0.000033032641670203 + (-0.00037897975032630 + o[1]*(-0.0157571108973420
     + (-0.306581069554011 - 0.00096028372490713*o[13])*o[2]))*tau2 + g.pi
    *(4.3870667284435e-7 + o[1]*(-0.000096833031715710 + (-0.0090203547252888
     - 1.42338887469272*o[13])*o[2]) + g.pi*(-7.8847309559367e-10 + g.pi*
    (0.0000160454534363627*o[20] + g.pi*(o[1]*(-5.0144299353183e-11 + o[
    15]*(-0.033874355714168 - 836.35096769364*o[16])) + g.pi*((-0.0000138839897890111
     - 0.97367106089347*o[18])*o[50] + g.pi*(o[14]*(9.0049690883672e-11
     - 296.320827232793*o[19]) + g.pi*(2.57526266427144e-7*o[51] + g.pi*(
    o[2]*(4.1627860840696e-19 + (-1.02347470959290e-12 -
    1.40254511313154e-8*o[10])*o[20]) + o[23]*(o[19]*(-2.34560435076256e-9
     + 5.3465159397045*o[24]) + o[21]*(-19.1874828272775*o[52] + o[21]*(o[
    16]*(1.78371690710842e-23 + (1.07202609066812e-11 -
    0.000201611844951398*o[15])*o[28]) + g.pi*(-1.24017662339842e-24*o[27]
     + g.pi*(0.000200482822351322*o[53] + g.pi*(-4.9797574845256e-14*o[54]
     + (1.90027787547159e-27 + o[18]*(2.21658861403112e-15 -
    0.000054734430199902*o[32]))*o[55]*g.pi)))))))))))) + (
    2.55814357045700e-8 + 1.44676118155521e-6*tau2)*tau2))));
g.gtautau = (-0.168263735490600 + g.tau*(1.42905477629100 + g.tau*(-4.8852597887136
     + g.tau*(8.5444918286640 + g.tau*(-8.7679022389000 + o[33]*(-0.56817265215440
     + 0.127610781198420*g.tau)*g.tau)))))/(o[33]*o[34]*g.tau) + g.pi*(-0.091992027392730
     + (-0.34548755450059 - 1.50975836183790*o[2])*tau2 + g.pi*(-0.00037897975032630
     + o[1]*(-0.047271332692026 + (-1.83948641732407 - 0.033609930371750*
    o[13])*o[2]) + g.pi*((-0.000193666063431420 + (-0.045101773626444 -
    48.395221739552*o[13])*o[2])*tau2 + g.pi*(2.55814357045700e-8 +
    2.89352236311042e-6*tau2 + g.pi*(0.000096272720618176*o[10]*tau2 + g.pi
    *((-1.00288598706366e-10 + o[15]*(-0.50811533571252 -
    28435.9329015838*o[16]))*tau2 + g.pi*(o[11]*(-0.000138839897890111 -
    23.3681054614434*o[18])*tau2 + g.pi*((6.3034783618570e-10 -
    10371.2289531477*o[19])*o[20] + g.pi*(3.09031519712573e-6*o[17] + g.pi
    *(o[1]*(1.24883582522088e-18 + (-9.2112723863361e-12 -
    1.82330864707100e-7*o[10])*o[20]) + o[23]*(o[1]*o[11]*o[12]*(-6.5676921821352e-8
     + 261.979281045521*o[24])*tau2 + o[21]*(-1074.49903832754*o[1]*o[10]
    *o[12]*o[25]*tau2 + o[21]*((3.3890621235060e-22 + (
    3.6448887082716e-10 - 0.0094757567127157*o[15])*o[28])*o[32] + g.pi*(
    -2.48035324679684e-23*o[16] + g.pi*(0.0104251067622687*o[1]*o[12]*o[
    25]*tau2 + g.pi*(o[11]*o[12]*(4.7506946886790e-26 + o[18]*(
    8.6446955947214e-14 - 0.00311986252139440*o[32]))*g.pi -
    1.89230784411972e-12*o[10]*o[25]*tau2))))))))))))))));
g.gtaupi = -0.0178348622923580 + o[49] + g.pi*(-0.000066065283340406
     + (-0.00075795950065260 + o[1]*(-0.0315142217946840 + (-0.61316213910802
     - 0.00192056744981426*o[13])*o[2]))*tau2 + g.pi*(1.31612001853305e-6
     + o[1]*(-0.000290499095147130 + (-0.0270610641758664 -
    4.2701666240781*o[13])*o[2]) + g.pi*(-3.15389238237468e-9 + g.pi*(
    0.000080227267181813*o[20] + g.pi*(o[1]*(-3.00865796119098e-10 + o[15]
    *(-0.203246134285008 - 5018.1058061618*o[16])) + g.pi*((-0.000097187928523078
     - 6.8156974262543*o[18])*o[50] + g.pi*(o[14]*(7.2039752706938e-10 -
    2370.56661786234*o[19]) + g.pi*(2.31773639784430e-6*o[51] + g.pi*(o[2]
    *(4.1627860840696e-18 + (-1.02347470959290e-11 - 1.40254511313154e-7*
    o[10])*o[20]) + o[23]*(o[19]*(-3.7529669612201e-8 + 85.544255035272*o[
    24]) + o[21]*(-345.37469089099*o[52] + o[21]*(o[16]*(
    3.5674338142168e-22 + (2.14405218133624e-10 - 0.0040322368990280*o[15])
    *o[28]) + g.pi*(-2.60437090913668e-23*o[27] + g.pi*(
    0.0044106220917291*o[53] + g.pi*(-1.14534422144089e-12*o[54] + (
    4.5606669011318e-26 + o[18]*(5.3198126736747e-14 -
    0.00131362632479764*o[32]))*o[55]*g.pi)))))))))))) + (
    1.02325742818280e-7 + o[44])*tau2)));

function Media.Air.ReferenceMoistAir.Utilities.IF97_new.h_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... g := Modelica400.Media.Air.ReferenceMoistAir.Utilities.IF97_new.g2(p, T);
h = g.R_sTg.tau*g.gtau;	h = g.RTg.tau*g.gtau;

function Media.Air.ReferenceMoistAir.Utilities.IF97_new.s_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... g := Modelica400.Media.Air.ReferenceMoistAir.Utilities.IF97_new.g2(p, T);
s = g.R_s(g.taug.gtau - g.g);	s = g.R(g.taug.gtau - g.g);

function Media.Air.ReferenceMoistAir.Utilities.IF97_new.cp_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
cp	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... g := Modelica400.Media.Air.ReferenceMoistAir.Utilities.IF97_new.g2(p, T);
cp = -g.R_sg.taug.tau*g.gtautau;	cp = -g.Rg.taug.tau*g.gtautau;

function Media.Air.ReferenceMoistAir.Utilities.IF97_new.cv_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
cv	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... g := Modelica400.Media.Air.ReferenceMoistAir.Utilities.IF97_new.g2(p, T);
cv = g.R_s(-g.taug.taug.gtautau + ((g.gpi - g.taug.gtaupi)(g.gpi - g.taug.gtaupi)/g.gpipi));	cv = g.R(-g.taug.taug.gtautau + ((g.gpi - g.taug.gtaupi)(g.gpi - g.taug.gtaupi)/g.gpipi));

function Media.Air.ReferenceMoistAir.Utilities.IF97_new.rho_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
rho	Units.SI.Density	SIunits.Density

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... g := Modelica400.Media.Air.ReferenceMoistAir.Utilities.IF97_new.g2(p, T);
rho = p/(g.R_sTg.pi*g.gpi);	rho = p/(g.RTg.pi*g.gpi);

function Media.Air.ReferenceMoistAir.Utilities.IF97_new.rho_pT_der

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
d	Units.SI.Density	SIunits.Density

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... g := Modelica400.Media.Air.ReferenceMoistAir.Utilities.IF97_new.g2(p, T);
vt = g.R_s/p(g.pig.gpi - g.taug.pig.gtaupi);	vt = g.R/p(g.pig.gpi - g.taug.pig.gtaupi);
vp = g.R_sT/(pp)g.pig.pi*g.gpipi;	vp = g.RT/(pp)g.pig.pi*g.gpipi;
d = p/(g.R_sTg.pi*g.gpi);	d = p/(g.RTg.pi*g.gpi);
rho_der = (-d^2vp)p_der + (-d^2vt)T_der; ...

function Media.Air.ReferenceMoistAir.Utilities.IF97_new.visc_dT

Component	Modelica 4.0.0	Modelica 3.2.3
function	shortClass
d		Present
T		Present
eta		Present
n0		Present
n1		Present
n2		Present
n3		Present
nn		Present
rhostar		Present
etastar		Present
tstar		Present
i		Present
j		Present
delta		Present
deltam1		Present
tau		Present
taum1		Present
Psi0		Present
Psi1		Present
tfun		Present
rhofun		Present

Equations in Modelica 4.0.0

Equations in Modelica 3.2.3

algorithm

delta := d/rhostar;
deltam1 = delta - 1.0;
tau = tstar/T;
taum1 = tau - 1.0;
Psi0 = 1/(n0 + (n1 + (n2 + n3*tau)*tau)*tau)/(tau^0.5);
Psi1 = 0.0;
tfun = 1.0;
for i in 1:6 loop
if (i <> 1) then
tfun = tfun*taum1;
end if;
rhofun = 1.;
for j in 0:6 loop
if (j <> 0) then
rhofun = rhofun*deltam1;
end if;
Psi1 = Psi1 + nn[i + j*6]*tfun*rhofun;
end for;
end for;
eta = etastar*Psi0*Modelica323.Math.exp(delta*Psi1);

function Media.Air.ReferenceMoistAir.Utilities.IF97_new.cond_dT

Component	Modelica 4.0.0	Modelica 3.2.3
function	shortClass
d		Present
T		Present
lambda		Present
region		Present
n0		Present
n1		Present
n2		Present
n3		Present
nn		Present
lamstar		Present
rhostar		Present
tstar		Present
pstar		Present
etastar		Present
i		Present
j		Present
delta		Present
tau		Present
deltam1		Present
taum1		Present
Lam0		Present
Lam1		Present
Lam2		Present
tfun		Present
rhofun		Present
dpitau		Present
ddelpi		Present
d2		Present
g		Present
f		Present
Tc		Present
Chi		Present
rhostar2		Present
Tstar2		Present
lambdastar		Present
TREL		Present
rhoREL		Present
lambdaREL		Present
deltaTREL		Present
C		Present
dpar		Present
b		Present
B		Present
a		Present
Q		Present
S		Present
lambdaREL2		Present
lambdaREL1		Present
lambdaREL0		Present

Equations in Modelica 4.0.0

Equations in Modelica 3.2.3

algorithm

deltaTREL := abs(TREL - 1) + C[4];
Q = 2 + C[5]/deltaTREL^(3/5);
if TREL >= 1 then
S = 1/deltaTREL;
else
S = C[6]/deltaTREL^(3/5);
end if;
lambdaREL2 = (dpar[1]/TREL^10 + dpar[2])*rhoREL^(9/5)*Modelica323.Math.exp(C[1]
  *(1 - rhoREL^(14/5))) + dpar[3]*S*rhoREL^Q*Modelica323.Math.exp((Q/(1 + Q))*(
  1 - rhoREL^(1 + Q))) + dpar[4]*Modelica323.Math.exp(C[2]*TREL^(3/2) + C[3]/
  rhoREL^5);
lambdaREL1 = b[1] + b[2]*rhoREL + b[3]*Modelica323.Math.exp(B[1]*(rhoREL + B[2])
  ^2);
lambdaREL0 = TREL^(1/2)*sum(a[i]*TREL^(i - 1) for i in 1:4);
lambdaREL = lambdaREL0 + lambdaREL1 + lambdaREL2;
lambda = lambdaREL*lambdastar;

function Media.Air.ReferenceMoistAir.Utilities.IF97_new.h_pT_der

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
rho	Units.SI.Density	SIunits.Density

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... g := Modelica400.Media.Air.ReferenceMoistAir.Utilities.IF97_new.g2(p, T);
vt = g.R_s/p(g.pig.gpi - g.taug.pig.gtaupi);	vt = g.R/p(g.pig.gpi - g.taug.pig.gtaupi);
rho = max(p/(g.R_sTg.pi*g.gpi), 1e-9);	rho = max(p/(g.RTg.pi*g.gpi), 1e-9);
h_der = (1/rho - Tvt)p_der - g.R_sg.taug.taug.gtautauT_der;	h_der = (1/rho - Tvt)p_der - g.Rg.taug.taug.gtautauT_der;

package Media.Air.ReferenceMoistAir.Utilities.Water95_Utilities

Component	Modelica 4.0.0	Modelica 3.2.3
Constants	R_s=461.51805
Constants		R=461.51805

function Media.Air.ReferenceMoistAir.Utilities.Water95_Utilities.psat

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure

function Media.Air.ReferenceMoistAir.Utilities.Water95_Utilities.Tsat

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
T	Units.SI.Temperature	SIunits.Temperature

function Media.Air.ReferenceMoistAir.Utilities.Water95_Utilities.psat_der

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature

function Media.Air.ReferenceMoistAir.Utilities.Water95_Utilities.Tsat_der

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure

package Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.Basic

Component	Modelica 4.0.0	Modelica 3.2.3
Constants	R_s=461.52364
Constants		R=461.52364

record Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.Basic.IceConstants

Component	Modelica 4.0.0	Modelica 3.2.3
p0	Units.SI.AbsolutePressure	SIunits.AbsolutePressure

function Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.Basic.Gibbs

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
T	Units.SI.Temperature	SIunits.Temperature
t	Complex	Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.Basic.MyComplex
r_1	Complex	Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.Basic.MyComplex
r_2	Complex	Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.Basic.MyComplex
r2	Complex	Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.Basic.MyComplex
r2p	Complex	Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.Basic.MyComplex
r2pp	Complex	Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.Basic.MyComplex
o	Complex	Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.Basic.MyComplex

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... g.T = T;
g.R_s = Constants.R_s;	g.R = Modelica323.Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.Basic.Constants.R;
g.pi = g.p/Constants.pred;	g.pi = g.p/Modelica323.Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.Basic.Constants.pred;
g.theta = g.T/Constants.Tred;	g.theta = g.T/Modelica323.Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.Basic.Constants.Tred;
g0 = g_0[1]; ... for k in 2:3 loop
r2 = r2 + (r_2[k] * Complex((g.pi - pi0)^(k - 1)));	r2 = MyComplexF.'+'(r2, MyComplexF.'*'(r_2[k], MyComplex((g.pi - pi0) ^(k - 1), 0)));
end for;
g0p = g_0[2]/Constants.pred;	g0p = g_0[2]/Modelica323.Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.Basic.Constants.pred;
for k in 3:5 loop
g0p = g0p + g_0[k](k - 1)/Constants.pred(g.pi - pi0)^(k - 2);	g0p = g0p + g_0[k](k - 1)/Modelica323.Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.Basic.Constants.pred (g.pi - pi0)^(k - 2);
end for;
r2p = (r_2[2] / Complex(Constants.pred)) + ((r_2[3] / Complex(Constants.pred/2)) * Complex(g.pi - pi0));	r2p = MyComplexF.'+'(MyComplexF.'/'(r_2[2], MyComplex(Modelica323.Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.Basic.Constants.pred, 0)), MyComplexF.'*'(MyComplexF.'/'(r_2[3], MyComplex(Modelica323.Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.Basic.Constants.pred /2, 0)), MyComplex(g.pi - pi0, 0)));
g0pp = g_0[3]*2/Constants.pred^2;	g0pp = g_0[3]*2/Modelica323.Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.Basic.Constants.pred ^2;
for k in 4:5 loop
g0pp = g0pp + g_0[k](k - 1)(k - 2)/Constants.pred^2*(g.pi - pi0)^(k - 3);	g0pp = g0pp + g_0[k](k - 1)(k - 2)/Modelica323.Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.Basic.Constants.pred ^2*(g.pi - pi0)^(k - 3);
end for;
r2pp = r_2[3] * Complex(2/Constants.pred^2);	r2pp = MyComplexF.'*'(r_2[3], MyComplex(2/Modelica323.Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.Basic.Constants.pred ^2, 0));
o[1] = (t[1] - Complex(g.theta))*Modelica400.ComplexMath.log(t[1] - Complex(g.theta));	o[1] = MyComplexF.'*'(MyComplexF.'-'(t[1], MyComplex(g.theta, 0)), MyComplexF.'log'(MyComplexF.'-'(t[1], MyComplex(g.theta, 0))));
o[2] = (t[1] + Complex(g.theta))*Modelica400.ComplexMath.log(t[1] + Complex(g.theta));	o[2] = MyComplexF.'*'(MyComplexF.'+'(t[1], MyComplex(g.theta, 0)), MyComplexF.'log'(MyComplexF.'+'(t[1], MyComplex(g.theta, 0))));
o[3] = (t[2] - Complex(g.theta))*Modelica400.ComplexMath.log(t[2] - Complex(g.theta));	o[3] = MyComplexF.'*'(MyComplexF.'-'(t[2], MyComplex(g.theta, 0)), MyComplexF.'log'(MyComplexF.'-'(t[2], MyComplex(g.theta, 0))));
o[4] = (t[2] + Complex(g.theta))*Modelica400.ComplexMath.log(t[2] + Complex(g.theta));	o[4] = MyComplexF.'*'(MyComplexF.'+'(t[2], MyComplex(g.theta, 0)), MyComplexF.'log'(MyComplexF.'+'(t[2], MyComplex(g.theta, 0))));
o[5] = (Complex(2)t[1])Modelica400.ComplexMath.log(t[1]);	o[5] = MyComplexF.''(MyComplexF.''(MyComplex(2, 0), t[1]), MyComplexF.'log'(t[1]));
o[6] = (Complex(2)t[2])Modelica400.ComplexMath.log(t[2]);	o[6] = MyComplexF.''(MyComplexF.''(MyComplex(2, 0), t[2]), MyComplexF.'log'(t[2]));
o[7] = Complex(g.theta^2) / t[1];	o[7] = MyComplexF.'/'(MyComplex(g.theta^2, 0), t[1]);
o[8] = Complex(g.theta^2) / t[2];	o[8] = MyComplexF.'/'(MyComplex(g.theta^2, 0), t[2]);
o[9] = o[1] + o[2] - o[5] - o[7];	o[9] = MyComplexF.'-'(MyComplexF.'-'(MyComplexF.'+'(o[1], o[2]), o[5]), o[7]);
o[10] = o[3] + o[4] - o[6] - o[8];	o[10] = MyComplexF.'-'(MyComplexF.'-'(MyComplexF.'+'(o[3], o[4]), o[6]), o[8]);
g.g = g0 - s_0Constants.Tredg.theta + Constants.Tred* Modelica400.ComplexMath.real((r_1o[9]) + (r2o[10]));	g.g = g0 - s_0Modelica323.Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.Basic.Constants.Tred g.theta + Modelica323.Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.Basic.Constants.Tred MyComplexF.toReal(MyComplexF.'+'(MyComplexF.''(r_1, o[9]), MyComplexF.'*'( r2, o[10])));
g.gp = g0p + Constants.TredModelica400.ComplexMath.real(r2po[10]);	g.gp = g0p + Modelica323.Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.Basic.Constants.Tred MyComplexF.toReal(MyComplexF.''(r2p, o[10]));
g.gpp = g0pp + Constants.TredModelica400.ComplexMath.real(r2ppo[10]);	g.gpp = g0pp + Modelica323.Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.Basic.Constants.Tred MyComplexF.toReal(MyComplexF.''(r2pp, o[10]));
o[11] = Modelica400.ComplexMath.log(t[1] + Complex(g.theta)) - (Complex(2*g.theta) /t[1]) - Modelica400.ComplexMath.log(t[1] - Complex(g.theta));	o[11] = MyComplexF.'-'(MyComplexF.'-'(MyComplexF.'log'(MyComplexF.'+'(t[ 1], MyComplex(g.theta, 0))), MyComplexF.'/'(MyComplex(2*g.theta, 0), t[1])), MyComplexF.'log'(MyComplexF.'-'(t[1], MyComplex(g.theta, 0))));
o[12] = Modelica400.ComplexMath.log(t[2] + Complex(g.theta)) - Modelica400.ComplexMath.log(t[2] - Complex(g.theta)) - (Complex(2*g.theta)/t[ 2]);	o[12] = MyComplexF.'-'(MyComplexF.'-'(MyComplexF.'log'(MyComplexF.'+'(t[ 2], MyComplex(g.theta, 0))), MyComplexF.'log'(MyComplexF.'-'(t[2], MyComplex(g.theta, 0)))), MyComplexF.'/'(MyComplex(2*g.theta, 0), t[ 2]));
g.gT = -s_0 + Modelica400.ComplexMath.real((r_1o[11]) + (r2o[12]));	g.gT = -s_0 + MyComplexF.toReal(MyComplexF.'+'(MyComplexF.''(r_1, o[11]), MyComplexF.''(r2, o[12])));
g.gTT = 1/Constants.TredModelica400.ComplexMath.real((r_1(((Complex(1)/(t[1] - Complex(g.theta))) + (Complex(1)/(t[1] + Complex(g.theta)))) - (Complex(2) /t[1]))) + (r2*(((Complex(1)/(t[2] - Complex(g.theta))) + (Complex(1)/(t[2] + Complex(g.theta)))) - (Complex(2)/t[2]))));	g.gTT = 1/Modelica323.Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.Basic.Constants.Tred MyComplexF.toReal(MyComplexF.'+'(MyComplexF.''(r_1, MyComplexF.'-'( MyComplexF.'+'(MyComplexF.'/'(MyComplex(1, 0), MyComplexF.'-'(t[1], MyComplex( g.theta, 0))), MyComplexF.'/'(MyComplex(1, 0), MyComplexF.'+'(t[1], MyComplex( g.theta, 0)))), MyComplexF.'/'(MyComplex(2, 0), t[1]))), MyComplexF.'*'(r2, MyComplexF.'-'(MyComplexF.'+'(MyComplexF.'/'(MyComplex(1, 0), MyComplexF.'-'( t[2], MyComplex(g.theta, 0))), MyComplexF.'/'(MyComplex(1, 0), MyComplexF.'+' (t[2], MyComplex(g.theta, 0)))), MyComplexF.'/'(MyComplex(2, 0), t[2])))));
g.gTp = Modelica400.ComplexMath.real(r2p(Modelica400.ComplexMath.log(t[2] + Complex(g.theta)) - ((Complex(2g.theta)/t[2]) + Modelica400.ComplexMath.log( t[2] - Complex(g.theta)))));	g.gTp = MyComplexF.toReal(MyComplexF.''(r2p, MyComplexF.'-'( MyComplexF.'log'(MyComplexF.'+'(t[2], MyComplex(g.theta, 0))), MyComplexF.'+'(MyComplexF.'/'(MyComplex(2g.theta, 0), t[2]), MyComplexF.'log'(MyComplexF.'-'(t[2], MyComplex(g.theta, 0)))))));

function Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.Basic.psub

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature
p_sub	Units.SI.AbsolutePressure	SIunits.AbsolutePressure

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
theta := T/Constants.Tred;	theta := T/Modelica323.Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.Basic.Constants.Tred;
for k in 1:3 loop ... end for;
p_sub = exp(sum/theta)*Constants.pred;	p_sub = exp(sum/theta)*Modelica323.Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.Basic.Constants.pred;

function Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.Basic.Tsub

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
T_sub	Units.SI.Temperature	SIunits.Temperature

function Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.Basic.psub_der

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
theta := T/Constants.Tred;	theta := T/Modelica323.Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.Basic.Constants.Tred;
theta_der = 1/Constants.Tred;	theta_der = 1/Modelica323.Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.Basic.Constants.Tred;
for k in 1:3 loop ... end for;
p_sub_der = (sum_dertheta - sumtheta_der)/theta^2exp(sum/theta)Constants.pred*T_der;	p_sub_der = (sum_dertheta - sumtheta_der)/theta^2exp(sum/theta)Modelica323.Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.Basic.Constants .pred*T_der;

function Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.ice09BaseProp_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... aux.T = T;
aux.R_s = Modelica400.Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.Basic.Constants.R_s;	aux.R = Modelica323.Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.Basic.Constants.R;
g = Basic.Gibbs(aux.p, T); ...

function Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.rho_props_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
rho	Units.SI.Density	SIunits.Density

function Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.rho_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
rho	Units.SI.Density	SIunits.Density

function Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.rho_pT_der

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature

function Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.h_props_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.h_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.h_pT_der

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature

function Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.s_props_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.s_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.kappa_props_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
kappa	Units.SI.IsothermalCompressibility	SIunits.IsothermalCompressibility

function Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.kappa_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
kappa	Units.SI.IsothermalCompressibility	SIunits.IsothermalCompressibility

function Media.Air.ReferenceMoistAir.Utilities.beta_H

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
T	Units.SI.Temperature	SIunits.Temperature

function Media.Air.ReferenceMoistAir.Utilities.f_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
T	Units.SI.Temperature	SIunits.Temperature

function Media.Air.ReferenceMoistAir.Utilities.rho_pTX

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
T	Units.SI.Temperature	SIunits.Temperature
X	Units.SI.MassFraction	SIunits.MassFraction
d	Units.SI.Density	SIunits.Density

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... if (T < 273.16) then
d = Modelica400.Media.Air.ReferenceAir.Air_Utilities.rho_pT(pl, T) + pd/(.Modelica400.Media.Air.ReferenceMoistAir.steam.R_s *T);	d = Modelica323.Media.Air.ReferenceAir.Air_Utilities.rho_pT(pl, T) + pd/(.Modelica323.Media.Air.ReferenceMoistAir.steam.R *T);
else ... if (T < 273.16) then
d = (1 + xw)/((1 + xws)/( Modelica400.Media.Air.ReferenceAir.Air_Utilities.rho_pT(pl, T) + pd/(.Modelica400.Media.Air.ReferenceMoistAir.steam.R_s *T)) + (xw - xws)/ Modelica400.Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.rho_pT(p, T));	d = (1 + xw)/((1 + xws)/( Modelica323.Media.Air.ReferenceAir.Air_Utilities.rho_pT(pl, T) + pd/(.Modelica323.Media.Air.ReferenceMoistAir.steam.R *T)) + (xw - xws)/ Modelica323.Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.rho_pT(p, T));
else ...

function Media.Air.ReferenceMoistAir.Utilities.pds_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
T	Units.SI.Temperature	SIunits.Temperature
pds	Units.SI.AbsolutePressure	SIunits.AbsolutePressure

function Media.Air.ReferenceMoistAir.Utilities.pd_pTX

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
T	Units.SI.Temperature	SIunits.Temperature
X	Units.SI.MassFraction	SIunits.MassFraction
pd	Units.SI.AbsolutePressure	SIunits.AbsolutePressure

function Media.Air.ReferenceMoistAir.Utilities.xws_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
T	Units.SI.Temperature	SIunits.Temperature

function Media.Air.ReferenceMoistAir.Utilities.phi_pTX

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
T	Units.SI.Temperature	SIunits.Temperature
X	Units.SI.MassFraction	SIunits.MassFraction

function Media.Air.ReferenceMoistAir.Utilities.cp_pTX

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
T	Units.SI.Temperature	SIunits.Temperature
X	Units.SI.MassFraction	SIunits.MassFraction
cp	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

function Media.Air.ReferenceMoistAir.Utilities.cv_pTX

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
T	Units.SI.Temperature	SIunits.Temperature
X	Units.SI.MassFraction	SIunits.MassFraction
cv	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

function Media.Air.ReferenceMoistAir.Utilities.h_pTX

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
T	Units.SI.Temperature	SIunits.Temperature
X	Units.SI.MassFraction	SIunits.MassFraction
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Air.ReferenceMoistAir.Utilities.h_dis_pTX

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
T	Units.SI.Temperature	SIunits.Temperature
X	Units.SI.MassFraction	SIunits.MassFraction
Mmix	Units.SI.MolarMass	SIunits.MolarMass
Y	Units.SI.MoleFraction	SIunits.MoleFraction

function Media.Air.ReferenceMoistAir.Utilities.s_pTX

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
T	Units.SI.Temperature	SIunits.Temperature
X	Units.SI.MassFraction	SIunits.MassFraction
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Air.ReferenceMoistAir.Utilities.u_pTX

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
T	Units.SI.Temperature	SIunits.Temperature
X	Units.SI.MassFraction	SIunits.MassFraction
u	Units.SI.SpecificEnergy	SIunits.SpecificEnergy

function Media.Air.ReferenceMoistAir.Utilities.cp_dis_pTX

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
T	Units.SI.Temperature	SIunits.Temperature
X	Units.SI.MassFraction	SIunits.MassFraction
Mmix	Units.SI.MolarMass	SIunits.MolarMass
Y	Units.SI.MoleFraction	SIunits.MoleFraction

function Media.Air.ReferenceMoistAir.Utilities.s_dis_pTX

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
T	Units.SI.Temperature	SIunits.Temperature
X	Units.SI.MassFraction	SIunits.MassFraction
Mmix	Units.SI.MolarMass	SIunits.MolarMass
Y	Units.SI.MoleFraction	SIunits.MoleFraction

function Media.Air.ReferenceMoistAir.Utilities.pd_pTX_der

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
T	Units.SI.Temperature	SIunits.Temperature
X	Units.SI.MassFraction	SIunits.MassFraction

function Media.Air.ReferenceMoistAir.Utilities.xws_pT_der

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
T	Units.SI.Temperature	SIunits.Temperature

function Media.Air.ReferenceMoistAir.Utilities.pds_pT_der

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
T	Units.SI.Temperature	SIunits.Temperature

function Media.Air.ReferenceMoistAir.Utilities.rho_pTX_der

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
T	Units.SI.Temperature	SIunits.Temperature
X	Units.SI.MassFraction	SIunits.MassFraction

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... if (T < 273.16) then
d_der = Modelica400.Media.Air.ReferenceAir.Air_Utilities.rho_pT_der( pl, T, Modelica400.Media.Air.ReferenceAir.Air_Utilities.airBaseProp_pT(pl, T), pl_der, T_der) + Modelica400.Media.Air.ReferenceMoistAir.steam.R_s(pd_derT - pdT_der)/(Modelica400.Media.Air.ReferenceMoistAir.steam.R_sT)^2;	d_der = Modelica323.Media.Air.ReferenceAir.Air_Utilities.rho_pT_der( pl, T, Modelica323.Media.Air.ReferenceAir.Air_Utilities.airBaseProp_pT(pl, T), pl_der, T_der) + Modelica323.Media.Air.ReferenceMoistAir.steam.R(pd_derT - pd T_der)/(Modelica323.Media.Air.ReferenceMoistAir.steam.RT)^2;
else ... o[2] = Modelica400.Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.rho_pT( p, T);
o[3] = ((1 + xws)/(Modelica400.Media.Air.ReferenceAir.Air_Utilities.rho_pT(pl, T) + pd/(.Modelica400.Media.Air.ReferenceMoistAir.steam.R_s*T)) + (xw - xws)/ Modelica400.Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.rho_pT(p, T));	o[3] = ((1 + xws)/(Modelica323.Media.Air.ReferenceAir.Air_Utilities.rho_pT(pl, T) + pd/(.Modelica323.Media.Air.ReferenceMoistAir.steam.R*T)) + (xw - xws)/ Modelica323.Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.rho_pT(p, T));
o[4] = Modelica400.Media.Air.ReferenceAir.Air_Utilities.rho_pT_der( pl, T, Modelica400.Media.Air.ReferenceAir.Air_Utilities.airBaseProp_pT(p, T), p_der, T_der);
o[5] = (xws_dero[1] - (1 + xws)o[4])/o[1]^2 + (pd_derT - pdT_der)/ Modelica400.Media.Air.ReferenceMoistAir.steam.R_s/T^2 + (xw_dero[2] - xw Modelica400.Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.rho_pT_der( p, T, Modelica400.Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.ice09BaseProp_pT( p, T), p_der, T_der))/o[2]^2 - (xws_dero[2] - xws Modelica400.Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.rho_pT_der( p, T, Modelica400.Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.ice09BaseProp_pT( p, T), p_der, T_der))/o[2]^2;	o[5] = (xws_dero[1] - (1 + xws)o[4])/o[1]^2 + (pd_derT - pdT_der)/ Modelica323.Media.Air.ReferenceMoistAir.steam.R/T^2 + (xw_dero[2] - xw Modelica323.Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.rho_pT_der( p, T, Modelica323.Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.ice09BaseProp_pT( p, T), p_der, T_der))/o[2]^2 - (xws_dero[2] - xws Modelica323.Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.rho_pT_der( p, T, Modelica323.Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.ice09BaseProp_pT( p, T), p_der, T_der))/o[2]^2;
d_der = (xw_dero[3] - (1 + xw)o[5])/o[3]^2; ...

function Media.Air.ReferenceMoistAir.Utilities.h_dis_pTX_der

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
T	Units.SI.Temperature	SIunits.Temperature
X	Units.SI.MassFraction	SIunits.MassFraction
Mmix	Units.SI.MolarMass	SIunits.MolarMass
Y	Units.SI.MoleFraction	SIunits.MoleFraction

function Media.Air.ReferenceMoistAir.Utilities.h_pTX_der

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
T	Units.SI.Temperature	SIunits.Temperature
X	Units.SI.MassFraction	SIunits.MassFraction
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Air.ReferenceMoistAir.Utilities.u_pTX_der

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure
T	Units.SI.Temperature	SIunits.Temperature
X	Units.SI.MassFraction	SIunits.MassFraction

record Media.IdealGases.Common.DataRecord

Component	Modelica 4.0.0	Modelica 3.2.3
MM	Units.SI.MolarMass	SIunits.MolarMass
Hf	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
H0	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
Tlimit	Units.SI.Temperature	SIunits.Temperature
R_s	Present
R		Present

function Media.IdealGases.Common.Functions.cp_T

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature
cp	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
cp := smooth(0,if T < data.Tlimit then data.R_s(1/(TT)(data.alow[1] + T( data.alow[2] + T(1.data.alow[3] + T(data.alow[4] + T(data.alow[5] + T (data.alow[6] + data.alow[7]T))))))) else data.R_s(1/(TT)(data.ahigh[1] + T(data.ahigh[2] + T(1.data.ahigh[3] + T(data.ahigh[4] + T(data. ahigh[5] + T(data.ahigh[6] + data.ahigh[7]T))))))));	cp := smooth(0,if T < data.Tlimit then data.R(1/(TT)(data.alow[1] + T( data.alow[2] + T(1.data.alow[3] + T(data.alow[4] + T(data.alow[5] + T (data.alow[6] + data.alow[7]T))))))) else data.R(1/(TT)(data.ahigh[1] + T(data.ahigh[2] + T(1.data.ahigh[3] + T(data.ahigh[4] + T(data. ahigh[5] + T(data.ahigh[6] + data.ahigh[7]T))))))));

function Media.IdealGases.Common.Functions.cp_Tlow

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature
cp	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
cp := data.R_s(1/(TT)(data.alow[1] + T( data.alow[2] + T(1.data.alow[3] + T(data.alow[4] + T(data.alow[5] + T (data.alow[6] + data.alow[7]T)))))));	cp := data.R(1/(TT)(data.alow[1] + T( data.alow[2] + T(1.data.alow[3] + T(data.alow[4] + T(data.alow[5] + T (data.alow[6] + data.alow[7]T)))))));

function Media.IdealGases.Common.Functions.cp_Tlow_der

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature
dT	unit="K/s"
cp_der	unit="J/(kg.K.s)"

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
cp_der := dTdata.R_s/(TTT)(-2data.alow[1] + T( -data.alow[2] + TT(data.alow[4] + T(2.data.alow[5] + T (3.data.alow[6] + 4.data.alow[7]T)))));	cp_der := dTdata.R/(TTT)(-2data.alow[1] + T( -data.alow[2] + TT(data.alow[4] + T(2.data.alow[5] + T (3.data.alow[6] + 4.data.alow[7]T)))));

function Media.IdealGases.Common.Functions.h_T

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature
h_off	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
h := smooth(0,(if T < data.Tlimit then data.R_s((-data.alow[1] + T(data. blow[1] + data.alow[2]Math.log(T) + T(1.data.alow[3] + T(0.5data. alow[4] + T(1/3data.alow[5] + T(0.25data.alow[6] + 0.2data.alow[7]T)))))) /T) else data.R_s((-data.ahigh[1] + T(data.bhigh[1] + data.ahigh[2] Math.log(T) + T(1.data.ahigh[3] + T(0.5data.ahigh[4] + T(1/3data. ahigh[5] + T(0.25data.ahigh[6] + 0.2data.ahigh[7]T))))))/T)) + (if exclEnthForm then -data.Hf else 0.0) + (if (refChoice == Choices.ReferenceEnthalpy.ZeroAt0K) then data.H0 else 0.0) + (if refChoice == Choices.ReferenceEnthalpy.UserDefined then h_off else 0.0));	h := smooth(0,(if T < data.Tlimit then data.R((-data.alow[1] + T(data. blow[1] + data.alow[2]Math.log(T) + T(1.data.alow[3] + T(0.5data. alow[4] + T(1/3data.alow[5] + T(0.25data.alow[6] + 0.2data.alow[7]T)))))) /T) else data.R((-data.ahigh[1] + T(data.bhigh[1] + data.ahigh[2] Math.log(T) + T(1.data.ahigh[3] + T(0.5data.ahigh[4] + T(1/3data. ahigh[5] + T(0.25data.ahigh[6] + 0.2data.ahigh[7]T))))))/T)) + (if exclEnthForm then -data.Hf else 0.0) + (if (refChoice == Choices.ReferenceEnthalpy.ZeroAt0K) then data.H0 else 0.0) + (if refChoice == Choices.ReferenceEnthalpy.UserDefined then h_off else 0.0));

function Media.IdealGases.Common.Functions.h_T_der

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature
h_off	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
dT	unit="K/s"
h_der	unit="J/(kg.s)"

function Media.IdealGases.Common.Functions.h_Tlow

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature
h_off	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
h := data.R_s((-data.alow[1] + T(data. blow[1] + data.alow[2]Math.log(T) + T(1.data.alow[3] + T(0.5data. alow[4] + T(1/3data.alow[5] + T(0.25data.alow[6] + 0.2data.alow[7]*T)))))) /T) + (if exclEnthForm then -data.Hf else 0.0) + (if (refChoice == Choices.ReferenceEnthalpy.ZeroAt0K) then data.H0 else 0.0) + (if refChoice == Choices.ReferenceEnthalpy.UserDefined then h_off else 0.0);	h := data.R((-data.alow[1] + T(data. blow[1] + data.alow[2]Math.log(T) + T(1.data.alow[3] + T(0.5data. alow[4] + T(1/3data.alow[5] + T(0.25data.alow[6] + 0.2data.alow[7]*T)))))) /T) + (if exclEnthForm then -data.Hf else 0.0) + (if (refChoice == Choices.ReferenceEnthalpy.ZeroAt0K) then data.H0 else 0.0) + (if refChoice == Choices.ReferenceEnthalpy.UserDefined then h_off else 0.0);

function Media.IdealGases.Common.Functions.h_Tlow_der

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature
h_off	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.IdealGases.Common.Functions.s0_T

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
s := if T < data.Tlimit then data.R_s(data.blow[2] - 0.5data.alow[ 1]/(TT) - data.alow[2]/T + data.alow[3]Math.log(T) + T( data.alow[4] + T(0.5data.alow[5] + T(1/3data.alow[6] + 0.25data.alow[ 7]T)))) else data.R_s(data.bhigh[2] - 0.5data.ahigh[1]/(TT) - data. ahigh[2]/T + data.ahigh[3]Math.log(T) + T(data.ahigh[4] + T(0.5data.ahigh[5] + T(1/3data.ahigh[6] + 0.25data.ahigh[7]T))));	s := if T < data.Tlimit then data.R(data.blow[2] - 0.5data.alow[ 1]/(TT) - data.alow[2]/T + data.alow[3]Math.log(T) + T( data.alow[4] + T(0.5data.alow[5] + T(1/3data.alow[6] + 0.25data.alow[ 7]T)))) else data.R(data.bhigh[2] - 0.5data.ahigh[1]/(TT) - data. ahigh[2]/T + data.ahigh[3]Math.log(T) + T(data.ahigh[4] + T(0.5data.ahigh[5] + T(1/3data.ahigh[6] + 0.25data.ahigh[7]T))));

function Media.IdealGases.Common.Functions.s0_Tlow

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
s := data.R_s(data.blow[2] - 0.5data.alow[ 1]/(TT) - data.alow[2]/T + data.alow[3]Math.log(T) + T( data.alow[4] + T(0.5data.alow[5] + T(1/3data.alow[6] + 0.25data.alow[ 7]*T))));	s := data.R(data.blow[2] - 0.5data.alow[ 1]/(TT) - data.alow[2]/T + data.alow[3]Math.log(T) + T( data.alow[4] + T(0.5data.alow[5] + T(1/3data.alow[6] + 0.25data.alow[ 7]*T))));

function Media.IdealGases.Common.Functions.s0_Tlow_der

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature
T_der	unit="K/s"
s_der	Present
s		Present

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
s_der := data.R_sT_der(data.alow[1]/(TTT) + data.alow[2]/(TT) + data.alow[3]/T + data.alow[4] + T(data.alow[5] + T(data.alow[6] + Tdata.alow[7])));	s := data.R(data.blow[2] - 0.5data.alow[ 1]/(TT) - data.alow[2]/T + data.alow[3]Math.log(T) + T( data.alow[4] + T(0.5data.alow[5] + T(1/3data.alow[6] + 0.25data.alow[ 7]*T))));

function Media.IdealGases.Common.Functions.dynamicViscosityLowPressure

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temp_K
Tc	Units.SI.Temperature	SIunits.Temp_K
M	Units.SI.MolarMass	SIunits.MolarMass
Vc	Units.SI.MolarVolume	SIunits.MolarVolume
eta	Units.SI.DynamicViscosity	SIunits.DynamicViscosity

function Media.IdealGases.Common.Functions.thermalConductivityEstimate

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
lambda := if method == 1 then eta(Cp - data.R_s + (9/4)data.R_s) else eta(Cp - data.R_s)(1.32 + 1.77/((Cp/data.R_s) - 1.0));	lambda := if method == 1 then eta(Cp - data.R + (9/4)data.R) else eta(Cp - data.R)(1.32 + 1.77/((Cp/data.R) - 1.0));

model Media.IdealGases.Common.SingleGasNasa.BaseProperties

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... MM = data.MM;
R_s = data.R_s;	R = data.R;
h = Modelica400.Media.IdealGases.Common.Functions.h_T( data, T, Modelica400.Media.IdealGases.Common.Functions.excludeEnthalpyOfFormation, Modelica400.Media.IdealGases.Common.Functions.referenceChoice, Modelica400.Media.IdealGases.Common.Functions.h_offset);
u = h - R_s*T;	u = h - R*T;
d = p/(R_s*T);	d = p/(R*T);
state.T = T; ...

function Media.IdealGases.Common.SingleGasNasa.setState_dTX

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
state := ThermodynamicState(p=ddata.R_sT,T=T);	state := ThermodynamicState(p=ddata.RT,T=T);

function Media.IdealGases.Common.SingleGasNasa.density

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
d := state.p/(data.R_s*state.T);	d := state.p/(data.R*state.T);

function Media.IdealGases.Common.SingleGasNasa.specificInternalEnergy

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
u := Modelica400.Media.IdealGases.Common.Functions.h_T(data, state.T) - data.R_s *state.T;	u := Modelica323.Media.IdealGases.Common.Functions.h_T(data, state.T) - data.R* state.T;

function Media.IdealGases.Common.SingleGasNasa.specificEntropy

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
s := Modelica400.Media.IdealGases.Common.Functions.s0_T(data, state.T) - data.R_s *Modelica400.Math.log(state.p/reference_p);	s := Modelica323.Media.IdealGases.Common.Functions.s0_T(data, state.T) - data.R *Modelica323.Math.log(state.p/reference_p);

function Media.IdealGases.Common.SingleGasNasa.specificHelmholtzEnergy

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
f := Modelica400.Media.IdealGases.Common.Functions.h_T(data, state.T) - data.R_s state.T - state.TspecificEntropy(state);	f := Modelica323.Media.IdealGases.Common.Functions.h_T(data, state.T) - data.R* state.T - state.T*specificEntropy(state);

function Media.IdealGases.Common.SingleGasNasa.specificHeatCapacityCv

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
cv := Modelica400.Media.IdealGases.Common.Functions.cp_T(data, state.T) - data.R_s;	cv := Modelica323.Media.IdealGases.Common.Functions.cp_T(data, state.T) - data.R;

function Media.IdealGases.Common.SingleGasNasa.velocityOfSound

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
a := sqrt(max(0, data.R_sstate.T Modelica400.Media.IdealGases.Common.Functions.cp_T(data, state.T)/ specificHeatCapacityCv(state)));	a := sqrt(max(0, data.Rstate.T Modelica323.Media.IdealGases.Common.Functions.cp_T(data, state.T)/ specificHeatCapacityCv(state)));

function Media.IdealGases.Common.SingleGasNasa.isentropicEnthalpyApproximation

Component	Modelica 4.0.0	Modelica 3.2.3
p2	Units.SI.Pressure	SIunits.Pressure
h_is	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.IdealGases.Common.SingleGasNasa.density_derp_T

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
ddpT := 1/(state.T*data.R_s);	ddpT := 1/(state.T*data.R);

function Media.IdealGases.Common.SingleGasNasa.density_derT_p

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
ddTp := -state.p/(state.Tstate.Tdata.R_s);	ddTp := -state.p/(state.Tstate.Tdata.R);

function Media.IdealGases.Common.SingleGasNasa.T_h

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
T := Modelica400.Math.Nonlinear.solveOneNonlinearEquation( function f_nonlinear(data=data, h=h), 200, 6000);	T := Internal.solve(h, 200, 6000, 1.0e5, {1}, data);

function Media.IdealGases.Common.SingleGasNasa.T_ps

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
T := Modelica400.Math.Nonlinear.solveOneNonlinearEquation( function f_nonlinear( data=data, p=p, s=s), 200, 6000);	T := Internal.solve(s, 200, 6000, p, {1}, data);

function Media.IdealGases.Common.SingleGasNasa.dynamicViscosityLowPressure

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temp_K
Tc	Units.SI.Temperature	SIunits.Temp_K
M	Units.SI.MolarMass	SIunits.MolarMass
Vc	Units.SI.MolarVolume	SIunits.MolarVolume

model Media.IdealGases.Common.MixtureGasNasa.BaseProperties

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... h = h_TX(T, X);
R_s = data.R_s*X;	R = data.R*X;
u = h - R_s*T;	u = h - R*T;
d = p/(R_s*T);	d = p/(R*T);
state.T = T; ...

function Media.IdealGases.Common.MixtureGasNasa.setState_dTX

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
state := if size(X,1) == 0 then ThermodynamicState(p=d(data.R_sreference_X)T,T=T,X=reference_X) else if size(X,1) == nX then ThermodynamicState(p=d(data.R_sX)T,T=T,X=X) else ThermodynamicState(p=d(data.R_scat(1,X,{1-sum(X)}))*T,T=T, X=cat(1,X,{1-sum(X)}));	state := if size(X,1) == 0 then ThermodynamicState(p=d(data.Rreference_X)T,T=T,X=reference_X) else if size(X,1) == nX then ThermodynamicState(p=d(data.RX)T,T=T,X=X) else ThermodynamicState(p=d(data.Rcat(1,X,{1-sum(X)}))*T,T=T, X=cat(1,X,{1-sum(X)}));

function Media.IdealGases.Common.MixtureGasNasa.density

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
d := state.p/((state.Xdata.R_s)state.T);	d := state.p/((state.Xdata.R)state.T);

function Media.IdealGases.Common.MixtureGasNasa.specificEntropy

Component	Modelica 4.0.0	Modelica 3.2.3
Y		Present

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
s := specificEntropyOfpTX(state.p, state.T, state.X);	s := s_TX(state.T, state.X) - sum(state.X[i]Modelica323.Constants.R/MMX[i]( if state.X[i] < Modelica323.Constants.eps then Y[i] else Modelica323.Math.log( Y[i]*state.p/reference_p)) for i in 1:nX);

function Media.IdealGases.Common.MixtureGasNasa.h_TX

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature
h_off	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.IdealGases.Common.MixtureGasNasa.h_TX_der

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature
h_off	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.IdealGases.Common.MixtureGasNasa.gasConstant

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
R_s := data.R_s*state.X;	R := data.R*state.X;

function Media.IdealGases.Common.MixtureGasNasa.specificHeatCapacityCv

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
cv := {Modelica400.Media.IdealGases.Common.Functions.cp_T(data[i], state.T) for i in 1:nX}state.X - data.R_sstate.X;	cv := {Modelica323.Media.IdealGases.Common.Functions.cp_T(data[i], state.T) for i in 1:nX}state.X - data.Rstate.X;

function Media.IdealGases.Common.MixtureGasNasa.MixEntropy

Component	Modelica 4.0.0	Modelica 3.2.3
x	Units.SI.MoleFraction	SIunits.MoleFraction

function Media.IdealGases.Common.MixtureGasNasa.T_hX

Component	Modelica 4.0.0	Modelica 3.2.3
h_off	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
Xfull		Present

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
T := Modelica400.Math.Nonlinear.solveOneNonlinearEquation( function f_nonlinear( h=h, X=X, exclEnthForm=exclEnthForm, refChoice=refChoice, h_off=h_off), 200, 6000);	T := Internal.solve(h, 200, 6000, 1.0e5, Xfull, data[1]);

function Media.IdealGases.Common.MixtureGasNasa.T_psX

Component	Modelica 4.0.0	Modelica 3.2.3
Xfull		Present

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
T := Modelica400.Math.Nonlinear.solveOneNonlinearEquation( function f_nonlinear( p=p, s=s, X=X), 200, 6000);	T := Internal.solve(s, 200, 6000, p, Xfull, data[1]);

package Media.IdealGases.Common.SingleGasesData

Component	Modelica 4.0.0	Modelica 3.2.3
Ag	R_s=77.07991789980736
Ag		R=77.07991789980736
Agplus	R_s=77.08030991764042
Agplus		R=77.08030991764042
Agminus	R_s=77.07952588596174
Agminus		R=77.07952588596174
Air	R_s=287.0512249529787
Air		R=287.0512249529787
AL	R_s=308.1541163442944
AL		R=308.1541163442944
ALplus	R_s=308.1603819910326
ALplus		R=308.1603819910326
ALminus	R_s=308.1478509523426
ALminus		R=308.1478509523426
ALBr	R_s=77.7885591968485
ALBr		R=77.7885591968485
ALBr2	R_s=44.51251440003026
ALBr2		R=44.51251440003026
ALBr3	R_s=31.17612845947546
ALBr3		R=31.17612845947546
ALC	R_s=213.2340287828567
ALC		R=213.2340287828567
ALC2	R_s=163.019471544953
ALC2		R=163.019471544953
ALCL	R_s=133.1710342759323
ALCL		R=133.1710342759323
ALCLplus	R_s=133.1722044338881
ALCLplus		R=133.1722044338881
ALCL2	R_s=84.93902461823076
ALCL2		R=84.93902461823076
ALCL3	R_s=62.35517063835456
ALCL3		R=62.35517063835456
ALF	R_s=180.8282434254179
ALF		R=180.8282434254179
ALFplus	R_s=180.8304009653229
ALFplus		R=180.8304009653229
ALFCL	R_s=102.1020716859482
ALFCL		R=102.1020716859482
ALFCL2	R_s=71.13320827671959
ALFCL2		R=71.13320827671959
ALF2	R_s=127.9575845887511
ALF2		R=127.9575845887511
ALF2minus	R_s=127.9565042759347
ALF2minus		R=127.9565042759347
ALF2CL	R_s=82.78762023621782
ALF2CL		R=82.78762023621782
ALF3	R_s=99.00921668940654
ALF3		R=99.00921668940654
ALF4minus	R_s=80.74207845584199
ALF4minus		R=80.74207845584199
ALH	R_s=297.0570583702919
ALH		R=297.0570583702919
ALHCL	R_s=131.0552844420737
ALHCL		R=131.0552844420737
ALHCL2	R_s=84.07332840840307
ALHCL2		R=84.07332840840307
ALHF	R_s=176.9492853829723
ALHF		R=176.9492853829723
ALHFCL	R_s=100.8537497292059
ALHFCL		R=100.8537497292059
ALHF2	R_s=126.0030334425073
ALHF2		R=126.0030334425073
ALH2	R_s=286.7314600217164
ALH2		R=286.7314600217164
ALH2CL	R_s=129.0057110257997
ALH2CL		R=129.0057110257997
ALH2F	R_s=173.2332480645211
ALH2F		R=173.2332480645211
ALH3	R_s=277.0995766822712
ALH3		R=277.0995766822712
ALI	R_s=54.03007140194319
ALI		R=54.03007140194319
ALI2	R_s=29.61094713475291
ALI2		R=29.61094713475291
ALI3	R_s=20.39385584930034
ALI3		R=20.39385584930034
ALN	R_s=202.8501932676394
ALN		R=202.8501932676394
ALO	R_s=193.4455688240215
ALO		R=193.4455688240215
ALOplus	R_s=193.4480379556543
ALOplus		R=193.4480379556543
ALOminus	R_s=193.4430997554189
ALOminus		R=193.4430997554189
ALOCL	R_s=106.0060505950881
ALOCL		R=106.0060505950881
ALOCL2	R_s=73.00637058132162
ALOCL2		R=73.00637058132162
ALOF	R_s=134.1490864378533
ALOF		R=134.1490864378533
ALOF2	R_s=102.6760137813866
ALOF2		R=102.6760137813866
ALOF2minus	R_s=102.6753181868134
ALOF2minus		R=102.6753181868134
ALOH	R_s=189.0130500714294
ALOH		R=189.0130500714294
ALOHCL	R_s=104.661070575396
ALOHCL		R=104.661070575396
ALOHCL2	R_s=72.36590651151568
ALOHCL2		R=72.36590651151568
ALOHF	R_s=132.0023954296348
ALOHF		R=132.0023954296348
ALOHF2	R_s=101.4137048540635
ALOHF2		R=101.4137048540635
ALO2	R_s=140.9702331648218
ALO2		R=140.9702331648218
ALO2minus	R_s=140.9689219558121
ALO2minus		R=140.9689219558121
AL_OH_2	R_s=136.3112709709314
AL_OH_2		R=136.3112709709314
AL_OH_2CL	R_s=86.20569634893255
AL_OH_2CL		R=86.20569634893255
AL_OH_2F	R_s=103.9378882639174
AL_OH_2F		R=103.9378882639174
AL_OH_3	R_s=106.5909326854039
AL_OH_3		R=106.5909326854039
ALS	R_s=140.8121844501705
ALS		R=140.8121844501705
ALS2	R_s=91.25597243238283
ALS2		R=91.25597243238283
AL2	R_s=154.0770581721472
AL2		R=154.0770581721472
AL2Br6	R_s=15.58806422973773
AL2Br6		R=15.58806422973773
AL2C2	R_s=106.6170143914284
AL2C2		R=106.6170143914284
AL2CL6	R_s=31.17758531917728
AL2CL6		R=31.17758531917728
AL2F6	R_s=49.50460834470327
AL2F6		R=49.50460834470327
AL2I6	R_s=10.19692792465017
AL2I6		R=10.19692792465017
AL2O	R_s=118.8418774658576
AL2O		R=118.8418774658576
AL2Oplus	R_s=118.842809353477
AL2Oplus		R=118.842809353477
AL2O2	R_s=96.72278441201074
AL2O2		R=96.72278441201074
AL2O2plus	R_s=96.72340169097949
AL2O2plus		R=96.72340169097949
AL2O3	R_s=81.54538983996238
AL2O3		R=81.54538983996238
AL2S	R_s=96.64835466040181
AL2S		R=96.64835466040181
AL2S2	R_s=70.40609222508525
AL2S2		R=70.40609222508525
Ar	R_s=208.1323720837088
Ar		R=208.1323720837088
Arplus	R_s=208.135230374171
Arplus		R=208.135230374171
B	R_s=769.0752011839794
B		R=769.0752011839794
Bplus	R_s=769.1142295871198
Bplus		R=769.1142295871198
Bminus	R_s=769.0361767416002
Bminus		R=769.0361767416002
BBr	R_s=91.65487515846331
BBr		R=91.65487515846331
BBr2	R_s=48.73121985241972
BBr2		R=48.73121985241972
BBr3	R_s=33.18845774639455
BBr3		R=33.18845774639455
BC	R_s=364.323078473558
BC		R=364.323078473558
BC2	R_s=238.6993718491979
BC2		R=238.6993718491979
BCL	R_s=179.7179664533979
BCL		R=179.7179664533979
BCLplus	R_s=179.7200975800954
BCLplus		R=179.7200975800954
BCLOH	R_s=131.4097662543578
BCLOH		R=131.4097662543578
BCL_OH_2	R_s=103.5701135095894
BCL_OH_2		R=103.5701135095894
BCL2	R_s=101.7471517554487
BCL2		R=101.7471517554487
BCL2plus	R_s=101.747834830723
BCL2plus		R=101.747834830723
BCL2OH	R_s=84.2190689752902
BCL2OH		R=84.2190689752902
BF	R_s=278.9211157370638
BF		R=278.9211157370638
BFCL	R_s=127.4006409865091
BFCL		R=127.4006409865091
BFCL2	R_s=82.5541251469666
BFCL2		R=82.5541251469666
BFOH	R_s=177.5961212099008
BFOH		R=177.5961212099008
BF_OH_2	R_s=130.2717028295677
BF_OH_2		R=130.2717028295677
BF2	R_s=170.3512739716162
BF2		R=170.3512739716162
BF2plus	R_s=170.3531887423513
BF2plus		R=170.3531887423513
BF2minus	R_s=170.3493592439245
BF2minus		R=170.3493592439245
BF2CL	R_s=98.67543826402306
BF2CL		R=98.67543826402306
BF2OH	R_s=126.3306769762044
BF2OH		R=126.3306769762044
BF3	R_s=122.6210998822739
BF3		R=122.6210998822739
BF4minus	R_s=95.783152359878
BF4minus		R=95.783152359878
BH	R_s=703.4871147497153
BH		R=703.4871147497153
BHCL	R_s=175.8859907166916
BHCL		R=175.8859907166916
BHCL2	R_s=100.5074406823384
BHCL2		R=100.5074406823384
BHF	R_s=269.798468545465
BHF		R=269.798468545465
BHFCL	R_s=125.4629386014708
BHFCL		R=125.4629386014708
BHF2	R_s=166.904495081499
BHF2		R=166.904495081499
BH2	R_s=648.2068905298874
BH2		R=648.2068905298874
BH2CL	R_s=172.2140154449431
BH2CL		R=172.2140154449431
BH2F	R_s=261.2536689068646
BH2F		R=261.2536689068646
BH3	R_s=600.9815812565686
BH3		R=600.9815812565686
BH3NH3	R_s=269.3789214698429
BH3NH3		R=269.3789214698429
BH4	R_s=560.1702109311207
BH4		R=560.1702109311207
BI	R_s=60.37427748676311
BI		R=60.37427748676311
BI2	R_s=31.42042886110548
BI2		R=31.42042886110548
BI3	R_s=21.23615230018481
BI3		R=21.23615230018481
BN	R_s=335.0218593987356
BN		R=335.0218593987356
BO	R_s=310.1211470175753
BO		R=310.1211470175753
BOminus	R_s=310.1148013837899
BOminus		R=310.1148013837899
BOCL	R_s=133.5370699319344
BOCL		R=133.5370699319344
BOCL2	R_s=85.08778465027366
BOCL2		R=85.08778465027366
BOF	R_s=181.5038031816557
BOF		R=181.5038031816557
BOF2	R_s=128.2954853613317
BOF2		R=128.2954853613317
BOH	R_s=298.8845488264217
BOH		R=298.8845488264217
BO2	R_s=194.2188938046896
BO2		R=194.2188938046896
BO2minus	R_s=194.2164049558802
BO2minus		R=194.2164049558802
B_OH_2	R_s=185.4845704515805
B_OH_2		R=185.4845704515805
BS	R_s=193.9190222968561
BS		R=193.9190222968561
BS2	R_s=110.9469048985202
BS2		R=110.9469048985202
B2	R_s=384.5376005919897
B2		R=384.5376005919897
B2C	R_s=247.2139316795856
B2C		R=247.2139316795856
B2CL4	R_s=50.87357587772434
B2CL4		R=50.87357587772434
B2F4	R_s=85.17563698580808
B2F4		R=85.17563698580808
B2H	R_s=367.4102538495462
B2H		R=367.4102538495462
B2H2	R_s=351.7435573748576
B2H2		R=351.7435573748576
B2H3	R_s=337.3583025437985
B2H3		R=337.3583025437985
B2H3_db	R_s=337.3583025437985
B2H3_db		R=337.3583025437985
B2H4	R_s=324.1034452649437
B2H4		R=324.1034452649437
B2H4_db	R_s=324.1034452649437
B2H4_db		R=324.1034452649437
B2H5	R_s=311.8507822081863
B2H5		R=311.8507822081863
B2H5_db	R_s=311.8507822081863
B2H5_db		R=311.8507822081863
B2H6	R_s=300.4907906282843
B2H6		R=300.4907906282843
B2O	R_s=221.0037903958917
B2O		R=221.0037903958917
B2O2	R_s=155.0605735087876
B2O2		R=155.0605735087876
B2O3	R_s=119.4261435617824
B2O3		R=119.4261435617824
B2_OH_4	R_s=92.74228522579023
B2_OH_4		R=92.74228522579023
B2S	R_s=154.8693724737832
B2S		R=154.8693724737832
B2S2	R_s=96.95951114842804
B2S2		R=96.95951114842804
B2S3	R_s=70.57107208637125
B2S3		R=70.57107208637125
B3H7_C2v	R_s=210.5538360710869
B3H7_C2v		R=210.5538360710869
B3H7_Cs	R_s=210.5538360710869
B3H7_Cs		R=210.5538360710869
B3H9	R_s=200.3271937521895
B3H9		R=200.3271937521895
B3N3H6	R_s=103.2844170128126
B3N3H6		R=103.2844170128126
B3O3CL3	R_s=44.51235664397812
B3O3CL3		R=44.51235664397812
B3O3FCL2	R_s=48.81229668842362
B3O3FCL2		R=48.81229668842362
B3O3F2CL	R_s=54.03182754333741
B3O3F2CL		R=54.03182754333741
B3O3F3	R_s=60.50126772721858
B3O3F3		R=60.50126772721858
B4H4	R_s=175.8717786874288
B4H4		R=175.8717786874288
B4H10	R_s=155.9253911040931
B4H10		R=155.9253911040931
B4H12	R_s=150.2453953141421
B4H12		R=150.2453953141421
B5H9	R_s=131.7113616065276
B5H9		R=131.7113616065276
Ba	R_s=60.54506397139674
Ba		R=60.54506397139674
Baplus	R_s=60.54530584047409
Baplus		R=60.54530584047409
BaBr	R_s=38.27479503385797
BaBr		R=38.27479503385797
BaBr2	R_s=27.98213606609791
BaBr2		R=27.98213606609791
BaCL	R_s=48.12172705174211
BaCL		R=48.12172705174211
BaCLplus	R_s=48.12187984525572
BaCLplus		R=48.12187984525572
BaCL2	R_s=39.92869525963705
BaCL2		R=39.92869525963705
BaF	R_s=53.18695381429856
BaF		R=53.18695381429856
BaFplus	R_s=53.18714046640156
BaFplus		R=53.18714046640156
BaF2	R_s=47.42351977592018
BaF2		R=47.42351977592018
BaH	R_s=60.10391879303957
BaH		R=60.10391879303957
BaI	R_s=31.46662280613282
BaI		R=31.46662280613282
BaI2	R_s=21.25724370918203
BaI2		R=21.25724370918203
BaO	R_s=54.22726940696449
BaO		R=54.22726940696449
BaOplus	R_s=54.22746343217109
BaOplus		R=54.22746343217109
BaOH	R_s=53.87311728549849
BaOH		R=53.87311728549849
BaOHplus	R_s=53.87330878466322
BaOHplus		R=53.87330878466322
Ba_OH_2	R_s=48.52568271771352
Ba_OH_2		R=48.52568271771352
BaS	R_s=49.08420704637764
BaS		R=49.08420704637764
Ba2	R_s=30.27253198569837
Ba2		R=30.27253198569837
Be	R_s=922.581456965694
Be		R=922.581456965694
Beplus	R_s=922.6376208335329
Beplus		R=922.6376208335329
Beplusplus	R_s=922.6937915399486
Beplusplus		R=922.6937915399486
BeBr	R_s=93.50909826515043
BeBr		R=93.50909826515043
BeBr2	R_s=49.25046224627338
BeBr2		R=49.25046224627338
BeCL	R_s=186.9883721604918
BeCL		R=186.9883721604918
BeCL2	R_s=104.0373015492269
BeCL2		R=104.0373015492269
BeF	R_s=296.8332128955307
BeF		R=296.8332128955307
BeF2	R_s=176.8698345357289
BeF2		R=176.8698345357289
BeH	R_s=829.7775216708938
BeH		R=829.7775216708938
BeHplus	R_s=829.822954338555
BeHplus		R=829.822954338555
BeH2	R_s=753.9377272271411
BeH2		R=753.9377272271411
BeI	R_s=61.17331377468009
BeI		R=61.17331377468009
BeI2	R_s=31.63547867359002
BeI2		R=31.63547867359002
BeN	R_s=361.2022512648529
BeN		R=361.2022512648529
BeO	R_s=332.4248742042786
BeO		R=332.4248742042786
BeOH	R_s=319.5474536388486
BeOH		R=319.5474536388486
BeOHplus	R_s=319.5541911734304
BeOHplus		R=319.5541911734304
Be_OH_2	R_s=193.2390979383995
Be_OH_2		R=193.2390979383995
BeS	R_s=202.4109638290182
BeS		R=202.4109638290182
Be2	R_s=461.290728482847
Be2		R=461.290728482847
Be2CL4	R_s=52.01865077461346
Be2CL4		R=52.01865077461346
Be2F4	R_s=88.43491726786446
Be2F4		R=88.43491726786446
Be2O	R_s=244.3724921205073
Be2O		R=244.3724921205073
Be2OF2	R_s=115.4457949141708
Be2OF2		R=115.4457949141708
Be2O2	R_s=166.2124371021393
Be2O2		R=166.2124371021393
Be3O3	R_s=110.8082914014262
Be3O3		R=110.8082914014262
Be4O4	R_s=83.10621855106966
Be4O4		R=83.10621855106966
Br	R_s=104.0557669203044
Br		R=104.0557669203044
Brplus	R_s=104.0564813449348
Brplus		R=104.0564813449348
Brminus	R_s=104.055052505484
Brminus		R=104.055052505484
BrCL	R_s=72.07600752446753
BrCL		R=72.07600752446753
BrF	R_s=84.06744154827575
BrF		R=84.06744154827575
BrF3	R_s=60.73425861474075
BrF3		R=60.73425861474075
BrF5	R_s=47.53951628034798
BrF5		R=47.53951628034798
BrO	R_s=86.6963215068496
BrO		R=86.6963215068496
OBrO	R_s=74.300839657274
OBrO		R=74.300839657274
BrOO	R_s=74.300839657274
BrOO		R=74.300839657274
BrO3	R_s=65.00648151478239
BrO3		R=65.00648151478239
Br2	R_s=52.02788346015218
Br2		R=52.02788346015218
BrBrO	R_s=47.29307185021791
BrBrO		R=47.29307185021791
BrOBr	R_s=47.29307185021791
BrOBr		R=47.29307185021791
C	R_s=692.2554055966764
C		R=692.2554055966764
Cplus	R_s=692.2870264566357
Cplus		R=692.2870264566357
Cminus	R_s=692.22378762521
Cminus		R=692.22378762521
CBr	R_s=90.45856647522105
CBr		R=90.45856647522105
CBr2	R_s=48.39096093731357
CBr2		R=48.39096093731357
CBr3	R_s=33.03028292641069
CBr3		R=33.03028292641069
CBr4	R_s=25.0717810116013
CBr4		R=25.0717810116013
CCL	R_s=175.1753866639137
CCL		R=175.1753866639137
CCL2	R_s=100.2749988844225
CCL2		R=100.2749988844225
CCL2Br2	R_s=34.25474210082452
CCL2Br2		R=34.25474210082452
CCL3	R_s=70.24155674974254
CCL3		R=70.24155674974254
CCL3Br	R_s=41.93431604897675
CCL3Br		R=41.93431604897675
CCL4	R_s=54.05230827439643
CCL4		R=54.05230827439643
CF	R_s=268.1300373756052
CF		R=268.1300373756052
CFplus	R_s=268.1347811032766
CFplus		R=268.1347811032766
CFBr3	R_s=30.71231574384335
CFBr3		R=30.71231574384335
CFCL	R_s=125.1009462487188
CFCL		R=125.1009462487188
CFCLBr2	R_s=36.74578250689551
CFCLBr2		R=36.74578250689551
CFCL2	R_s=81.58233410884678
CFCL2		R=81.58233410884678
CFCL2Br	R_s=45.72936426187367
CFCL2Br		R=45.72936426187367
CFCL3	R_s=60.52694771430753
CFCL3		R=60.52694771430753
CF2	R_s=166.2644790462898
CF2		R=166.2644790462898
CF2plus	R_s=166.2663030463333
CF2plus		R=166.2663030463333
CF2Br2	R_s=39.62753822469625
CF2Br2		R=39.62753822469625
CF2CL	R_s=97.29022621377774
CF2CL		R=97.29022621377774
CF2CLBr	R_s=50.27966509262958
CF2CLBr		R=50.27966509262958
CF2CL2	R_s=68.76379858255437
CF2CL2		R=68.76379858255437
CF3	R_s=120.489274733073
CF3		R=120.489274733073
CF3plus	R_s=120.4902326356934
CF3plus		R=120.4902326356934
CF3Br	R_s=55.83558557206995
CF3Br		R=55.83558557206995
CF3CL	R_s=79.59562311954289
CF3CL		R=79.59562311954289
CF4	R_s=94.47800608244737
CF4		R=94.47800608244737
CHplus	R_s=638.6859443927395
CHplus		R=638.6859443927395
CHBr3	R_s=32.89855159627658
CHBr3		R=32.89855159627658
CHCL	R_s=171.5327147998293
CHCL		R=171.5327147998293
CHCLBr2	R_s=39.91975403836881
CHCLBr2		R=39.91975403836881
CHCL2	R_s=99.0706900857722
CHCL2		R=99.0706900857722
CHCL2Br	R_s=50.75102863577455
CHCL2Br		R=50.75102863577455
CHCL3	R_s=69.64848693607949
CHCL3		R=69.64848693607949
CHF	R_s=259.6889396707313
CHF		R=259.6889396707313
CHFBr2	R_s=43.34403819907494
CHFBr2		R=43.34403819907494
CHFCL	R_s=123.2320538961801
CHFCL		R=123.2320538961801
CHFCLBr	R_s=56.41747908562503
CHFCLBr		R=56.41747908562503
CHFCL2	R_s=80.78338670809922
CHFCL2		R=80.78338670809922
CHF2	R_s=162.9795010477454
CHF2		R=162.9795010477454
CHF2Br	R_s=63.50830398867315
CHF2Br		R=63.50830398867315
CHF2CL	R_s=96.15613956491762
CHF2CL		R=96.15613956491762
CHF3	R_s=118.7546756463453
CHF3		R=118.7546756463453
CHI3	R_s=21.11708203586678
CHI3		R=21.11708203586678
CH2	R_s=592.7654495964092
CH2		R=592.7654495964092
CH2Br2	R_s=47.82979312861688
CH2Br2		R=47.82979312861688
CH2CL	R_s=168.0384514177364
CH2CL		R=168.0384514177364
CH2CLBr	R_s=64.26218844771493
CH2CLBr		R=64.26218844771493
CH2CL2	R_s=97.89496563038588
CH2CL2		R=97.89496563038588
CH2F	R_s=251.7630955221803
CH2F		R=251.7630955221803
CH2FBr	R_s=73.62566955265032
CH2FBr		R=73.62566955265032
CH2FCL	R_s=121.4181786825755
CH2FCL		R=121.4181786825755
CH2F2	R_s=159.8218142908129
CH2F2		R=159.8218142908129
CH2I2	R_s=31.0432014394506
CH2I2		R=31.0432014394506
CH3	R_s=553.0254374599256
CH3		R=553.0254374599256
CH3Br	R_s=87.57743432275962
CH3Br		R=87.57743432275962
CH3CL	R_s=164.6837079737725
CH3CL		R=164.6837079737725
CH3F	R_s=244.3067247305985
CH3F		R=244.3067247305985
CH3I	R_s=58.57778754097095
CH3I		R=58.57778754097095
CH2OH	R_s=267.9156226477351
CH2OH		R=267.9156226477351
CH2OHplus	R_s=267.9203587915685
CH2OHplus		R=267.9203587915685
CH3O	R_s=267.9156226477351
CH3O		R=267.9156226477351
CH4	R_s=518.2791167938085
CH4		R=518.2791167938085
CH3OH	R_s=259.4878075117987
CH3OH		R=259.4878075117987
CH3OOH	R_s=173.069399095694
CH3OOH		R=173.069399095694
CI	R_s=59.85287279999731
CI		R=59.85287279999731
CI2	R_s=31.27862185051489
CI2		R=31.27862185051489
CI3	R_s=21.17127975667193
CI3		R=21.17127975667193
CI4	R_s=16.0007981085259
CI4		R=16.0007981085259
CN	R_s=319.5735161853222
CN		R=319.5735161853222
CNplus	R_s=319.5802548189978
CNplus		R=319.5802548189978
CNminus	R_s=319.5667778358206
CNminus		R=319.5667778358206
CNN	R_s=207.7366386751982
CNN		R=207.7366386751982
CO	R_s=296.8383547363272
CO		R=296.8383547363272
COplus	R_s=296.8441686645506
COplus		R=296.8441686645506
COCL	R_s=131.0126987178376
COCL		R=131.0126987178376
COCL2	R_s=84.05580082514373
COCL2		R=84.05580082514373
COFCL	R_s=100.8285281901095
COFCL		R=100.8285281901095
COF2	R_s=125.9636673413314
COF2		R=125.9636673413314
COHCL	R_s=128.9644466724905
COHCL		R=128.9644466724905
COHF	R_s=173.1588482172291
COHF		R=173.1588482172291
COS	R_s=138.4013010382005
COS		R=138.4013010382005
CO2	R_s=188.9244822140674
CO2		R=188.9244822140674
CO2plus	R_s=188.9268372797449
CO2plus		R=188.9268372797449
COOH	R_s=184.694465078423
COOH		R=184.694465078423
CP	R_s=193.429714054109
CP		R=193.429714054109
CS	R_s=188.6407249346012
CS		R=188.6407249346012
CS2	R_s=109.1987859318341
CS2		R=109.1987859318341
C2	R_s=346.1277027983382
C2		R=346.1277027983382
C2plus	R_s=346.1356078327848
C2plus		R=346.1356078327848
C2minus	R_s=346.1197981249531
C2minus		R=346.1197981249531
C2CL	R_s=139.7991740984356
C2CL		R=139.7991740984356
C2CL2	R_s=87.58824694396103
C2CL2		R=87.58824694396103
C2CL3	R_s=63.77087353620636
C2CL3		R=63.77087353620636
C2CL4	R_s=50.13786224870682
C2CL4		R=50.13786224870682
C2CL6	R_s=35.12104541061496
C2CL6		R=35.12104541061496
C2F	R_s=193.2708051067979
C2F		R=193.2708051067979
C2FCL	R_s=105.9535490125068
C2FCL		R=105.9535490125068
C2FCL3	R_s=55.66032008482446
C2FCL3		R=55.66032008482446
C2F2	R_s=134.0650186878026
C2F2		R=134.0650186878026
C2F2CL2	R_s=62.55047312435939
C2F2CL2		R=62.55047312435939
C2F3	R_s=102.6267581555277
C2F3		R=102.6267581555277
C2F3CL	R_s=71.38748063597872
C2F3CL		R=71.38748063597872
C2F4	R_s=83.13223952314488
C2F4		R=83.13223952314488
C2F6	R_s=60.24463736653651
C2F6		R=60.24463736653651
C2H	R_s=332.1890229626511
C2H		R=332.1890229626511
C2HCL	R_s=137.4700985614903
C2HCL		R=137.4700985614903
C2HCL3	R_s=63.28209149976589
C2HCL3		R=63.28209149976589
C2HF	R_s=188.8462000477917
C2HF		R=188.8462000477917
C2HFCL2	R_s=72.34143575687527
C2HFCL2		R=72.34143575687527
C2HF2CL	R_s=84.42875780247421
C2HF2CL		R=84.42875780247421
C2HF3	R_s=101.3656526070093
C2HF3		R=101.3656526070093
C2H2_vinylidene	R_s=319.3295152181795
C2H2_vinylidene		R=319.3295152181795
C2H2CL2	R_s=85.76635739991467
C2H2CL2		R=85.76635739991467
C2H2FCL	R_s=103.2998884991077
C2H2FCL		R=103.2998884991077
C2H2F2	R_s=129.8444698353657
C2H2F2		R=129.8444698353657
CH2CO_ketene	R_s=197.7908816776206
CH2CO_ketene		R=197.7908816776206
O_CH_2O	R_s=143.2638455250596
O_CH_2O		R=143.2638455250596
HO_CO_2OH	R_s=92.34723253921148
HO_CO_2OH		R=92.34723253921148
C2H3_vinyl	R_s=307.4285215649937
C2H3_vinyl		R=307.4285215649937
CH2BrminusCOOH	R_s=59.83872242296076
CH2BrminusCOOH		R=59.83872242296076
C2H3CL	R_s=133.0359794373957
C2H3CL		R=133.0359794373957
CH2CLminusCOOH	R_s=87.98688462414359
CH2CLminusCOOH		R=87.98688462414359
C2H3F	R_s=180.5781435549581
C2H3F		R=180.5781435549581
CH3CN	R_s=202.5355208721054
CH3CN		R=202.5355208721054
CH3CO_acetyl	R_s=193.1593774088376
CH3CO_acetyl		R=193.1593774088376
C2H4	R_s=296.3827247982046
C2H4		R=296.3827247982046
C2H4O_ethylen_o	R_s=188.7398144398419
C2H4O_ethylen_o		R=188.7398144398419
CH3CHO_ethanal	R_s=188.7398144398419
CH3CHO_ethanal		R=188.7398144398419
CH3COOH	R_s=138.4546316223484
CH3COOH		R=138.4546316223484
OHCH2COOH	R_s=109.3270652885103
OHCH2COOH		R=109.3270652885103
C2H5	R_s=286.1031413126138
C2H5		R=286.1031413126138
C2H5Br	R_s=76.30399091085127
C2H5Br		R=76.30399091085127
C2H6	R_s=276.5127187299628
C2H6		R=276.5127187299628
CH3N2CH3	R_s=143.1494957856454
CH3N2CH3		R=143.1494957856454
C2H5OH	R_s=180.4808671619877
C2H5OH		R=180.4808671619877
CH3OCH3	R_s=180.4808671619877
CH3OCH3		R=180.4808671619877
CH3O2CH3	R_s=133.9578113238676
CH3O2CH3		R=133.9578113238676
CCN	R_s=218.6402160507625
CCN		R=218.6402160507625
CNC	R_s=218.6402160507625
CNC		R=218.6402160507625
OCCN	R_s=153.8932181624409
OCCN		R=153.8932181624409
C2N2	R_s=159.7867580926611
C2N2		R=159.7867580926611
C2O	R_s=207.7537680406189
C2O		R=207.7537680406189
C3	R_s=230.7518018655588
C3		R=230.7518018655588
C3H3_1_propynl	R_s=212.8863434787863
C3H3_1_propynl		R=212.8863434787863
C3H3_2_propynl	R_s=212.8863434787863
C3H3_2_propynl		R=212.8863434787863
C3H4_allene	R_s=207.5304775925235
C3H4_allene		R=207.5304775925235
C3H4_propyne	R_s=207.5304775925235
C3H4_propyne		R=207.5304775925235
C3H4_cyclo	R_s=207.5304775925235
C3H4_cyclo		R=207.5304775925235
C3H5_allyl	R_s=202.437487521852
C3H5_allyl		R=202.437487521852
C3H6_propylene	R_s=197.588483198803
C3H6_propylene		R=197.588483198803
C3H6_cyclo	R_s=197.588483198803
C3H6_cyclo		R=197.588483198803
C3H6O_propylox	R_s=143.1576294001599
C3H6O_propylox		R=143.1576294001599
C3H6O_acetone	R_s=143.1576294001599
C3H6O_acetone		R=143.1576294001599
C3H6O_propanal	R_s=143.1576294001599
C3H6O_propanal		R=143.1576294001599
C3H7_n_propyl	R_s=192.9663421191394
C3H7_n_propyl		R=192.9663421191394
C3H7_i_propyl	R_s=192.9663421191394
C3H7_i_propyl		R=192.9663421191394
C3H8	R_s=188.5555073270316
C3H8		R=188.5555073270316
C3H8O_1propanol	R_s=138.3554244594644
C3H8O_1propanol		R=138.3554244594644
C3H8O_2propanol	R_s=138.3554244594644
C3H8O_2propanol		R=138.3554244594644
CNCOCN	R_s=103.8724976881748
CNCOCN		R=103.8724976881748
C3O2	R_s=122.2161106203211
C3O2		R=122.2161106203211
C4	R_s=173.0638513991691
C4		R=173.0638513991691
C4H2_butadiyne	R_s=166.0945114813255
C4H2_butadiyne		R=166.0945114813255
C4H4_1_3minuscyclo	R_s=159.6647576090898
C4H4_1_3minuscyclo		R=159.6647576090898
C4H6_butadiene	R_s=153.7142607824969
C4H6_butadiene		R=153.7142607824969
C4H6_1butyne	R_s=153.7142607824969
C4H6_1butyne		R=153.7142607824969
C4H6_2butyne	R_s=153.7142607824969
C4H6_2butyne		R=153.7142607824969
C4H6_cyclo	R_s=153.7142607824969
C4H6_cyclo		R=153.7142607824969
C4H8_1_butene	R_s=148.1913623991023
C4H8_1_butene		R=148.1913623991023
C4H8_cis2_buten	R_s=148.1913623991023
C4H8_cis2_buten		R=148.1913623991023
C4H8_isobutene	R_s=148.1913623991023
C4H8_isobutene		R=148.1913623991023
C4H8_cyclo	R_s=148.1913623991023
C4H8_cyclo		R=148.1913623991023
C4H9_n_butyl	R_s=145.5761135660341
C4H9_n_butyl		R=145.5761135660341
C4H9_i_butyl	R_s=145.5761135660341
C4H9_i_butyl		R=145.5761135660341
C4H9_s_butyl	R_s=145.5761135660341
C4H9_s_butyl		R=145.5761135660341
C4H9_t_butyl	R_s=145.5761135660341
C4H9_t_butyl		R=145.5761135660341
C4H10_n_butane	R_s=143.0515706563069
C4H10_n_butane		R=143.0515706563069
C4H10_isobutane	R_s=143.0515706563069
C4H10_isobutane		R=143.0515706563069
C4N2	R_s=109.3201080253812
C4N2		R=109.3201080253812
C5	R_s=138.4510811193353
C5		R=138.4510811193353
C5H6_1_3cyclo	R_s=125.78409389006
C5H6_1_3cyclo		R=125.78409389006
C5H8_cyclo	R_s=122.0615934167408
C5H8_cyclo		R=122.0615934167408
C5H10_1_pentene	R_s=118.5530899192818
C5H10_1_pentene		R=118.5530899192818
C5H10_cyclo	R_s=118.5530899192818
C5H10_cyclo		R=118.5530899192818
C5H11_pentyl	R_s=116.873402113329
C5H11_pentyl		R=116.873402113329
C5H11_t_pentyl	R_s=116.873402113329
C5H11_t_pentyl		R=116.873402113329
C5H12_n_pentane	R_s=115.2406457877736
C5H12_n_pentane		R=115.2406457877736
C5H12_i_pentane	R_s=115.2406457877736
C5H12_i_pentane		R=115.2406457877736
CH3C_CH3_2CH3	R_s=115.2406457877736
CH3C_CH3_2CH3		R=115.2406457877736
C6D5_phenyl	R_s=101.2296993560944
C6D5_phenyl		R=101.2296993560944
C6D6	R_s=98.80676627971884
C6D6		R=98.80676627971884
C6H2	R_s=112.2362718830757
C6H2		R=112.2362718830757
C6H5_phenyl	R_s=107.8346490903833
C6H5_phenyl		R=107.8346490903833
C6H5O_phenoxy	R_s=89.30373037260763
C6H5O_phenoxy		R=89.30373037260763
C6H6	R_s=106.4431717393932
C6H6		R=106.4431717393932
C6H5OH_phenol	R_s=88.34727924103434
C6H5OH_phenol		R=88.34727924103434
C6H10_cyclo	R_s=101.218743760926
C6H10_cyclo		R=101.218743760926
C6H12_1_hexene	R_s=98.79424159940152
C6H12_1_hexene		R=98.79424159940152
C6H12_cyclo	R_s=98.79424159940152
C6H12_cyclo		R=98.79424159940152
C6H13_n_hexyl	R_s=97.62503079229123
C6H13_n_hexyl		R=97.62503079229123
C6H14_n_hexane	R_s=96.48317105956971
C6H14_n_hexane		R=96.48317105956971
C7H7_benzyl	R_s=91.23700434805129
C7H7_benzyl		R=91.23700434805129
C7H8	R_s=90.23892530390688
C7H8		R=90.23892530390688
C7H8O_cresol_mx	R_s=76.88773455947235
C7H8O_cresol_mx		R=76.88773455947235
C7H14_1_heptene	R_s=84.68077851377274
C7H14_1_heptene		R=84.68077851377274
C7H15_n_heptyl	R_s=83.82031171240196
C7H15_n_heptyl		R=83.82031171240196
C7H16_n_heptane	R_s=82.97715593131233
C7H16_n_heptane		R=82.97715593131233
C7H16_2_methylh	R_s=82.97715593131233
C7H16_2_methylh		R=82.97715593131233
C8H8_styrene	R_s=79.83237880454487
C8H8_styrene		R=79.83237880454487
C8H10_ethylbenz	R_s=78.31650732350586
C8H10_ethylbenz		R=78.31650732350586
C8H16_1_octene	R_s=74.09568119955115
C8H16_1_octene		R=74.09568119955115
C8H17_n_octyl	R_s=73.43604846398067
C8H17_n_octyl		R=73.43604846398067
C8H18_n_octane	R_s=72.78805678301707
C8H18_n_octane		R=72.78805678301707
C8H18_isooctane	R_s=72.78805678301707
C8H18_isooctane		R=72.78805678301707
C9H19_n_nonyl	R_s=65.34112038335474
C9H19_n_nonyl		R=65.34112038335474
C10H8_naphthale	R_s=64.87039297336079
C10H8_naphthale		R=64.87039297336079
C10H21_n_decyl	R_s=58.85362700810497
C10H21_n_decyl		R=58.85362700810497
C12H9_o_bipheny	R_s=54.27206003974155
C12H9_o_bipheny		R=54.27206003974155
C12H10_biphenyl	R_s=53.91732454519163
C12H10_biphenyl		R=53.91732454519163
Ca	R_s=207.4572583462249
Ca		R=207.4572583462249
Caplus	R_s=207.4600981239042
Caplus		R=207.4600981239042
CaBr	R_s=69.29766131586405
CaBr		R=69.29766131586405
CaBr2	R_s=41.59606975976306
CaBr2		R=41.59606975976306
CaCL	R_s=110.0802584369332
CaCL		R=110.0802584369332
CaCLplus	R_s=110.0810579823968
CaCLplus		R=110.0810579823968
CaCL2	R_s=74.91595184891516
CaCL2		R=74.91595184891516
CaF	R_s=140.7409989374573
CaF		R=140.7409989374573
CaFplus	R_s=140.7423059098666
CaFplus		R=140.7423059098666
CaF2	R_s=106.4936614431362
CaF2		R=106.4936614431362
CaH	R_s=202.367817311713
CaH		R=202.367817311713
CaI	R_s=49.79248420507854
CaI		R=49.79248420507854
CaI2	R_s=28.29139668472509
CaI2		R=28.29139668472509
CaO	R_s=148.2677870229362
CaO		R=148.2677870229362
CaOplus	R_s=148.2692375271269
CaOplus		R=148.2692375271269
CaOH	R_s=145.6498638704788
CaOH		R=145.6498638704788
CaOHplus	R_s=145.6512636043372
CaOHplus		R=145.6512636043372
Ca_OH_2	R_s=112.2171852873995
Ca_OH_2		R=112.2171852873995
CaS	R_s=115.2498787131115
CaS		R=115.2498787131115
Ca2	R_s=103.7286291731124
Ca2		R=103.7286291731124
Cd	R_s=73.96493225751928
Cd		R=73.96493225751928
Cdplus	R_s=73.96529323073246
Cdplus		R=73.96529323073246
CL	R_s=234.5209714269596
CL		R=234.5209714269596
CLplus	R_s=234.5246004624662
CLplus		R=234.5246004624662
CLminus	R_s=234.5173425037629
CLminus		R=234.5173425037629
CLCN	R_s=135.2597673026367
CLCN		R=135.2597673026367
CLF	R_s=152.6952752615198
CLF		R=152.6952752615198
CLF3	R_s=89.93653891161999
CLF3		R=89.93653891161999
CLF5	R_s=63.73928460402045
CLF5		R=63.73928460402045
CLO	R_s=161.5954163459819
CLO		R=161.5954163459819
CLO2	R_s=123.2653835776065
CLO2		R=123.2653835776065
CL2	R_s=117.2604857134798
CL2		R=117.2604857134798
CL2O	R_s=95.67267396502405
CL2O		R=95.67267396502405
Co	R_s=141.0829888755405
Co		R=141.0829888755405
Coplus	R_s=141.0843022073838
Coplus		R=141.0843022073838
Cominus	R_s=141.0816755681481
Cominus		R=141.0816755681481
Cr	R_s=159.9056852340849
Cr		R=159.9056852340849
Crplus	R_s=159.9073723833997
Crplus		R=159.9073723833997
Crminus	R_s=159.9039981203712
Crminus		R=159.9039981203712
CrN	R_s=125.9715042392141
CrN		R=125.9715042392141
CrO	R_s=122.2797391003817
CrO		R=122.2797391003817
CrO2	R_s=98.9878194985648
CrO2		R=98.9878194985648
CrO3	R_s=83.1494595191926
CrO3		R=83.1494595191926
CrO3minus	R_s=83.14900333775795
CrO3minus		R=83.14900333775795
Cs	R_s=62.559300615588
Cs		R=62.559300615588
Csplus	R_s=62.55955884558522
Csplus		R=62.55955884558522
Csminus	R_s=62.5590423877226
Csminus		R=62.5590423877226
CsBO2	R_s=47.31787366207544
CsBO2		R=47.31787366207544
CsBr	R_s=39.07003189942927
CsBr		R=39.07003189942927
CsCL	R_s=49.38553425741328
CsCL		R=49.38553425741328
CsF	R_s=54.73509608115722
CsF		R=54.73509608115722
CsH	R_s=62.08842894650043
CsH		R=62.08842894650043
CsI	R_s=32.0021344835486
CsI		R=32.0021344835486
CsLi	R_s=59.45429433496524
CsLi		R=59.45429433496524
CsNO2	R_s=46.4726837569193
CsNO2		R=46.4726837569193
CsNO3	R_s=42.65792965843015
CsNO3		R=42.65792965843015
CsNa	R_s=53.33371991777555
CsNa		R=53.33371991777555
CsO	R_s=55.83748279522124
CsO		R=55.83748279522124
CsOH	R_s=55.46205897442107
CsOH		R=55.46205897442107
CsRb	R_s=38.07459017988696
CsRb		R=38.07459017988696
Cs2	R_s=31.279650307794
Cs2		R=31.279650307794
Cs2Br2	R_s=19.53501594971464
Cs2Br2		R=19.53501594971464
Cs2CO3	R_s=25.51862102917011
Cs2CO3		R=25.51862102917011
Cs2CL2	R_s=24.69276712870664
Cs2CL2		R=24.69276712870664
Cs2F2	R_s=27.36754804057861
Cs2F2		R=27.36754804057861
Cs2I2	R_s=16.0010672417743
Cs2I2		R=16.0010672417743
Cs2O	R_s=29.503790315684
Cs2O		R=29.503790315684
Cs2Oplus	R_s=29.50384775081279
Cs2Oplus		R=29.50384775081279
Cs2O2	R_s=27.91874139761062
Cs2O2		R=27.91874139761062
Cs2O2H2	R_s=27.73102948721054
Cs2O2H2		R=27.73102948721054
Cs2SO4	R_s=22.97618366639171
Cs2SO4		R=22.97618366639171
Cu	R_s=130.8417839045731
Cu		R=130.8417839045731
Cuplus	R_s=130.842913486645
Cuplus		R=130.842913486645
Cuminus	R_s=130.8406543420047
Cuminus		R=130.8406543420047
CuCL	R_s=83.98541399408076
CuCL		R=83.98541399408076
CuF	R_s=100.7272652981032
CuF		R=100.7272652981032
CuF2	R_s=81.88144778318831
CuF2		R=81.88144778318831
CuO	R_s=104.5248625313343
CuO		R=104.5248625313343
Cu2	R_s=65.42089195228652
Cu2		R=65.42089195228652
Cu3CL3	R_s=27.99513799802692
Cu3CL3		R=27.99513799802692
D	R_s=4128.128565484767
D		R=4128.128565484767
Dplus	R_s=4129.253289234842
Dplus		R=4129.253289234842
Dminus	R_s=4127.004454271128
Dminus		R=4127.004454271128
DBr	R_s=101.4973711182908
DBr		R=101.4973711182908
DCL	R_s=221.9139339893436
DCL		R=221.9139339893436
DF	R_s=395.6916093945809
DF		R=395.6916093945809
DOCL	R_s=155.5080599811822
DOCL		R=155.5080599811822
DO2	R_s=244.4505323303493
DO2		R=244.4505323303493
DO2minus	R_s=244.4465896088767
DO2minus		R=244.4465896088767
D2	R_s=2064.064282742384
D2		R=2064.064282742384
D2plus	R_s=2064.345425380731
D2plus		R=2064.345425380731
D2minus	R_s=2063.783216671086
D2minus		R=2063.783216671086
D2O	R_s=415.1506091292798
D2O		R=415.1506091292798
D2O2	R_s=230.7844415816536
D2O2		R=230.7844415816536
D2S	R_s=230.3611505368158
D2S		R=230.3611505368158
eminus	R_s=15156355.44527048
eminus		R=15156355.44527048
F	R_s=437.6405697085111
F		R=437.6405697085111
Fplus	R_s=437.653207431117
Fplus		R=437.653207431117
Fminus	R_s=437.6279327157407
Fminus		R=437.6279327157407
FCN	R_s=184.7011806733685
FCN		R=184.7011806733685
FCO	R_s=176.8716601042511
FCO		R=176.8716601042511
FO	R_s=237.5712541866057
FO		R=237.5712541866057
FO2_FOO	R_s=163.0378036103753
FO2_FOO		R=163.0378036103753
FO2_OFO	R_s=163.0378036103753
FO2_OFO		R=163.0378036103753
F2	R_s=218.8202848542556
F2		R=218.8202848542556
F2O	R_s=153.9825212609751
F2O		R=153.9825212609751
F2O2	R_s=118.7856270933028
F2O2		R=118.7856270933028
FS2F	R_s=81.41321845936034
FS2F		R=81.41321845936034
Fe	R_s=148.8848061599069
Fe		R=148.8848061599069
Feplus	R_s=148.8862687618774
Feplus		R=148.8862687618774
Fe_CO_5	R_s=42.44340477448436
Fe_CO_5		R=42.44340477448436
FeCL	R_s=91.06959626716905
FeCL		R=91.06959626716905
FeCL2	R_s=65.59689469905563
FeCL2		R=65.59689469905563
FeCL3	R_s=51.25935242040887
FeCL3		R=51.25935242040887
FeO	R_s=115.7288807478384
FeO		R=115.7288807478384
Fe_OH_2	R_s=92.52728253650581
Fe_OH_2		R=92.52728253650581
Fe2CL4	R_s=32.79844734952781
Fe2CL4		R=32.79844734952781
Fe2CL6	R_s=25.62967621020443
Fe2CL6		R=25.62967621020443
Ga	R_s=119.2500609554953
Ga		R=119.2500609554953
Gaplus	R_s=119.2509992555999
Gaplus		R=119.2509992555999
GaBr	R_s=55.56799240778737
GaBr		R=55.56799240778737
GaBr2	R_s=36.22374319808653
GaBr2		R=36.22374319808653
GaBr3	R_s=26.86984988769855
GaBr3		R=26.86984988769855
GaCL	R_s=79.05293983418271
GaCL		R=79.05293983418271
GaCL2	R_s=59.12345248846255
GaCL2		R=59.12345248846255
GaCL3	R_s=47.21931827216866
GaCL3		R=47.21931827216866
GaF	R_s=93.71438796179906
GaF		R=93.71438796179906
GaF2	R_s=77.18610233224483
GaF2		R=77.18610233224483
GaF3	R_s=65.61386896362842
GaF3		R=65.61386896362842
GaH	R_s=117.5507069466347
GaH		R=117.5507069466347
GaI	R_s=42.28540396720764
GaI		R=42.28540396720764
GaI2	R_s=25.69907626430948
GaI2		R=25.69907626430948
GaI3	R_s=18.45870319408682
GaI3		R=18.45870319408682
GaO	R_s=96.9929913301541
GaO		R=96.9929913301541
GaOH	R_s=95.86578353088434
GaOH		R=95.86578353088434
Ga2Br2	R_s=27.78399620389368
Ga2Br2		R=27.78399620389368
Ga2Br4	R_s=18.11187159904327
Ga2Br4		R=18.11187159904327
Ga2Br6	R_s=13.43492494384927
Ga2Br6		R=13.43492494384927
Ga2CL2	R_s=39.52646991709135
Ga2CL2		R=39.52646991709135
Ga2CL4	R_s=29.56172624423128
Ga2CL4		R=29.56172624423128
Ga2CL6	R_s=23.60965913608433
Ga2CL6		R=23.60965913608433
Ga2F2	R_s=46.85719398089953
Ga2F2		R=46.85719398089953
Ga2F4	R_s=38.59305116612241
Ga2F4		R=38.59305116612241
Ga2F6	R_s=32.80693448181421
Ga2F6		R=32.80693448181421
Ga2I2	R_s=21.14270198360382
Ga2I2		R=21.14270198360382
Ga2I4	R_s=12.84953813215474
Ga2I4		R=12.84953813215474
Ga2I6	R_s=9.22935159704341
Ga2I6		R=9.22935159704341
Ga2O	R_s=53.4880543264709
Ga2O		R=53.4880543264709
Ge	R_s=114.4613436123348
Ge		R=114.4613436123348
Geplus	R_s=114.4622080667311
Geplus		R=114.4622080667311
Geminus	R_s=114.4604791709957
Geminus		R=114.4604791709957
GeBr	R_s=54.50540172015943
GeBr		R=54.50540172015943
GeBr2	R_s=35.76916987885463
GeBr2		R=35.76916987885463
GeBr3	R_s=26.61891711914763
GeBr3		R=26.61891711914763
GeBr4	R_s=21.19654511339533
GeBr4		R=21.19654511339533
GeCL	R_s=76.91961551626839
GeCL		R=76.91961551626839
GeCL2	R_s=57.9220040962479
GeCL2		R=57.9220040962479
GeCL3	R_s=46.44982374203208
GeCL3		R=46.44982374203208
GeCL4	R_s=38.77078320556581
GeCL4		R=38.77078320556581
GeF	R_s=90.73130597718665
GeF		R=90.73130597718665
GeF2	R_s=75.15104846699552
GeF2		R=75.15104846699552
GeF3	R_s=64.13745174366579
GeF3		R=64.13745174366579
GeF4	R_s=55.93937900969867
GeF4		R=55.93937900969867
GeH4	R_s=108.4424304333173
GeH4		R=108.4424304333173
GeI	R_s=41.66726344257999
GeI		R=41.66726344257999
GeO	R_s=93.80108619868818
GeO		R=93.80108619868818
GeO2	R_s=79.45878584234529
GeO2		R=79.45878584234529
GeS	R_s=79.40854782484124
GeS		R=79.40854782484124
GeS2	R_s=60.79163559260072
GeS2		R=60.79163559260072
Ge2	R_s=57.23067180616741
Ge2		R=57.23067180616741
H	R_s=8248.975137408972
H		R=8248.975137408972
Hplus	R_s=8253.46732163884
Hplus		R=8253.46732163884
Hminus	R_s=8244.487840516989
Hminus		R=8244.487840516989
HALO	R_s=189.0130500714294
HALO		R=189.0130500714294
HALO2	R_s=138.6016114681605
HALO2		R=138.6016114681605
HBO	R_s=298.8845488264217
HBO		R=298.8845488264217
HBOplus	R_s=298.8904431859389
HBOplus		R=298.8904431859389
HBO2	R_s=189.7512742555869
HBO2		R=189.7512742555869
HBS	R_s=189.4650298036138
HBS		R=189.4650298036138
HBSplus	R_s=189.4673983652048
HBSplus		R=189.4673983652048
HCN	R_s=307.6546678043644
HCN		R=307.6546678043644
HCO	R_s=286.5276910501192
HCO		R=286.5276910501192
HCOplus	R_s=286.5331080963119
HCOplus		R=286.5331080963119
HCCN	R_s=212.9947607390504
HCCN		R=212.9947607390504
HCCO	R_s=202.6499473296036
HCCO		R=202.6499473296036
HCL	R_s=228.0377850927595
HCL		R=228.0377850927595
HD	R_s=2751.276123892388
HD		R=2751.276123892388
HDplus	R_s=2751.775661664527
HDplus		R=2751.775661664527
HDO	R_s=437.1104987729112
HDO		R=437.1104987729112
HDO2	R_s=237.4149656367485
HDO2		R=237.4149656367485
HF	R_s=415.5917909075958
HF		R=415.5917909075958
HI	R_s=65.00129268145288
HI		R=65.00129268145288
HNC	R_s=307.6546678043644
HNC		R=307.6546678043644
HNCO	R_s=193.2486285797427
HNCO		R=193.2486285797427
HNO	R_s=268.0873565649622
HNO		R=268.0873565649622
HNO2	R_s=176.8530871172158
HNO2		R=176.8530871172158
HNO3	R_s=131.9488535987269
HNO3		R=131.9488535987269
HOCL	R_s=158.4906235834537
HOCL		R=158.4906235834537
HOF	R_s=230.9207160039958
HOF		R=230.9207160039958
HO2	R_s=251.9022478439252
HO2		R=251.9022478439252
HO2minus	R_s=251.8980610846054
HO2minus		R=251.8980610846054
HPO	R_s=173.2863945743971
HPO		R=173.2863945743971
HSO3F	R_s=83.08693868405707
HSO3F		R=83.08693868405707
H2	R_s=4124.487568704486
H2		R=4124.487568704486
H2plus	R_s=4125.610309053885
H2plus		R=4125.610309053885
H2minus	R_s=4123.365439272186
H2minus		R=4123.365439272186
HBOH	R_s=288.4337486488024
HBOH		R=288.4337486488024
HCOOH	R_s=180.6497197850404
HCOOH		R=180.6497197850404
H2F2	R_s=207.7958954537979
H2F2		R=207.7958954537979
H2O	R_s=461.5233290850878
H2O		R=461.5233290850878
H2Oplus	R_s=461.5373837880259
H2Oplus		R=461.5373837880259
H2O2	R_s=244.4377545224592
H2O2		R=244.4377545224592
H2S	R_s=243.9629493135154
H2S		R=243.9629493135154
H2SO4	R_s=84.77366288710837
H2SO4		R=84.77366288710837
H2BOH	R_s=278.689102647899
H2BOH		R=278.689102647899
HB_OH_2	R_s=181.4055272090662
HB_OH_2		R=181.4055272090662
H3BO3	R_s=134.4665358412059
H3BO3		R=134.4665358412059
H3B3O3	R_s=99.62818294214057
H3B3O3		R=99.62818294214057
H3B3O6	R_s=63.25042475186231
H3B3O6		R=63.25042475186231
H3F3	R_s=138.5305969691986
H3F3		R=138.5305969691986
H3Oplus	R_s=437.0822491314233
H3Oplus		R=437.0822491314233
H4F4	R_s=103.897947726899
H4F4		R=103.897947726899
H5F5	R_s=83.11835818151914
H5F5		R=83.11835818151914
H6F6	R_s=69.26529848459929
H6F6		R=69.26529848459929
H7F7	R_s=59.37025584394225
H7F7		R=59.37025584394225
He	R_s=2077.26673798694
He		R=2077.26673798694
Heplus	R_s=2077.551488943151
Heplus		R=2077.551488943151
Hg	R_s=41.45008225734085
Hg		R=41.45008225734085
Hgplus	R_s=41.45019562080521
Hgplus		R=41.45019562080521
HgBr2	R_s=23.07025011237576
HgBr2		R=23.07025011237576
I	R_s=65.51756608730962
I		R=65.51756608730962
Iplus	R_s=65.5178493168297
Iplus		R=65.5178493168297
Iminus	R_s=65.51728286023828
Iminus		R=65.51728286023828
IF5	R_s=37.47004808359156
IF5		R=37.47004808359156
IF7	R_s=31.99186836728072
IF7		R=31.99186836728072
I2	R_s=32.75878304365481
I2		R=32.75878304365481
In	R_s=72.41436011775157
In		R=72.41436011775157
Inplus	R_s=72.4147061149626
Inplus		R=72.4147061149626
InBr	R_s=42.69919166812174
InBr		R=42.69919166812174
InBr2	R_s=30.27561847749303
InBr2		R=30.27561847749303
InBr3	R_s=23.45209714269597
InBr3		R=23.45209714269597
InCL	R_s=55.32985073633636
InCL		R=55.32985073633636
InCL2	R_s=44.76789214102647
InCL2		R=44.76789214102647
InCL3	R_s=37.59193767887258
InCL3		R=37.59193767887258
InF	R_s=62.13342909518585
InF		R=62.13342909518585
InF2	R_s=54.40881152731022
InF2		R=54.40881152731022
InF3	R_s=48.39250730113827
InF3		R=48.39250730113827
InH	R_s=71.78419618265131
InH		R=71.78419618265131
InI	R_s=34.39676915431156
InI		R=34.39676915431156
InI2	R_s=22.55524786115741
InI2		R=22.55524786115741
InI3	R_s=16.7789000499484
InI3		R=16.7789000499484
InO	R_s=63.55784475153917
InO		R=63.55784475153917
InOH	R_s=63.07187980702344
InOH		R=63.07187980702344
In2Br2	R_s=21.34959583406087
In2Br2		R=21.34959583406087
In2Br4	R_s=15.13780923874652
In2Br4		R=15.13780923874652
In2Br6	R_s=11.72604857134799
In2Br6		R=11.72604857134799
In2CL2	R_s=27.66492536816818
In2CL2		R=27.66492536816818
In2CL4	R_s=22.38394607051324
In2CL4		R=22.38394607051324
In2CL6	R_s=18.79596883943629
In2CL6		R=18.79596883943629
In2F2	R_s=31.06671454759293
In2F2		R=31.06671454759293
In2F4	R_s=27.20440576365511
In2F4		R=27.20440576365511
In2F6	R_s=24.19625365056914
In2F6		R=24.19625365056914
In2I2	R_s=17.19838457715578
In2I2		R=17.19838457715578
In2I4	R_s=11.2776239305787
In2I4		R=11.2776239305787
In2I6	R_s=8.389450024974199
In2I6		R=8.389450024974199
In2O	R_s=33.84883449209683
In2O		R=33.84883449209683
K	R_s=212.6555886061542
K		R=212.6555886061542
Kplus	R_s=212.6585724825086
Kplus		R=212.6585724825086
Kminus	R_s=212.6526048135341
Kminus		R=212.6526048135341
KALF4	R_s=58.5223484977814
KALF4		R=58.5223484977814
KBO2	R_s=101.5097652124759
KBO2		R=101.5097652124759
KBr	R_s=69.86816221199086
KBr		R=69.86816221199086
KCN	R_s=127.6876697939207
KCN		R=127.6876697939207
KCL	R_s=111.5268546624942
KCL		R=111.5268546624942
KF	R_s=143.1143514525623
KF		R=143.1143514525623
KH	R_s=207.3111815019309
KH		R=207.3111815019309
KI	R_s=50.08634494472592
KI		R=50.08634494472592
KLi	R_s=180.5951002730276
KLi		R=180.5951002730276
KNO2	R_s=97.69801113463794
KNO2		R=97.69801113463794
KNO3	R_s=82.23747616297011
KNO3		R=82.23747616297011
KNa	R_s=133.9141641864532
KNa		R=133.9141641864532
KO	R_s=150.9041575238168
KO		R=150.9041575238168
KOH	R_s=148.1931584774721
KOH		R=148.1931584774721
K2	R_s=106.3277943030771
K2		R=106.3277943030771
K2plus	R_s=106.3285402669322
K2plus		R=106.3285402669322
K2Br2	R_s=34.93408110599543
K2Br2		R=34.93408110599543
K2CO3	R_s=60.16021070073188
K2CO3		R=60.16021070073188
K2C2N2	R_s=63.84383489696034
K2C2N2		R=63.84383489696034
K2CL2	R_s=55.76342733124707
K2CL2		R=55.76342733124707
K2F2	R_s=71.55717572628115
K2F2		R=71.55717572628115
K2I2	R_s=25.04317247236296
K2I2		R=25.04317247236296
K2O	R_s=88.26778207142554
K2O		R=88.26778207142554
K2Oplus	R_s=88.26829614832124
K2Oplus		R=88.26829614832124
K2O2	R_s=75.45207876190838
K2O2		R=75.45207876190838
K2O2H2	R_s=74.09657923873607
K2O2H2		R=74.09657923873607
K2SO4	R_s=47.71324555604525
K2SO4		R=47.71324555604525
Kr	R_s=99.21804295942721
Kr		R=99.21804295942721
Krplus	R_s=99.21869249850485
Krplus		R=99.21869249850485
Li	R_s=1197.878115545311
Li		R=1197.878115545311
Liplus	R_s=1197.972800443499
Liplus		R=1197.972800443499
Liminus	R_s=1197.783445613274
Liminus		R=1197.783445613274
LiALF4	R_s=75.64376972342085
LiALF4		R=75.64376972342085
LiBO2	R_s=167.1223779316112
LiBO2		R=167.1223779316112
LiBr	R_s=95.73921354136679
LiBr		R=95.73921354136679
LiCL	R_s=196.1237911025145
LiCL		R=196.1237911025145
LiF	R_s=320.5344369680795
LiF		R=320.5344369680795
LiH	R_s=1045.984999257763
LiH		R=1045.984999257763
LiI	R_s=62.11993577369485
LiI		R=62.11993577369485
LiN	R_s=396.9157473135476
LiN		R=396.9157473135476
LiNO2	R_s=157.0353470012182
LiNO2		R=157.0353470012182
LiNO3	R_s=120.5941470051156
LiNO3		R=120.5941470051156
LiO	R_s=362.4379696953846
LiO		R=362.4379696953846
LiOF	R_s=198.2524861367527
LiOF		R=198.2524861367527
LiOH	R_s=347.1836461316316
LiOH		R=347.1836461316316
LiON	R_s=225.0372018372214
LiON		R=225.0372018372214
Li2	R_s=598.9390577726553
Li2		R=598.9390577726553
Li2plus	R_s=598.9627280617069
Li2plus		R=598.9627280617069
Li2Br2	R_s=47.8696067706834
Li2Br2		R=47.8696067706834
Li2F2	R_s=160.2672184840397
Li2F2		R=160.2672184840397
Li2I2	R_s=31.05996788684742
Li2I2		R=31.05996788684742
Li2O	R_s=278.2490780217794
Li2O		R=278.2490780217794
Li2Oplus	R_s=278.2541865590885
Li2Oplus		R=278.2541865590885
Li2O2	R_s=181.2189848476923
Li2O2		R=181.2189848476923
Li2O2H2	R_s=173.5918230658158
Li2O2H2		R=173.5918230658158
Li2SO4	R_s=75.62419618607918
Li2SO4		R=75.62419618607918
Li3plus	R_s=399.303225171653
Li3plus		R=399.303225171653
Li3Br3	R_s=31.9130711804556
Li3Br3		R=31.9130711804556
Li3CL3	R_s=65.37459703417152
Li3CL3		R=65.37459703417152
Li3F3	R_s=106.8448123226932
Li3F3		R=106.8448123226932
Li3I3	R_s=20.70664525789828
Li3I3		R=20.70664525789828
Mg	R_s=342.0889528903518
Mg		R=342.0889528903518
Mgplus	R_s=342.0966745211126
Mgplus		R=342.0966745211126
MgBr	R_s=79.78650596397624
MgBr		R=79.78650596397624
MgBr2	R_s=45.15961393274782
MgBr2		R=45.15961393274782
MgCL	R_s=139.1357140466548
MgCL		R=139.1357140466548
MgCLplus	R_s=139.1369913744347
MgCLplus		R=139.1369913744347
MgCL2	R_s=87.32680047473507
MgCL2		R=87.32680047473507
MgF	R_s=192.0050477695481
MgF		R=192.0050477695481
MgFplus	R_s=192.0074802643611
MgFplus		R=192.0074802643611
MgF2	R_s=133.4547500375527
MgF2		R=133.4547500375527
MgF2plus	R_s=133.4559251867945
MgF2plus		R=133.4559251867945
MgH	R_s=328.4672582481529
MgH		R=328.4672582481529
MgI	R_s=54.98645025341336
MgI		R=54.98645025341336
MgI2	R_s=29.89591963639075
MgI2		R=29.89591963639075
MgN	R_s=217.0217453153997
MgN		R=217.0217453153997
MgO	R_s=206.2919185002134
MgO		R=206.2919185002134
MgOH	R_s=201.2588006392279
MgOH		R=201.2588006392279
MgOHplus	R_s=201.261473255793
MgOHplus		R=201.261473255793
Mg_OH_2	R_s=142.5671745798331
Mg_OH_2		R=142.5671745798331
MgS	R_s=147.4981727869434
MgS		R=147.4981727869434
Mg2	R_s=171.0444764451759
Mg2		R=171.0444764451759
Mg2F4	R_s=66.72737501877634
Mg2F4		R=66.72737501877634
Mn	R_s=151.3426878337088
Mn		R=151.3426878337088
Mnplus	R_s=151.344199125594
Mnplus		R=151.344199125594
Mo	R_s=86.66324786324788
Mo		R=86.66324786324788
Moplus	R_s=86.66374342015469
Moplus		R=86.66374342015469
Mominus	R_s=86.66275231200837
Mominus		R=86.66275231200837
MoO	R_s=74.27654605974304
MoO		R=74.27654605974304
MoO2	R_s=64.98788483243551
MoO2		R=64.98788483243551
MoO3	R_s=57.76417934919292
MoO3		R=57.76417934919292
MoO3minus	R_s=57.763959190069
MoO3minus		R=57.763959190069
Mo2O6	R_s=28.88208967459646
Mo2O6		R=28.88208967459646
Mo3O9	R_s=19.25472644973097
Mo3O9		R=19.25472644973097
Mo4O12	R_s=14.44104483729823
Mo4O12		R=14.44104483729823
Mo5O15	R_s=11.55283586983858
Mo5O15		R=11.55283586983858
N	R_s=593.6067739010616
N		R=593.6067739010616
Nplus	R_s=593.6300245904811
Nplus		R=593.6300245904811
Nminus	R_s=593.583525032889
Nminus		R=593.583525032889
NCO	R_s=197.8844652615144
NCO		R=197.8844652615144
ND	R_s=518.9797614376608
ND		R=518.9797614376608
ND2	R_s=461.0211398962811
ND2		R=461.0211398962811
ND3	R_s=414.7074423540001
ND3		R=414.7074423540001
NF	R_s=251.9147402635602
NF		R=251.9147402635602
NF2	R_s=159.8829112799979
NF2		R=159.8829112799979
NF3	R_s=117.1020898851994
NF3		R=117.1020898851994
NH	R_s=553.7576658514623
NH		R=553.7576658514623
NHplus	R_s=553.7778996070318
NHplus		R=553.7778996070318
NHF	R_s=244.4495175309689
NHF		R=244.4495175309689
NHF2	R_s=156.8429568448825
NHF2		R=156.8429568448825
NH2	R_s=518.9221710860547
NH2		R=518.9221710860547
NH2F	R_s=237.4140084108204
NH2F		R=237.4140084108204
NH3	R_s=488.2101075011215
NH3		R=488.2101075011215
NH2OH	R_s=251.7254658806319
NH2OH		R=251.7254658806319
NH4plus	R_s=460.944275399867
NH4plus		R=460.944275399867
NO	R_s=277.0927244793559
NO		R=277.0927244793559
NOCL	R_s=127.0178172324398
NOCL		R=127.0178172324398
NOF	R_s=169.667509250456
NOF		R=169.667509250456
NOF3	R_s=95.56720511710552
NOF3		R=95.56720511710552
NO2	R_s=180.7277825477389
NO2		R=180.7277825477389
NO2minus	R_s=180.7256274558646
NO2minus		R=180.7256274558646
NO2CL	R_s=102.0700356623311
NO2CL		R=102.0700356623311
NO2F	R_s=127.9072731127937
NO2F		R=127.9072731127937
NO3	R_s=134.0937893618085
NO3		R=134.0937893618085
NO3minus	R_s=134.0926029523154
NO3minus		R=134.0926029523154
NO3F	R_s=102.6436166371052
NO3F		R=102.6436166371052
N2	R_s=296.8033869505308
N2		R=296.8033869505308
N2plus	R_s=296.809199509051
N2plus		R=296.809199509051
N2minus	R_s=296.7975746196665
N2minus		R=296.7975746196665
NCN	R_s=207.7366386751982
NCN		R=207.7366386751982
N2D2_cis	R_s=259.4898807188304
N2D2_cis		R=259.4898807188304
N2F2	R_s=125.9573701317801
N2F2		R=125.9573701317801
N2F4	R_s=79.94145563999894
N2F4		R=79.94145563999894
N2H2	R_s=276.8788329257312
N2H2		R=276.8788329257312
NH2NO2	R_s=134.0436782824811
NH2NO2		R=134.0436782824811
N2H4	R_s=259.4610855430274
N2H4		R=259.4610855430274
N2O	R_s=188.9103169986913
N2O		R=188.9103169986913
N2Oplus	R_s=188.9126717112227
N2Oplus		R=188.9126717112227
N2O3	R_s=109.384251877345
N2O3		R=109.384251877345
N2O4	R_s=90.36389127386944
N2O4		R=90.36389127386944
N2O5	R_s=76.97843911327057
N2O5		R=76.97843911327057
N3	R_s=197.8689246336872
N3		R=197.8689246336872
N3H	R_s=193.2338075357372
N3H		R=193.2338075357372
Na	R_s=361.6596425279592
Na		R=361.6596425279592
Naplus	R_s=361.6682729411619
Naplus		R=361.6682729411619
Naminus	R_s=361.6510125266381
Naminus		R=361.6510125266381
NaALF4	R_s=66.00624957484196
NaALF4		R=66.00624957484196
NaBO2	R_s=126.360582599552
NaBO2		R=126.360582599552
NaBr	R_s=80.80636952072025
NaBr		R=80.80636952072025
NaCN	R_s=169.6582765338215
NaCN		R=169.6582765338215
NaCL	R_s=142.2669048712099
NaCL		R=142.2669048712099
NaF	R_s=198.0193794189646
NaF		R=198.0193794189646
NaH	R_s=346.4693922878474
NaH		R=346.4693922878474
NaI	R_s=55.46892262170982
NaI		R=55.46892262170982
NaLi	R_s=277.7901136522716
NaLi		R=277.7901136522716
NaNO2	R_s=120.5078551036904
NaNO2		R=120.5078551036904
NaNO3	R_s=97.82345175291582
NaNO3		R=97.82345175291582
NaO	R_s=213.2508078525396
NaO		R=213.2508078525396
NaOH	R_s=207.87681910018
NaOH		R=207.87681910018
NaOHplus	R_s=207.8796703758639
NaOHplus		R=207.8796703758639
Na2	R_s=180.8298212639796
Na2		R=180.8298212639796
Na2Br2	R_s=40.40318476036013
Na2Br2		R=40.40318476036013
Na2CL2	R_s=71.13345243560495
Na2CL2		R=71.13345243560495
Na2F2	R_s=99.00968970948229
Na2F2		R=99.00968970948229
Na2I2	R_s=27.73446131085491
Na2I2		R=27.73446131085491
Na2O	R_s=134.1499548072297
Na2O		R=134.1499548072297
Na2Oplus	R_s=134.1511422318069
Na2Oplus		R=134.1511422318069
Na2O2	R_s=106.6254039262698
Na2O2		R=106.6254039262698
Na2O2H2	R_s=103.93840955009
Na2O2H2		R=103.93840955009
Na2SO4	R_s=58.53524876490879
Na2SO4		R=58.53524876490879
Na3CL3	R_s=47.42230162373664
Na3CL3		R=47.42230162373664
Na3F3	R_s=66.00645980632153
Na3F3		R=66.00645980632153
Nb	R_s=89.49301436564421
Nb		R=89.49301436564421
Nbplus	R_s=89.49354281328783
Nbplus		R=89.49354281328783
Nbminus	R_s=89.49248592424141
Nbminus		R=89.49248592424141
NbCL5	R_s=30.77480671712896
NbCL5		R=30.77480671712896
NbO	R_s=76.34555300921586
NbO		R=76.34555300921586
NbOCL3	R_s=38.62439550027646
NbOCL3		R=38.62439550027646
NbO2	R_s=66.56627051015819
NbO2		R=66.56627051015819
Ne	R_s=412.0215860493466
Ne		R=412.0215860493466
Neplus	R_s=412.0327874639962
Neplus		R=412.0327874639962
Ni	R_s=141.6594029311643
Ni		R=141.6594029311643
Niplus	R_s=141.6607270165784
Niplus		R=141.6607270165784
Niminus	R_s=141.6580788705022
Niminus		R=141.6580788705022
NiCL	R_s=88.31428498593679
NiCL		R=88.31428498593679
NiCL2	R_s=64.15517355790227
NiCL2		R=64.15517355790227
NiO	R_s=111.3155752629437
NiO		R=111.3155752629437
NiS	R_s=91.61104647062973
NiS		R=91.61104647062973
O	R_s=519.6739877745415
O		R=519.6739877745415
Oplus	R_s=519.691807375622
Oplus		R=519.691807375622
Ominus	R_s=519.6561693954442
Ominus		R=519.6561693954442
OD	R_s=461.5688831633072
OD		R=461.5688831633072
ODminus	R_s=461.5548265418994
ODminus		R=461.5548265418994
OH	R_s=488.8755090449183
OH		R=488.8755090449183
OHplus	R_s=488.8912790451466
OHplus		R=488.8912790451466
OHminus	R_s=488.8597400620322
OHminus		R=488.8597400620322
O2	R_s=259.8369938872708
O2		R=259.8369938872708
O2plus	R_s=259.841448711163
O2plus		R=259.841448711163
O2minus	R_s=259.8325392161265
O2minus		R=259.8325392161265
O3	R_s=173.2246625915139
O3		R=173.2246625915139
P	R_s=268.4359836056074
P		R=268.4359836056074
Pplus	R_s=268.4407381650862
Pplus		R=268.4407381650862
Pminus	R_s=268.4312292145488
Pminus		R=268.4312292145488
PCL	R_s=125.1675059092525
PCL		R=125.1675059092525
PCL2	R_s=81.61063510936191
PCL2		R=81.61063510936191
PCL2minus	R_s=81.6101956564922
PCL2minus		R=81.6101956564922
PCL3	R_s=60.54252415416013
PCL3		R=60.54252415416013
PCL5	R_s=39.92759061796377
PCL5		R=39.92759061796377
PF	R_s=166.3820675591232
PF		R=166.3820675591232
PFplus	R_s=166.3838941400966
PFplus		R=166.3838941400966
PFminus	R_s=166.3802410182543
PFminus		R=166.3802410182543
PFCL	R_s=97.33047724127172
PFCL		R=97.33047724127172
PFCLminus	R_s=97.32985218942183
PFCLminus		R=97.32985218942183
PFCL2	R_s=68.7839036523025
PFCL2		R=68.7839036523025
PFCL4	R_s=43.35327702723852
PFCL4		R=43.35327702723852
PF2	R_s=120.5510163745587
PF2		R=120.5510163745587
PF2minus	R_s=120.5500575052316
PF2minus		R=120.5500575052316
PF2CL	R_s=79.62256229143155
PF2CL		R=79.62256229143155
PF2CL3	R_s=47.42196152820714
PF2CL3		R=47.42196152820714
PF3	R_s=94.51596333673592
PF3		R=94.51596333673592
PF3CL2	R_s=52.33342903919946
PF3CL2		R=52.33342903919946
PF4CL	R_s=58.37979341127105
PF4CL		R=58.37979341127105
PF5	R_s=66.00580092480199
PF5		R=66.00580092480199
PH	R_s=259.9759156024878
PH		R=259.9759156024878
PH2	R_s=252.0328123607044
PH2		R=252.0328123607044
PH2minus	R_s=252.0286212601821
PH2minus		R=252.0286212601821
PH3	R_s=244.5606938917213
PH3		R=244.5606938917213
PN	R_s=184.8463047099495
PN		R=184.8463047099495
PO	R_s=177.0047368113038
PO		R=177.0047368113038
POminus	R_s=177.0026695954198
POminus		R=177.0026695954198
POCL3	R_s=54.2252319785671
POCL3		R=54.2252319785671
POFCL2	R_s=60.74386294492521
POFCL2		R=60.74386294492521
POF2CL	R_s=69.04390565615641
POF2CL		R=69.04390565615641
POF3	R_s=79.97116769280214
POF3		R=79.97116769280214
PO2	R_s=132.0332517522989
PO2		R=132.0332517522989
PO2minus	R_s=132.0321015241718
PO2minus		R=132.0321015241718
PS	R_s=131.8945973573307
PS		R=131.8945973573307
P2	R_s=134.2179918028037
P2		R=134.2179918028037
P2O3	R_s=75.62342443846974
P2O3		R=75.62342443846974
P2O4	R_s=66.01662587614946
P2O4		R=66.01662587614946
P2O5	R_s=58.57550459044837
P2O5		R=58.57550459044837
P3	R_s=89.47866120186912
P3		R=89.47866120186912
P3O6	R_s=44.01108391743297
P3O6		R=44.01108391743297
P4	R_s=67.10899590140184
P4		R=67.10899590140184
P4O6	R_s=37.81171221923487
P4O6		R=37.81171221923487
P4O7	R_s=35.24711624669926
P4O7		R=35.24711624669926
P4O8	R_s=33.00831293807473
P4O8		R=33.00831293807473
P4O9	R_s=31.03692952012733
P4O9		R=31.03692952012733
P4O10	R_s=29.28775229522418
P4O10		R=29.28775229522418
Pb	R_s=40.12776061776062
Pb		R=40.12776061776062
Pbplus	R_s=40.12786686364751
Pbplus		R=40.12786686364751
Pbminus	R_s=40.12765437243635
Pbminus		R=40.12765437243635
PbBr	R_s=28.95979157378512
PbBr		R=28.95979157378512
PbBr2	R_s=22.65474322085622
PbBr2		R=22.65474322085622
PbBr3	R_s=18.60427108692539
PbBr3		R=18.60427108692539
PbBr4	R_s=15.78249711474215
PbBr4		R=15.78249711474215
PbCL	R_s=34.26486381787986
PbCL		R=34.26486381787986
PbCL2	R_s=29.896773172819
PbCL2		R=29.896773172819
PbCL3	R_s=26.51645144932851
PbCL3		R=26.51645144932851
PbCL4	R_s=23.82288288081785
PbCL4		R=23.82288288081785
PbF	R_s=36.75743012495325
PbF		R=36.75743012495325
PbF2	R_s=33.90938129282258
PbF2		R=33.90938129282258
PbF3	R_s=31.47094155336267
PbF3		R=31.47094155336267
PbF4	R_s=29.35967346788974
PbF4		R=29.35967346788974
PbI	R_s=24.88584483769403
PbI		R=24.88584483769403
PbI2	R_s=18.03538126614204
PbI2		R=18.03538126614204
PbI3	R_s=14.14234113149418
PbI3		R=14.14234113149418
PbI4	R_s=11.63159488959622
PbI4		R=11.63159488959622
PbO	R_s=37.25131877594653
PbO		R=37.25131877594653
PbO2	R_s=34.75967270738816
PbO2		R=34.75967270738816
PbS	R_s=34.75005537792824
PbS		R=34.75005537792824
PbS2	R_s=30.64339365348469
PbS2		R=30.64339365348469
Rb	R_s=97.28192371864024
Rb		R=97.28192371864024
Rbplus	R_s=97.28254815504691
Rbplus		R=97.28254815504691
Rbminus	R_s=97.28129929024978
Rbminus		R=97.28129929024978
RbBO2	R_s=64.81624227456703
RbBO2		R=64.81624227456703
RbBr	R_s=50.27744754547027
RbBr		R=50.27744754547027
RbCL	R_s=68.75965094508142
RbCL		R=68.75965094508142
RbF	R_s=79.59006592861414
RbF		R=79.59006592861414
RbH	R_s=96.14802949358978
RbH		R=96.14802949358978
RbI	R_s=39.15045970926431
RbI		R=39.15045970926431
RbK	R_s=66.74746981722957
RbK		R=66.74746981722957
RbLi	R_s=89.9748941659236
RbLi		R=89.9748941659236
RbNO2	R_s=63.24076447461196
RbNO2		R=63.24076447461196
RbNO3	R_s=56.37973672415301
RbNO3		R=56.37973672415301
RbNa	R_s=76.6610574070579
RbNa		R=76.6610574070579
RbO	R_s=81.94246022359934
RbO		R=81.94246022359934
RbOH	R_s=81.13647856445964
RbOH		R=81.13647856445964
Rb2Br2	R_s=25.13872377273513
Rb2Br2		R=25.13872377273513
Rb2CL2	R_s=34.37982547254071
Rb2CL2		R=34.37982547254071
Rb2F2	R_s=39.79503296430707
Rb2F2		R=39.79503296430707
Rb2I2	R_s=19.57522985463216
Rb2I2		R=19.57522985463216
Rb2O	R_s=44.47787733704229
Rb2O		R=44.47787733704229
Rb2O2	R_s=40.97123011179967
Rb2O2		R=40.97123011179967
Rb2O2H2	R_s=40.56823928222982
Rb2O2H2		R=40.56823928222982
Rb2SO4	R_s=31.1405545056109
Rb2SO4		R=31.1405545056109
Rn	R_s=37.44960759867686
Rn		R=37.44960759867686
Rnplus	R_s=37.44970013595992
Rnplus		R=37.44970013595992
S	R_s=259.300545766412
S		R=259.300545766412
Splus	R_s=259.3049822146652
Splus		R=259.3049822146652
Sminus	R_s=259.2961094699624
Sminus		R=259.2961094699624
SCL	R_s=123.1445244231168
SCL		R=123.1445244231168
SCL2	R_s=80.7457633702693
SCL2		R=80.7457633702693
SCL2plus	R_s=80.74619356286517
SCL2plus		R=80.74619356286517
SD	R_s=243.9756775281227
SD		R=243.9756775281227
SF	R_s=162.8264369187207
SF		R=162.8264369187207
SFplus	R_s=162.8281862643848
SFplus		R=162.8281862643848
SFminus	R_s=162.8246876106444
SFminus		R=162.8246876106444
SF2	R_s=118.6733889293497
SF2		R=118.6733889293497
SF2plus	R_s=118.6743181764573
SF2plus		R=118.6743181764573
SF2minus	R_s=118.6724596967944
SF2minus		R=118.6724596967944
SF3	R_s=93.35787595092299
SF3		R=93.35787595092299
SF3plus	R_s=93.35845102756454
SF3plus		R=93.35845102756454
SF3minus	R_s=93.35730088136619
SF3minus		R=93.35730088136619
SF4	R_s=76.944093437409
SF4		R=76.944093437409
SF4plus	R_s=76.94448407488684
SF4plus		R=76.94448407488684
SF4minus	R_s=76.94370280389758
SF4minus		R=76.94370280389758
SF5	R_s=65.43890500308933
SF5		R=65.43890500308933
SF5plus	R_s=65.43918755291948
SF5plus		R=65.43918755291948
SF5minus	R_s=65.4386224556991
SF5minus		R=65.4386224556991
SF6	R_s=56.92682986733026
SF6		R=56.92682986733026
SF6minus	R_s=56.92661604478445
SF6minus		R=56.92661604478445
SH	R_s=251.3980311396568
SH		R=251.3980311396568
SHminus	R_s=251.3938611241634
SHminus		R=251.3938611241634
SN	R_s=180.4680964670286
SN		R=180.4680964670286
SO	R_s=172.9860770133404
SO		R=172.9860770133404
SOminus	R_s=172.9841025982081
SOminus		R=172.9841025982081
SOF2	R_s=96.61114859761017
SOF2		R=96.61114859761017
SO2	R_s=129.7842463294403
SO2		R=129.7842463294403
SO2minus	R_s=129.7831349525343
SO2minus		R=129.7831349525343
SO2CL2	R_s=61.60246218042851
SO2CL2		R=61.60246218042851
SO2FCL	R_s=70.15531995476509
SO2FCL		R=70.15531995476509
SO2F2	R_s=81.46602585735764
SO2F2		R=81.46602585735764
SO3	R_s=103.8488594010732
SO3		R=103.8488594010732
S2	R_s=129.650272883206
S2		R=129.650272883206
S2minus	R_s=129.6491637996061
S2minus		R=129.6491637996061
S2CL2	R_s=61.5722622115584
S2CL2		R=61.5722622115584
S2F2	R_s=81.41321845936034
S2F2		R=81.41321845936034
S2O	R_s=103.7630632452009
S2O		R=103.7630632452009
S3	R_s=86.43351525547067
S3		R=86.43351525547067
S4	R_s=64.82513644160301
S4		R=64.82513644160301
S5	R_s=51.8601091532824
S5		R=51.8601091532824
S6	R_s=43.21675762773533
S6		R=43.21675762773533
S7	R_s=37.04293510948742
S7		R=37.04293510948742
S8	R_s=32.4125682208015
S8		R=32.4125682208015
Sc	R_s=184.9472516516738
Sc		R=184.9472516516738
Scplus	R_s=184.9495086029939
Scplus		R=184.9495086029939
Scminus	R_s=184.9449947554365
Scminus		R=184.9449947554365
ScO	R_s=136.4027514584045
ScO		R=136.4027514584045
ScOplus	R_s=136.4039790991619
ScOplus		R=136.4039790991619
ScO2	R_s=108.0437051871159
ScO2		R=108.0437051871159
Sc2O	R_s=78.50416603642182
Sc2O		R=78.50416603642182
Sc2O2	R_s=68.20137572920227
Sc2O2		R=68.20137572920227
Si	R_s=296.0414448736893
Si		R=296.0414448736893
Siplus	R_s=296.0472276266784
Siplus		R=296.0472276266784
Siminus	R_s=296.0356623466072
Siminus		R=296.0356623466072
SiBr	R_s=76.99333731520194
SiBr		R=76.99333731520194
SiBr2	R_s=44.25098260450734
SiBr2		R=44.25098260450734
SiBr3	R_s=31.04760873421148
SiBr3		R=31.04760873421148
SiBr4	R_s=23.9126722202809
SiBr4		R=23.9126722202809
SiC	R_s=207.3630917643068
SiC		R=207.3630917643068
SiC2	R_s=159.5656621291998
SiC2		R=159.5656621291998
SiCL	R_s=130.857228294656
SiCL		R=130.857228294656
SiCL2	R_s=83.99177707176879
SiCL2		R=83.99177707176879
SiCL3	R_s=61.84315461026669
SiCL3		R=61.84315461026669
SiCL4	R_s=48.93816565870598
SiCL4		R=48.93816565870598
SiF	R_s=176.5884184385121
SiF		R=176.5884184385121
SiFCL	R_s=100.7364182280103
SiFCL		R=100.7364182280103
SiF2	R_s=125.8199426283947
SiF2		R=125.8199426283947
SiF3	R_s=97.7245257954454
SiF3		R=97.7245257954454
SiF4	R_s=79.88607681521283
SiF4		R=79.88607681521283
SiH	R_s=285.7851116952825
SiH		R=285.7851116952825
SiHplus	R_s=285.7905006994252
SiHplus		R=285.7905006994252
SiHBr3	R_s=30.9311894878318
SiHBr3		R=30.9311894878318
SiHCL	R_s=128.8137967020334
SiHCL		R=128.8137967020334
SiHCL3	R_s=61.3829621673851
SiHCL3		R=61.3829621673851
SiHF	R_s=172.8873639844189
SiHF		R=172.8873639844189
SiHF3	R_s=96.58035105245745
SiHF3		R=96.58035105245745
SiHI3	R_s=20.28875798440168
SiHI3		R=20.28875798440168
SiH2	R_s=276.2156419406685
SiH2		R=276.2156419406685
SiH2Br2	R_s=43.7812603042567
SiH2Br2		R=43.7812603042567
SiH2CL2	R_s=82.31549021467541
SiH2CL2		R=82.31549021467541
SiH2F2	R_s=122.0953514262753
SiH2F2		R=122.0953514262753
SiH2I2	R_s=29.28555749576134
SiH2I2		R=29.28555749576134
SiH3	R_s=267.2662726154092
SiH3		R=267.2662726154092
SiH3Br	R_s=74.89616561327956
SiH3Br		R=74.89616561327956
SiH3CL	R_s=124.9125931908624
SiH3CL		R=124.9125931908624
SiH3F	R_s=165.9319455967618
SiH3F		R=165.9319455967618
SiH3I	R_s=52.61864803065607
SiH3I		R=52.61864803065607
SiH4	R_s=258.8786216507884
SiH4		R=258.8786216507884
SiI	R_s=53.64522620399243
SiI		R=53.64522620399243
SiI2	R_s=29.49498400890774
SiI2		R=29.49498400890774
SiN	R_s=197.5299936805394
SiN		R=197.5299936805394
SiO	R_s=188.601357834542
SiO		R=188.601357834542
SiO2	R_s=138.3801092797952
SiO2		R=138.3801092797952
SiS	R_s=138.2278119051379
SiS		R=138.2278119051379
SiS2	R_s=90.1634974597546
SiS2		R=90.1634974597546
Si2	R_s=148.0207224368446
Si2		R=148.0207224368446
Si2C	R_s=121.9458007060545
Si2C		R=121.9458007060545
Si2F6	R_s=48.8622628977227
Si2F6		R=48.8622628977227
Si2N	R_s=118.4774080655251
Si2N		R=118.4774080655251
Si3	R_s=98.6804816245631
Si3		R=98.6804816245631
Sn	R_s=70.0401988038076
Sn		R=70.0401988038076
Snplus	R_s=70.04052248530566
Snplus		R=70.04052248530566
Snminus	R_s=70.03987512530121
Snminus		R=70.03987512530121
SnBr	R_s=41.86246689558642
SnBr		R=41.86246689558642
SnBr2	R_s=29.85254812974386
SnBr2		R=29.85254812974386
SnBr3	R_s=23.19743765728666
SnBr3		R=23.19743765728666
SnBr4	R_s=18.96869453329257
SnBr4		R=18.96869453329257
SnCL	R_s=53.93299300091461
SnCL		R=53.93299300091461
SnCL2	R_s=43.84900008438107
SnCL2		R=43.84900008438107
SnCL3	R_s=36.94188004567489
SnCL3		R=36.94188004567489
SnCL4	R_s=31.91466363685217
SnCL4		R=31.91466363685217
SnF	R_s=60.3773757213968
SnF		R=60.3773757213968
SnF2	R_s=53.05750395280852
SnF2		R=53.05750395280852
SnF3	R_s=47.32057756812237
SnF3		R=47.32057756812237
SnF4	R_s=42.70322404618472
SnF4		R=42.70322404618472
SnI	R_s=33.85171891542058
SnI		R=33.85171891542058
SnI2	R_s=22.31959534728624
SnI2		R=22.31959534728624
SnI3	R_s=16.64814230474298
SnI3		R=16.64814230474298
SnI4	R_s=13.27495113262402
SnI4		R=13.27495113262402
SnO	R_s=61.72154281735352
SnO		R=61.72154281735352
SnO2	R_s=55.16912084762137
SnO2		R=55.16912084762137
SnS	R_s=55.14489802686122
SnS		R=55.14489802686122
SnS2	R_s=45.47403194049442
SnS2		R=45.47403194049442
Sn2	R_s=35.0200994019038
Sn2		R=35.0200994019038
Sr	R_s=94.89239899566309
Sr		R=94.89239899566309
Srplus	R_s=94.8929931328011
Srplus		R=94.8929931328011
SrBr	R_s=49.63152742293642
SrBr		R=49.63152742293642
SrBr2	R_s=33.60360185589343
SrBr2		R=33.60360185589343
SrCL	R_s=67.55723838697359
SrCL		R=67.55723838697359
SrCLplus	R_s=67.55753952586014
SrCLplus		R=67.55753952586014
SrCL2	R_s=52.44863303180551
SrCL2		R=52.44863303180551
SrF	R_s=77.98346017622593
SrF		R=77.98346017622593
SrFplus	R_s=77.98386143853246
SrFplus		R=77.98386143853246
SrF2	R_s=66.1891687767028
SrF2		R=66.1891687767028
SrH	R_s=93.81321511026886
SrH		R=93.81321511026886
SrI	R_s=38.75768577822381
SrI		R=38.75768577822381
SrI2	R_s=24.35198375392549
SrI2		R=24.35198375392549
SrO	R_s=80.24049550566787
SrO		R=80.24049550566787
SrOH	R_s=79.46748909032763
SrOH		R=79.46748909032763
SrOHplus	R_s=79.46790577007029
SrOHplus		R=79.46790577007029
Sr_OH_2	R_s=68.35609712624722
Sr_OH_2		R=68.35609712624722
SrS	R_s=69.46962443079751
SrS		R=69.46962443079751
Sr2	R_s=47.44619949783154
Sr2		R=47.44619949783154
Ta	R_s=45.94953575034582
Ta		R=45.94953575034582
Taplus	R_s=45.94967506111836
Taplus		R=45.94967506111836
Taminus	R_s=45.94939644041801
Taminus		R=45.94939644041801
TaCL5	R_s=23.21097872243015
TaCL5		R=23.21097872243015
TaO	R_s=42.21673513675993
TaO		R=42.21673513675993
TaO2	R_s=39.04485019021192
TaO2		R=39.04485019021192
Ti	R_s=173.699458917417
Ti		R=173.699458917417
Tiplus	R_s=173.7014496963525
Tiplus		R=173.7014496963525
Timinus	R_s=173.6974681841134
Timinus		R=173.6974681841134
TiCL	R_s=99.78963034085456
TiCL		R=99.78963034085456
TiCL2	R_s=70.00304783073595
TiCL2		R=70.00304783073595
TiCL3	R_s=53.91096183522882
TiCL3		R=53.91096183522882
TiCL4	R_s=43.83443607357694
TiCL4		R=43.83443607357694
TiO	R_s=130.1853869953528
TiO		R=130.1853869953528
TiOplus	R_s=130.1865052722056
TiOplus		R=130.1865052722056
TiOCL	R_s=83.71448075602551
TiOCL		R=83.71448075602551
TiOCL2	R_s=61.69269078832164
TiOCL2		R=61.69269078832164
TiO2	R_s=104.1055370383819
TiO2		R=104.1055370383819
U	R_s=34.93051327252644
U		R=34.93051327252644
UF	R_s=32.34859321557893
UF		R=32.34859321557893
UFplus	R_s=32.34866226067727
UFplus		R=32.34866226067727
UFminus	R_s=32.34852417077533
UFminus		R=32.34852417077533
UF2	R_s=30.12209191389676
UF2		R=30.12209191389676
UF2plus	R_s=30.12215178155214
UF2plus		R=30.12215178155214
UF2minus	R_s=30.12203204647934
UF2minus		R=30.12203204647934
UF3	R_s=28.18234662058458
UF3		R=28.18234662058458
UF3plus	R_s=28.18239902600868
UF3plus		R=28.18239902600868
UF3minus	R_s=28.18229421535538
UF3minus		R=28.18229421535538
UF4	R_s=26.47731100897964
UF4		R=26.47731100897964
UF4plus	R_s=26.47735726514645
UF4plus		R=26.47735726514645
UF4minus	R_s=26.47726475297446
UF4minus		R=26.47726475297446
UF5	R_s=24.96681544870847
UF5		R=24.96681544870847
UF5plus	R_s=24.96685657770803
UF5plus		R=24.96685657770803
UF5minus	R_s=24.96677431984442
UF5minus		R=24.96677431984442
UF6	R_s=23.61936209268818
UF6		R=23.61936209268818
UF6minus	R_s=23.61932528345421
UF6minus		R=23.61932528345421
UO	R_s=32.73049369969828
UO		R=32.73049369969828
UOplus	R_s=32.73056438468461
UOplus		R=32.73056438468461
UOF	R_s=30.45296155292104
UOF		R=30.45296155292104
UOF2	R_s=28.47177017682031
UOF2		R=28.47177017682031
UOF3	R_s=26.73261498260018
UOF3		R=26.73261498260018
UOF4	R_s=25.1936960110336
UOF4		R=25.1936960110336
UO2	R_s=30.79118065327443
UO2		R=30.79118065327443
UO2plus	R_s=30.79124321009879
UO2plus		R=30.79124321009879
UO2minus	R_s=30.79111809670427
UO2minus		R=30.79111809670427
UO2F	R_s=28.76719998738163
UO2F		R=28.76719998738163
UO2F2	R_s=26.99289036202185
UO2F2		R=26.99289036202185
UO3	R_s=29.06882497956226
UO3		R=29.06882497956226
UO3minus	R_s=29.06876922566257
UO3minus		R=29.06876922566257
V	R_s=163.2160811911703
V		R=163.2160811911703
Vplus	R_s=163.2178389192786
Vplus		R=163.2178389192786
Vminus	R_s=163.2143235009202
Vminus		R=163.2143235009202
VCL4	R_s=43.13525824433798
VCL4		R=43.13525824433798
VN	R_s=128.0169735265951
VN		R=128.0169735265951
VO	R_s=124.2061579691937
VO		R=124.2061579691937
VO2	R_s=100.2464664342907
VO2		R=100.2464664342907
V4O10	R_s=22.85702661095228
V4O10		R=22.85702661095228
W	R_s=45.22667536988686
W		R=45.22667536988686
Wplus	R_s=45.22681033196339
Wplus		R=45.22681033196339
Wminus	R_s=45.22654040861582
Wminus		R=45.22654040861582
WCL6	R_s=20.96659757210799
WCL6		R=20.96659757210799
WO	R_s=41.60576943285459
WO		R=41.60576943285459
WOCL4	R_s=24.33612740940034
WOCL4		R=24.33612740940034
WO2	R_s=38.52167450893908
WO2		R=38.52167450893908
WO2CL2	R_s=28.99606897840868
WO2CL2		R=28.99606897840868
WO3	R_s=35.86325290655294
WO3		R=35.86325290655294
WO3minus	R_s=35.86316804334235
WO3minus		R=35.86316804334235
Xe	R_s=63.3276107637117
Xe		R=63.3276107637117
Xeplus	R_s=63.32787537547646
Xeplus		R=63.32787537547646
Zn	R_s=127.1520415965744
Zn		R=127.1520415965744
Znplus	R_s=127.1531083681794
Znplus		R=127.1531083681794
Zr	R_s=91.1434710163992
Zr		R=91.1434710163992
Zrplus	R_s=91.14401913541281
Zrplus		R=91.14401913541281
Zrminus	R_s=91.14292290397806
Zrminus		R=91.14292290397806
ZrN	R_s=79.01184730311593
ZrN		R=79.01184730311593
ZrO	R_s=77.54344667302101
ZrO		R=77.54344667302101
ZrOplus	R_s=77.5438434199298
ZrOplus		R=77.5438434199298
ZrO2	R_s=67.47511012572349
ZrO2		R=67.47511012572349

model Media.Incompressible.Examples.TestGlycol

Component	Modelica 4.0.0	Modelica 3.2.3
timeUnit	Units.SI.Time	SIunits.Time
Ta	Units.SI.Temperature	SIunits.Temperature

record Media.Incompressible.Common.BaseProps_Tpoly

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature
p	Units.SI.Pressure	SIunits.Pressure

package Media.Incompressible.TableBased

Component	Modelica 4.0.0	Modelica 3.2.3
T_min	Units.SI.Temperature	SIunits.Temperature
T_max	Units.SI.Temperature	SIunits.Temperature
poly_rho	=if hasDensity then Polynomials.fitting(tableDensity[:, 1], tableDensity[:, 2], npolDensity) else zeros(npolDensity + 1)	=if hasDensity then Poly.fitting(tableDensity[:, 1], tableDensity[:, 2], npolDensity) else zeros(npolDensity + 1)
poly_Cp	=if hasHeatCapacity then Polynomials.fitting(tableHeatCapacity[:, 1], tableHeatCapacity[:, 2], npolHeatCapacity) else zeros(npolHeatCapacity + 1)	=if hasHeatCapacity then Poly.fitting(tableHeatCapacity[:, 1], tableHeatCapacity[:, 2], npolHeatCapacity) else zeros(npolHeatCapacity + 1)
poly_eta	=if hasViscosity then Polynomials.fitting(invTK, Math.log(tableViscosity[:, 2]), npolViscosity) else zeros(npolViscosity + 1)	=if hasViscosity then Poly.fitting(invTK, Math.log(tableViscosity[:, 2]), npolViscosity) else zeros(npolViscosity + 1)
poly_pVap	=if hasVaporPressure then Polynomials.fitting(tableVaporPressure[:, 1], tableVaporPressure[:, 2], npolVaporPressure) else zeros(npolVaporPressure + 1)	=if hasVaporPressure then Poly.fitting(tableVaporPressure[:, 1], tableVaporPressure[:, 2], npolVaporPressure) else zeros(npolVaporPressure + 1)
poly_lam	=if size(tableConductivity, 1) > 0 then Polynomials.fitting(tableConductivity[:, 1], tableConductivity[:, 2], npolConductivity) else zeros(npolConductivity + 1)	=if size(tableConductivity, 1) > 0 then Poly.fitting(tableConductivity[:, 1], tableConductivity[:, 2], npolConductivity) else zeros(npolConductivity + 1)

model Media.Incompressible.TableBased.BaseProperties

Component	Modelica 4.0.0	Modelica 3.2.3
cp	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity
T_start	Units.SI.Temperature	SIunits.Temperature

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... assert(T >= T_min and T <= T_max, "Temperature T (= " + String(T) + " K) is not in the allowed range (" + String(T_min) + " K <= T <= " + String(T_max) + " K) required from medium model \"" + mediumName + "\".");
R_s = Modelica400.Constants.R/MM_const;	R = Modelica323.Constants.R/MM_const;
cp = Polynomials.evaluate(poly_Cp,if TinK then T else T_degC);	cp = Poly.evaluate(poly_Cp,if TinK then T else T_degC);
h = specificEnthalpyOfT(p,T,densityOfT);	h = if enthalpyOfT then h_T(T) else h_pT(p,T,densityOfT);
u = h - (if singleState then reference_p/d else state.p/d);
d = Polynomials.evaluate(poly_rho,if TinK then T else T_degC);	d = Poly.evaluate(poly_rho,if TinK then T else T_degC);
state.T = T; ...

function Media.Incompressible.TableBased.specificHeatCapacityCv

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... assert(hasHeatCapacity,"Specific Heat Capacity, Cv, is not defined for medium " + mediumName + ".");
cv = Polynomials.evaluate(poly_Cp,if TinK then state.T else state.T - 273.15);	cv = Poly.evaluate(poly_Cp,if TinK then state.T else state.T - 273.15);

function Media.Incompressible.TableBased.specificHeatCapacityCp

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... assert(hasHeatCapacity,"Specific Heat Capacity, Cv, is not defined for medium " + mediumName + ".");
cp = Polynomials.evaluate(poly_Cp,if TinK then state.T else state.T - 273.15);	cp = Poly.evaluate(poly_Cp,if TinK then state.T else state.T - 273.15);

function Media.Incompressible.TableBased.dynamicViscosity

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... assert(size(tableViscosity,1)>0,"DynamicViscosity, eta, is not defined for medium " + mediumName + ".");
eta = Math.exp(Polynomials.evaluate(poly_eta, 1/state.T));	eta = Math.exp(Poly.evaluate(poly_eta, 1/state.T));

function Media.Incompressible.TableBased.thermalConductivity

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... assert(size(tableConductivity,1)>0,"ThermalConductivity, lambda, is not defined for medium " + mediumName + ".");
lambda = Polynomials.evaluate(poly_lam,if TinK then state.T else Cv.to_degC(state.T));	lambda = Poly.evaluate(poly_lam,if TinK then state.T else Cv.to_degC(state.T));

function Media.Incompressible.TableBased.s_T

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
s := s0 + (if TinK then Polynomials.integralValue( poly_Cp[1:npol], T, T0) else Polynomials.integralValue( poly_Cp[1:npol], Cv.to_degC(T), Cv.to_degC(T0))) + Modelica400.Math.log(T/T0)*Polynomials.evaluate(poly_Cp, if TinK then 0 else Modelica400.Constants.T_zero);	s := s0 + (if TinK then Poly.integralValue( poly_Cp[1:npol], T, T0) else Poly.integralValue( poly_Cp[1:npol], Cv.to_degC(T), Cv.to_degC(T0))) + Modelica323.Math.log(T/T0)*Poly.evaluate(poly_Cp, if TinK then 0 else Modelica323.Constants.T_zero);

function Media.Incompressible.TableBased.h_T

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
h :=h0 + Polynomials.integralValue(poly_Cp, if TinK then T else Cv.to_degC(T), if TinK then T0 else Cv.to_degC(T0));	h :=h0 + Poly.integralValue(poly_Cp, if TinK then T else Cv.to_degC(T), if TinK then T0 else Cv.to_degC(T0));

function Media.Incompressible.TableBased.h_T_der

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
dh :=Polynomials.evaluate(poly_Cp, if TinK then T else Cv.to_degC(T))*dT;	dh :=Poly.evaluate(poly_Cp, if TinK then T else Cv.to_degC(T))*dT;

function Media.Incompressible.TableBased.h_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
h :=h0 + Polynomials.integralValue(poly_Cp, if TinK then T else Cv.to_degC(T), if TinK then T0 else Cv.to_degC(T0)) + (p - reference_p)/Polynomials.evaluate(poly_rho, if TinK then T else Cv.to_degC(T)) (if densityOfT then (1 + T/Polynomials.evaluate(poly_rho, if TinK then T else Cv.to_degC(T)) Polynomials.derivativeValue(poly_rho,if TinK then T else Cv.to_degC(T))) else 1.0);	h :=h0 + Poly.integralValue(poly_Cp, if TinK then T else Cv.to_degC(T), if TinK then T0 else Cv.to_degC(T0)) + (p - reference_p)/Poly.evaluate(poly_rho, if TinK then T else Cv.to_degC(T)) (if densityOfT then (1 + T/Poly.evaluate(poly_rho, if TinK then T else Cv.to_degC(T)) Poly.derivativeValue(poly_rho,if TinK then T else Cv.to_degC(T))) else 1.0);

function Media.Incompressible.TableBased.density_T

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
d := Polynomials.evaluate(poly_rho,if TinK then T else Cv.to_degC(T));	d := Poly.evaluate(poly_rho,if TinK then T else Cv.to_degC(T));

function Media.Incompressible.TableBased.density

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
d := Polynomials.evaluate(poly_rho,if TinK then state.T else Cv.to_degC(state.T));	d := Poly.evaluate(poly_rho,if TinK then state.T else Cv.to_degC(state.T));

function Media.Incompressible.TableBased.specificEnthalpy

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
h := specificEnthalpyOfT(state.p, state.T);	h := if enthalpyOfT then h_T(state.T) else h_pT(state.p,state.T);

function Media.Incompressible.TableBased.specificInternalEnergy

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
u := specificEnthalpyOfT(state.p,state.T) - (if singleState then reference_p else state.p)/density(state);	u := (if enthalpyOfT then h_T(state.T) else h_pT(state.p,state.T)) - (if singleState then reference_p else state.p)/density(state);

function Media.Incompressible.TableBased.T_ph

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
T := Modelica400.Math.Nonlinear.solveOneNonlinearEquation( function f_nonlinear(p=p, h=h), T_min, T_max);	T := Internal.solve(h, T_min, T_max, p, {1}, Internal.f_nonlinear_Data());

function Media.Incompressible.TableBased.T_ps

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
T := Modelica400.Math.Nonlinear.solveOneNonlinearEquation( function f_nonlinear(s=s), T_min, T_max);	T := Internal.solve(s, T_min, T_max, p, {1}, Internal.f_nonlinear_Data());

record Media.R134a.Common.PhaseBoundaryProperties

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
u	Units.SI.SpecificEnergy	SIunits.SpecificEnergy
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
cp	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity
cv	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity
kappa	Units.SI.IsothermalCompressibility	SIunits.IsothermalCompressibility
a	Units.SI.Velocity	SIunits.Velocity
gamma	Units.SI.IsentropicExponent	SIunits.IsentropicExponent
pt	Units.SI.DerPressureByTemperature	SIunits.DerPressureByTemperature
pd	Units.SI.DerPressureByDensity	SIunits.DerPressureByDensity

record Media.R134a.Common.InverseDerivatives_rhoT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
rho	Units.SI.Density	SIunits.Density
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
cv	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

function Media.R134a.Common.cv2Phase

Component	Modelica 4.0.0	Modelica 3.2.3
x	Units.SI.MassFraction	SIunits.MassFraction
T	Units.SI.Temperature	SIunits.Temperature
p	Units.SI.Pressure	SIunits.Pressure
cv	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

function Media.R134a.Common.helmholtzToBoundaryProps

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
p := f.R_sf.df.Tf.deltaf.fdelta;	p := f.Rf.df.Tf.deltaf.fdelta;
sat.d = f.d;
sat.h = f.R_sf.T(f.tauf.ftau + f.deltaf.fdelta);	sat.h = f.Rf.T(f.tauf.ftau + f.deltaf.fdelta);
sat.s = f.R_s(f.tauf.ftau - f.f);	sat.s = f.R(f.tauf.ftau - f.f);
sat.u = f.R_sf.Tf.tau*f.ftau;	sat.u = f.Rf.Tf.tau*f.ftau;
sat.cp = f.R_s(-f.tauf.tauf.ftautau + (f.deltaf.fdelta - f.deltaf.tau f.fdeltatau)^2/(2f.deltaf.fdelta + f.deltaf.deltaf.fdeltadelta));	sat.cp = f.R(-f.tauf.tauf.ftautau + (f.deltaf.fdelta - f.deltaf.tau f.fdeltatau)^2/(2f.deltaf.fdelta + f.deltaf.deltaf.fdeltadelta));
sat.cv = f.R_s(-f.tauf.tau*f.ftautau);	sat.cv = f.R(-f.tauf.tau*f.ftautau);
sat.pt = f.R_sf.d(f.delta(f.fdelta - f.tauf.fdeltatau));	sat.pt = f.Rf.d(f.delta(f.fdelta - f.tauf.fdeltatau));
sat.pd = f.R_sf.T(f.delta(2.0f.fdelta + f.delta*f.fdeltadelta));	sat.pd = f.Rf.T(f.delta(2.0f.fdelta + f.delta*f.fdeltadelta));
sat.a = abs(f.R_sf.T(2f.deltaf.fdelta + f.deltaf.deltaf.fdeltadelta - ((f.deltaf.fdelta - f.deltaf.tauf.fdeltatau)(f.deltaf.fdelta - f.deltaf.tauf.fdeltatau))/(f.tauf.tau*f.ftautau)))^0.5;	sat.a = abs(f.Rf.T(2f.deltaf.fdelta + f.deltaf.deltaf.fdeltadelta - ((f.deltaf.fdelta - f.deltaf.tauf.fdeltatau)(f.deltaf.fdelta - f.deltaf.tauf.fdeltatau))/(f.tauf.tau*f.ftautau)))^0.5;
sat.kappa = 1/(f.df.R_sf.Tf.delta(2.0f.fdelta + f.deltaf.fdeltadelta));	sat.kappa = 1/(f.df.Rf.Tf.delta(2.0f.fdelta + f.deltaf.fdeltadelta));
sat.beta = f.R_sf.df.delta(f.fdelta - f.tauf.fdeltatau)*sat.kappa;	sat.beta = f.Rf.df.delta(f.fdelta - f.tauf.fdeltatau)*sat.kappa;
sat.gamma = sat.a^2/f.R_s/f.T;	sat.gamma = sat.a^2/f.R/f.T;

package Media.R134a.R134a_ph

Component	Modelica 4.0.0	Modelica 3.2.3
r134aConstants	each iupacName="tetrafluoroethane"	each iupacName="tetrafluoroethan"

model Media.R134a.R134a_ph.BaseProperties

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... u = h - p/d;
R_s = R134aData.data.R_s;	R = R134aData.data.R;
h = state.h; ...

function Media.R134a.R134a_ph.setState_phX

Component	Modelica 4.0.0	Modelica 3.2.3
sat		Present
hl		Present
hv		Present

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
state := ThermodynamicState(phase=getPhase_ph(p, h), p=p, h=h, d=density_ph(p, h), T=temperature_ph(p, h));	state.p := p;
	state.h = h;
	state.phase = if ((state.h < hl) or (state.h > hv) or (state.p > R134aData.data.FPCRIT)) then 1 else 2; state.d = density_ph(p, h); state.T = temperature_ph(p, h);

function Media.R134a.R134a_ph.setState_dTX

Component	Modelica 4.0.0	Modelica 3.2.3
dl	Units.SI.Density	SIunits.Density
dv	Units.SI.Density	SIunits.Density
R_s	Present
R		Present

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
R_s := R134aData.data.R_s;	R := R134aData.data.R;
sat = setSat_T(T); dl = bubbleDensity(sat); dv = dewDensity(sat); if d < dl and d > dv and T < R134aData.data.FTCRIT then f = Modelica400.Media.Common.HelmholtzDerivs( d=d, T=T, R_s=R_s, delta=0, tau=0, f=0, fdelta=0, fdeltadelta=0, ftau=0, ftautau=0, fdeltatau=0); state.p = saturationPressure_sat(sat); state.h = (dldv/d(dewEnthalpy(sat) - bubbleEnthalpy(sat)) - dvdewEnthalpy(sat) + dlbubbleEnthalpy(sat))/(dl - dv); state.phase = 2; else
f = f_R134a(d=d, T=T);
state.p = dR_sTf.deltaf.fdelta;	state.p = dRTf.deltaf.fdelta;
state.h = R_sT(f.tauf.ftau + f.deltaf.fdelta);	state.h = RT(f.tauf.ftau + f.deltaf.fdelta);
state.phase = 1;	sat.psat = state.p;
end if;
state.T = T;
state.d = d;
	sat.Tsat = state.T;
	dl = bubbleDensity(sat); dv = dewDensity(sat); state.phase = if ((state.d < dl) or (state.d > dv) or (state.p > R134aData.data.FPCRIT)) then 1 else 2;

function Media.R134a.R134a_ph.setState_psX

Component	Modelica 4.0.0	Modelica 3.2.3
delp	Units.SI.Pressure	SIunits.Pressure
dels	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... state.p := p;
state.phase = getPhase_ps(p, s);	if (getPhase_ps(p, s) == 1) then
if state.phase == 1 then
(state.d, state.T, error) = dtofpsOnePhase( p=p, s=s, delp=delp, dels=dels);
f = f_R134a(d=state.d, T=state.T);
state.h = R134aData.R_sstate.T(f.tauf.ftau + f.deltaf.fdelta);	state.h = R134aData.Rstate.T(f.tauf.ftau + f.deltaf.fdelta);
else
state.h = hofpsTwoPhase(p, s);
(state.d, state.T) = dt_ph(p, state.h);
end if; ...

function Media.R134a.R134a_ph.setState_pTX

Component	Modelica 4.0.0	Modelica 3.2.3
delp	Units.SI.Pressure	SIunits.Pressure

function Media.R134a.R134a_ph.specificEntropy

Component	Modelica 4.0.0	Modelica 3.2.3
x	Units.SI.MassFraction	SIunits.MassFraction

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... f = f_R134a(state.d, state.T);
s = R134aData.R_s(f.tauf.ftau - f.f);	s = R134aData.R(f.tauf.ftau - f.f);
end if; ...

function Media.R134a.R134a_ph.saturationTemperature_der_p

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.AbsolutePressure	SIunits.AbsolutePressure

function Media.R134a.R134a_ph.specificHeatCapacityCp

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... f := f_R134a(state.d, state.T);
cp = if getPhase_ph(state.p, state.h) == 2 then 0 else R134aData.R_s(-f.tau f.tauf.ftautau + (f.deltaf.fdelta - f.deltaf.tauf.fdeltatau)^2/(2* f.deltaf.fdelta + f.deltaf.delta*f.fdeltadelta));	cp = if getPhase_ph(state.p, state.h) == 2 then 0 else R134aData.R(-f.tau f.tauf.ftautau + (f.deltaf.fdelta - f.deltaf.tauf.fdeltatau)^2/(2* f.deltaf.fdelta + f.deltaf.delta*f.fdeltadelta));

function Media.R134a.R134a_ph.specificHeatCapacityCv

Component	Modelica 4.0.0	Modelica 3.2.3
x	Units.SI.MassFraction	SIunits.MassFraction

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... f = f_R134a(state.d, state.T);
cv = R134aData.R_s(-f.tauf.tau*f.ftautau);	cv = R134aData.R(-f.tauf.tau*f.ftautau);
end if; ...

function Media.R134a.R134a_ph.dynamicViscosity

Component	Modelica 4.0.0	Modelica 3.2.3
sigma	Units.SI.Length	SIunits.Length
epsilon_k	Units.SI.Temperature	SIunits.Temperature

function Media.R134a.R134a_ph.thermalConductivity

Component	Modelica 4.0.0	Modelica 3.2.3
lambda_dg	Units.SI.ThermalConductivity	SIunits.ThermalConductivity
lambda_reduced	Units.SI.ThermalConductivity	SIunits.ThermalConductivity
lambda_crit	Units.SI.ThermalConductivity	SIunits.ThermalConductivity
chi_star	Units.SI.ThermalConductivity	SIunits.ThermalConductivity
chi_star_ref	Units.SI.ThermalConductivity	SIunits.ThermalConductivity
delta_chi	Units.SI.ThermalConductivity	SIunits.ThermalConductivity
xi	Units.SI.Length	SIunits.Length
cp	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity
cv	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity
eta	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
omega	Units.SI.ThermalConductivity	SIunits.ThermalConductivity
omega_0	Units.SI.ThermalConductivity	SIunits.ThermalConductivity

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... lambda_reduced = lambda_reduced*coeff.lambda_reducing;
dddp = 1/(f.R_sf.Tf.delta(2.0f.fdelta + f.delta*f.fdeltadelta));	dddp = 1/(f.Rf.Tf.delta(2.0f.fdelta + f.delta*f.fdeltadelta));
chi_star = state.dcoeff.p_crit1e3/((coeff.rho_critR134aData.data.MM 1000)^2)*dddp;
dddp_ref = 1/(f_ref.R_sf_ref.Tf_ref.delta(2.0f_ref.fdelta + f_ref.delta *f_ref.fdeltadelta));	dddp_ref = 1/(f_ref.Rf_ref.Tf_ref.delta(2.0f_ref.fdelta + f_ref.delta *f_ref.fdeltadelta));
chi_star_ref = state.dcoeff.p_crit1e3/((coeff.rho_critR134aData.data.MM 1000)^2)dddp_ref; ... xi = coeff.xi_0(1/coeff.GAMMA*(delta_chi))^(coeff.nu/coeff.gamma);
cp = R134aData.data.R_s(-f.tauf.tauf.ftautau + (f.deltaf.fdelta - f.delta f.tauf.fdeltatau)^2/(2f.deltaf.fdelta + f.deltaf.deltaf.fdeltadelta));	cp = R134aData.data.R(-f.tauf.tauf.ftautau + (f.deltaf.fdelta - f.delta f.tauf.fdeltatau)^2/(2f.deltaf.fdelta + f.deltaf.deltaf.fdeltadelta));
eta = dynamicViscosity(state=state); ...

function Media.R134a.R134a_ph.surfaceTension

Component	Modelica 4.0.0	Modelica 3.2.3
Tc	Units.SI.Temperature	SIunits.Temperature

function Media.R134a.R134a_ph.velocityOfSound

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... f = f_R134a(state.d, state.T);
a = abs(R134aData.data.R_sstate.T(2f.deltaf.fdelta + f.deltaf.delta f.fdeltadelta - ((f.deltaf.fdelta - f.deltaf.tauf.fdeltatau)(f.delta f.fdelta - f.deltaf.tauf.fdeltatau))/(f.tauf.tau*f.ftautau)))^0.5;	a = abs(R134aData.data.Rstate.T(2f.deltaf.fdelta + f.deltaf.delta f.fdeltadelta - ((f.deltaf.fdelta - f.deltaf.tauf.fdeltatau)(f.delta f.fdelta - f.deltaf.tauf.fdeltatau))/(f.tauf.tau*f.ftautau)))^0.5;
end if; ...

function Media.R134a.R134a_ph.isothermalCompressibility

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... f = f_R134a(state.d, state.T);
kappa = 1/(state.dR134aData.data.R_sstate.Tf.delta(2.0f.fdelta + f.delta f.fdeltadelta));	kappa = 1/(state.dR134aData.data.Rstate.Tf.delta(2.0f.fdelta + f.delta f.fdeltadelta));
end if; ...

function Media.R134a.R134a_ph.isobaricExpansionCoefficient

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... f = f_R134a(state.d, state.T);
beta = R134aData.data.R_sstate.df.delta(f.fdelta - f.tauf.fdeltatau) *isothermalCompressibility(state);	beta = R134aData.data.Rstate.df.delta(f.fdelta - f.tauf.fdeltatau) *isothermalCompressibility(state);
end if; ...

function Media.R134a.R134a_ph.derivsOf_ph

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... f.T = derivs.T;
f.R_s = R134aData.R_s;	f.R = R134aData.R;
newder = Modelica400.Media.Common.Helmholtz_ph(f=f);
derivs.cv = -f.R_s(f.tauf.tau*f.ftautau);	derivs.cv = -f.R(f.tauf.tau*f.ftautau);
derivs.pd = newder.pd; ...

function Media.R134a.R134a_ph.dt_ph

Component	Modelica 4.0.0	Modelica 3.2.3
delp	Units.SI.Pressure	SIunits.Pressure
delh	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
hvapor	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
hliquid	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.R134a.R134a_ph.dtofphOnePhase

Component	Modelica 4.0.0	Modelica 3.2.3
hl	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... damping = 0.3;
d = R134aData.data.FDCRITCommon.CubicSplineEval(localx, dl_coef[int,1:4])1.5;	d = R134aData.data.FDCRITCommon.CubicSplineEval(localx, dl_coef[int, 1:4])1.02;
T = Common.CubicSplineEval(localx, T_coef[int, 1:4]); ...

function Media.R134a.R134a_ph.f_R134a

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... f.T = T;
f.R_s = R134aData.R_s;	f.R = R134aData.R;

function Media.R134a.R134a_ph.fid_R134a

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... fid.T = R134aData.data.TCRIT/fid.tau;
fid.R_s = R134aData.R_s;	fid.R = R134aData.R;

function Media.R134a.R134a_ph.fres_R134a

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... f.T = R134aData.data.TCRIT/f.tau;
f.R_s = R134aData.R_s;	f.R = R134aData.R;

function Media.R134a.R134a_ph.getPhase_ph

Component	Modelica 4.0.0	Modelica 3.2.3
hl	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
hv	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.R134a.R134a_ph.getPhase_ps

Component	Modelica 4.0.0	Modelica 3.2.3
sl	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
sv	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.R134a.R134a_ph.hofpsTwoPhase

Component	Modelica 4.0.0	Modelica 3.2.3
x	Units.SI.MassFraction	SIunits.MassFraction
sl	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
sv	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
hl	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
hv	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.R134a.R134a_ph.R134a_liqofdT

Component	Modelica 4.0.0	Modelica 3.2.3
T_liq	Units.SI.Temperature	SIunits.Temperature
d_liq	Units.SI.Density	SIunits.Density

function Media.R134a.R134a_ph.R134a_vapofdT

Component	Modelica 4.0.0	Modelica 3.2.3
T_vap	Units.SI.Temperature	SIunits.Temperature
d_vap	Units.SI.Density	SIunits.Density

function Media.R134a.R134a_ph.rho_props_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
d	Units.SI.Density	SIunits.Density

function Media.R134a.R134a_ph.dofpT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
delp	Units.SI.Pressure	SIunits.Pressure
d	Units.SI.Density	SIunits.Density
deld	Units.SI.Density	SIunits.Density

function Media.R134a.R134a_ph.hofpT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
delp	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
d	Units.SI.Density	SIunits.Density

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... f = f_R134a(d, T);
h = R134aData.data.R_sT(f.tauf.ftau + f.deltaf.fdelta);	h = R134aData.data.RT(f.tauf.ftau + f.deltaf.fdelta);

function Media.R134a.R134a_ph.phaseBoundaryAssert

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
T_lim_gas	Units.SI.Temperature	SIunits.Temperature
T_lim_liq	Units.SI.Temperature	SIunits.Temperature
T_sat	Present

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
T_sat := Modelica400.Media.R134a.R134a_ph.saturationTemperature(p);	T_lim_gas := Modelica323.Media.R134a.R134a_ph.saturationTemperature(p) + 1;
T_lim_gas = T_sat + 1;	T_lim_liq = Modelica323.Media.R134a.R134a_ph.saturationTemperature(p) - 1;
T_lim_liq = T_sat - 1;
assert(p>R134aData.data.PCRIT+1000 or not (T<T_lim_gas and T>T_lim_liq), "Fluid state is too close to the two-phase region (p="+String(p)+"[Pa], T="+String(T)+"[K]. Pressure and temperature can not be used to determine properties in two-phase region."); ...

package Media.R134a.R134aData

Component	Modelica 4.0.0	Modelica 3.2.3
R_s	Present
R		Present

record Media.R134a.R134aData.crit

Component	Modelica 4.0.0	Modelica 3.2.3
TCRIT	Units.SI.Temperature	SIunits.Temperature
PCRIT	Units.SI.Pressure	SIunits.Pressure
DCRIT	Units.SI.Density	SIunits.Density

record Media.R134a.R134aData.data

Component	Modelica 4.0.0	Modelica 3.2.3
MM	Units.SI.MolarMass	SIunits.MolarMass
HCRIT	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
SCRIT	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
R_s	Present
R		Present

record Media.R134a.R134aData.fcrit

Component	Modelica 4.0.0	Modelica 3.2.3
FTCRIT	Units.SI.Temperature	SIunits.Temperature
FPCRIT	Units.SI.Pressure	SIunits.Pressure
FDCRIT	Units.SI.Density	SIunits.Density

record Media.R134a.R134aData.ReferenceStates

Component	Modelica 4.0.0	Modelica 3.2.3
h0	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
s0	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

record Media.R134a.R134aData.triple

Component	Modelica 4.0.0	Modelica 3.2.3
TTRIPLE	Units.SI.Temperature	SIunits.Temperature
PTRIPLE	Units.SI.Pressure	SIunits.Pressure
DLTRIPLE	Units.SI.Density	SIunits.Density
DVTRIPLE	Units.SI.Density	SIunits.Density

model Media.Water.WaterIF97_base.BaseProperties

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... u = h - p/d;
R_s = Modelica400.Constants.R/fluidConstants[1].molarMass;	R = Modelica323.Constants.R/fluidConstants[1].molarMass;
h = state.h; ...

record Media.Water.IF97_Utilities.BaseIF97.data

Component	Modelica 4.0.0	Modelica 3.2.3
RH2O	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity
MH2O	Units.SI.MolarMass	SIunits.MolarMass
TSTAR1	Units.SI.Temperature	SIunits.Temperature
PSTAR1	Units.SI.Pressure	SIunits.Pressure
TSTAR2	Units.SI.Temperature	SIunits.Temperature
PSTAR2	Units.SI.Pressure	SIunits.Pressure
TSTAR5	Units.SI.Temperature	SIunits.Temperature
PSTAR5	Units.SI.Pressure	SIunits.Pressure
HSTAR1	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
TLIMIT1	Units.SI.Temperature	SIunits.Temperature
TLIMIT2	Units.SI.Temperature	SIunits.Temperature
TLIMIT5	Units.SI.Temperature	SIunits.Temperature
PLIMIT1	Units.SI.Pressure	SIunits.Pressure
PLIMIT4A	Units.SI.Pressure	SIunits.Pressure
PLIMIT5	Units.SI.Pressure	SIunits.Pressure
PCRIT	Units.SI.Pressure	SIunits.Pressure
TCRIT	Units.SI.Temperature	SIunits.Temperature
DCRIT	Units.SI.Density	SIunits.Density
SCRIT	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
HCRIT	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Water.IF97_Utilities.BaseIF97.getTstar

Component	Modelica 4.0.0	Modelica 3.2.3
Tstar	Units.SI.Temperature	SIunits.Temperature

function Media.Water.IF97_Utilities.BaseIF97.getpstar

Component	Modelica 4.0.0	Modelica 3.2.3
pstar	Units.SI.Pressure	SIunits.Pressure

record Media.Water.IF97_Utilities.BaseIF97.critical

Component	Modelica 4.0.0	Modelica 3.2.3
PCRIT	Units.SI.Pressure	SIunits.Pressure
TCRIT	Units.SI.Temperature	SIunits.Temperature
DCRIT	Units.SI.Density	SIunits.Density
HCRIT	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
SCRIT	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

record Media.Water.IF97_Utilities.BaseIF97.triple

Component	Modelica 4.0.0	Modelica 3.2.3
Ttriple	Units.SI.Temperature	SIunits.Temperature
ptriple	Units.SI.Pressure	SIunits.Pressure
dltriple	Units.SI.Density	SIunits.Density
dvtriple	Units.SI.Density	SIunits.Density

function Media.Water.IF97_Utilities.BaseIF97.Regions.boundary23ofT

Component	Modelica 4.0.0	Modelica 3.2.3
t	Units.SI.Temperature	SIunits.Temperature
p	Units.SI.Pressure	SIunits.Pressure

function Media.Water.IF97_Utilities.BaseIF97.Regions.boundary23ofp

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
t	Units.SI.Temperature	SIunits.Temperature

function Media.Water.IF97_Utilities.BaseIF97.Regions.hlowerofp5

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Water.IF97_Utilities.BaseIF97.Regions.hupperofp5

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Water.IF97_Utilities.BaseIF97.Regions.slowerofp5

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Water.IF97_Utilities.BaseIF97.Regions.supperofp5

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Water.IF97_Utilities.BaseIF97.Regions.hlowerofp1

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Water.IF97_Utilities.BaseIF97.Regions.hupperofp1

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Water.IF97_Utilities.BaseIF97.Regions.slowerofp1

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Water.IF97_Utilities.BaseIF97.Regions.supperofp1

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Water.IF97_Utilities.BaseIF97.Regions.hlowerofp2

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Water.IF97_Utilities.BaseIF97.Regions.hupperofp2

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Water.IF97_Utilities.BaseIF97.Regions.slowerofp2

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Water.IF97_Utilities.BaseIF97.Regions.supperofp2

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Water.IF97_Utilities.BaseIF97.Regions.d1n

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
d	Units.SI.Density	SIunits.Density

function Media.Water.IF97_Utilities.BaseIF97.Regions.d2n

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
d	Units.SI.Density	SIunits.Density

function Media.Water.IF97_Utilities.BaseIF97.Regions.dhot1ofp

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
d	Units.SI.Density	SIunits.Density

function Media.Water.IF97_Utilities.BaseIF97.Regions.dupper1ofT

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature
d	Units.SI.Density	SIunits.Density

function Media.Water.IF97_Utilities.BaseIF97.Regions.hl_p_R4b

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Water.IF97_Utilities.BaseIF97.Regions.hv_p_R4b

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Water.IF97_Utilities.BaseIF97.Regions.sl_p_R4b

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Water.IF97_Utilities.BaseIF97.Regions.sv_p_R4b

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Water.IF97_Utilities.BaseIF97.Regions.rhol_p_R4b

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
dl	Units.SI.Density	SIunits.Density

function Media.Water.IF97_Utilities.BaseIF97.Regions.rhov_p_R4b

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
dv	Units.SI.Density	SIunits.Density

function Media.Water.IF97_Utilities.BaseIF97.Regions.boilingcurve_p

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
plim	Units.SI.Pressure	SIunits.Pressure

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
bpro.R_s := data.RH2O;	bpro.R := data.RH2O;
bpro.T = Basic.tsat(plim); ... g = Basic.g1(p, bpro.T);
bpro.d = p/(bpro.R_sbpro.Tg.pi*g.gpi);	bpro.d = p/(bpro.Rbpro.Tg.pi*g.gpi);
bpro.h = if p > plim then data.HCRIT else bpro.R_sbpro.Tg.tau*g.gtau;	bpro.h = if p > plim then data.HCRIT else bpro.Rbpro.Tg.tau*g.gtau;
bpro.s = g.R_s(g.taug.gtau - g.g);	bpro.s = g.R(g.taug.gtau - g.g);
bpro.cp = -bpro.R_sg.taug.tau*g.gtautau;	bpro.cp = -bpro.Rg.taug.tau*g.gtautau;
bpro.vt = bpro.R_s/p(g.pig.gpi - g.taug.pig.gtaupi);	bpro.vt = bpro.R/p(g.pig.gpi - g.taug.pig.gtaupi);
bpro.vp = bpro.R_sbpro.T/(pp)g.pig.pi*g.gpipi;	bpro.vp = bpro.Rbpro.T/(pp)g.pig.pi*g.gpipi;
bpro.pt = -p/bpro.T(g.gpi - g.taug.gtaupi)/(g.gpipi*g.pi);
bpro.pd = -bpro.R_sbpro.Tg.gpi*g.gpi/(g.gpipi);	bpro.pd = -bpro.Rbpro.Tg.gpi*g.gpi/(g.gpipi);
else ... bpro.h = hl_p_R4b(plim);
bpro.s = f.R_s(f.tauf.ftau - f.f);	bpro.s = f.R(f.tauf.ftau - f.f);
bpro.cv = bpro.R_s(-f.tauf.tau*f.ftautau);	bpro.cv = bpro.R(-f.tauf.tau*f.ftautau);
bpro.pt = bpro.R_sbpro.df.delta(f.fdelta - f.tauf.fdeltatau);	bpro.pt = bpro.Rbpro.df.delta(f.fdelta - f.tauf.fdeltatau);
bpro.pd = bpro.R_sbpro.Tf.delta(2.0f.fdelta + f.delta*f.fdeltadelta);	bpro.pd = bpro.Rbpro.Tf.delta(2.0f.fdelta + f.delta*f.fdeltadelta);
end if; ...

function Media.Water.IF97_Utilities.BaseIF97.Regions.dewcurve_p

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
plim	Units.SI.Pressure	SIunits.Pressure

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
bpro.R_s := data.RH2O;	bpro.R := data.RH2O;
bpro.T = Basic.tsat(plim); ... g = Basic.g2(p, bpro.T);
bpro.d = p/(bpro.R_sbpro.Tg.pi*g.gpi);	bpro.d = p/(bpro.Rbpro.Tg.pi*g.gpi);
bpro.h = if p > plim then data.HCRIT else bpro.R_sbpro.Tg.tau*g.gtau;	bpro.h = if p > plim then data.HCRIT else bpro.Rbpro.Tg.tau*g.gtau;
bpro.s = g.R_s(g.taug.gtau - g.g);	bpro.s = g.R(g.taug.gtau - g.g);
bpro.cp = -bpro.R_sg.taug.tau*g.gtautau;	bpro.cp = -bpro.Rg.taug.tau*g.gtautau;
bpro.vt = bpro.R_s/p(g.pig.gpi - g.taug.pig.gtaupi);	bpro.vt = bpro.R/p(g.pig.gpi - g.taug.pig.gtaupi);
bpro.vp = bpro.R_sbpro.T/(pp)g.pig.pi*g.gpipi;	bpro.vp = bpro.Rbpro.T/(pp)g.pig.pi*g.gpipi;
bpro.pt = -p/bpro.T(g.gpi - g.taug.gtaupi)/(g.gpipi*g.pi);
bpro.pd = -bpro.R_sbpro.Tg.gpi*g.gpi/(g.gpipi);	bpro.pd = -bpro.Rbpro.Tg.gpi*g.gpi/(g.gpipi);
else ... bpro.h = hv_p_R4b(plim);
bpro.s = f.R_s(f.tauf.ftau - f.f);	bpro.s = f.R(f.tauf.ftau - f.f);
bpro.cv = bpro.R_s(-f.tauf.tau*f.ftautau);	bpro.cv = bpro.R(-f.tauf.tau*f.ftautau);
bpro.pt = bpro.R_sbpro.df.delta(f.fdelta - f.tauf.fdeltatau);	bpro.pt = bpro.Rbpro.df.delta(f.fdelta - f.tauf.fdeltatau);
bpro.pd = bpro.R_sbpro.Tf.delta(2.0f.fdelta + f.delta*f.fdeltadelta);	bpro.pd = bpro.Rbpro.Tf.delta(2.0f.fdelta + f.delta*f.fdeltadelta);
end if; ...

function Media.Water.IF97_Utilities.BaseIF97.Regions.hvl_p

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Water.IF97_Utilities.BaseIF97.Regions.hl_p

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Water.IF97_Utilities.BaseIF97.Regions.hv_p

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Water.IF97_Utilities.BaseIF97.Regions.hvl_p_der

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure

function Media.Water.IF97_Utilities.BaseIF97.Regions.rhovl_p

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
rho	Units.SI.Density	SIunits.Density

function Media.Water.IF97_Utilities.BaseIF97.Regions.rhol_p

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
rho	Units.SI.Density	SIunits.Density

function Media.Water.IF97_Utilities.BaseIF97.Regions.rhov_p

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
rho	Units.SI.Density	SIunits.Density

function Media.Water.IF97_Utilities.BaseIF97.Regions.rhovl_p_der

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure

function Media.Water.IF97_Utilities.BaseIF97.Regions.sl_p

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
Tsat	Units.SI.Temperature	SIunits.Temperature
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Water.IF97_Utilities.BaseIF97.Regions.sv_p

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
Tsat	Units.SI.Temperature	SIunits.Temperature
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Water.IF97_Utilities.BaseIF97.Regions.rhol_T

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature
d	Units.SI.Density	SIunits.Density
p	Units.SI.Pressure	SIunits.Pressure

function Media.Water.IF97_Utilities.BaseIF97.Regions.rhov_T

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature
d	Units.SI.Density	SIunits.Density
p	Units.SI.Pressure	SIunits.Pressure

function Media.Water.IF97_Utilities.BaseIF97.Regions.region_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
Ttest	Units.SI.Temperature	SIunits.Temperature
hl	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
hv	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Water.IF97_Utilities.BaseIF97.Regions.region_ps

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
Ttest	Units.SI.Temperature	SIunits.Temperature
sl	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
sv	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Water.IF97_Utilities.BaseIF97.Regions.region_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature

function Media.Water.IF97_Utilities.BaseIF97.Regions.region_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
p23	Units.SI.Pressure	SIunits.Pressure

function Media.Water.IF97_Utilities.BaseIF97.Regions.hvl_dp

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure

function Media.Water.IF97_Utilities.BaseIF97.Regions.dhl_dp

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
dh_dp	Units.SI.DerEnthalpyByPressure	SIunits.DerEnthalpyByPressure

function Media.Water.IF97_Utilities.BaseIF97.Regions.dhv_dp

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
dh_dp	Units.SI.DerEnthalpyByPressure	SIunits.DerEnthalpyByPressure

function Media.Water.IF97_Utilities.BaseIF97.Regions.drhovl_dp

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure

function Media.Water.IF97_Utilities.BaseIF97.Regions.drhol_dp

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
dd_dp	Units.SI.DerDensityByPressure	SIunits.DerDensityByPressure

function Media.Water.IF97_Utilities.BaseIF97.Regions.drhov_dp

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
dd_dp	Units.SI.DerDensityByPressure	SIunits.DerDensityByPressure

function Media.Water.IF97_Utilities.BaseIF97.Basic.g1

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... assert(p > triple.ptriple, "IF97 medium function g1 called with too low pressure\n" + "p = " + String(p) + " Pa <= " + String(triple.ptriple) + " Pa (triple point pressure)");
assert(p <= 100.0e6, "IF97 medium function g1: the input pressure (= " + String(p) + " Pa) is higher than 100 MPa");	assert(p <= 100.0e6, "IF97 medium function g1: the input pressure (= " + String(p) + " Pa) is higher than 100 Mpa");
assert(T >= 273.15, "IF97 medium function g1: the temperature (= " + String(T) + " K) is lower than 273.15 K!"); ... g.T = T;
g.R_s = data.RH2O;	g.R = data.RH2O;
g.pi = p/data.PSTAR1; ...

function Media.Water.IF97_Utilities.BaseIF97.Basic.g2

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
checkLimits	Present

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... g.T = T;
g.R_s = data.RH2O;	g.R = data.RH2O;
if checkLimits then
assert(p > 0.0, "IF97 medium function g2 called with too low pressure\n" + "p = " + String(p) + " Pa <= 0.0 Pa");
assert(p <= 100.0e6, "IF97 medium function g2: the input pressure (= " + String(p) + " Pa) is higher than 100 MPa");	assert(p <= 100.0e6, "IF97 medium function g2: the input pressure (= " + String(p) + " Pa) is higher than 100 Mpa");
assert(T >= 273.15, "IF97 medium function g2: the temperature (= " + String(T) + " K) is lower than 273.15 K!");
assert(T <= 1073.15, "IF97 medium function g2: the input temperature (= " + String(T) + " K) is higher than the limit of 1073.15 K");
end if;
g.pi = p/data.PSTAR2; ...

function Media.Water.IF97_Utilities.BaseIF97.Basic.g2metastable

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... assert(p > 0.0, "IF97 medium function g2metastable called with too low pressure\n" + "p = " + String(p) + " Pa <= 0.0 Pa");
assert(p <= 100.0e6, "IF97 medium function g2metastable: the input pressure (= " + String( p) + " Pa) is higher than 100 MPa");	assert(p <= 100.0e6, "IF97 medium function g2metastable: the input pressure (= " + String( p) + " Pa) is higher than 100 Mpa");
assert(T >= 273.15, "IF97 medium function g2metastable: the temperature (= " + String(T) + " K) is lower than 273.15 K!"); ... g.T = T;
g.R_s = data.RH2O;	g.R = data.RH2O;
g.pi = p/data.PSTAR2; ...

function Media.Water.IF97_Utilities.BaseIF97.Basic.f3

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... f.d = d;
f.R_s = data.RH2O;	f.R = data.RH2O;
f.tau = data.TCRIT/T; ...

function Media.Water.IF97_Utilities.BaseIF97.Basic.g5

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... assert(p > 0.0, "IF97 medium function g5 called with too low pressure\n" + "p = " + String(p) + " Pa <= 0.0 Pa");
assert(p <= data.PLIMIT5, "IF97 medium function g5: input pressure (= " + String(p) + " Pa) is higher than 10 MPa in region 5");	assert(p <= data.PLIMIT5, "IF97 medium function g5: input pressure (= " + String(p) + " Pa) is higher than 10 Mpa in region 5");
assert(T <= 2273.15, "IF97 medium function g5: input temperature (= " + String(T) + " K) is higher than limit of 2273.15K in region 5"); ... g.T = T;
g.R_s = data.RH2O;	g.R = data.RH2O;
g.pi = p/data.PSTAR5; ...

function Media.Water.IF97_Utilities.BaseIF97.Basic.gibbs

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature

function Media.Water.IF97_Utilities.BaseIF97.Basic.g1pitau

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... assert(p > triple.ptriple, "IF97 medium function g1pitau called with too low pressure\n" + "p = " + String(p) + " Pa <= " + String(triple.ptriple) + " Pa (triple point pressure)");
assert(p <= 100.0e6, "IF97 medium function g1pitau: the input pressure (= " + String(p) + " Pa) is higher than 100 MPa");	assert(p <= 100.0e6, "IF97 medium function g1pitau: the input pressure (= " + String(p) + " Pa) is higher than 100 Mpa");
assert(T >= 273.15, "IF97 medium function g1pitau: the temperature (= " + String(T) + " K) is lower than 273.15 K!"); ...

function Media.Water.IF97_Utilities.BaseIF97.Basic.g2pitau

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... assert(p > 0.0, "IF97 medium function g2pitau called with too low pressure\n" + "p = " + String(p) + " Pa <= " + String(triple.ptriple) + " Pa (triple point pressure)");
assert(p <= 100.0e6, "IF97 medium function g2pitau: the input pressure (= " + String(p) + " Pa) is higher than 100 MPa");	assert(p <= 100.0e6, "IF97 medium function g2pitau: the input pressure (= " + String(p) + " Pa) is higher than 100 Mpa");
assert(T >= 273.15, "IF97 medium function g2pitau: the temperature (= " + String(T) + " K) is lower than 273.15 K!"); ...

function Media.Water.IF97_Utilities.BaseIF97.Basic.g5pitau

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... assert(p > 0.0, "IF97 medium function g5pitau called with too low pressure\n" + "p = " + String(p) + " Pa <= " + String(triple.ptriple) + " Pa (triple point pressure)");
assert(p <= data.PLIMIT5, "IF97 medium function g5pitau: input pressure (= " + String(p) + " Pa) is higher than 10 MPa in region 5");	assert(p <= data.PLIMIT5, "IF97 medium function g5pitau: input pressure (= " + String(p) + " Pa) is higher than 10 Mpa in region 5");
assert(T <= 2273.15, "IF97 medium function g5pitau: input temperature (= " + String(T) + " K) is higher than limit of 2273.15 K in region 5"); ...

function Media.Water.IF97_Utilities.BaseIF97.Basic.f3deltatau

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature

function Media.Water.IF97_Utilities.BaseIF97.Basic.tph1

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
T	Units.SI.Temperature	SIunits.Temperature

function Media.Water.IF97_Utilities.BaseIF97.Basic.tps1

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
T	Units.SI.Temperature	SIunits.Temperature
pstar	Units.SI.Pressure	SIunits.Pressure
sstar	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Water.IF97_Utilities.BaseIF97.Basic.tph2

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
T	Units.SI.Temperature	SIunits.Temperature

function Media.Water.IF97_Utilities.BaseIF97.Basic.tps2a

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
T	Units.SI.Temperature	SIunits.Temperature

function Media.Water.IF97_Utilities.BaseIF97.Basic.tps2b

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
T	Units.SI.Temperature	SIunits.Temperature

function Media.Water.IF97_Utilities.BaseIF97.Basic.tps2c

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
T	Units.SI.Temperature	SIunits.Temperature

function Media.Water.IF97_Utilities.BaseIF97.Basic.tps2

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
T	Units.SI.Temperature	SIunits.Temperature
SLIMIT	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Water.IF97_Utilities.BaseIF97.Basic.tsat

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
t_sat	Units.SI.Temperature	SIunits.Temperature

function Media.Water.IF97_Utilities.BaseIF97.Basic.dtsatofp

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure

function Media.Water.IF97_Utilities.BaseIF97.Basic.tsat_der

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure

function Media.Water.IF97_Utilities.BaseIF97.Basic.psat

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature
p_sat	Units.SI.Pressure	SIunits.Pressure

function Media.Water.IF97_Utilities.BaseIF97.Basic.dptofT

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature

function Media.Water.IF97_Utilities.BaseIF97.Basic.psat_der

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature

function Media.Water.IF97_Utilities.BaseIF97.Basic.p1_hs

Component	Modelica 4.0.0	Modelica 3.2.3
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
p	Units.SI.Pressure	SIunits.Pressure
hstar	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
pstar	Units.SI.Pressure	SIunits.Pressure
sstar	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Water.IF97_Utilities.BaseIF97.Basic.h2ab_s

Component	Modelica 4.0.0	Modelica 3.2.3
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
hstar	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
sstar	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Water.IF97_Utilities.BaseIF97.Basic.p2a_hs

Component	Modelica 4.0.0	Modelica 3.2.3
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
p	Units.SI.Pressure	SIunits.Pressure
hstar	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
pstar	Units.SI.Pressure	SIunits.Pressure
sstar	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Water.IF97_Utilities.BaseIF97.Basic.p2b_hs

Component	Modelica 4.0.0	Modelica 3.2.3
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
p	Units.SI.Pressure	SIunits.Pressure
hstar	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
pstar	Units.SI.Pressure	SIunits.Pressure
sstar	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Water.IF97_Utilities.BaseIF97.Basic.p2c_hs

Component	Modelica 4.0.0	Modelica 3.2.3
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
p	Units.SI.Pressure	SIunits.Pressure
hstar	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
pstar	Units.SI.Pressure	SIunits.Pressure
sstar	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Water.IF97_Utilities.BaseIF97.Basic.h3ab_p

Component	Modelica 4.0.0	Modelica 3.2.3
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
p	Units.SI.Pressure	SIunits.Pressure
hstar	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
pstar	Units.SI.Pressure	SIunits.Pressure

function Media.Water.IF97_Utilities.BaseIF97.Basic.T3a_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
T	Units.SI.Temperature	SIunits.Temp_K
hstar	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
pstar	Units.SI.Pressure	SIunits.Pressure
Tstar	Units.SI.Temperature	SIunits.Temp_K

function Media.Water.IF97_Utilities.BaseIF97.Basic.T3b_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
T	Units.SI.Temperature	SIunits.Temp_K
Tstar	Units.SI.Temperature	SIunits.Temp_K
pstar	Units.SI.Pressure	SIunits.Pressure
hstar	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Water.IF97_Utilities.BaseIF97.Basic.v3a_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
v	Units.SI.SpecificVolume	SIunits.SpecificVolume
vstar	Units.SI.Volume	SIunits.Volume
pstar	Units.SI.Pressure	SIunits.Pressure
hstar	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Water.IF97_Utilities.BaseIF97.Basic.v3b_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
v	Units.SI.SpecificVolume	SIunits.SpecificVolume
vstar	Units.SI.Volume	SIunits.Volume
pstar	Units.SI.Pressure	SIunits.Pressure
hstar	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Water.IF97_Utilities.BaseIF97.Basic.T3a_ps

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
T	Units.SI.Temperature	SIunits.Temp_K
Tstar	Units.SI.Temperature	SIunits.Temp_K
pstar	Units.SI.Pressure	SIunits.Pressure
sstar	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Water.IF97_Utilities.BaseIF97.Basic.T3b_ps

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
T	Units.SI.Temperature	SIunits.Temp_K
Tstar	Units.SI.Temperature	SIunits.Temp_K
pstar	Units.SI.Pressure	SIunits.Pressure
sstar	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Water.IF97_Utilities.BaseIF97.Basic.v3a_ps

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
v	Units.SI.SpecificVolume	SIunits.SpecificVolume
vstar	Units.SI.Volume	SIunits.Volume
pstar	Units.SI.Pressure	SIunits.Pressure
sstar	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Water.IF97_Utilities.BaseIF97.Basic.v3b_ps

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
v	Units.SI.SpecificVolume	SIunits.SpecificVolume
vstar	Units.SI.Volume	SIunits.Volume
pstar	Units.SI.Pressure	SIunits.Pressure
sstar	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Water.IF97_Utilities.BaseIF97.IceBoundaries.pmIceI_T

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temp_K
pm	Units.SI.Pressure	SIunits.Pressure
Tn	Units.SI.Temperature	SIunits.Temp_K
pn	Units.SI.Pressure	SIunits.Pressure

function Media.Water.IF97_Utilities.BaseIF97.IceBoundaries.pmIceIII_T

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temp_K
pm	Units.SI.Pressure	SIunits.Pressure
Tn	Units.SI.Temperature	SIunits.Temp_K
pn	Units.SI.Pressure	SIunits.Pressure

function Media.Water.IF97_Utilities.BaseIF97.IceBoundaries.pmIceV_T

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temp_K
pm	Units.SI.Pressure	SIunits.Pressure
Tn	Units.SI.Temperature	SIunits.Temp_K
pn	Units.SI.Pressure	SIunits.Pressure

function Media.Water.IF97_Utilities.BaseIF97.IceBoundaries.sublimationPressure_T

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temp_K
psubl	Units.SI.Pressure	SIunits.Pressure
Tn	Units.SI.Temperature	SIunits.Temp_K
pn	Units.SI.Pressure	SIunits.Pressure

function Media.Water.IF97_Utilities.BaseIF97.Transport.visc_dTp

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
p	Units.SI.Pressure	SIunits.Pressure
eta	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
rhostar	Units.SI.Density	SIunits.Density
etastar	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
tstar	Units.SI.Temperature	SIunits.Temperature
checkLimits	Present

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... delta := d/rhostar;
if checkLimits then
assert(d > triple.dvtriple, "IF97 medium function visc_dTp for viscosity called with too low density\n" + "d = " + String(d) + " <= " + String(triple.dvtriple) + " (triple point density)");
assert((p <= 500e6 and (Tc >= 0.0 and Tc <= 150)) or (p <= 350e6 and ( Tc > 150.0 and Tc <= 600)) or (p <= 300e6 and (Tc > 600.0 and Tc <= 900)), "IF97 medium function visc_dTp: viscosity computed outside the range\n" + "of validity of the IF97 formulation: p = " + String(p) + " Pa, Tc = " + String(Tc) + " K");
end if;
deltam1 = delta - 1.0; ...

function Media.Water.IF97_Utilities.BaseIF97.Transport.cond_dTp

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
p	Units.SI.Pressure	SIunits.Pressure
lambda	Units.SI.ThermalConductivity	SIunits.ThermalConductivity
lamstar	Units.SI.ThermalConductivity	SIunits.ThermalConductivity
rhostar	Units.SI.Density	SIunits.Density
tstar	Units.SI.Temperature	SIunits.Temperature
pstar	Units.SI.Pressure	SIunits.Pressure
etastar	Units.SI.DynamicViscosity	SIunits.DynamicViscosity
rhostar2	Units.SI.Density	SIunits.Density
Tstar2	Units.SI.Temperature	SIunits.Temperature
lambdastar	Units.SI.ThermalConductivity	SIunits.ThermalConductivity
checkLimits	Present

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
if checkLimits then
assert(d > triple.dvtriple, "IF97 medium function cond_dTp called with too low density\n" + "d = " + String(d) + " <= " + String(triple.dvtriple) + " (triple point density)");
assert((p <= 100e6 and (Tc >= 0.0 and Tc <= 500)) or (p <= 70e6 and (Tc > 500.0 and Tc <= 650)) or (p <= 40e6 and (Tc > 650.0 and Tc <= 800)), "IF97 medium function cond_dTp: thermal conductivity computed outside the range\n" + "of validity of the IF97 formulation: p = " + String(p) + " Pa, Tc = " + String(Tc) + " K");
end if;
if industrialMethod == true then ...

function Media.Water.IF97_Utilities.BaseIF97.Transport.surfaceTension

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature
sigma	Units.SI.SurfaceTension	SIunits.SurfaceTension

function Media.Water.IF97_Utilities.BaseIF97.Isentropic.hofpT1

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Water.IF97_Utilities.BaseIF97.Isentropic.handsofpT1

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Water.IF97_Utilities.BaseIF97.Isentropic.hofps1

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
T	Units.SI.Temperature	SIunits.Temperature

function Media.Water.IF97_Utilities.BaseIF97.Isentropic.hofpT2

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Water.IF97_Utilities.BaseIF97.Isentropic.handsofpT2

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Water.IF97_Utilities.BaseIF97.Isentropic.hofps2

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
T	Units.SI.Temperature	SIunits.Temperature

function Media.Water.IF97_Utilities.BaseIF97.Isentropic.hofdT3

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Water.IF97_Utilities.BaseIF97.Isentropic.hofps3

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
delp	Units.SI.Pressure	SIunits.Pressure
dels	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Water.IF97_Utilities.BaseIF97.Isentropic.hofpsdt3

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
dguess	Units.SI.Density	SIunits.Density
Tguess	Units.SI.Temperature	SIunits.Temperature
delp	Units.SI.Pressure	SIunits.Pressure
dels	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature

function Media.Water.IF97_Utilities.BaseIF97.Isentropic.hofps4

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
Tsat	Units.SI.Temperature	SIunits.Temp_K
x	Units.SI.MassFraction	SIunits.MassFraction
sl	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
sv	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
hl	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
hv	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Water.IF97_Utilities.BaseIF97.Isentropic.hofpT5

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Water.IF97_Utilities.BaseIF97.Isentropic.water_hisentropic

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
T	Units.SI.Temperature	SIunits.Temperature
d	Units.SI.Density	SIunits.Density

function Media.Water.IF97_Utilities.BaseIF97.Isentropic.water_hisentropic_dyn

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
dguess	Units.SI.Density	SIunits.Density
Tguess	Units.SI.Temperature	SIunits.Temperature
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
T	Units.SI.Temperature	SIunits.Temperature
d	Units.SI.Density	SIunits.Density

function Media.Water.IF97_Utilities.BaseIF97.Inverses.fixdT

Component	Modelica 4.0.0	Modelica 3.2.3
din	Units.SI.Density	SIunits.Density
Tin	Units.SI.Temperature	SIunits.Temperature
dout	Units.SI.Density	SIunits.Density
Tout	Units.SI.Temperature	SIunits.Temperature
Tmin	Units.SI.Temperature	SIunits.Temperature
Tmax	Units.SI.Temperature	SIunits.Temperature

function Media.Water.IF97_Utilities.BaseIF97.Inverses.dofp13

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
d	Units.SI.Density	SIunits.Density

function Media.Water.IF97_Utilities.BaseIF97.Inverses.dofp23

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature

function Media.Water.IF97_Utilities.BaseIF97.Inverses.dofpt3

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
delp	Units.SI.Pressure	SIunits.Pressure
d	Units.SI.Density	SIunits.Density
dguess	Units.SI.Density	SIunits.Density
deld	Units.SI.Density	SIunits.Density
dmin	Units.SI.Density	SIunits.Density
dmax	Units.SI.Density	SIunits.Density
Tmax	Units.SI.Temperature	SIunits.Temperature

function Media.Water.IF97_Utilities.BaseIF97.Inverses.dtofph3

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
delp	Units.SI.Pressure	SIunits.Pressure
delh	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
Tguess	Units.SI.Temperature	SIunits.Temperature
dguess	Units.SI.Density	SIunits.Density

function Media.Water.IF97_Utilities.BaseIF97.Inverses.dtofps3

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
delp	Units.SI.Pressure	SIunits.Pressure
dels	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
Tguess	Units.SI.Temperature	SIunits.Temperature
dguess	Units.SI.Density	SIunits.Density

function Media.Water.IF97_Utilities.BaseIF97.Inverses.dtofpsdt3

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
dguess	Units.SI.Density	SIunits.Density
Tguess	Units.SI.Temperature	SIunits.Temperature
delp	Units.SI.Pressure	SIunits.Pressure
dels	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
diter	Units.SI.Density	SIunits.Density
Titer	Units.SI.Temperature	SIunits.Temperature

function Media.Water.IF97_Utilities.BaseIF97.Inverses.pofdt125

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
reldd	Units.SI.Pressure	SIunits.Pressure
p	Units.SI.Pressure	SIunits.Pressure
pguess1	Units.SI.Pressure	SIunits.Pressure
pguess2	Units.SI.Pressure	SIunits.Pressure
pguess5	Units.SI.Pressure	SIunits.Pressure

function Media.Water.IF97_Utilities.BaseIF97.Inverses.tofph5

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
reldh	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
T	Units.SI.Temperature	SIunits.Temperature
proh	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
Tguess	Units.SI.Temperature	SIunits.Temperature

function Media.Water.IF97_Utilities.BaseIF97.Inverses.tofps5

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
relds	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
T	Units.SI.Temperature	SIunits.Temperature
pros	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
Tguess	Units.SI.Temperature	SIunits.Temperature

function Media.Water.IF97_Utilities.BaseIF97.Inverses.tofpst5

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
Tguess	Units.SI.Temperature	SIunits.Temperature
relds	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
T	Units.SI.Temperature	SIunits.Temperature
pros	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Water.IF97_Utilities.BaseIF97.ByRegion.waterR1_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature

function Media.Water.IF97_Utilities.BaseIF97.ByRegion.waterR2_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature

function Media.Water.IF97_Utilities.BaseIF97.ByRegion.waterR3_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... pro = Modelica400.Media.Common.ThermoFluidSpecial.helmholtzToProps_dT(f);
assert(pro.p <= 100.0e6, "IF97 medium function waterR3_dT: the input pressure (= " + String( pro.p) + " Pa) is higher than 100 MPa");	assert(pro.p <= 100.0e6, "IF97 medium function waterR3_dT: the input pressure (= " + String( pro.p) + " Pa) is higher than 100 Mpa");

function Media.Water.IF97_Utilities.BaseIF97.ByRegion.waterR5_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature

function Media.Water.IF97_Utilities.BaseIF97.TwoPhase.waterLiq_p

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
Tsat	Units.SI.Temperature	SIunits.Temperature
dl	Units.SI.Density	SIunits.Density

function Media.Water.IF97_Utilities.BaseIF97.TwoPhase.waterVap_p

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
Tsat	Units.SI.Temperature	SIunits.Temperature
dv	Units.SI.Density	SIunits.Density

function Media.Water.IF97_Utilities.BaseIF97.TwoPhase.waterSat_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
dl	Units.SI.Density	SIunits.Density
dv	Units.SI.Density	SIunits.Density

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... pro.kappa = 1/(pro.dp)pro.dpTpro.dpTpro.T/pro.cv;
pro.R_s = data.RH2O;	pro.R = data.RH2O;

function Media.Water.IF97_Utilities.BaseIF97.TwoPhase.waterR4_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
dl	Units.SI.Density	SIunits.Density
dv	Units.SI.Density	SIunits.Density

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... pro.a = Modelica400.Constants.inf;
pro.R_s = data.RH2O;	pro.R = data.RH2O;
pro.ddph = pro.d(pro.dpro.cv/dpT + 1.0)/(dpT*pro.T); ...

function Media.Water.IF97_Utilities.BaseIF97.TwoPhase.waterR4_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
dl	Units.SI.Density	SIunits.Density
dv	Units.SI.Density	SIunits.Density

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... pro.a = Modelica400.Constants.inf;
pro.R_s = data.RH2O;	pro.R = data.RH2O;
pro.dudT = (pro.p - TdpT)/(dd); ...

function Media.Water.IF97_Utilities.BaseIF97.extraDerivs_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature

function Media.Water.IF97_Utilities.BaseIF97.extraDerivs_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
d	Units.SI.Density	SIunits.Density

function Media.Water.IF97_Utilities.waterBaseProp_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
h_liq	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
d_liq	Units.SI.Density	SIunits.Density
h_vap	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
d_vap	Units.SI.Density	SIunits.Density
t1	Units.SI.Temperature	SIunits.Temperature
t2	Units.SI.Temperature	SIunits.Temperature

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... aux.h = max(h, 1e3);
aux.R_s = BaseIF97.data.RH2O;	aux.R = BaseIF97.data.RH2O;
aux.vt = 0.0 "Initialized in case it is not needed";	aux.vt = 0.0 "initialized in case it is not needed";
aux.vp = 0.0 "Initialized in case it is not needed";	aux.vp = 0.0 "initialized in case it is not needed";
if (aux.region == 1) then ... g = BaseIF97.Basic.g1(p, aux.T);
aux.s = aux.R_s(g.taug.gtau - g.g);	aux.s = aux.R(g.taug.gtau - g.g);
aux.rho = p/(aux.R_saux.Tg.pi*g.gpi);	aux.rho = p/(aux.Raux.Tg.pi*g.gpi);
aux.vt = aux.R_s/p(g.pig.gpi - g.taug.pig.gtaupi);	aux.vt = aux.R/p(g.pig.gpi - g.taug.pig.gtaupi);
aux.pt = -g.p/g.T(g.gpi - g.taug.gtaupi)/(g.gpipi*g.pi);
aux.pd = -g.R_sg.Tg.gpi*g.gpi/(g.gpipi);	aux.pd = -g.Rg.Tg.gpi*g.gpi/(g.gpipi);
aux.vp = aux.R_saux.T/(pp)g.pig.pi*g.gpipi;	aux.vp = aux.Raux.T/(pp)g.pig.pi*g.gpipi;
aux.cp = -aux.R_sg.taug.tau*g.gtautau;	aux.cp = -aux.Rg.taug.tau*g.gtautau;
aux.cv = aux.R_s(-g.taug.taug.gtautau + ((g.gpi - g.taug.gtaupi)(g.gpi - g.taug.gtaupi)/g.gpipi));	aux.cv = aux.R(-g.taug.taug.gtautau + ((g.gpi - g.taug.gtaupi)(g.gpi - g.taug.gtaupi)/g.gpipi));
aux.x = 0.0; ... g = BaseIF97.Basic.g2(p, aux.T);
aux.s = aux.R_s(g.taug.gtau - g.g);	aux.s = aux.R(g.taug.gtau - g.g);
aux.rho = p/(aux.R_saux.Tg.pi*g.gpi);	aux.rho = p/(aux.Raux.Tg.pi*g.gpi);
aux.vt = aux.R_s/p(g.pig.gpi - g.taug.pig.gtaupi);	aux.vt = aux.R/p(g.pig.gpi - g.taug.pig.gtaupi);
aux.vp = aux.R_saux.T/(pp)g.pig.pi*g.gpipi;	aux.vp = aux.Raux.T/(pp)g.pig.pi*g.gpipi;
aux.pt = -g.p/g.T(g.gpi - g.taug.gtaupi)/(g.gpipi*g.pi);
aux.pd = -g.R_sg.Tg.gpi*g.gpi/(g.gpipi);	aux.pd = -g.Rg.Tg.gpi*g.gpi/(g.gpipi);
aux.cp = -aux.R_sg.taug.tau*g.gtautau;	aux.cp = -aux.Rg.taug.tau*g.gtautau;
aux.cv = aux.R_s(-g.taug.taug.gtautau + ((g.gpi - g.taug.gtaupi)(g.gpi - g.taug.gtaupi)/g.gpipi));	aux.cv = aux.R(-g.taug.taug.gtautau + ((g.gpi - g.taug.gtaupi)(g.gpi - g.taug.gtaupi)/g.gpipi));
aux.x = 1.0; ... f = BaseIF97.Basic.f3(aux.rho, aux.T);
aux.h = aux.R_saux.T(f.tauf.ftau + f.deltaf.fdelta);	aux.h = aux.Raux.T(f.tauf.ftau + f.deltaf.fdelta);
aux.s = aux.R_s(f.tauf.ftau - f.f);	aux.s = aux.R(f.tauf.ftau - f.f);
aux.pd = aux.R_saux.Tf.delta(2.0f.fdelta + f.delta*f.fdeltadelta);	aux.pd = aux.Raux.Tf.delta(2.0f.fdelta + f.delta*f.fdeltadelta);
aux.pt = aux.R_saux.rhof.delta(f.fdelta - f.tauf.fdeltatau);	aux.pt = aux.Raux.rhof.delta(f.fdelta - f.tauf.fdeltatau);
aux.cv = abs(aux.R_s(-f.tauf.tau*f.ftautau)) "Can be close to neg. infinity near critical point";	aux.cv = abs(aux.R(-f.tauf.tau*f.ftautau)) "Can be close to neg. infinity near critical point";
aux.cp = (aux.rhoaux.rhoaux.pdaux.cv + aux.Taux.ptaux.pt)/(aux.rho aux.rho*aux.pd); ... g = BaseIF97.Basic.g5(aux.p, aux.T);
aux.s = aux.R_s(g.taug.gtau - g.g);	aux.s = aux.R(g.taug.gtau - g.g);
aux.rho = p/(aux.R_saux.Tg.pi*g.gpi);	aux.rho = p/(aux.Raux.Tg.pi*g.gpi);
aux.vt = aux.R_s/p(g.pig.gpi - g.taug.pig.gtaupi);	aux.vt = aux.R/p(g.pig.gpi - g.taug.pig.gtaupi);
aux.vp = aux.R_saux.T/(pp)g.pig.pi*g.gpipi;	aux.vp = aux.Raux.T/(pp)g.pig.pi*g.gpipi;
aux.pt = -g.p/g.T(g.gpi - g.taug.gtaupi)/(g.gpipi*g.pi);
aux.pd = -g.R_sg.Tg.gpi*g.gpi/(g.gpipi);	aux.pd = -g.Rg.Tg.gpi*g.gpi/(g.gpipi);
aux.cp = -aux.R_sg.taug.tau*g.gtautau;	aux.cp = -aux.Rg.taug.tau*g.gtautau;
aux.cv = aux.R_s(-g.taug.taug.gtautau + ((g.gpi - g.taug.gtaupi)(g.gpi - g.taug.gtaupi)/g.gpipi));	aux.cv = aux.R(-g.taug.taug.gtautau + ((g.gpi - g.taug.gtaupi)(g.gpi - g.taug.gtaupi)/g.gpipi));
aux.dpT = -aux.vt/aux.vp; ...

function Media.Water.IF97_Utilities.waterBaseProp_ps

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
s_liq	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
d_liq	Units.SI.Density	SIunits.Density
s_vap	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
d_vap	Units.SI.Density	SIunits.Density
t1	Units.SI.Temperature	SIunits.Temperature
t2	Units.SI.Temperature	SIunits.Temperature

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... aux.s = s;
aux.R_s = BaseIF97.data.RH2O;	aux.R = BaseIF97.data.RH2O;
aux.vt = 0.0 "Initialized in case it is not needed";	aux.vt = 0.0 "initialized in case it is not needed";
aux.vp = 0.0 "Initialized in case it is not needed";	aux.vp = 0.0 "initialized in case it is not needed";
if (aux.region == 1) then ... g = BaseIF97.Basic.g1(p, aux.T);
aux.h = aux.R_saux.Tg.tau*g.gtau;	aux.h = aux.Raux.Tg.tau*g.gtau;
aux.rho = p/(aux.R_saux.Tg.pi*g.gpi);	aux.rho = p/(aux.Raux.Tg.pi*g.gpi);
aux.vt = aux.R_s/p(g.pig.gpi - g.taug.pig.gtaupi);	aux.vt = aux.R/p(g.pig.gpi - g.taug.pig.gtaupi);
aux.vp = aux.R_saux.T/(pp)g.pig.pi*g.gpipi;	aux.vp = aux.Raux.T/(pp)g.pig.pi*g.gpipi;
aux.pt = -g.p/g.T(g.gpi - g.taug.gtaupi)/(g.gpipi*g.pi);
aux.pd = -g.R_sg.Tg.gpi*g.gpi/(g.gpipi);	aux.pd = -g.Rg.Tg.gpi*g.gpi/(g.gpipi);
aux.cp = -aux.R_sg.taug.tau*g.gtautau;	aux.cp = -aux.Rg.taug.tau*g.gtautau;
aux.cv = aux.R_s(-g.taug.taug.gtautau + ((g.gpi - g.taug.gtaupi)(g.gpi - g.taug.gtaupi)/g.gpipi));	aux.cv = aux.R(-g.taug.taug.gtautau + ((g.gpi - g.taug.gtaupi)(g.gpi - g.taug.gtaupi)/g.gpipi));
aux.x = 0.0; ... g = BaseIF97.Basic.g2(p, aux.T);
aux.h = aux.R_saux.Tg.tau*g.gtau;	aux.h = aux.Raux.Tg.tau*g.gtau;
aux.rho = p/(aux.R_saux.Tg.pi*g.gpi);	aux.rho = p/(aux.Raux.Tg.pi*g.gpi);
aux.vt = aux.R_s/p(g.pig.gpi - g.taug.pig.gtaupi);	aux.vt = aux.R/p(g.pig.gpi - g.taug.pig.gtaupi);
aux.vp = aux.R_saux.T/(pp)g.pig.pi*g.gpipi;	aux.vp = aux.Raux.T/(pp)g.pig.pi*g.gpipi;
aux.pt = -g.p/g.T(g.gpi - g.taug.gtaupi)/(g.gpipi*g.pi);
aux.pd = -g.R_sg.Tg.gpi*g.gpi/(g.gpipi);	aux.pd = -g.Rg.Tg.gpi*g.gpi/(g.gpipi);
aux.cp = -aux.R_sg.taug.tau*g.gtautau;	aux.cp = -aux.Rg.taug.tau*g.gtautau;
aux.cv = aux.R_s(-g.taug.taug.gtautau + ((g.gpi - g.taug.gtaupi)(g.gpi - g.taug.gtaupi)/g.gpipi));	aux.cv = aux.R(-g.taug.taug.gtautau + ((g.gpi - g.taug.gtaupi)(g.gpi - g.taug.gtaupi)/g.gpipi));
aux.x = 1.0; ... f = BaseIF97.Basic.f3(aux.rho, aux.T);
aux.h = aux.R_saux.T(f.tauf.ftau + f.deltaf.fdelta);	aux.h = aux.Raux.T(f.tauf.ftau + f.deltaf.fdelta);
aux.s = aux.R_s(f.tauf.ftau - f.f);	aux.s = aux.R(f.tauf.ftau - f.f);
aux.pd = aux.R_saux.Tf.delta(2.0f.fdelta + f.delta*f.fdeltadelta);	aux.pd = aux.Raux.Tf.delta(2.0f.fdelta + f.delta*f.fdeltadelta);
aux.pt = aux.R_saux.rhof.delta(f.fdelta - f.tauf.fdeltatau);	aux.pt = aux.Raux.rhof.delta(f.fdelta - f.tauf.fdeltatau);
aux.cv = aux.R_s(-f.tauf.tau*f.ftautau);	aux.cv = aux.R(-f.tauf.tau*f.ftautau);
aux.cp = (aux.rhoaux.rhoaux.pdaux.cv + aux.Taux.ptaux.pt)/(aux.rho aux.rho*aux.pd); ... g = BaseIF97.Basic.g5(p, aux.T);
aux.h = aux.R_saux.Tg.tau*g.gtau;	aux.h = aux.Raux.Tg.tau*g.gtau;
aux.rho = p/(aux.R_saux.Tg.pi*g.gpi);	aux.rho = p/(aux.Raux.Tg.pi*g.gpi);
aux.vt = aux.R_s/p(g.pig.gpi - g.taug.pig.gtaupi);	aux.vt = aux.R/p(g.pig.gpi - g.taug.pig.gtaupi);
aux.vp = aux.R_saux.T/(pp)g.pig.pi*g.gpipi;	aux.vp = aux.Raux.T/(pp)g.pig.pi*g.gpipi;
aux.pt = -g.p/g.T(g.gpi - g.taug.gtaupi)/(g.gpipi*g.pi);
aux.pd = -g.R_sg.Tg.gpi*g.gpi/(g.gpipi);	aux.pd = -g.Rg.Tg.gpi*g.gpi/(g.gpipi);
aux.cp = -aux.R_sg.taug.tau*g.gtautau;	aux.cp = -aux.Rg.taug.tau*g.gtautau;
aux.cv = aux.R_s(-g.taug.taug.gtautau + ((g.gpi - g.taug.gtaupi)(g.gpi - g.taug.gtaupi)/g.gpipi));	aux.cv = aux.R(-g.taug.taug.gtautau + ((g.gpi - g.taug.gtaupi)(g.gpi - g.taug.gtaupi)/g.gpipi));
aux.dpT = -aux.vt/aux.vp; ...

function Media.Water.IF97_Utilities.rho_props_ps

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
rho	Units.SI.Density	SIunits.Density

function Media.Water.IF97_Utilities.rho_ps

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
rho	Units.SI.Density	SIunits.Density

function Media.Water.IF97_Utilities.T_props_ps

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
T	Units.SI.Temperature	SIunits.Temperature

function Media.Water.IF97_Utilities.T_ps

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
T	Units.SI.Temperature	SIunits.Temperature

function Media.Water.IF97_Utilities.h_props_ps

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Water.IF97_Utilities.h_ps

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Water.IF97_Utilities.phase_ps

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Water.IF97_Utilities.phase_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Water.IF97_Utilities.phase_dT

Component	Modelica 4.0.0	Modelica 3.2.3
rho	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature

function Media.Water.IF97_Utilities.rho_props_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
rho	Units.SI.Density	SIunits.Density

function Media.Water.IF97_Utilities.rho_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
rho	Units.SI.Density	SIunits.Density

function Media.Water.IF97_Utilities.rho_ph_der

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Water.IF97_Utilities.T_props_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
T	Units.SI.Temperature	SIunits.Temperature

function Media.Water.IF97_Utilities.T_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
T	Units.SI.Temperature	SIunits.Temperature

function Media.Water.IF97_Utilities.T_ph_der

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Water.IF97_Utilities.s_props_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Water.IF97_Utilities.s_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Water.IF97_Utilities.s_ph_der

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Water.IF97_Utilities.cv_props_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
cv	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

function Media.Water.IF97_Utilities.cv_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
cv	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

function Media.Water.IF97_Utilities.cp_props_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
cp	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

function Media.Water.IF97_Utilities.cp_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
cp	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

function Media.Water.IF97_Utilities.beta_props_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
beta	Units.SI.RelativePressureCoefficient	SIunits.RelativePressureCoefficient

function Media.Water.IF97_Utilities.beta_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
beta	Units.SI.RelativePressureCoefficient	SIunits.RelativePressureCoefficient

function Media.Water.IF97_Utilities.kappa_props_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
kappa	Units.SI.IsothermalCompressibility	SIunits.IsothermalCompressibility

function Media.Water.IF97_Utilities.kappa_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
kappa	Units.SI.IsothermalCompressibility	SIunits.IsothermalCompressibility

function Media.Water.IF97_Utilities.velocityOfSound_props_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
v_sound	Units.SI.Velocity	SIunits.Velocity

function Media.Water.IF97_Utilities.velocityOfSound_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
v_sound	Units.SI.Velocity	SIunits.Velocity

function Media.Water.IF97_Utilities.isentropicExponent_props_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Water.IF97_Utilities.isentropicExponent_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Water.IF97_Utilities.ddph_props

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
ddph	Units.SI.DerDensityByPressure	SIunits.DerDensityByPressure

function Media.Water.IF97_Utilities.ddph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
ddph	Units.SI.DerDensityByPressure	SIunits.DerDensityByPressure

function Media.Water.IF97_Utilities.ddhp_props

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
ddhp	Units.SI.DerDensityByEnthalpy	SIunits.DerDensityByEnthalpy

function Media.Water.IF97_Utilities.ddhp

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
ddhp	Units.SI.DerDensityByEnthalpy	SIunits.DerDensityByEnthalpy

function Media.Water.IF97_Utilities.waterBaseProp_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... aux.region = if region == 0 then BaseIF97.Regions.region_pT(p=p, T=T) else region;
aux.R_s = BaseIF97.data.RH2O;	aux.R = BaseIF97.data.RH2O;
aux.p = p;
aux.T = T;
aux.vt = 0.0 "Initialized in case it is not needed";	aux.vt = 0.0 "initialized in case it is not needed";
aux.vp = 0.0 "Initialized in case it is not needed";	aux.vp = 0.0 "initialized in case it is not needed";
if (aux.region == 1) then
g = BaseIF97.Basic.g1(p, T);
aux.h = aux.R_saux.Tg.tau*g.gtau;	aux.h = aux.Raux.Tg.tau*g.gtau;
aux.s = aux.R_s(g.taug.gtau - g.g);	aux.s = aux.R(g.taug.gtau - g.g);
aux.rho = p/(aux.R_sTg.pi*g.gpi);	aux.rho = p/(aux.RTg.pi*g.gpi);
aux.vt = aux.R_s/p(g.pig.gpi - g.taug.pig.gtaupi);	aux.vt = aux.R/p(g.pig.gpi - g.taug.pig.gtaupi);
aux.vp = aux.R_sT/(pp)g.pig.pi*g.gpipi;	aux.vp = aux.RT/(pp)g.pig.pi*g.gpipi;
aux.cp = -aux.R_sg.taug.tau*g.gtautau;	aux.cp = -aux.Rg.taug.tau*g.gtautau;
aux.cv = aux.R_s(-g.taug.taug.gtautau + ((g.gpi - g.taug.gtaupi)(g.gpi - g.taug.gtaupi)/g.gpipi));	aux.cv = aux.R(-g.taug.taug.gtautau + ((g.gpi - g.taug.gtaupi)(g.gpi - g.taug.gtaupi)/g.gpipi));
aux.x = 0.0; ... aux.pt = -g.p/g.T(g.gpi - g.taug.gtaupi)/(g.gpipi*g.pi);
aux.pd = -g.R_sg.Tg.gpi*g.gpi/(g.gpipi);	aux.pd = -g.Rg.Tg.gpi*g.gpi/(g.gpipi);
elseif (aux.region == 2) then
g = BaseIF97.Basic.g2(p, T);
aux.h = aux.R_saux.Tg.tau*g.gtau;	aux.h = aux.Raux.Tg.tau*g.gtau;
aux.s = aux.R_s(g.taug.gtau - g.g);	aux.s = aux.R(g.taug.gtau - g.g);
aux.rho = p/(aux.R_sTg.pi*g.gpi);	aux.rho = p/(aux.RTg.pi*g.gpi);
aux.vt = aux.R_s/p(g.pig.gpi - g.taug.pig.gtaupi);	aux.vt = aux.R/p(g.pig.gpi - g.taug.pig.gtaupi);
aux.vp = aux.R_sT/(pp)g.pig.pi*g.gpipi;	aux.vp = aux.RT/(pp)g.pig.pi*g.gpipi;
aux.pt = -g.p/g.T(g.gpi - g.taug.gtaupi)/(g.gpipi*g.pi);
aux.pd = -g.R_sg.Tg.gpi*g.gpi/(g.gpipi);	aux.pd = -g.Rg.Tg.gpi*g.gpi/(g.gpipi);
aux.cp = -aux.R_sg.taug.tau*g.gtautau;	aux.cp = -aux.Rg.taug.tau*g.gtautau;
aux.cv = aux.R_s(-g.taug.taug.gtautau + ((g.gpi - g.taug.gtaupi)(g.gpi - g.taug.gtaupi)/g.gpipi));	aux.cv = aux.R(-g.taug.taug.gtautau + ((g.gpi - g.taug.gtaupi)(g.gpi - g.taug.gtaupi)/g.gpipi));
aux.x = 1.0; ... f = BaseIF97.Basic.f3(aux.rho, T);
aux.h = aux.R_sT(f.tauf.ftau + f.deltaf.fdelta);	aux.h = aux.RT(f.tauf.ftau + f.deltaf.fdelta);
aux.s = aux.R_s(f.tauf.ftau - f.f);	aux.s = aux.R(f.tauf.ftau - f.f);
aux.pd = aux.R_sTf.delta(2.0f.fdelta + f.delta*f.fdeltadelta);	aux.pd = aux.RTf.delta(2.0f.fdelta + f.delta*f.fdeltadelta);
aux.pt = aux.R_saux.rhof.delta(f.fdelta - f.tauf.fdeltatau);	aux.pt = aux.Raux.rhof.delta(f.fdelta - f.tauf.fdeltatau);
aux.cv = aux.R_s(-f.tauf.tau*f.ftautau);	aux.cv = aux.R(-f.tauf.tau*f.ftautau);
aux.x = 0.0; ... g = BaseIF97.Basic.g5(p, T);
aux.h = aux.R_saux.Tg.tau*g.gtau;	aux.h = aux.Raux.Tg.tau*g.gtau;
aux.s = aux.R_s(g.taug.gtau - g.g);	aux.s = aux.R(g.taug.gtau - g.g);
aux.rho = p/(aux.R_sTg.pi*g.gpi);	aux.rho = p/(aux.RTg.pi*g.gpi);
aux.vt = aux.R_s/p(g.pig.gpi - g.taug.pig.gtaupi);	aux.vt = aux.R/p(g.pig.gpi - g.taug.pig.gtaupi);
aux.vp = aux.R_sT/(pp)g.pig.pi*g.gpipi;	aux.vp = aux.RT/(pp)g.pig.pi*g.gpipi;
aux.pt = -g.p/g.T(g.gpi - g.taug.gtaupi)/(g.gpipi*g.pi);
aux.pd = -g.R_sg.Tg.gpi*g.gpi/(g.gpipi);	aux.pd = -g.Rg.Tg.gpi*g.gpi/(g.gpipi);
aux.cp = -aux.R_sg.taug.tau*g.gtautau;	aux.cp = -aux.Rg.taug.tau*g.gtautau;
aux.cv = aux.R_s(-g.taug.taug.gtautau + ((g.gpi - g.taug.gtaupi)(g.gpi - g.taug.gtaupi)/g.gpipi));	aux.cv = aux.R(-g.taug.taug.gtautau + ((g.gpi - g.taug.gtaupi)(g.gpi - g.taug.gtaupi)/g.gpipi));
aux.x = 1.0; ...

function Media.Water.IF97_Utilities.rho_props_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
rho	Units.SI.Density	SIunits.Density

function Media.Water.IF97_Utilities.rho_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
rho	Units.SI.Density	SIunits.Density

function Media.Water.IF97_Utilities.h_props_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Water.IF97_Utilities.h_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Water.IF97_Utilities.h_pT_der

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature

function Media.Water.IF97_Utilities.rho_pT_der

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature

function Media.Water.IF97_Utilities.s_props_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Water.IF97_Utilities.s_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Water.IF97_Utilities.cv_props_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
cv	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

function Media.Water.IF97_Utilities.cv_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
cv	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

function Media.Water.IF97_Utilities.cp_props_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
cp	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

function Media.Water.IF97_Utilities.cp_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
cp	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

function Media.Water.IF97_Utilities.beta_props_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
beta	Units.SI.RelativePressureCoefficient	SIunits.RelativePressureCoefficient

function Media.Water.IF97_Utilities.beta_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
beta	Units.SI.RelativePressureCoefficient	SIunits.RelativePressureCoefficient

function Media.Water.IF97_Utilities.kappa_props_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
kappa	Units.SI.IsothermalCompressibility	SIunits.IsothermalCompressibility

function Media.Water.IF97_Utilities.kappa_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
kappa	Units.SI.IsothermalCompressibility	SIunits.IsothermalCompressibility

function Media.Water.IF97_Utilities.velocityOfSound_props_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
v_sound	Units.SI.Velocity	SIunits.Velocity

function Media.Water.IF97_Utilities.velocityOfSound_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
v_sound	Units.SI.Velocity	SIunits.Velocity

function Media.Water.IF97_Utilities.isentropicExponent_props_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature

function Media.Water.IF97_Utilities.isentropicExponent_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature

function Media.Water.IF97_Utilities.waterBaseProp_dT

Component	Modelica 4.0.0	Modelica 3.2.3
rho	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
h_liq	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
d_liq	Units.SI.Density	SIunits.Density
h_vap	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
d_vap	Units.SI.Density	SIunits.Density

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... aux.phase = if aux.region == 4 then 2 else 1;
aux.R_s = BaseIF97.data.RH2O;	aux.R = BaseIF97.data.RH2O;
aux.rho = rho;
aux.T = T;
aux.vt = 0.0 "Initialized in case it is not needed";	aux.vt = 0.0 "initialized in case it is not needed";
aux.vp = 0.0 "Initialized in case it is not needed";	aux.vp = 0.0 "initialized in case it is not needed";
if (aux.region == 1) then ... g = BaseIF97.Basic.g1(aux.p, T);
aux.h = aux.R_saux.Tg.tau*g.gtau;	aux.h = aux.Raux.Tg.tau*g.gtau;
aux.s = aux.R_s(g.taug.gtau - g.g);	aux.s = aux.R(g.taug.gtau - g.g);
aux.rho = aux.p/(aux.R_sTg.pi*g.gpi);	aux.rho = aux.p/(aux.RTg.pi*g.gpi);
aux.vt = aux.R_s/aux.p(g.pig.gpi - g.taug.pig.gtaupi);	aux.vt = aux.R/aux.p(g.pig.gpi - g.taug.pig.gtaupi);
aux.vp = aux.R_sT/(aux.paux.p)g.pig.pi*g.gpipi;	aux.vp = aux.RT/(aux.paux.p)g.pig.pi*g.gpipi;
aux.pt = -g.p/g.T(g.gpi - g.taug.gtaupi)/(g.gpipi*g.pi);
aux.pd = -g.R_sg.Tg.gpi*g.gpi/(g.gpipi);	aux.pd = -g.Rg.Tg.gpi*g.gpi/(g.gpipi);
aux.cp = -aux.R_sg.taug.tau*g.gtautau;	aux.cp = -aux.Rg.taug.tau*g.gtautau;
aux.cv = aux.R_s(-g.taug.taug.gtautau + ((g.gpi - g.taug.gtaupi)(g.gpi - g.taug.gtaupi)/g.gpipi));	aux.cv = aux.R(-g.taug.taug.gtautau + ((g.gpi - g.taug.gtaupi)(g.gpi - g.taug.gtaupi)/g.gpipi));
aux.x = 0.0; ... g = BaseIF97.Basic.g2(aux.p, T);
aux.h = aux.R_saux.Tg.tau*g.gtau;	aux.h = aux.Raux.Tg.tau*g.gtau;
aux.s = aux.R_s(g.taug.gtau - g.g);	aux.s = aux.R(g.taug.gtau - g.g);
aux.rho = aux.p/(aux.R_sTg.pi*g.gpi);	aux.rho = aux.p/(aux.RTg.pi*g.gpi);
aux.vt = aux.R_s/aux.p(g.pig.gpi - g.taug.pig.gtaupi);	aux.vt = aux.R/aux.p(g.pig.gpi - g.taug.pig.gtaupi);
aux.vp = aux.R_sT/(aux.paux.p)g.pig.pi*g.gpipi;	aux.vp = aux.RT/(aux.paux.p)g.pig.pi*g.gpipi;
aux.pt = -g.p/g.T(g.gpi - g.taug.gtaupi)/(g.gpipi*g.pi);
aux.pd = -g.R_sg.Tg.gpi*g.gpi/(g.gpipi);	aux.pd = -g.Rg.Tg.gpi*g.gpi/(g.gpipi);
aux.cp = -aux.R_sg.taug.tau*g.gtautau;	aux.cp = -aux.Rg.taug.tau*g.gtautau;
aux.cv = aux.R_s(-g.taug.taug.gtautau + ((g.gpi - g.taug.gtaupi)(g.gpi - g.taug.gtaupi)/g.gpipi));	aux.cv = aux.R(-g.taug.taug.gtautau + ((g.gpi - g.taug.gtaupi)(g.gpi - g.taug.gtaupi)/g.gpipi));
aux.x = 1.0; ... f = BaseIF97.Basic.f3(rho, T);
aux.p = aux.R_srhoTf.deltaf.fdelta;	aux.p = aux.RrhoTf.deltaf.fdelta;
aux.h = aux.R_sT(f.tauf.ftau + f.deltaf.fdelta);	aux.h = aux.RT(f.tauf.ftau + f.deltaf.fdelta);
aux.s = aux.R_s(f.tauf.ftau - f.f);	aux.s = aux.R(f.tauf.ftau - f.f);
aux.pd = aux.R_sTf.delta(2.0f.fdelta + f.delta*f.fdeltadelta);	aux.pd = aux.RTf.delta(2.0f.fdelta + f.delta*f.fdeltadelta);
aux.pt = aux.R_srhof.delta(f.fdelta - f.tauf.fdeltatau);	aux.pt = aux.Rrhof.delta(f.fdelta - f.tauf.fdeltatau);
aux.cv = aux.R_s(-f.tauf.tau*f.ftautau);	aux.cv = aux.R(-f.tauf.tau*f.ftautau);
aux.cp = (aux.rhoaux.rhoaux.pdaux.cv + aux.Taux.ptaux.pt)/(aux.rho aux.rho*aux.pd); ... g = BaseIF97.Basic.g2(aux.p, T);
aux.h = aux.R_saux.Tg.tau*g.gtau;	aux.h = aux.Raux.Tg.tau*g.gtau;
aux.s = aux.R_s(g.taug.gtau - g.g);	aux.s = aux.R(g.taug.gtau - g.g);
aux.rho = aux.p/(aux.R_sTg.pi*g.gpi);	aux.rho = aux.p/(aux.RTg.pi*g.gpi);
aux.vt = aux.R_s/aux.p(g.pig.gpi - g.taug.pig.gtaupi);	aux.vt = aux.R/aux.p(g.pig.gpi - g.taug.pig.gtaupi);
aux.vp = aux.R_sT/(aux.paux.p)g.pig.pi*g.gpipi;	aux.vp = aux.RT/(aux.paux.p)g.pig.pi*g.gpipi;
aux.pt = -g.p/g.T(g.gpi - g.taug.gtaupi)/(g.gpipi*g.pi);
aux.pd = -g.R_sg.Tg.gpi*g.gpi/(g.gpipi);	aux.pd = -g.Rg.Tg.gpi*g.gpi/(g.gpipi);
aux.cp = -aux.R_sg.taug.tau*g.gtautau;	aux.cp = -aux.Rg.taug.tau*g.gtautau;
aux.cv = aux.R_s(-g.taug.taug.gtautau + ((g.gpi - g.taug.gtaupi)(g.gpi - g.taug.gtaupi)/g.gpipi));	aux.cv = aux.R(-g.taug.taug.gtautau + ((g.gpi - g.taug.gtaupi)(g.gpi - g.taug.gtaupi)/g.gpipi));
else ...

function Media.Water.IF97_Utilities.h_props_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Water.IF97_Utilities.h_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Water.IF97_Utilities.h_dT_der

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature

function Media.Water.IF97_Utilities.p_props_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
p	Units.SI.Pressure	SIunits.Pressure

function Media.Water.IF97_Utilities.p_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
p	Units.SI.Pressure	SIunits.Pressure

function Media.Water.IF97_Utilities.p_dT_der

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature

function Media.Water.IF97_Utilities.s_props_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Water.IF97_Utilities.s_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Water.IF97_Utilities.cv_props_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
cv	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

function Media.Water.IF97_Utilities.cv_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
cv	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

function Media.Water.IF97_Utilities.cp_props_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
cp	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

function Media.Water.IF97_Utilities.cp_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
cp	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity

function Media.Water.IF97_Utilities.beta_props_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
beta	Units.SI.RelativePressureCoefficient	SIunits.RelativePressureCoefficient

function Media.Water.IF97_Utilities.beta_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
beta	Units.SI.RelativePressureCoefficient	SIunits.RelativePressureCoefficient

function Media.Water.IF97_Utilities.kappa_props_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
kappa	Units.SI.IsothermalCompressibility	SIunits.IsothermalCompressibility

function Media.Water.IF97_Utilities.kappa_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
kappa	Units.SI.IsothermalCompressibility	SIunits.IsothermalCompressibility

function Media.Water.IF97_Utilities.velocityOfSound_props_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
v_sound	Units.SI.Velocity	SIunits.Velocity

function Media.Water.IF97_Utilities.velocityOfSound_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
v_sound	Units.SI.Velocity	SIunits.Velocity

function Media.Water.IF97_Utilities.isentropicExponent_props_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature

function Media.Water.IF97_Utilities.isentropicExponent_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature

function Media.Water.IF97_Utilities.ThermoFluidSpecial.water_ph

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
T	Units.SI.Temperature	SIunits.Temperature
d	Units.SI.Density	SIunits.Density

function Media.Water.IF97_Utilities.ThermoFluidSpecial.water_dT

Component	Modelica 4.0.0	Modelica 3.2.3
d	Units.SI.Density	SIunits.Density
T	Units.SI.Temperature	SIunits.Temperature
p	Units.SI.Pressure	SIunits.Pressure

function Media.Water.IF97_Utilities.ThermoFluidSpecial.water_pT

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
T	Units.SI.Temperature	SIunits.Temperature
d	Units.SI.Density	SIunits.Density

function Media.Water.IF97_Utilities.isentropicEnthalpy

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Water.IF97_Utilities.isentropicEnthalpy_props

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

function Media.Water.IF97_Utilities.isentropicEnthalpy_der

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy

function Media.Water.IF97_Utilities.dynamicIsentropicEnthalpy

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
s	Units.SI.SpecificEntropy	SIunits.SpecificEntropy
dguess	Units.SI.Density	SIunits.Density
Tguess	Units.SI.Temperature	SIunits.Temperature
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy

model Thermal.FluidHeatFlow.Examples.SimpleCooling

Component	Modelica 4.0.0	Modelica 3.2.3
medium	=FluidHeatFlow.Media.Medium()	=Modelica323.Thermal.FluidHeatFlow.Media.Medium()
TAmb	Units.SI.Temperature	SIunits.Temperature
dTSource	Units.SI.TemperatureDifference	SIunits.TemperatureDifference
dTtoPipe	Units.SI.TemperatureDifference	SIunits.TemperatureDifference
dTCoolant	Units.SI.TemperatureDifference	SIunits.TemperatureDifference

model Thermal.FluidHeatFlow.Examples.ParallelCooling

Component	Modelica 4.0.0	Modelica 3.2.3
medium	=FluidHeatFlow.Media.Medium()	=Modelica323.Thermal.FluidHeatFlow.Media.Medium()
TAmb	Units.SI.Temperature	SIunits.Temperature
dTSource1	Units.SI.TemperatureDifference	SIunits.TemperatureDifference
dTtoPipe1	Units.SI.TemperatureDifference	SIunits.TemperatureDifference
dTCoolant1	Units.SI.TemperatureDifference	SIunits.TemperatureDifference
dTSource2	Units.SI.TemperatureDifference	SIunits.TemperatureDifference
dTtoPipe2	Units.SI.TemperatureDifference	SIunits.TemperatureDifference
dTCoolant2	Units.SI.TemperatureDifference	SIunits.TemperatureDifference
dTmixedCoolant	Units.SI.TemperatureDifference	SIunits.TemperatureDifference

model Thermal.FluidHeatFlow.Examples.IndirectCooling

Component	Modelica 4.0.0	Modelica 3.2.3
outerMedium	=FluidHeatFlow.Media.Medium()	=Modelica323.Thermal.FluidHeatFlow.Media.Medium()
innerMedium	=FluidHeatFlow.Media.Medium()	=Modelica323.Thermal.FluidHeatFlow.Media.Medium()
TAmb	Units.SI.Temperature	SIunits.Temperature
dTSource	Units.SI.TemperatureDifference	SIunits.TemperatureDifference
dTtoPipe	Units.SI.TemperatureDifference	SIunits.TemperatureDifference
dTinnerCoolant	Units.SI.TemperatureDifference	SIunits.TemperatureDifference
dTCooler	Units.SI.TemperatureDifference	SIunits.TemperatureDifference
dTouterCoolant	Units.SI.TemperatureDifference	SIunits.TemperatureDifference

model Thermal.FluidHeatFlow.Examples.PumpAndValve

Component	Modelica 4.0.0	Modelica 3.2.3
medium	=FluidHeatFlow.Media.Medium()	=Modelica323.Thermal.FluidHeatFlow.Media.Medium()
TAmb	Units.SI.Temperature	SIunits.Temperature
dTSource	Units.SI.TemperatureDifference	SIunits.TemperatureDifference
dTtoPipe	Units.SI.TemperatureDifference	SIunits.TemperatureDifference
dTCoolant	Units.SI.TemperatureDifference	SIunits.TemperatureDifference

model Thermal.FluidHeatFlow.Examples.PumpDropOut

Component	Modelica 4.0.0	Modelica 3.2.3
medium	=FluidHeatFlow.Media.Medium()	=Modelica323.Thermal.FluidHeatFlow.Media.Medium()
TAmb	Units.SI.Temperature	SIunits.Temperature
dTSource	Units.SI.TemperatureDifference	SIunits.TemperatureDifference
dTtoPipe	Units.SI.TemperatureDifference	SIunits.TemperatureDifference
dTCoolant	Units.SI.TemperatureDifference	SIunits.TemperatureDifference

model Thermal.FluidHeatFlow.Examples.ParallelPumpDropOut

Component	Modelica 4.0.0	Modelica 3.2.3
medium	=FluidHeatFlow.Media.Medium()	=Modelica323.Thermal.FluidHeatFlow.Media.Medium()
TAmb	Units.SI.Temperature	SIunits.Temperature
dTSource1	Units.SI.TemperatureDifference	SIunits.TemperatureDifference
dTtoPipe1	Units.SI.TemperatureDifference	SIunits.TemperatureDifference
dTCoolant1	Units.SI.TemperatureDifference	SIunits.TemperatureDifference
dTSource2	Units.SI.TemperatureDifference	SIunits.TemperatureDifference
dTtoPipe2	Units.SI.TemperatureDifference	SIunits.TemperatureDifference
dTCoolant2	Units.SI.TemperatureDifference	SIunits.TemperatureDifference
dTmixedCoolant	Units.SI.TemperatureDifference	SIunits.TemperatureDifference

model Thermal.FluidHeatFlow.Examples.OneMass

Component	Modelica 4.0.0	Modelica 3.2.3
medium	=FluidHeatFlow.Media.Medium()	=Modelica323.Thermal.FluidHeatFlow.Media.Medium()
TAmb	Units.SI.Temperature	SIunits.Temperature
TMass	Units.SI.Temperature	SIunits.Temperature
dTMass	Units.SI.TemperatureDifference	SIunits.TemperatureDifference
dTtoPipe	Units.SI.TemperatureDifference	SIunits.TemperatureDifference
dTCoolant	Units.SI.TemperatureDifference	SIunits.TemperatureDifference

model Thermal.FluidHeatFlow.Examples.TwoMass

Component	Modelica 4.0.0	Modelica 3.2.3
medium	=FluidHeatFlow.Media.Medium()	=Modelica323.Thermal.FluidHeatFlow.Media.Medium()
TAmb	Units.SI.Temperature	SIunits.Temperature
TMass1	Units.SI.Temperature	SIunits.Temperature
TMass2	Units.SI.Temperature	SIunits.Temperature
dTMass1	Units.SI.TemperatureDifference	SIunits.TemperatureDifference
dTtoPipe1	Units.SI.TemperatureDifference	SIunits.TemperatureDifference
dTCoolant1	Units.SI.TemperatureDifference	SIunits.TemperatureDifference
dTMass2	Units.SI.TemperatureDifference	SIunits.TemperatureDifference
dTtoPipe2	Units.SI.TemperatureDifference	SIunits.TemperatureDifference
dTCoolant2	Units.SI.TemperatureDifference	SIunits.TemperatureDifference
dTmixedCoolant	Units.SI.TemperatureDifference	SIunits.TemperatureDifference

model Thermal.FluidHeatFlow.Examples.WaterPump

Component	Modelica 4.0.0	Modelica 3.2.3
V_flow	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate
p	Units.SI.Pressure	SIunits.Pressure
w	Units.SI.AngularVelocity	SIunits.AngularVelocity
tau	Units.SI.Torque	SIunits.Torque
power	Units.SI.Power	SIunits.Power
ambient1	medium=FluidHeatFlow.Media.Water()	medium=Modelica323.Thermal.FluidHeatFlow.Media.Water()
idealPump	medium=FluidHeatFlow.Media.Water()	medium=Modelica323.Thermal.FluidHeatFlow.Media.Water()
volumeFlowSensor	medium=FluidHeatFlow.Media.Water()	medium=Modelica323.Thermal.FluidHeatFlow.Media.Water()
pressureSensor	medium=FluidHeatFlow.Media.Water()	medium=Modelica323.Thermal.FluidHeatFlow.Media.Water()
oneWayValve	medium=FluidHeatFlow.Media.Water()	medium=Modelica323.Thermal.FluidHeatFlow.Media.Water()
pipe	medium=FluidHeatFlow.Media.Water()	medium=Modelica323.Thermal.FluidHeatFlow.Media.Water()
ambient2	medium=FluidHeatFlow.Media.Water()	medium=Modelica323.Thermal.FluidHeatFlow.Media.Water()

model Thermal.FluidHeatFlow.Examples.TestOpenTank

Component	Modelica 4.0.0	Modelica 3.2.3
V_flow	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate
level	Units.SI.Length	SIunits.Length
T	Units.SI.Temperature	SIunits.Temperature

model Thermal.FluidHeatFlow.Examples.TwoTanks

Component	Modelica 4.0.0	Modelica 3.2.3
V_flow	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate
level1	Units.SI.Length	SIunits.Length
T1	Units.SI.Temperature	SIunits.Temperature
level2	Units.SI.Length	SIunits.Length
T2	Units.SI.Temperature	SIunits.Temperature

model Thermal.FluidHeatFlow.Examples.TestCylinder

Component	Modelica 4.0.0	Modelica 3.2.3
f1	Units.SI.Force	SIunits.Force
s1	Units.SI.Position	SIunits.Position
s2	Units.SI.Position	SIunits.Position
f2	Units.SI.Force	SIunits.Force
f	Units.SI.Force	SIunits.Force
combiTimeTable	table=[0, 0; 0.25, -1; 0.5, 0; 0.75, 0]	table=[0, 0; 0.25, 0; 0.25, -1; 0.5, -1; 0.5, 0; 0.75, 0]
combiTimeTable	smoothness=Modelica400.Blocks.Types.Smoothness.ConstantSegments

model Thermal.FluidHeatFlow.Examples.Utilities.DoubleRamp

Component	Modelica 4.0.0	Modelica 3.2.3
startTime	Units.SI.Time	SIunits.Time
interval	Units.SI.Time	SIunits.Time
duration_1	Units.SI.Time	SIunits.Time
duration_2	Units.SI.Time	SIunits.Time

model Thermal.FluidHeatFlow.Components.Pipe

Component	Modelica 4.0.0	Modelica 3.2.3
h_g	Units.SI.Length	SIunits.Length
g	Units.SI.Acceleration	SIunits.Acceleration
Q_flowHeatPort	Units.SI.HeatFlowRate	SIunits.HeatFlowRate

model Thermal.FluidHeatFlow.Components.Valve

Component	Modelica 4.0.0	Modelica 3.2.3
Kv1	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate
dp0	Units.SI.Pressure	SIunits.Pressure
rho0	Units.SI.Density	SIunits.Density
unitVolumeFlowRate	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate
smallVolumeFlowRate	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate
Kv	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate

model Thermal.FluidHeatFlow.Components.OpenTank

Component	Modelica 4.0.0	Modelica 3.2.3
ATank	Units.SI.Area	SIunits.Area
hTank	Units.SI.Length	SIunits.Length
pAmbient	Units.SI.Pressure	SIunits.Pressure
g	Units.SI.Acceleration	SIunits.Acceleration
m	Units.SI.Mass	SIunits.Mass
H	Units.SI.Enthalpy	SIunits.Enthalpy
Q_flow	Units.SI.HeatFlowRate	SIunits.HeatFlowRate

model Thermal.FluidHeatFlow.Components.Cylinder

Component	Modelica 4.0.0	Modelica 3.2.3
A	Units.SI.Area	SIunits.Area
L	Units.SI.Length	SIunits.Length
f	Units.SI.Force	SIunits.Force
m	Units.SI.Mass	SIunits.Mass
H	Units.SI.Enthalpy	SIunits.Enthalpy

model Thermal.FluidHeatFlow.Components.OneWayValve

Component	Modelica 4.0.0	Modelica 3.2.3
V_flowNominal	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate
dpForward	Units.SI.Pressure	SIunits.Pressure
dpNominal	Units.SI.Pressure	SIunits.Pressure
V_flowBackward	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate
unitVolumeFlowRate	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate
unitPressureDrop	Units.SI.Pressure	SIunits.Pressure

record Thermal.FluidHeatFlow.Media.Medium

Component	Modelica 4.0.0	Modelica 3.2.3
rho	Units.SI.Density	SIunits.Density
cp	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity
cv	Units.SI.SpecificHeatCapacity	SIunits.SpecificHeatCapacity
lambda	Present
nu	Present
lamda		Present
nue		Present

model Thermal.FluidHeatFlow.Sensors.RelPressureSensor

Component	Modelica 4.0.0	Modelica 3.2.3
y	Present
y

model Thermal.FluidHeatFlow.Sensors.RelTemperatureSensor

Component	Modelica 4.0.0	Modelica 3.2.3
y	Present
y

model Thermal.FluidHeatFlow.Sources.Ambient

Component	Modelica 4.0.0	Modelica 3.2.3
constantAmbientPressure	Units.SI.Pressure	SIunits.Pressure
constantAmbientTemperature	Units.SI.Temperature	SIunits.Temperature
pAmbient	Units.SI.Pressure	SIunits.Pressure
TAmbient	Units.SI.Temperature	SIunits.Temperature

model Thermal.FluidHeatFlow.Sources.AbsolutePressure

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure

model Thermal.FluidHeatFlow.Sources.VolumeFlow

Component	Modelica 4.0.0	Modelica 3.2.3
constantVolumeFlow	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate
volumeFlow	unit="m3/s"
internalVolumeFlow	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate

model Thermal.FluidHeatFlow.Sources.PressureIncrease

Component	Modelica 4.0.0	Modelica 3.2.3
constantPressureIncrease	Units.SI.Pressure	SIunits.Pressure
pressureIncrease	unit="Pa"
internalPressureIncrease	Units.SI.Pressure	SIunits.Pressure

model Thermal.FluidHeatFlow.Sources.IdealPump

Component	Modelica 4.0.0	Modelica 3.2.3
wNominal	Units.SI.AngularVelocity	SIunits.AngularVelocity
dp0	Units.SI.Pressure	SIunits.Pressure
V_flow0	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate
w	Units.SI.AngularVelocity	SIunits.AngularVelocity
dp1	Units.SI.Pressure	SIunits.Pressure
V_flow1	Units.SI.VolumeFlowRate	SIunits.VolumeFlowRate

connector Thermal.FluidHeatFlow.Interfaces.FlowPort

Component	Modelica 4.0.0	Modelica 3.2.3
p	Units.SI.Pressure	SIunits.Pressure
m_flow	Units.SI.MassFlowRate	SIunits.MassFlowRate
h	Units.SI.SpecificEnthalpy	SIunits.SpecificEnthalpy
H_flow	Units.SI.EnthalpyFlowRate	SIunits.EnthalpyFlowRate

model Thermal.HeatTransfer.Examples.TwoMasses

Component	Modelica 4.0.0	Modelica 3.2.3
T_final_K	Units.SI.Temperature	SIunits.Temperature

model Thermal.HeatTransfer.Examples.ControlledTemperature

Component	Modelica 4.0.0	Modelica 3.2.3
TAmb	Units.SI.Temperature	SIunits.Temperature
TDif	Units.SI.TemperatureDifference	SIunits.TemperatureDifference
TRes	Units.SI.Temperature	SIunits.Temperature
resistor	Present
resistor
heatingResistor		Present
heatingResistor

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
connect(constantVoltage.n, resistor.n);	connect(constantVoltage.n, heatingResistor.n);
connect(constantVoltage.n, ground.p);
connect(resistor.heatPort, thermalConductor.port_a);	connect(heatingResistor.heatPort, thermalConductor.port_a);
connect(thermalConductor.port_b, fixedTemperature.port);
connect(resistor.heatPort, temperatureSensor.port);	connect(heatingResistor.heatPort, temperatureSensor.port);
connect(resistor.heatPort, heatCapacitor.port);	connect(heatingResistor.heatPort, heatCapacitor.port);
connect(constantVoltage.p, idealSwitch.p);
connect(idealSwitch.n, resistor.p);	connect(idealSwitch.n, heatingResistor.p);
connect(ramp.y, onOffController.reference); ...

model Thermal.HeatTransfer.Examples.Motor

Component	Modelica 4.0.0	Modelica 3.2.3
TAmb	Units.SI.Temperature	SIunits.Temperature

model Thermal.HeatTransfer.Examples.GenerationOfFMUs

Component	Modelica 4.0.0	Modelica 3.2.3
sine1	f=2
sine1		freqHz=2

model Thermal.HeatTransfer.Examples.Utilities.DirectCapacity

Component	Modelica 4.0.0	Modelica 3.2.3
C	Units.SI.HeatCapacity	SIunits.HeatCapacity

model Thermal.HeatTransfer.Examples.Utilities.InverseCapacity

Component	Modelica 4.0.0	Modelica 3.2.3
C	Units.SI.HeatCapacity	SIunits.HeatCapacity

model Thermal.HeatTransfer.Examples.Utilities.Conduction

Component	Modelica 4.0.0	Modelica 3.2.3
G	Units.SI.ThermalConductance	SIunits.ThermalConductance

model Thermal.HeatTransfer.Components.HeatCapacitor

Component	Modelica 4.0.0	Modelica 3.2.3
C	Units.SI.HeatCapacity	SIunits.HeatCapacity
T	Units.SI.Temperature	SIunits.Temperature
der_T	Units.SI.TemperatureSlope	SIunits.TemperatureSlope

model Thermal.HeatTransfer.Components.ThermalConductor

Component	Modelica 4.0.0	Modelica 3.2.3
G	Units.SI.ThermalConductance	SIunits.ThermalConductance

model Thermal.HeatTransfer.Components.ThermalResistor

Component	Modelica 4.0.0	Modelica 3.2.3
R	Units.SI.ThermalResistance	SIunits.ThermalResistance

model Thermal.HeatTransfer.Components.Convection

Component	Modelica 4.0.0	Modelica 3.2.3
Q_flow	Units.SI.HeatFlowRate	SIunits.HeatFlowRate
dT	Units.SI.TemperatureDifference	SIunits.TemperatureDifference

model Thermal.HeatTransfer.Components.ConvectiveResistor

Component	Modelica 4.0.0	Modelica 3.2.3
Q_flow	Units.SI.HeatFlowRate	SIunits.HeatFlowRate
dT	Units.SI.TemperatureDifference	SIunits.TemperatureDifference

model Thermal.HeatTransfer.Sources.FixedTemperature

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature

model Thermal.HeatTransfer.Sources.FixedHeatFlow

Component	Modelica 4.0.0	Modelica 3.2.3
Q_flow	Units.SI.HeatFlowRate	SIunits.HeatFlowRate
T_ref	Units.SI.Temperature	SIunits.Temperature
alpha	Units.SI.LinearTemperatureCoefficient	SIunits.LinearTemperatureCoefficient

model Thermal.HeatTransfer.Sources.PrescribedHeatFlow

Component	Modelica 4.0.0	Modelica 3.2.3
T_ref	Units.SI.Temperature	SIunits.Temperature
alpha	Units.SI.LinearTemperatureCoefficient	SIunits.LinearTemperatureCoefficient

model Thermal.HeatTransfer.Celsius.ToKelvin

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
Kelvin = Modelica400.Units.Conversions.from_degC(Celsius);	Kelvin = Modelica323.SIunits.Conversions.from_degC(Celsius);

model Thermal.HeatTransfer.Celsius.FromKelvin

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
Celsius = Modelica400.Units.Conversions.to_degC(Kelvin);	Celsius = Modelica323.SIunits.Conversions.to_degC(Kelvin);

model Thermal.HeatTransfer.Celsius.FixedTemperature

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.NonSI.Temperature_degC	SIunits.Conversions.NonSIunits.Temperature_degC

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
port.T = Modelica400.Units.Conversions.from_degC(T);	port.T = Modelica323.SIunits.Conversions.from_degC(T);

model Thermal.HeatTransfer.Celsius.PrescribedTemperature

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
port.T = Modelica400.Units.Conversions.from_degC(T);	port.T = Modelica323.SIunits.Conversions.from_degC(T);

model Thermal.HeatTransfer.Celsius.TemperatureSensor

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
T = Modelica400.Units.Conversions.to_degC(port.T);	T = Modelica323.SIunits.Conversions.to_degC(port.T);
port.Q_flow = 0;

model Thermal.HeatTransfer.Fahrenheit.ToKelvin

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
Kelvin = Modelica400.Units.Conversions.from_degF(Fahrenheit);	Kelvin = Modelica323.SIunits.Conversions.from_degF(Fahrenheit);

model Thermal.HeatTransfer.Fahrenheit.FromKelvin

Component	Modelica 4.0.0	Modelica 3.2.3
n		Present

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
Fahrenheit = Modelica400.Units.Conversions.to_degF(Kelvin);	Fahrenheit = Modelica323.SIunits.Conversions.to_degF(Kelvin);

model Thermal.HeatTransfer.Fahrenheit.FixedTemperature

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.NonSI.Temperature_degF	SIunits.Conversions.NonSIunits.Temperature_degF

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
port.T = Modelica400.Units.Conversions.from_degF(T);	port.T = Modelica323.SIunits.Conversions.from_degF(T);

model Thermal.HeatTransfer.Fahrenheit.PrescribedTemperature

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
port.T = Modelica400.Units.Conversions.from_degF(T);	port.T = Modelica323.SIunits.Conversions.from_degF(T);

model Thermal.HeatTransfer.Fahrenheit.TemperatureSensor

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
T = Modelica400.Units.Conversions.to_degF(port.T);	T = Modelica323.SIunits.Conversions.to_degF(port.T);
port.Q_flow = 0;

model Thermal.HeatTransfer.Rankine.ToKelvin

Component	Modelica 4.0.0	Modelica 3.2.3
n		Present

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
Kelvin = Modelica400.Units.Conversions.from_degRk(Rankine);	Kelvin = Modelica323.SIunits.Conversions.from_degRk(Rankine);

model Thermal.HeatTransfer.Rankine.FromKelvin

Component	Modelica 4.0.0	Modelica 3.2.3
n		Present

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
Rankine = Modelica400.Units.Conversions.to_degRk(Kelvin);	Rankine = Modelica323.SIunits.Conversions.to_degRk(Kelvin);

model Thermal.HeatTransfer.Rankine.FixedTemperature

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.NonSI.Temperature_degRk	SIunits.Conversions.NonSIunits.Temperature_degRk

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
port.T = Modelica400.Units.Conversions.from_degRk(T);	port.T = Modelica323.SIunits.Conversions.from_degRk(T);

model Thermal.HeatTransfer.Rankine.PrescribedTemperature

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
port.T = Modelica400.Units.Conversions.from_degRk(T);	port.T = Modelica323.SIunits.Conversions.from_degRk(T);

model Thermal.HeatTransfer.Rankine.TemperatureSensor

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
T = Modelica400.Units.Conversions.to_degRk(port.T);	T = Modelica323.SIunits.Conversions.to_degRk(port.T);
port.Q_flow = 0;

connector Thermal.HeatTransfer.Interfaces.HeatPort

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature
Q_flow	Units.SI.HeatFlowRate	SIunits.HeatFlowRate

model Thermal.HeatTransfer.Interfaces.Element1D

Component	Modelica 4.0.0	Modelica 3.2.3
Q_flow	Units.SI.HeatFlowRate	SIunits.HeatFlowRate
dT	Units.SI.TemperatureDifference	SIunits.TemperatureDifference

model Thermal.HeatTransfer.Interfaces.PartialElementaryConditionalHeatPort

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature
lossPower	Units.SI.Power	SIunits.Power
TheatPort	Units.SI.Temperature	SIunits.Temperature

model Thermal.HeatTransfer.Interfaces.PartialElementaryConditionalHeatPortWithoutT

Component	Modelica 4.0.0	Modelica 3.2.3
lossPower	Units.SI.Power	SIunits.Power

model Thermal.HeatTransfer.Interfaces.PartialConditionalHeatPort

Component	Modelica 4.0.0	Modelica 3.2.3
T	Units.SI.Temperature	SIunits.Temperature

function Math.Matrices.QR

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
assert(nrow >= ncol, "\nInput matrix A[" + String(nrow) + "," + String(ncol) + "] has more columns than rows. This is not allowed when calling Modelica.Math.Matrices.QR(A).");	assert(nrow >= ncol, "\nInput matrix A[" + String(nrow) + "," + String(ncol) + "] has more columns as rows. This is not allowed when calling Modelica.Matrices.QR(A).");
if pivoting then
(Q,tau,p) = LAPACK.dgeqp3(A);	(Q,tau,p) = LAPACK.dgeqpf(A);
else
(Q,tau) = LAPACK.dgeqrf(A);	(Q,tau) = Modelica323.Math.Matrices.LAPACK.dgeqrf(A);
p = 1:ncol; ...

function Math.Matrices.Utilities.findLocal_tk

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... if gamma_k > Modelica400.Constants.eps then
p = Polynomials.roots({4gamma_k,6beta_k,2(alpha_k - 2beta_k), -2*alpha_k});	p = Vectors.Utilities.roots({4gamma_k,6beta_k,2(alpha_k - 2beta_k), -2*alpha_k});
h = false; ...

model Math.Random.Examples.GenerateRandomNumbers

Component	Modelica 4.0.0	Modelica 3.2.3
samplePeriod	Units.SI.Period	SIunits.Period

model Math.FastFourierTransform.Examples.RealFFT1

Component	Modelica 4.0.0	Modelica 3.2.3
f_max	Units.SI.Frequency	SIunits.Frequency
f_resolution	Units.SI.Frequency	SIunits.Frequency
f1	Units.SI.Frequency	SIunits.Frequency
f2	Units.SI.Frequency	SIunits.Frequency
fi	Units.SI.Frequency	SIunits.Frequency
f_max_FFT	Units.SI.Frequency	SIunits.Frequency
Ts	Units.SI.Time	SIunits.Time
T	Units.SI.Time	SIunits.Time

model Math.FastFourierTransform.Examples.RealFFT2

Component	Modelica 4.0.0	Modelica 3.2.3
f_max	Units.SI.Frequency	SIunits.Frequency
f_resolution	Units.SI.Frequency	SIunits.Frequency
f1	Units.SI.Frequency	SIunits.Frequency
f2	Units.SI.Frequency	SIunits.Frequency
fi	Units.SI.Frequency	SIunits.Frequency
f_max_FFT	Units.SI.Frequency	SIunits.Frequency
Ts	Units.SI.Time	SIunits.Time
T	Units.SI.Time	SIunits.Time

function Math.FastFourierTransform.realFFTinfo

Component	Modelica 4.0.0	Modelica 3.2.3
f_max	Units.SI.Frequency	SIunits.Frequency
f_resolution	Units.SI.Frequency	SIunits.Frequency
f_max_used	Units.SI.Frequency	SIunits.Frequency
fs	Units.SI.Frequency	SIunits.Frequency
Ts	Units.SI.Time	SIunits.Time
T	Units.SI.Time	SIunits.Time

function Math.FastFourierTransform.realFFTsamplePoints

Component	Modelica 4.0.0	Modelica 3.2.3
f_max	Units.SI.Frequency	SIunits.Frequency
f_resolution	Units.SI.Frequency	SIunits.Frequency

function Math.FastFourierTransform.realFFT

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... amplitudes = A[1:nfi];
phases = Modelica400.Units.Conversions.to_deg(Phi[1:nfi]);	phases = Modelica323.SIunits.Conversions.to_deg(Phi[1:nfi]);
Aeps = 0.0001*max(amplitudes); ...

function Math.FastFourierTransform.realFFTwriteToFile

Component	Modelica 4.0.0	Modelica 3.2.3
f_max	Units.SI.Frequency	SIunits.Frequency

function Math.sin

Component	Modelica 4.0.0	Modelica 3.2.3
u	Units.SI.Angle	SIunits.Angle

function Math.cos

Component	Modelica 4.0.0	Modelica 3.2.3
u	Units.SI.Angle	SIunits.Angle

function Math.tan

Component	Modelica 4.0.0	Modelica 3.2.3
u	Units.SI.Angle	SIunits.Angle

function Math.asin

Component	Modelica 4.0.0	Modelica 3.2.3
y	Units.SI.Angle	SIunits.Angle

function Math.acos

Component	Modelica 4.0.0	Modelica 3.2.3
y	Units.SI.Angle	SIunits.Angle

function Math.atan

Component	Modelica 4.0.0	Modelica 3.2.3
y	Units.SI.Angle	SIunits.Angle

function Math.atan2

Component	Modelica 4.0.0	Modelica 3.2.3
y	Units.SI.Angle	SIunits.Angle

function Math.atan3

Component	Modelica 4.0.0	Modelica 3.2.3
y0	Units.SI.Angle	SIunits.Angle
y	Units.SI.Angle	SIunits.Angle

function Math.wrapAngle

Component	Modelica 4.0.0	Modelica 3.2.3
u	Units.SI.Angle	SIunits.Angle
y	Units.SI.Angle	SIunits.Angle

function ComplexMath.Vectors.norm

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... if p == 2 then
result= .sqrt(.sum(v[i].re^2 + v[i].im^2 for i in 1:size(v,1)));	result= sqrt(sum(v[i].re^2 + v[i].im^2 for i in 1:size(v,1)));
elseif p == Modelica400.Constants.inf then
result= ComplexMath.abs(ComplexMath.max(v));	result= ComplexMath.'abs'(ComplexMath.'max'(v));
elseif p == 1 then
result= .sum(ComplexMath.abs(v[i]) for i in 1:size(v,1));	result= sum(ComplexMath.'abs'(v[i]) for i in 1:size(v,1));
else
result= (.sum(ComplexMath.abs(v[i])^p for i in 1:size(v, 1)))^(1/p);	result= (sum(ComplexMath.'abs'(v[i])^p for i in 1:size(v, 1)))^(1/p);
end if; ...

function ComplexMath.Vectors.length

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
result := .sqrt(.sum({v[i].re^2 + v[i].im^2 for i in 1:size(v,1)}));	result := sqrt(sum({v[i].re^2 + v[i].im^2 for i in 1:size(v,1)}));

function ComplexMath.Vectors.sort

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
... if ascending then
swap = .abs(sorted_v[k1].im) > .abs(sorted_v[k2].im) or .abs(sorted_v[k1].im) == .abs(sorted_v[k2].im) and (sorted_v[k1].re > sorted_v[k2].re or sorted_v[k1].re == sorted_v[k2].re and sorted_v[k1].im < sorted_v[k2].im);	swap = abs(sorted_v[k1].im) > abs(sorted_v[k2].im) or abs(sorted_v[k1].im) == abs(sorted_v[k2].im) and (sorted_v[k1].re > sorted_v[k2].re or sorted_v[k1].re == sorted_v[k2].re and sorted_v[k1].im < sorted_v[k2].im);
else
swap = .abs(sorted_v[k1].im) < .abs(sorted_v[k2].im) or .abs(sorted_v[k1].im) == .abs(sorted_v[k2].im) and (sorted_v[k1].re < sorted_v[k2].re or sorted_v[k1].re == sorted_v[k2].re and sorted_v[k1].im < sorted_v[k2].im);	swap = abs(sorted_v[k1].im) < abs(sorted_v[k2].im) or abs(sorted_v[k1].im) == abs(sorted_v[k2].im) and (sorted_v[k1].re < sorted_v[k2].re or sorted_v[k1].re == sorted_v[k2].re and sorted_v[k1].im < sorted_v[k2].im);
end if; ... if ascending then
swap = ComplexMath.abs(sorted_v[k1]) > ComplexMath.abs(sorted_v[k2]);	swap = ComplexMath.'abs'(sorted_v[k1]) > ComplexMath.'abs'(sorted_v[k2]);
else
swap = ComplexMath.abs(sorted_v[k1]) < ComplexMath.abs(sorted_v[k2]);	swap = ComplexMath.'abs'(sorted_v[k1]) < ComplexMath.'abs'(sorted_v[k2]);
end if; ... if ascending then
swap = .abs(sorted_v[k1].im) > .abs(sorted_v[k2].im) or .abs(sorted_v[k1].im) == .abs(sorted_v[k2].im) and (sorted_v[k1].re > sorted_v[k2].re or sorted_v[k1].re == sorted_v[k2].re and sorted_v[k1].im < sorted_v[k2].im);	swap = abs(sorted_v[k1].im) > abs(sorted_v[k2].im) or abs(sorted_v[k1].im) == abs(sorted_v[k2].im) and (sorted_v[k1].re > sorted_v[k2].re or sorted_v[k1].re == sorted_v[k2].re and sorted_v[k1].im < sorted_v[k2].im);
else
swap = .abs(sorted_v[k1].im) < .abs(sorted_v[k2].im) or .abs(sorted_v[k1].im) == .abs(sorted_v[k2].im) and (sorted_v[k1].re < sorted_v[k2].re or sorted_v[k1].re == sorted_v[k2].re and sorted_v[k1].im < sorted_v[k2].im);	swap = abs(sorted_v[k1].im) < abs(sorted_v[k2].im) or abs(sorted_v[k1].im) == abs(sorted_v[k2].im) and (sorted_v[k1].re < sorted_v[k2].re or sorted_v[k1].re == sorted_v[k2].re and sorted_v[k1].im < sorted_v[k2].im);
end if; ... if ascending then
swap = ComplexMath.abs(sorted_v[k1]) > ComplexMath.abs(sorted_v[k2]);	swap = ComplexMath.'abs'(sorted_v[k1]) > ComplexMath.'abs'(sorted_v[k2]);
else
swap = ComplexMath.abs(sorted_v[k1]) < ComplexMath.abs(sorted_v[k2]);	swap = ComplexMath.'abs'(sorted_v[k1]) < ComplexMath.'abs'(sorted_v[k2]);
end if; ...

function ComplexMath.asin

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
c2 := -jlog(jc1 + sqrt(1 - c1*c1));	c2 := -jlog(jc1 + 'sqrt'(1 - c1*c1));

function ComplexMath.acos

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
c2 := -jlog(c1 + jsqrt(1 - c1*c1));	c2 := -jlog(c1 + j'sqrt'(1 - c1*c1));

function ComplexMath.asinh

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
c2 := log(c1 + sqrt(c1*c1 + 1));	c2 := log(c1 + 'sqrt'(c1*c1 + 1));

function ComplexMath.acosh

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
c2 := log(c1 + (c1 + 1)*sqrt((c1 - 1)/(c1 + 1)));	c2 := log(c1 + (c1 + 1)*'sqrt'((c1 - 1)/(c1 + 1)));

function ComplexMath.log

Equations in Modelica 4.0.0	Equations in Modelica 3.2.3
algorithm
c2 := Complex(Modelica400.Math.log(abs(c1)), arg(c1));	c2 := Complex(Modelica323.Math.log('abs'(c1)), arg(c1));

function ComplexMath.arg

Component	Modelica 4.0.0	Modelica 3.2.3
phi0	Units.SI.Angle	SIunits.Angle
phi	Units.SI.Angle	SIunits.Angle

function ComplexMath.fromPolar

Component	Modelica 4.0.0	Modelica 3.2.3
phi	Units.SI.Angle	SIunits.Angle

model Utilities.Examples.readRealParameterModel

Component	Modelica 4.0.0	Modelica 3.2.3
J	Units.SI.Inertia	SIunits.Inertia
phi_rel0	Units.SI.Angle	SIunits.Angle
w_rel0	Units.SI.AngularVelocity	SIunits.AngularVelocity

model Utilities.Internal.PartialModelicaServices.Animation.PartialShape

Component	Modelica 4.0.0	Modelica 3.2.3
r	Units.SI.Position	SIunits.Position
r_shape	Units.SI.Position	SIunits.Position
length	Units.SI.Length	SIunits.Length
width	Units.SI.Length	SIunits.Length
height	Units.SI.Length	SIunits.Length

model Utilities.Internal.PartialModelicaServices.Animation.PartialSurface

Component	Modelica 4.0.0	Modelica 3.2.3
r_0	Units.SI.Position	SIunits.Position

package Constants

Component	Modelica 4.0.0	Modelica 3.2.3
gamma	=0.57721566490153286061	=0.57721566490153286060
c	Units.SI.Velocity	SIunits.Velocity
g_n	Units.SI.Acceleration	SIunits.Acceleration
G	=6.67430e-11	=6.67408e-11
q	Units.SI.ElectricCharge	SIunits.ElectricCharge
F	Units.SI.FaradayConstant	SIunits.FaradayConstant
h	=6.62607015e-34	=6.626070040e-34
k	=1.380649e-23	=1.38064852e-23
R	=k*N_A	=8.3144598
sigma	=2pi^5k^4/(15h^3c^2)	=5.670367e-8
N_A	=6.02214076e23	=6.022140857e23
epsilon_0	=1/(mu_0cc)	=1/(mue_0cc)
T_zero	Units.NonSI.Temperature_degC	SIunits.Conversions.NonSIunits.Temperature_degC
mu_0	Present
mue_0		Present

Class	Modelica 4.0.0	Modelica 3.2.3
Modelica400.Mechanics.MultiBody.Examples.Loops.Utilities.Engine1bBase	block	model
class Modelica400.UsersGuide.Conventions.ModelicaCode.ParameterDefaults	Present
class Modelica400.UsersGuide.ReleaseNotes.Version_4_0_0	Present
model Modelica400.Blocks.Examples.Modulation	Present
model Modelica400.Blocks.Examples.SinCosEncoder	Present
model Modelica400.Blocks.Examples.CompareSincExpSine	Present
package Modelica400.Blocks.Examples.Noise	Present
block Modelica400.Blocks.Logical.LogicalDelay	Present
block Modelica400.Blocks.Sources.ContinuousClock	Present
block Modelica400.Blocks.Sources.SineVariableFrequencyAndAmplitude	Present
block Modelica400.Blocks.Sources.CosineVariableFrequencyAndAmplitude	Present
block Modelica400.Blocks.Sources.Sinc	Present
block Modelica400.Blocks.Sources.LogFrequencySweep	Present
function Modelica400.Blocks.Tables.Internal.getTimeTableValueNoDer2	Present
function Modelica400.Blocks.Tables.Internal.getDerTimeTableValueNoDer	Present
function Modelica400.Blocks.Tables.Internal.getDer2TimeTableValue	Present
function Modelica400.Blocks.Tables.Internal.getTable1DValueNoDer2	Present
function Modelica400.Blocks.Tables.Internal.getDerTable1DValueNoDer	Present
function Modelica400.Blocks.Tables.Internal.getDer2Table1DValue	Present
function Modelica400.Blocks.Tables.Internal.getTable2DValueNoDer2	Present
function Modelica400.Blocks.Tables.Internal.getDerTable2DValueNoDer	Present
function Modelica400.Blocks.Tables.Internal.getDer2Table2DValue	Present
block Modelica400.Blocks.Tables.CombiTable1Dv	Present
block Modelica400.Blocks.Tables.CombiTable2Ds	Present
package Modelica400.ComplexBlocks.Icons	Present
model Modelica400.Electrical.Analog.Examples.OpAmps.NonInvertingAmplifier	Present
model Modelica400.Electrical.Analog.Examples.OpAmps.InvertingAmplifier	Present
model Modelica400.Electrical.Analog.Examples.OpAmps.DifferentialAmplifier	Present
model Modelica400.Electrical.Analog.Examples.OpAmps.Adder	Present
model Modelica400.Electrical.Analog.Examples.OpAmps.Subtracter	Present
model Modelica400.Electrical.Analog.Examples.OpAmps.ControlCircuit	Present
package Modelica400.Electrical.Analog.Examples.OpAmps.OpAmpCircuits	Present
model Modelica400.Electrical.Analog.Examples.HeatingNPN_NORGate	Present
model Modelica400.Electrical.Analog.Examples.Resistor	Present
model Modelica400.Electrical.Analog.Examples.SeriesResonance	Present
model Modelica400.Electrical.Analog.Examples.ParallelResonance	Present
model Modelica400.Electrical.Analog.Basic.RotationalEMF	Present
model Modelica400.Electrical.Analog.Ideal.IdealTwoWaySwitch	Present
model Modelica400.Electrical.Analog.Ideal.ControlledIdealTwoWaySwitch	Present
model Modelica400.Electrical.Analog.Ideal.IdealizedOpAmpLimited	Present
model Modelica400.Electrical.Analog.Interfaces.FourPin	Present
model Modelica400.Electrical.Analog.Interfaces.PartialConditionalHeatPort	Present
model Modelica400.Electrical.Analog.Sources.SineVoltageVariableFrequencyAndAmplitude	Present
model Modelica400.Electrical.Analog.Sources.CosineVoltageVariableFrequencyAndAmplitude	Present
model Modelica400.Electrical.Analog.Sources.SineCurrentVariableFrequencyAndAmplitude	Present
model Modelica400.Electrical.Analog.Sources.CosineCurrentVariableFrequencyAndAmplitude	Present
package Modelica400.Electrical.Analog.UsersGuide	Present
package Modelica400.Electrical.Analog.Icons	Present
model Modelica400.Electrical.Digital.Sources.DigitalClock	Present
model Modelica400.Electrical.Machines.Examples.DCMachines.DCPM_QuasiStatic	Present
model Modelica400.Electrical.Machines.Examples.DCMachines.DC_CompareCharacteristics	Present
model Modelica400.Electrical.Machines.Examples.Transformers.IMC_Transformer	Present
package Modelica400.Electrical.Machines.Examples.InductionMachines	Present
package Modelica400.Electrical.Machines.Examples.SynchronousMachines	Present
package Modelica400.Electrical.Machines.BasicMachines.InductionMachines	Present
package Modelica400.Electrical.Machines.BasicMachines.SynchronousMachines	Present
package Modelica400.Electrical.Machines.BasicMachines.QuasiStaticDCMachines	Present
model Modelica400.Electrical.Machines.Sensors.SinCosResolver	Present
package Modelica400.Electrical.Machines.Thermal.InductionMachines	Present
package Modelica400.Electrical.Machines.Thermal.SynchronousMachines	Present
connector Modelica400.Electrical.Machines.Interfaces.InductionMachines.ThermalPortIMC	Present
record Modelica400.Electrical.Machines.Interfaces.InductionMachines.PowerBalanceIMC	Present
connector Modelica400.Electrical.Machines.Interfaces.InductionMachines.ThermalPortIMS	Present
record Modelica400.Electrical.Machines.Interfaces.InductionMachines.PowerBalanceIMS	Present
model Modelica400.Electrical.Machines.Icons.QuasiStaticMachine	Present
model Modelica400.Electrical.Machines.Icons.QuasiStaticTransformer	Present
record Modelica400.Electrical.Machines.Utilities.ParameterRecords.IM_SquirrelCageData	Present
record Modelica400.Electrical.Machines.Utilities.ParameterRecords.IM_SlipRingData	Present
model Modelica400.Electrical.Machines.Utilities.DQToThreePhase	Present
model Modelica400.Electrical.Machines.Utilities.DQCurrentController	Present
block Modelica400.Electrical.Machines.Utilities.SinCosEvaluation	Present
model Modelica400.Electrical.Machines.Utilities.SwitchYDwithArc	Present
record Modelica400.Electrical.Machines.Utilities.DcBrakeSettings	Present
class Modelica400.Electrical.PowerConverters.UsersGuide.ACACConcept	Present
package Modelica400.Electrical.PowerConverters.Examples.DCAC.PolyphaseTwoLevel	Present
package Modelica400.Electrical.PowerConverters.Examples.ACAC	Present
model Modelica400.Electrical.PowerConverters.DCAC.Polyphase2Level	Present
block Modelica400.Electrical.PowerConverters.DCDC.Control.Voltage2DutyCycle	Present
type Modelica400.Electrical.PowerConverters.Types.Voltage2AngleType	Present
type Modelica400.Electrical.PowerConverters.Types.SoftStarterModeOfOperation	Present
package Modelica400.Electrical.PowerConverters.ACAC	Present
type Modelica400.Electrical.Spice3.Types.Capacitance	Present
package Modelica400.Electrical.Batteries	Present
package Modelica400.Electrical.Polyphase	Present
package Modelica400.Electrical.QuasiStatic	Present
model Modelica400.Magnetic.FluxTubes.Examples.SolenoidActuator.ComparisonQuasiStatic	Present
package Modelica400.Magnetic.FluxTubes.Examples.BasicExamples	Present
model Modelica400.Magnetic.FluxTubes.Basic.VariableReluctance	Present
model Modelica400.Magnetic.FluxTubes.Basic.VariablePermeance	Present
model Modelica400.Magnetic.FluxTubes.Shapes.FixedShape.HollowCylinderCircumferentialFlux	Present
model Modelica400.Magnetic.FluxTubes.Shapes.FixedShape.Toroid	Present
model Modelica400.Magnetic.FluxTubes.Interfaces.TwoPortElementary	Present
model Modelica400.Magnetic.FluxTubes.Interfaces.TwoPortExtended	Present
model Modelica400.Magnetic.FluxTubes.Interfaces.TwoPort	Present
package Modelica400.Magnetic.FluxTubes.BaseClasses	Present
package Modelica400.Magnetic.FluxTubes.Icons	Present
class Modelica400.Magnetic.FundamentalWave.UsersGuide.Polyphase	Present
model Modelica400.Magnetic.FundamentalWave.Examples.Components.PolyphaseInductance	Present
package Modelica400.Magnetic.FundamentalWave.Examples.BasicMachines.InductionMachines	Present
package Modelica400.Magnetic.FundamentalWave.Examples.BasicMachines.SynchronousMachines	Present
model Modelica400.Magnetic.FundamentalWave.Components.PolyphaseElectroMagneticConverter	Present
model Modelica400.Magnetic.FundamentalWave.BasicMachines.Components.SymmetricPolyphaseWinding	Present
model Modelica400.Magnetic.FundamentalWave.BasicMachines.Components.SymmetricPolyphaseCageWinding	Present
package Modelica400.Magnetic.FundamentalWave.BasicMachines.InductionMachines	Present
package Modelica400.Magnetic.FundamentalWave.BasicMachines.SynchronousMachines	Present
model Modelica400.Magnetic.FundamentalWave.Interfaces.TwoPortElementary	Present
model Modelica400.Magnetic.FundamentalWave.Interfaces.TwoPortExtended	Present
model Modelica400.Magnetic.FundamentalWave.Interfaces.TwoPort	Present
package Modelica400.Magnetic.FundamentalWave.BaseClasses	Present
package Modelica400.Magnetic.QuasiStatic.FluxTubes.Examples.BasicExamples	Present
model Modelica400.Magnetic.QuasiStatic.FluxTubes.Basic.VariableReluctance	Present
model Modelica400.Magnetic.QuasiStatic.FluxTubes.Basic.VariablePermeance	Present
model Modelica400.Magnetic.QuasiStatic.FluxTubes.Shapes.FixedShape.HollowCylinderCircumferentialFlux	Present
model Modelica400.Magnetic.QuasiStatic.FluxTubes.Shapes.FixedShape.Toroid	Present
model Modelica400.Magnetic.QuasiStatic.FluxTubes.Interfaces.TwoPortElementary	Present
model Modelica400.Magnetic.QuasiStatic.FluxTubes.Interfaces.TwoPort	Present
package Modelica400.Magnetic.QuasiStatic.FluxTubes.BaseClasses	Present
package Modelica400.Magnetic.QuasiStatic.FluxTubes.Icons	Present
model Modelica400.Magnetic.QuasiStatic.FundamentalWave.Examples.Components.PolyphaseInductance	Present
model Modelica400.Magnetic.QuasiStatic.FundamentalWave.Components.PolyphaseElectroMagneticConverter	Present
model Modelica400.Magnetic.QuasiStatic.FundamentalWave.BasicMachines.Components.SymmetricPolyphaseWinding	Present
model Modelica400.Magnetic.QuasiStatic.FundamentalWave.BasicMachines.Components.SymmetricPolyphaseCageWinding	Present
model Modelica400.Magnetic.QuasiStatic.FundamentalWave.Interfaces.TwoPortElementary	Present
model Modelica400.Magnetic.QuasiStatic.FundamentalWave.Interfaces.TwoPortExtended	Present
model Modelica400.Magnetic.QuasiStatic.FundamentalWave.Interfaces.TwoPort	Present
package Modelica400.Magnetic.QuasiStatic.FundamentalWave.BaseClasses	Present
block Modelica400.Mechanics.MultiBody.Examples.Loops.Utilities.Engine1Base	Present
model Modelica400.Mechanics.MultiBody.Examples.Systems.RobotR3.OneAxis	Present
model Modelica400.Mechanics.MultiBody.Examples.Systems.RobotR3.FullRobot	Present
package Modelica400.Mechanics.MultiBody.Examples.Systems.RobotR3.Utilities	Present
model Modelica400.Mechanics.MultiBody.Forces.Internal.ZeroForceAndTorque	Present
model Modelica400.Mechanics.MultiBody.Visualizers.Advanced.Vector	Present
type Modelica400.Mechanics.MultiBody.Types.VectorQuantity	Present
class Modelica400.Mechanics.Rotational.UsersGuide.References	Present
model Modelica400.Mechanics.Translational.Examples.Vehicle	Present
model Modelica400.Mechanics.Translational.Components.RollingResistance	Present
model Modelica400.Mechanics.Translational.Components.Vehicle	Present
model Modelica400.Fluid.Valves.ValveDiscreteRamp	Present
type Modelica400.Fluid.Types.CheckValveHomotopyType	Present
function Modelica400.Fluid.Dissipation.Utilities.Functions.General.CubicInterpolation_Re	Present
function Modelica400.Fluid.Dissipation.Utilities.Functions.General.CubicInterpolation_lambda	Present
function Modelica400.Media.IdealGases.Common.MixtureGasNasa.specificEntropyOfpTX	Present
package Modelica400.Media.IdealGases.MixtureGases.SimpleMoistAir	Present
function Modelica400.Media.Incompressible.TableBased.specificEnthalpyOfT	Present
record Modelica400.Media.Water.WaterIF97_base.SaturationProperties	Present
model Modelica400.Thermal.FluidHeatFlow.Interfaces.AbsoluteSensor	Present
model Modelica400.Thermal.FluidHeatFlow.Interfaces.RelativeSensorBase	Present
model Modelica400.Thermal.FluidHeatFlow.Interfaces.RelativeSensor	Present
model Modelica400.Thermal.FluidHeatFlow.Interfaces.FlowSensor	Present
package Modelica400.Thermal.FluidHeatFlow.BaseClasses	Present
model Modelica400.Thermal.HeatTransfer.Components.ThermalCollectorMatrix	Present
package Modelica400.Thermal.HeatTransfer.UsersGuide	Present
package Modelica400.Thermal.HeatTransfer.Icons	Present
function Modelica400.Math.BooleanVectors.andTrue	Present
function Modelica400.Math.Matrices.LAPACK.dgeqp3	Present
model Modelica400.Math.Nonlinear.Examples.QuadratureLobatto3	Present
function Modelica400.Math.Random.Utilities.automaticLocalSeed	Present
package Modelica400.Math.Polynomials	Present
function Modelica400.ComplexMath.abs	Present
function Modelica400.ComplexMath.sqrt	Present
function Modelica400.ComplexMath.max	Present
function Modelica400.ComplexMath.min	Present
function Modelica400.ComplexMath.sum	Present
function Modelica400.ComplexMath.product	Present
model Modelica400.Utilities.Internal.PartialModelicaServices.Animation.PartialVector	Present
class Modelica400.Icons.RoundSensor	Present
class Modelica400.Icons.RectangularSensor	Present
package Modelica400.Clocked	Present
package Modelica400.Units	Present
class Modelica323.UsersGuide.ParameterDefaults		Present
package Modelica323.Blocks.Examples.NoiseExamples		Present
block Modelica323.Blocks.Interfaces.Adaptors.SendReal		Present
block Modelica323.Blocks.Interfaces.Adaptors.SendBoolean		Present
block Modelica323.Blocks.Interfaces.Adaptors.SendInteger		Present
block Modelica323.Blocks.Interfaces.Adaptors.ReceiveReal		Present
block Modelica323.Blocks.Interfaces.Adaptors.ReceiveBoolean		Present
block Modelica323.Blocks.Interfaces.Adaptors.ReceiveInteger		Present
block Modelica323.Blocks.Interfaces.BlockIcon		Present
block Modelica323.Blocks.Interfaces.BooleanBlockIcon		Present
block Modelica323.Blocks.Interfaces.DiscreteBlockIcon		Present
block Modelica323.Blocks.Interfaces.IntegerBlockIcon		Present
block Modelica323.Blocks.Interfaces.partialBooleanBlockIcon		Present
block Modelica323.Blocks.Sources.Clock		Present
function Modelica323.Blocks.Tables.Internal.readTimeTableData		Present
function Modelica323.Blocks.Tables.Internal.readTable1DData		Present
function Modelica323.Blocks.Tables.Internal.readTable2DData		Present
block Modelica323.Blocks.Tables.CombiTable1D		Present
block Modelica323.Blocks.Tables.CombiTable2D		Present
type Modelica323.Blocks.Types.InitPID		Present
block Modelica323.ComplexBlocks.Sources.LogFrequencySweep		Present
package Modelica323.StateGraph.Temporary		Present
model Modelica323.Electrical.Analog.Examples.OpAmps.InvertingAmp		Present
model Modelica323.Electrical.Analog.Examples.OpAmps.NonInvertingAmp		Present
model Modelica323.Electrical.Analog.Examples.HeatingNPN_OrGate		Present
model Modelica323.Electrical.Analog.Examples.HeatingResistor		Present
model Modelica323.Electrical.Analog.Basic.HeatingResistor		Present
model Modelica323.Electrical.Analog.Basic.EMF		Present
model Modelica323.Electrical.Analog.Ideal.IdealCommutingSwitch		Present
model Modelica323.Electrical.Analog.Ideal.ControlledIdealCommutingSwitch		Present
model Modelica323.Electrical.Analog.Ideal.IdealizedOpAmpLimted		Present
model Modelica323.Electrical.Analog.Ideal.IdealGyrator		Present
model Modelica323.Electrical.Analog.Semiconductors.HeatingDiode		Present
model Modelica323.Electrical.Analog.Semiconductors.HeatingNMOS		Present
model Modelica323.Electrical.Analog.Semiconductors.HeatingPMOS		Present
model Modelica323.Electrical.Analog.Semiconductors.HeatingNPN		Present
model Modelica323.Electrical.Analog.Semiconductors.HeatingPNP		Present
model Modelica323.Electrical.Digital.Sources.Clock		Present
block Modelica323.Electrical.Digital.Converters.LogicToXO1		Present
block Modelica323.Electrical.Digital.Converters.LogicToXO1Z		Present
model Modelica323.Electrical.Machines.Examples.DCMachines.DCPM_QuasiStationary		Present
model Modelica323.Electrical.Machines.Examples.Transformers.AIMC_Transformer		Present
package Modelica323.Electrical.Machines.Examples.AsynchronousInductionMachines		Present
package Modelica323.Electrical.Machines.Examples.SynchronousInductionMachines		Present
model Modelica323.Electrical.Machines.BasicMachines.Components.BasicTransformer		Present
package Modelica323.Electrical.Machines.BasicMachines.AsynchronousInductionMachines		Present
package Modelica323.Electrical.Machines.BasicMachines.SynchronousInductionMachines		Present
package Modelica323.Electrical.Machines.BasicMachines.QuasiStationaryDCMachines		Present
package Modelica323.Electrical.Machines.Thermal.AsynchronousInductionMachines		Present
package Modelica323.Electrical.Machines.Thermal.SynchronousInductionMachines		Present
connector Modelica323.Electrical.Machines.Interfaces.InductionMachines.ThermalPortAIMC		Present
record Modelica323.Electrical.Machines.Interfaces.InductionMachines.PowerBalanceAIMC		Present
connector Modelica323.Electrical.Machines.Interfaces.InductionMachines.ThermalPortAIMS		Present
record Modelica323.Electrical.Machines.Interfaces.InductionMachines.PowerBalanceAIMS		Present
model Modelica323.Electrical.Machines.Icons.QuasiStationaryMachine		Present
model Modelica323.Electrical.Machines.Icons.QuasiStationaryTransformer		Present
record Modelica323.Electrical.Machines.Utilities.ParameterRecords.AIM_SquirrelCageData		Present
record Modelica323.Electrical.Machines.Utilities.ParameterRecords.AIM_SlipRingData		Present
model Modelica323.Electrical.Machines.Utilities.CurrentController		Present
model Modelica323.Electrical.Machines.Utilities.VoltageController		Present
package Modelica323.Electrical.PowerConverters.Examples.DCAC.MultiPhaseTwoLevel		Present
model Modelica323.Electrical.PowerConverters.DCAC.MultiPhase2Level		Present
block Modelica323.Electrical.PowerConverters.DCDC.Control.VoltageToDutyCycle		Present
function Modelica323.Electrical.Spice3.Internal.Functions.junction2SPICE3MOSFET		Present
function Modelica323.Electrical.Spice3.Internal.Functions.junctionCap		Present
function Modelica323.Electrical.Spice3.Internal.SpiceRoot.initJunctionVoltages		Present
function Modelica323.Electrical.Spice3.Internal.SpiceRoot.limitJunctionVoltage		Present
function Modelica323.Electrical.Spice3.Internal.Mos.mos2CalcInitEquations		Present
function Modelica323.Electrical.Spice3.Internal.Mos.mos2CalcCalcTempDependencies		Present
function Modelica323.Electrical.Spice3.Internal.Mos.mos2CalcNoBypassCode		Present
function Modelica323.Electrical.Spice3.Internal.Mos2.mos2ModelLineParamsInitEquations		Present
function Modelica323.Electrical.Spice3.Internal.Mos2.drainCur		Present
function Modelica323.Electrical.Spice3.Internal.Mos2.mos2RenameParameters		Present
record Modelica323.Electrical.Spice3.Internal.Bjt.BjtModelLineVariables		Present
record Modelica323.Electrical.Spice3.Internal.Bjt.BjtVariables		Present
record Modelica323.Electrical.Spice3.Internal.Bjt.Bjt3Variables		Present
model Modelica323.Electrical.Spice3.Internal.BJT		Present
record Modelica323.Electrical.Spice3.Internal.ModelcardBJT		Present
package Modelica323.Electrical.Spice3.Internal.Bjt3		Present
package Modelica323.Electrical.MultiPhase		Present
package Modelica323.Electrical.QuasiStationary		Present
model Modelica323.Magnetic.FluxTubes.Examples.SolenoidActuator.ComparisonQuasiStationary		Present
model Modelica323.Magnetic.FluxTubes.Examples.SaturatedInductor		Present
model Modelica323.Magnetic.FluxTubes.Interfaces.PartialTwoPortsElementary		Present
model Modelica323.Magnetic.FluxTubes.Interfaces.PartialTwoPorts		Present
model Modelica323.Magnetic.FluxTubes.Interfaces.PartialFixedShape		Present
model Modelica323.Magnetic.FluxTubes.Interfaces.PartialForce		Present
model Modelica323.Magnetic.FluxTubes.Interfaces.PartialLeakage		Present
model Modelica323.Magnetic.FluxTubes.Interfaces.PartialGeneric		Present
model Modelica323.Magnetic.FluxTubes.Interfaces.PartialGenericHysteresis		Present
model Modelica323.Magnetic.FluxTubes.Interfaces.PartialGenericHysteresisTellinen		Present
class Modelica323.Magnetic.FundamentalWave.UsersGuide.MultiPhase		Present
model Modelica323.Magnetic.FundamentalWave.Examples.Components.MultiPhaseInductance		Present
model Modelica323.Magnetic.FundamentalWave.Examples.BasicMachines.AIMC_DOL		Present
model Modelica323.Magnetic.FundamentalWave.Examples.BasicMachines.AIMC_DOL_MultiPhase		Present
model Modelica323.Magnetic.FundamentalWave.Examples.BasicMachines.AIMC_YD		Present
model Modelica323.Magnetic.FundamentalWave.Examples.BasicMachines.AIMC_Transformer		Present
model Modelica323.Magnetic.FundamentalWave.Examples.BasicMachines.AIMC_Inverter		Present
model Modelica323.Magnetic.FundamentalWave.Examples.BasicMachines.AIMC_Conveyor		Present
model Modelica323.Magnetic.FundamentalWave.Examples.BasicMachines.AIMC_Steinmetz		Present
model Modelica323.Magnetic.FundamentalWave.Examples.BasicMachines.AIMC_withLosses		Present
model Modelica323.Magnetic.FundamentalWave.Examples.BasicMachines.AIMC_Initialize		Present
model Modelica323.Magnetic.FundamentalWave.Examples.BasicMachines.AIMS_Start		Present
model Modelica323.Magnetic.FundamentalWave.Examples.BasicMachines.AIMS_Start_MultiPhase		Present
model Modelica323.Magnetic.FundamentalWave.Examples.BasicMachines.SMPM_Inverter		Present
model Modelica323.Magnetic.FundamentalWave.Examples.BasicMachines.SMPM_Inverter_MultiPhase		Present
model Modelica323.Magnetic.FundamentalWave.Examples.BasicMachines.SMPM_CurrentSource		Present
model Modelica323.Magnetic.FundamentalWave.Examples.BasicMachines.SMPM_VoltageSource		Present
model Modelica323.Magnetic.FundamentalWave.Examples.BasicMachines.SMPM_Braking		Present
model Modelica323.Magnetic.FundamentalWave.Examples.BasicMachines.SMEE_DOL		Present
model Modelica323.Magnetic.FundamentalWave.Examples.BasicMachines.SMEE_Generator_MultiPhase		Present
model Modelica323.Magnetic.FundamentalWave.Examples.BasicMachines.SMEE_Generator		Present
model Modelica323.Magnetic.FundamentalWave.Examples.BasicMachines.SMEE_LoadDump		Present
model Modelica323.Magnetic.FundamentalWave.Examples.BasicMachines.SMEE_Rectifier		Present
model Modelica323.Magnetic.FundamentalWave.Examples.BasicMachines.SMR_Inverter		Present
model Modelica323.Magnetic.FundamentalWave.Examples.BasicMachines.SMR_Inverter_MultiPhase		Present
model Modelica323.Magnetic.FundamentalWave.Components.MultiPhaseElectroMagneticConverter		Present
model Modelica323.Magnetic.FundamentalWave.BasicMachines.Components.SymmetricMultiPhaseWinding		Present
model Modelica323.Magnetic.FundamentalWave.BasicMachines.Components.SymmetricMultiPhaseCageWinding		Present
model Modelica323.Magnetic.FundamentalWave.BasicMachines.Components.SymmetricMultiPhaseCageWinding_obsolete		Present
model Modelica323.Magnetic.FundamentalWave.BasicMachines.Components.SaliencyCageWinding_obsolete		Present
package Modelica323.Magnetic.FundamentalWave.BasicMachines.AsynchronousInductionMachines		Present
package Modelica323.Magnetic.FundamentalWave.BasicMachines.SynchronousInductionMachines		Present
model Modelica323.Magnetic.FundamentalWave.Interfaces.PartialTwoPort		Present
model Modelica323.Magnetic.FundamentalWave.Interfaces.PartialTwoPortExtended		Present
model Modelica323.Magnetic.FundamentalWave.Interfaces.PartialTwoPortElementary		Present
model Modelica323.Magnetic.FundamentalWave.Interfaces.PartialBasicInductionMachine		Present
model Modelica323.Magnetic.QuasiStatic.FluxTubes.Interfaces.PartialTwoPortsElementary		Present
model Modelica323.Magnetic.QuasiStatic.FluxTubes.Interfaces.PartialTwoPorts		Present
model Modelica323.Magnetic.QuasiStatic.FluxTubes.Interfaces.PartialFixedShape		Present
model Modelica323.Magnetic.QuasiStatic.FluxTubes.Interfaces.PartialLeakage		Present
model Modelica323.Magnetic.QuasiStatic.FundamentalWave.Examples.Components.MultiPhaseInductance		Present
model Modelica323.Magnetic.QuasiStatic.FundamentalWave.Components.MultiPhaseElectroMagneticConverter		Present
model Modelica323.Magnetic.QuasiStatic.FundamentalWave.BasicMachines.Components.SymmetricMultiPhaseWinding		Present
model Modelica323.Magnetic.QuasiStatic.FundamentalWave.BasicMachines.Components.SymmetricMultiPhaseCageWinding		Present
package Modelica323.Magnetic.QuasiStatic.FundamentalWave.BasicMachines.BaseClasses		Present
model Modelica323.Magnetic.QuasiStatic.FundamentalWave.Interfaces.PartialTwoPort		Present
model Modelica323.Magnetic.QuasiStatic.FundamentalWave.Interfaces.PartialTwoPortExtended		Present
model Modelica323.Magnetic.QuasiStatic.FundamentalWave.Interfaces.PartialTwoPortElementary		Present
class Modelica323.Mechanics.MultiBody.UsersGuide.Upgrade		Present
model Modelica323.Mechanics.MultiBody.Examples.Loops.Utilities.GasForce		Present
model Modelica323.Mechanics.MultiBody.Examples.Systems.RobotR3.oneAxis		Present
model Modelica323.Mechanics.MultiBody.Examples.Systems.RobotR3.fullRobot		Present
package Modelica323.Mechanics.MultiBody.Examples.Systems.RobotR3.Components		Present
model Modelica323.Mechanics.MultiBody.Sensors.Internal.ZeroForceAndTorque		Present
model Modelica323.Mechanics.MultiBody.Sensors.TansformAbsoluteVector		Present
model Modelica323.Mechanics.MultiBody.Sensors.TansformRelativeVector		Present
model Modelica323.Mechanics.MultiBody.Visualizers.Ground		Present
type Modelica323.Mechanics.MultiBody.Types.Init		Present
class Modelica323.Mechanics.MultiBody.Icons.MotorIcon		Present
model Modelica323.Mechanics.Rotational.Interfaces.PartialElementaryOneFlangeAndSupport		Present
model Modelica323.Mechanics.Rotational.Interfaces.PartialElementaryTwoFlangesAndSupport		Present
model Modelica323.Mechanics.Translational.Interfaces.PartialElementaryOneFlangeAndSupport		Present
model Modelica323.Mechanics.Translational.Interfaces.PartialElementaryTwoFlangesAndSupport		Present
block Modelica323.Fluid.Examples.ControlledTankSystem.Utilities.RadioButton		Present
model Modelica323.Fluid.Pipes.BaseClasses.WallFriction.TestWallFrictionAndGravity		Present
model Modelica323.Fluid.Fittings.BaseClasses.QuadraticTurbulent.TestWallFriction		Present
function Modelica323.Fluid.Dissipation.Utilities.Functions.General.CubicInterpolation_DP		Present
function Modelica323.Fluid.Dissipation.Utilities.Functions.General.CubicInterpolation_MFLOW		Present
package Modelica323.Fluid.Icons		Present
package Modelica323.Media.Examples.TestOnly		Present
package Modelica323.Media.Examples.Tests		Present
package Modelica323.Media.Interfaces.PartialMedium.Choices		Present
package Modelica323.Media.Common.OneNonLinearEquation		Present
record Modelica323.Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.Basic.MyComplex		Present
package Modelica323.Media.Air.ReferenceMoistAir.Utilities.Ice09_Utilities.Basic.MyComplexF		Present
package Modelica323.Media.IdealGases.MixtureGases.simpleMoistAir		Present
package Modelica323.Media.Incompressible.TableBased.Polynomials_Temp		Present
model Modelica323.Thermal.FluidHeatFlow.Components.IsolatedPipe		Present
model Modelica323.Thermal.FluidHeatFlow.Components.HeatedPipe		Present
package Modelica323.Thermal.FluidHeatFlow.Interfaces.Partials		Present
package Modelica323.Math.Vectors.Utilities		Present
function Modelica323.Math.Matrices.LAPACK.dgegv		Present
function Modelica323.Math.Matrices.LAPACK.dgelsx		Present
function Modelica323.Math.Matrices.LAPACK.dgelsx_vec		Present
function Modelica323.Math.Matrices.LAPACK.dgeqpf		Present
function Modelica323.Math.Matrices.Utilities.householderReflection		Present
function Modelica323.Math.Matrices.Utilities.householderSimilarityTransformation		Present
model Modelica323.Math.Nonlinear.Examples.quadratureLobatto3		Present
function Modelica323.Math.baseIcon1		Present
function Modelica323.Math.baseIcon2		Present
function Modelica323.Math.tempInterpol1		Present
function Modelica323.Math.tempInterpol2		Present
function Modelica323.ComplexMath.'abs'		Present
function Modelica323.ComplexMath.'sqrt'		Present
function Modelica323.ComplexMath.'max'		Present
function Modelica323.ComplexMath.'min'		Present
function Modelica323.ComplexMath.'sum'		Present
function Modelica323.ComplexMath.'product'		Present
class Modelica323.Icons.RotationalSensor		Present
class Modelica323.Icons.TranslationalSensor		Present
operator record Modelica323.Icons.TypeComplex		Present
package Modelica323.Icons.Library		Present
package Modelica323.Icons.Library2		Present
class Modelica323.Icons.GearIcon		Present
class Modelica323.Icons.MotorIcon		Present
class Modelica323.Icons.Info		Present
package Modelica323.SIunits		Present