Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Modelica/Electrical/QuasiStationary/MultiPhase.mo
Original file line number Diff line number Diff line change
Expand Up @@ -2116,10 +2116,10 @@ This block determines the continuous quasi <a href=\"Modelica://Modelica.Blocks.
import Modelica.ComplexMath.arg;
parameter Integer m=3 "Number of phases";
output Real abs_u[m] = 'abs'(u) "Absolute of input";
output Modelica.SIunits.Angle arg_u[m](displayUnit="deg") = arg(u)
output Modelica.SIunits.Angle arg_u[m](each displayUnit="deg") = arg(u)
"Argument of input";
output Real abs_y[m] = 'abs'(y) "Absolute of output";
output Modelica.SIunits.Angle arg_y[m](displayUnit="deg") = arg(y)
output Modelica.SIunits.Angle arg_y[m](each displayUnit="deg") = arg(y)
"Argument of output";
protected
final parameter Complex sTM[m,m]=
Expand Down
6 changes: 3 additions & 3 deletions Modelica/Fluid/Examples/TraceSubstances.mo
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ of magnitude.
nPorts=2)
annotation (Placement(transformation(extent={{-70,-40},{-50,-20}})));
Modelica.Fluid.Vessels.ClosedVolume volume(
medium(Xi(nominal=0.01)),
medium(Xi(each nominal=0.01)),
C_start={1.519E-3},
V=100,
redeclare package Medium = Medium,
Expand All @@ -119,7 +119,7 @@ of magnitude.

Pipes.DynamicPipe ductOut(
mCs_scaled(each nominal = 0.01),
mediums(each Xi(nominal = 0.01)),
mediums(each Xi(each nominal = 0.01)),
redeclare package Medium = Medium,
diameter=0.15,
redeclare model FlowModel =
Expand Down Expand Up @@ -165,7 +165,7 @@ of magnitude.

Pipes.DynamicPipe ductIn(
mCs_scaled(each nominal = 0.01),
mediums(each Xi(nominal = 0.01)),
mediums(each Xi(each nominal = 0.01)),
redeclare package Medium = Medium,
diameter=0.15,
redeclare model FlowModel =
Expand Down
2 changes: 1 addition & 1 deletion Modelica/Magnetic/FundamentalWave.mo
Original file line number Diff line number Diff line change
Expand Up @@ -4101,7 +4101,7 @@ to speed to achieve constant current and torque.</p>
statorCoreParameters(VRef=100),
strayLoadParameters(IRef=100),
brushParameters(ILinear=0.01),
ir(fixed=true),
ir(each fixed=true),
wMechanical(fixed=true),
m=m,
Rs=smeeData.Rs*m/3,
Expand Down
4 changes: 2 additions & 2 deletions Modelica/Magnetic/QuasiStatic/FundamentalWave.mo
Original file line number Diff line number Diff line change
Expand Up @@ -3541,7 +3541,7 @@ to numerically stabilize the simulation.</p>
statorCoreParameters(VRef=100),
strayLoadParameters(IRef=100),
brushParameters(ILinear=0.01),
ir(fixed=true),
ir(each fixed=true),
useDamperCage=false,
m=m,
frictionParameters(PRef=0),
Expand Down Expand Up @@ -4007,7 +4007,7 @@ Simulate for 30 seconds and plot versus <code>rotorAngle|rotorAngleQS.rotorDispl
Rrq=smrData.Rrq,
TrRef=smrData.TrRef,
alpha20r(displayUnit="1/K") = smrData.alpha20r,
ir(fixed=true),
ir(each fixed=true),
m=m,
Rs=smrData.Rs*m/3,
Lssigma=smrData.Lssigma*m/3,
Expand Down
2 changes: 1 addition & 1 deletion Modelica/Media/Air/MoistAir.mo
Original file line number Diff line number Diff line change
Expand Up @@ -1399,7 +1399,7 @@ Specific entropy of moist air is computed from pressure, temperature and composi
input SI.MassFraction X[:] "Mass fractions of moist air";
input Real dp(unit="Pa/s") "Derivative of pressure";
input Real dT(unit="K/s") "Derivative of temperature";
input Real dX[nX](unit="1/s") "Derivative of mass fractions";
input Real dX[nX](each unit="1/s") "Derivative of mass fractions";
output Real ds(unit="J/(kg.K.s)") "Specific entropy at p, T, X";
protected
MoleFraction[2] Y=massToMoleFractions(X, {steam.MM,dryair.MM})
Expand Down
4 changes: 2 additions & 2 deletions Modelica/Media/IdealGases/Common/package.mo
Original file line number Diff line number Diff line change
Expand Up @@ -752,7 +752,7 @@ required from medium model \"" + mediumName + "\".");

redeclare function extends specificEntropy "Return specific entropy"
protected
Real[nX] Y(unit="mol/mol")=massToMoleFractions(state.X, data.MM)
Real[nX] Y(each unit="mol/mol")=massToMoleFractions(state.X, data.MM)
"Molar fractions";
algorithm
s := s_TX(state.T, state.X) - sum(state.X[i]*Modelica.Constants.R/MMX[i]*
Expand Down Expand Up @@ -1366,7 +1366,7 @@ end lowPressureThermalConductivity;
"Note that this function always sees the complete mass fraction vector"
protected
MassFraction[nX] Xfull = if size(X,1) == nX then X else cat(1,X,{1-sum(X)});
Real[nX] Y(unit="mol/mol")=massToMoleFractions(if size(X,1) == nX then X else cat(1,X,{1-sum(X)}), data.MM)
Real[nX] Y(each unit="mol/mol")=massToMoleFractions(if size(X,1) == nX then X else cat(1,X,{1-sum(X)}), data.MM)
"Molar fractions";
algorithm
y := s_TX(x,Xfull) - sum(Xfull[i]*Modelica.Constants.R/MMX[i]*
Expand Down
4 changes: 2 additions & 2 deletions Modelica/Media/package.mo
Original file line number Diff line number Diff line change
Expand Up @@ -2951,7 +2951,7 @@ points, e.g., when an isentropic reference state is computed.
p(start=1.0e5, fixed=true));
Medium.BaseProperties medium2(
T(start=300.0, fixed=true),
X(start={0.2,0.8}, fixed=true),
X(start={0.2,0.8}, each fixed=true),
p(start=2.0e5, fixed=true));
Medium.SpecificHeatCapacity cp=Medium.specificHeatCapacityCp(medium.state);
Medium.SpecificHeatCapacity cv=Medium.specificHeatCapacityCv(medium.state);
Expand Down Expand Up @@ -2991,7 +2991,7 @@ is given to compare the approximation.
p(start=1.0e5, fixed=true));
Medium.BaseProperties medium2(
T(start=300.0, fixed=true),
X(start={0.2,0.1,0.3,0.4}, fixed=true),
X(start={0.2,0.1,0.3,0.4}, each fixed=true),
p(start=2.0e5, fixed=true));
Medium.SpecificHeatCapacity cp=Medium.specificHeatCapacityCp(state);
Medium.SpecificHeatCapacity cv=Medium.specificHeatCapacityCv(state);
Expand Down