diff --git a/.travis.yml b/.travis.yml
index 109582530e..1e6a6cd063 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ env:
global:
- BUILDINGSPY_VERSION=BuildingsPy@v4.0.0
- OMC_VERSION=ubuntu-2004-omc:1.19.0_dev-551-g1772c4b-1
- - DYMOLA_VERSION=travis_ubuntu-2004_dymola:2022x-x86_64_rev-2
+ - DYMOLA_VERSION=travis_ubuntu-2004_dymola:2023-x86_64
jobs:
# Test matrix for regression tests.
diff --git a/IBPSA/Fluid/Actuators/Valves/TwoWayTable.mo b/IBPSA/Fluid/Actuators/Valves/TwoWayTable.mo
index 110a415151..5848098eeb 100644
--- a/IBPSA/Fluid/Actuators/Valves/TwoWayTable.mo
+++ b/IBPSA/Fluid/Actuators/Valves/TwoWayTable.mo
@@ -33,15 +33,15 @@ initial equation
Modelica.Constants.eps,
"flowCharateristics.phi[end] must be 1.");
- // Assert that the sequences are strictly monotonic increasing
+ // Assert that the sequences are strictly increasing
assert(IBPSA.Utilities.Math.Functions.isMonotonic(
x=flowCharacteristics.y,
strict=true),
- "The values for y in flowCharacteristics must be strictly monotone increasing.");
+ "The values for y in flowCharacteristics must be strictly increasing.");
assert(IBPSA.Utilities.Math.Functions.isMonotonic(
x=flowCharacteristics.phi,
strict=true),
- "The values for phi in flowCharacteristics must be strictly monotone increasing.");
+ "The values for phi in flowCharacteristics must be strictly increasing.");
equation
connect(phiLooUp.u[1], y_actual) annotation (Line(
@@ -102,7 +102,7 @@ requirements, otherwise the model stops with an error:
Their arrays
y
and phi
-must be strictly monotonic increasing.
+must be strictly increasing.
The first value must satisfy
diff --git a/IBPSA/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp.mo b/IBPSA/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp.mo
index 145a7871ef..8438ea7b8a 100644
--- a/IBPSA/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp.mo
+++ b/IBPSA/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp.mo
@@ -42,14 +42,14 @@ Documentation(info="
Function that computes the pressure drop of flow elements as
- m = sign(Δp) k √ Δp
+ ṁ = sign(Δp) k √ Δp
with regularization near the origin.
Therefore, the flow coefficient is
- k = m ⁄ √ Δp
+ k = ṁ ⁄ √ Δp
The input m_flow_turbulent
determines the location of the regularization.
diff --git a/IBPSA/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow.mo b/IBPSA/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow.mo
index dd6dae525a..d7c897f787 100644
--- a/IBPSA/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow.mo
+++ b/IBPSA/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow.mo
@@ -44,14 +44,14 @@ Documentation(info="
Function that computes the pressure drop of flow elements as
- Δp = sign(m) (m ⁄ k)2
+ Δp = sign(ṁ) (ṁ ⁄ k)2
with regularization near the origin.
Therefore, the flow coefficient is
- k = m ⁄ √ Δp
+ k = ṁ ⁄ √ Δp
The input m_flow_turbulent
determines the location of the regularization.
diff --git a/IBPSA/Fluid/Examples/SimpleHouse.mo b/IBPSA/Fluid/Examples/SimpleHouse.mo
index e0e98126c6..13c57eb561 100644
--- a/IBPSA/Fluid/Examples/SimpleHouse.mo
+++ b/IBPSA/Fluid/Examples/SimpleHouse.mo
@@ -291,15 +291,13 @@ equation
June 15, 2022, by Hongxiang Fu:
Changed conDam.yMin
from 0.1 to 0.25.
This is for
-
-IBPSA, #1624 .
+IBPSA, #1624 .
May 8, 2017, by Michael Wetter:
Updated heater model.
This is for
-
-IBPSA, #763 .
+IBPSA, #763 .
November 10, 2016, by Michael Wetter:
diff --git a/IBPSA/Fluid/FixedResistances/CheckValve.mo b/IBPSA/Fluid/FixedResistances/CheckValve.mo
index f306f8a3b2..211b6d5067 100644
--- a/IBPSA/Fluid/FixedResistances/CheckValve.mo
+++ b/IBPSA/Fluid/FixedResistances/CheckValve.mo
@@ -110,14 +110,14 @@ Note that the small reverse flows can still occur with this model.
The basic flow function
- m = sign(Δp) k √ Δp ,
+ ṁ = sign(Δp) k √ Δp ,
with regularization near the origin, is used to compute the pressure drop.
The flow coefficient
- k = m ⁄ √ Δp
+ k = ṁ ⁄ √ Δp
is increased from l*KV_Si
to KV_Si
,
diff --git a/IBPSA/Fluid/FixedResistances/HydraulicDiameter.mo b/IBPSA/Fluid/FixedResistances/HydraulicDiameter.mo
index 8405e8ee5f..e2cf02e7b2 100644
--- a/IBPSA/Fluid/FixedResistances/HydraulicDiameter.mo
+++ b/IBPSA/Fluid/FixedResistances/HydraulicDiameter.mo
@@ -66,12 +66,12 @@ The mass flow rate is computed as
ṁ = k
-√ΔP ,
+√Δp ,
where
k is a constant and
-ΔP is the pressure drop.
+Δp is the pressure drop.
The constant k is equal to
k=m_flow_nominal/sqrt(dp_nominal)
,
where m_flow_nominal
is a parameter.
@@ -163,7 +163,7 @@ IBPSA.Fluid.BaseClasses.FlowModels,
This package contains regularized implementations of the equation
- m = sign(Δp) k √ Δp
+ ṁ = sign(Δp) k √ Δp
and its inverse function.
diff --git a/IBPSA/Fluid/FixedResistances/PressureDrop.mo b/IBPSA/Fluid/FixedResistances/PressureDrop.mo
index 329f950819..ee6d021df6 100644
--- a/IBPSA/Fluid/FixedResistances/PressureDrop.mo
+++ b/IBPSA/Fluid/FixedResistances/PressureDrop.mo
@@ -80,12 +80,12 @@ The mass flow rate is
ṁ = k
-√ΔP ,
+√Δp ,
where
k is a constant and
-ΔP is the pressure drop.
+Δp is the pressure drop.
The constant k is equal to
k=m_flow_nominal/sqrt(dp_nominal)
,
where m_flow_nominal
and dp_nominal
@@ -163,7 +163,7 @@ IBPSA.Fluid.BaseClasses.FlowModels,
This package contains regularized implementations of the equation
- m = sign(Δp) k √ Δp
+ ṁ = sign(Δp) k √ Δp
and its inverse function.
diff --git a/IBPSA/Fluid/FixedResistances/package.mo b/IBPSA/Fluid/FixedResistances/package.mo
index 879d27150d..0a7684018d 100644
--- a/IBPSA/Fluid/FixedResistances/package.mo
+++ b/IBPSA/Fluid/FixedResistances/package.mo
@@ -10,7 +10,7 @@ flow coefficient
k = m ⁄
-√ΔP .
+√Δp .
For models of valves and air dampers, see
diff --git a/IBPSA/Fluid/Movers/BaseClasses/FlowMachineInterface.mo b/IBPSA/Fluid/Movers/BaseClasses/FlowMachineInterface.mo
index e6a2634f88..def73223ca 100644
--- a/IBPSA/Fluid/Movers/BaseClasses/FlowMachineInterface.mo
+++ b/IBPSA/Fluid/Movers/BaseClasses/FlowMachineInterface.mo
@@ -484,7 +484,10 @@ equation
end if;
// Flow work
- WFlo = dp_internal*V_flow;
+ WFlo = IBPSA.Utilities.Math.Functions.smoothMax(
+ x1=dp_internal*V_flow,
+ x2=0,
+ deltaX=1E-4*dpMax*V_flow_max);
// Power consumption
if per.use_powerCharacteristic then
@@ -665,10 +668,25 @@ point is added and where two additional points are added.
The parameter curve
causes the correct data record
to be used during the simulation.
+
+In order to prevent the model from producing negative mover power
+when either the flow rate or pressure rise is forced to be negative,
+the flow work Ẇflo is constrained to be non-negative.
+The regularisation starts around 0.01% of the characteristic maximum power
+Ẇmax = V̇max Δpmax .
+See discussions and an example of this situation in
+IBPSA, #1621 .
+
",
revisions="
+June 6, 2022, by Hongxiang Fu:
+Added a constraint that Wflo = V̇ Δp ≥ 0 .
+This is for
+IBPSA, #1621 .
+
+
April 14, 2020, by Michael Wetter:
Changed homotopyInitialization
to a constant.
This is for
diff --git a/IBPSA/Fluid/Movers/UsersGuide.mo b/IBPSA/Fluid/Movers/UsersGuide.mo
index 6779271878..f7b862e86b 100644
--- a/IBPSA/Fluid/Movers/UsersGuide.mo
+++ b/IBPSA/Fluid/Movers/UsersGuide.mo
@@ -432,6 +432,15 @@ the hydraulic power input Whyd , the flow work
where V̇ is the volume flow rate and
Δp is the pressure rise.
+In order to prevent the model from producing negative mover power
+when either the flow rate or pressure rise is forced to be negative,
+the flow work Ẇflo is constrained to be non-negative.
+The regularisation starts around 0.01% of the characteristic maximum power
+Ẇmax = V̇max Δpmax .
+See discussions and an example of this situation in
+IBPSA, #1621 .
+
+
The heat dissipated into the medium is as follows:
If the motor is cooled by the fluid, as indicated by
per.motorCooledByFluid=true
, then the heat dissipated into the medium is
diff --git a/IBPSA/Fluid/Movers/Validation/FlowControlled_dpSystem.mo b/IBPSA/Fluid/Movers/Validation/FlowControlled_dpSystem.mo
index f9200960e3..b44ccc78f2 100644
--- a/IBPSA/Fluid/Movers/Validation/FlowControlled_dpSystem.mo
+++ b/IBPSA/Fluid/Movers/Validation/FlowControlled_dpSystem.mo
@@ -235,5 +235,5 @@ This is for
"),
- Icon(coordinateSystem(extent={{-120,-120},{120,120}})));
+ Icon(coordinateSystem(extent={{-100,-100},{100,100}})));
end FlowControlled_dpSystem;
diff --git a/IBPSA/Fluid/Movers/Validation/NegativePressureOrFlow.mo b/IBPSA/Fluid/Movers/Validation/NegativePressureOrFlow.mo
new file mode 100644
index 0000000000..804108db5e
--- /dev/null
+++ b/IBPSA/Fluid/Movers/Validation/NegativePressureOrFlow.mo
@@ -0,0 +1,75 @@
+within IBPSA.Fluid.Movers.Validation;
+model NegativePressureOrFlow
+ "A validation model that tests the mover behaviour when the pressure rise or flow is negative"
+ extends Modelica.Icons.Example;
+
+ package Medium = IBPSA.Media.Air;
+
+ parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.1
+ "Nominal mass flow rate";
+ parameter Modelica.Units.SI.PressureDifference dp_nominal=sou.p*0.1
+ "Nominal pressure difference";
+
+ IBPSA.Fluid.Movers.SpeedControlled_y fan(
+ redeclare package Medium = Medium,
+ per(pressure(V_flow={0,m_flow_nominal,2*m_flow_nominal}/1.2,
+ dp={0.5*dp_nominal,0.25*dp_nominal,0})),
+ energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial) "Fan"
+ annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+ IBPSA.Fluid.Sources.Boundary_pT sou(
+ redeclare package Medium = Medium,
+ use_p_in=false,
+ p(displayUnit="Pa") = 101325,
+ T=293.15,
+ nPorts=1) "Source with constant pressure"
+ annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
+ IBPSA.Fluid.Sources.Boundary_pT sin(
+ redeclare package Medium = Medium,
+ use_p_in=true,
+ T=293.15,
+ nPorts=1) "Sink with varying pressure"
+ annotation (Placement(transformation(extent={{80,-10},{60,10}})));
+ Modelica.Blocks.Sources.Constant one(k=1) "Constant one"
+ annotation (Placement(transformation(extent={{-40,20},{-20,40}})));
+ Modelica.Blocks.Sources.Ramp ram(
+ height=-sou.p*0.5,
+ duration=3600,
+ offset=sou.p*1.25) "Ramp signal"
+ annotation (Placement(transformation(extent={{40,20},{60,40}})));
+equation
+ connect(one.y, fan.y)
+ annotation (Line(points={{-19,30},{0,30},{0,12}}, color={0,0,127}));
+
+ connect(ram.y, sin.p_in)
+ annotation (Line(points={{61,30},{88,30},{88,8},{82,8}}, color={0,0,127}));
+ connect(fan.port_b, sin.ports[1])
+ annotation (Line(points={{10,0},{60,0}}, color={0,127,255}));
+ connect(sou.ports[1], fan.port_a)
+ annotation (Line(points={{-60,0},{-10,0}}, color={0,127,255}));
+annotation(__Dymola_Commands(file="modelica://IBPSA/Resources/Scripts/Dymola/Fluid/Movers/Validation/NegativePressureOrFlow.mos"
+ "Simulate and plot"),
+ experiment(
+ StopTime=3600,
+ Tolerance=1e-06),
+ Documentation(info="
+
+Without the constraint that
+Wflo = V̇ Δp ≥ 0 ,
+this validation model would produce negative computed mover power
+when the pressure rise or the flow rate is forced to be negative,
+as shown below.
+
+
+
+
+", revisions="
+
+
+June 6, 2022, by Hongxiang Fu:
+First implementation.
+This is for
+IBPSA, #1621 .
+
+
+"));
+end NegativePressureOrFlow;
diff --git a/IBPSA/Fluid/Movers/Validation/package.order b/IBPSA/Fluid/Movers/Validation/package.order
index ebfb64c51f..bc6dd87462 100644
--- a/IBPSA/Fluid/Movers/Validation/package.order
+++ b/IBPSA/Fluid/Movers/Validation/package.order
@@ -3,6 +3,7 @@ ControlledFlowMachineDynamic
FlowControlled_dp
FlowControlled_dpSystem
FlowControlled_m_flow
+NegativePressureOrFlow
PowerExact
PowerSimplified
PumpCurveConstruction
diff --git a/IBPSA/Resources/Images/Fluid/Movers/Validation/NegativePressureOrFlow.png b/IBPSA/Resources/Images/Fluid/Movers/Validation/NegativePressureOrFlow.png
new file mode 100644
index 0000000000..4ab89579a5
Binary files /dev/null and b/IBPSA/Resources/Images/Fluid/Movers/Validation/NegativePressureOrFlow.png differ
diff --git a/IBPSA/Resources/Images/Fluid/Movers/Validation/NegativePressureOrFlow.svg b/IBPSA/Resources/Images/Fluid/Movers/Validation/NegativePressureOrFlow.svg
new file mode 100644
index 0000000000..6b2ad2128c
--- /dev/null
+++ b/IBPSA/Resources/Images/Fluid/Movers/Validation/NegativePressureOrFlow.svg
@@ -0,0 +1,171 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+
+ 1000
+
+ 2000
+
+ 3000
+
+ 4000
+
+
+
+
+
+
+
+ -4E4
+
+ 0E0
+ [W]
+
+
+
+
+
+
+
+ fan.P
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+
+ 1000
+
+ 2000
+
+ 3000
+
+ 4000
+
+
+
+
+
+ -5E4
+
+ 0E0
+
+ 5E4
+ [Pa]
+
+
+
+
+
+
+
+ fan.dpMachine
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+
+ 1000
+
+ 2000
+
+ 3000
+
+ 4000
+
+
+
+
+
+ -2
+
+ 0
+
+ 2
+ [kg/s]
+
+
+
+
+
+
+
+ fan.m_flow
+
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_FlowSystem_Basic.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_FlowSystem_Basic.txt
index 73eee530ad..1eb04a8bc5 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_FlowSystem_Basic.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_FlowSystem_Basic.txt
@@ -1,16 +1,16 @@
-last-generated=2021-07-22
+last-generated=2022-08-12
statistics-initialization=
{
- "nonlinear": "0, 0, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1",
+ "nonlinear": "0, 0, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1",
"numerical Jacobians": "0"
}
statistics-simulation=
{
"linear": "24",
- "nonlinear": "0, 0, 28, 0, 1, 0, 1, 1, 1",
+ "nonlinear": "0, 0, 29, 0, 1, 0, 1, 1, 1",
"number of continuous time states": "74",
"numerical Jacobians": "0"
}
time=[0e+00, 1e+03]
-pmpNorth.m_flow=[0e+00, 3.935724020004272e+00, 5.780118465423584e+00, 5.809208869934082e+00, 5.690212726593018e+00, 5.605245590209961e+00, 5.558028697967529e+00, 5.541175365447998e+00, 5.548319339752197e+00, 5.572464466094971e+00, 5.607481002807617e+00, 5.646369457244873e+00, 5.681735038757324e+00, 5.72193431854248e+00, 5.762411117553711e+00, 5.800228595733643e+00, 5.834198474884033e+00, 5.864230155944824e+00, 5.89064884185791e+00, 5.913696765899658e+00, 5.933657169342041e+00, 5.950778961181641e+00, 5.965269088745117e+00, 5.977297306060791e+00, 5.986998558044434e+00, 5.9944748878479e+00, 5.999798774719238e+00, 6.3902268409729e+00, 6.807069301605225e+00, 6.980991363525391e+00, 7.000593662261963e+00, 6.958019256591797e+00, 6.904678344726562e+00, 6.857888221740723e+00, 6.819098472595215e+00, 6.785050868988037e+00, 6.752820491790771e+00, 6.716575145721436e+00, 6.678925514221191e+00, 6.641193389892578e+00, 6.599531173706055e+00, 6.552486896514893e+00, 6.499288082122803e+00, 6.439398288726807e+00, 6.372330188751221e+00, 6.297479152679443e+00, 6.214093685150146e+00, 6.121401786804199e+00, 6.018572330474854e+00, 5.904721736907959e+00, 5.778929710388184e+00, 4.47222375869751e+00, 1.745699048042297e+00, 5.036171674728394e-01, 9.377436339855194e-02, 1.978908851742744e-02, 1.248623803257942e-02, 1.202286221086979e-02, 1.169310603290796e-02, 1.12301018089056e-02, 1.065045781433582e-02, 9.964198805391788e-03, 9.177707135677338e-03, 8.295927196741104e-03, 7.330215070396662e-03, 6.302594672888517e-03, 5.245842039585114e-03, 4.203033167868853e-03, 3.222585888579488e-03, 2.349353628233075e-03, 1.618833048269153e-03, 1.046625315211713e-03, 6.29027490504086e-04, 3.473415563348681e-04, 1.738473365548998e-04, 7.811961404513568e-05, 3.217469929950312e-05, 1.334789158136118e-05, 6.513616426673252e-06, 5.050420440966263e-06, 5.084565145807574e-06, 4.724148766399594e-06, 3.699633680298575e-06, 2.51979986387596e-06, 1.523279024695512e-06, 8.47593582875561e-07, 4.281127132799156e-07, 2.039845554691055e-07, 9.459198935246604e-08, 3.976019513629581e-08, 1.592701970309918e-08, 7.053657213873521e-09, 3.465641773559014e-09, 1.755281586746094e-09, 8.613355029218894e-10, 4.554035204495932e-10, 2.943428556445582e-10, 2.655828057473997e-10, 2.776880669852488e-10, 3.206765686325497e-10, 3.199153719712911e-10]
-pmpSouth.m_flow=[-0e+00, 3.541325807571411e+00, 5.228494167327881e+00, 5.277606010437012e+00, 5.183747291564941e+00, 5.11500072479248e+00, 5.076899528503418e+00, 5.063858985900879e+00, 5.070789337158203e+00, 5.091943264007568e+00, 5.122228622436523e+00, 5.155235767364502e+00, 5.186134338378906e+00, 5.221257209777832e+00, 5.256392478942871e+00, 5.289219856262207e+00, 5.318800926208496e+00, 5.345064163208008e+00, 5.36826753616333e+00, 5.388591289520264e+00, 5.406257629394531e+00, 5.421462535858154e+00, 5.434368133544922e+00, 5.445109367370605e+00, 5.45379114151001e+00, 5.460492610931396e+00, 5.465270519256592e+00, 5.777584075927734e+00, 6.105603694915771e+00, 6.243701457977295e+00, 6.263343334197998e+00, 6.234053611755371e+00, 6.194809436798096e+00, 6.159224987030029e+00, 6.128802299499512e+00, 6.101316928863525e+00, 6.074681282043457e+00, 6.046490669250488e+00, 6.015296459197998e+00, 5.982007026672363e+00, 5.945979118347168e+00, 5.905919075012207e+00, 5.861014366149902e+00, 5.810750961303711e+00, 5.754717826843262e+00, 5.692442417144775e+00, 5.623343467712402e+00, 5.546819686889648e+00, 5.462211132049561e+00, 5.36879825592041e+00, 5.265806198120117e+00, 4.085400104522705e+00, 1.59485936164856e+00, 4.647243022918701e-01, 8.380109071731567e-02, 1.835094578564167e-02, 1.158771384507418e-02, 1.104761473834515e-02, 1.070825103670359e-02, 1.028449833393097e-02, 9.770855307579041e-03, 9.167879819869995e-03, 8.477493189275265e-03, 7.701354566961527e-03, 6.846601143479347e-03, 5.929496604949236e-03, 4.976001102477312e-03, 4.022412467747927e-03, 3.112199017778039e-03, 2.288640476763248e-03, 1.589175080880523e-03, 1.033950597047806e-03, 6.243749521672726e-04, 3.45907494192943e-04, 1.734857069095597e-04, 7.804632332408801e-05, 3.216224649804644e-05, 1.353727202513255e-05, 7.105197710188804e-06, 5.877755484107183e-06, 6.787786333006807e-06, 7.6057458500145e-06, 6.684305844828486e-06, 4.705678293248639e-06, 2.857600975403329e-06, 1.584779965924099e-06, 7.951966836117208e-07, 3.75594083834585e-07, 1.7240412830688e-07, 7.167732007928862e-08, 2.839781565455723e-08, 1.244594294291801e-08, 6.057523815883314e-09, 3.04289748953579e-09, 1.482835632060642e-09, 7.795025736001548e-10, 5.014584303353331e-10, 4.507444972823293e-10, 4.698463840213662e-10, 5.412420511774485e-10, 5.388779422688117e-10]
+pmpNorth.m_flow=[-4.798053284898018e-18, 3.935721158981323e+00, 5.780116558074951e+00, 5.809209823608398e+00, 5.690202236175537e+00, 5.605241298675537e+00, 5.558027267456055e+00, 5.541175842285156e+00, 5.548302173614502e+00, 5.572486400604248e+00, 5.607396602630615e+00, 5.646417617797852e+00, 5.68189525604248e+00, 5.721853256225586e+00, 5.762373447418213e+00, 5.800230503082275e+00, 5.834185600280762e+00, 5.864241123199463e+00, 5.890644073486328e+00, 5.913690090179443e+00, 5.933657169342041e+00, 5.950785636901855e+00, 5.965280055999756e+00, 5.977309226989746e+00, 5.987007141113281e+00, 5.994473934173584e+00, 5.999794006347656e+00, 6.390223026275635e+00, 6.80706262588501e+00, 6.98099422454834e+00, 7.000592231750488e+00, 6.95805025100708e+00, 6.904640674591064e+00, 6.857924938201904e+00, 6.819052696228027e+00, 6.785079479217529e+00, 6.752790927886963e+00, 6.716523170471191e+00, 6.678958415985107e+00, 6.641191482543945e+00, 6.599569320678711e+00, 6.55250358581543e+00, 6.499250411987305e+00, 6.439381122589111e+00, 6.372344493865967e+00, 6.297481060028076e+00, 6.214086055755615e+00, 6.121389865875244e+00, 6.018561840057373e+00, 5.904717922210693e+00, 5.778934001922607e+00, 4.472177982330322e+00, 1.745278358459473e+00, 5.024964213371277e-01, 9.307030588388443e-02, 1.901817880570889e-02, 1.264136657118797e-02, 1.200185623019934e-02, 1.16927158087492e-02, 1.123250368982553e-02, 1.065156608819962e-02, 9.965270757675171e-03, 9.178410284221172e-03, 8.296509273350239e-03, 7.330868858844042e-03, 6.302871275693178e-03, 5.245259962975979e-03, 4.201991483569145e-03, 3.222420811653137e-03, 2.350914524868131e-03, 1.620577648282051e-03, 1.047386089339852e-03, 6.287603755481541e-04, 3.466466441750526e-04, 1.73381413333118e-04, 7.79970214352943e-05, 3.219255449948832e-05, 1.337109097221401e-05, 6.544453299284214e-06, 5.092298124509398e-06, 5.140294888406061e-06, 4.762345270137303e-06, 3.713541673278087e-06, 2.526684738768381e-06, 1.521332023912692e-06, 8.436474558948248e-07, 4.318564208460884e-07, 2.024092253805065e-07, 9.277906087845622e-08, 4.126753339050993e-08, 1.641576297117808e-08, 6.557832055165136e-09, 3.134358328438225e-09, 1.678908234659104e-09, 9.357168373469449e-10, 5.442942208055968e-10, 3.604418985503344e-10, 2.902829643325333e-10, 2.802219289943508e-10, 2.951387190197607e-10, 3.003797210965331e-10]
+pmpSouth.m_flow=[-4.231031314750574e-18, 3.541323184967041e+00, 5.228492259979248e+00, 5.277607440948486e+00, 5.183738231658936e+00, 5.114996910095215e+00, 5.076898574829102e+00, 5.063859462738037e+00, 5.070775508880615e+00, 5.09196138381958e+00, 5.122159481048584e+00, 5.155277252197266e+00, 5.186259746551514e+00, 5.221194267272949e+00, 5.256364345550537e+00, 5.289220809936523e+00, 5.318789482116699e+00, 5.34507417678833e+00, 5.368262767791748e+00, 5.388584613800049e+00, 5.406256675720215e+00, 5.421468257904053e+00, 5.434378623962402e+00, 5.445120811462402e+00, 5.453798770904541e+00, 5.46049165725708e+00, 5.465266227722168e+00, 5.777580261230469e+00, 6.105597972869873e+00, 6.243703842163086e+00, 6.263341426849365e+00, 6.234074592590332e+00, 6.194782257080078e+00, 6.15925121307373e+00, 6.128768920898438e+00, 6.101337909698486e+00, 6.074659824371338e+00, 6.04365062713623e+00, 6.012744426727295e+00, 5.980926990509033e+00, 5.945638179779053e+00, 5.905815601348877e+00, 5.860947608947754e+00, 5.810722351074219e+00, 5.754720211029053e+00, 5.692437648773193e+00, 5.623332500457764e+00, 5.546806812286377e+00, 5.46220064163208e+00, 5.368793964385986e+00, 5.26580810546875e+00, 4.085356712341309e+00, 1.594476461410522e+00, 4.636799991130829e-01, 8.308113366365433e-02, 1.691985130310059e-02, 1.125625241547823e-02, 1.0703488253057e-02, 1.045004930347204e-02, 1.006650552153587e-02, 9.579313918948174e-03, 9.001354686915874e-03, 8.335450664162636e-03, 7.584122940897942e-03, 6.753960624337196e-03, 5.859667900949717e-03, 4.926009569317102e-03, 3.989060409367085e-03, 3.092605154961348e-03, 2.279580105096102e-03, 1.585763529874384e-03, 1.032536616548896e-03, 6.233266904018819e-04, 3.449780342634767e-04, 1.729613286443055e-04, 7.7911710832268e-05, 3.217799894628115e-05, 1.336847617494641e-05, 6.543617018905934e-06, 5.091404091217555e-06, 5.138277174410177e-06, 4.757794158649631e-06, 3.705546987475827e-06, 2.515695541660534e-06, 1.509274625277612e-06, 8.325258136210323e-07, 4.231176831126504e-07, 1.965536000625434e-07, 8.917609051195541e-08, 3.923194924482232e-08, 1.543500083300842e-08, 6.10193584549279e-09, 2.889035455311273e-09, 1.534831040039819e-09, 8.494921988067006e-10, 4.913029427733306e-10, 3.238253554194159e-10, 2.598039561263477e-10, 2.500312179520847e-10, 2.626901751678901e-10, 2.668206489087055e-10]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_FlowSystem_Simplified1.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_FlowSystem_Simplified1.txt
index 1403fb5619..e306a99205 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_FlowSystem_Simplified1.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_FlowSystem_Simplified1.txt
@@ -1,16 +1,16 @@
-last-generated=2021-12-17
+last-generated=2022-08-12
statistics-initialization=
{
- "nonlinear": "0, 0, 27, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1",
+ "nonlinear": "0, 0, 28, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1",
"numerical Jacobians": "0"
}
statistics-simulation=
{
"linear": "24",
- "nonlinear": "0, 0, 7, 0, 1, 0, 1, 1, 1",
+ "nonlinear": "0, 0, 8, 0, 1, 0, 1, 1, 1",
"number of continuous time states": "74",
"numerical Jacobians": "0"
}
time=[0e+00, 1e+03]
-pmpNorth.m_flow=[0e+00, 3.935720205307007e+00, 5.780133724212646e+00, 5.809316635131836e+00, 5.690308094024658e+00, 5.605256080627441e+00, 5.558041572570801e+00, 5.541244506835938e+00, 5.548245429992676e+00, 5.572551250457764e+00, 5.607280731201172e+00, 5.646827697753906e+00, 5.681689262390137e+00, 5.721626758575439e+00, 5.762426376342773e+00, 5.800256729125977e+00, 5.834187984466553e+00, 5.86425256729126e+00, 5.890666007995605e+00, 5.913703918457031e+00, 5.933653831481934e+00, 5.950782775878906e+00, 5.965287685394287e+00, 5.977311134338379e+00, 5.987000465393066e+00, 5.994467258453369e+00, 5.999790668487549e+00, 6.390214920043945e+00, 6.807059764862061e+00, 6.980985641479492e+00, 7.000590324401855e+00, 6.958016872406006e+00, 6.904677391052246e+00, 6.857887268066406e+00, 6.819073677062988e+00, 6.785080432891846e+00, 6.752789497375488e+00, 6.716590881347656e+00, 6.678966045379639e+00, 6.641195297241211e+00, 6.599578380584717e+00, 6.552490234375e+00, 6.499238014221191e+00, 6.439386367797852e+00, 6.372347354888916e+00, 6.297480583190918e+00, 6.21408224105835e+00, 6.121385097503662e+00, 6.018558025360107e+00, 5.904716968536377e+00, 5.778936862945557e+00, 4.472194194793701e+00, 1.755364298820496e+00, 5.389235019683838e-01, 1.13118477165699e-01, 2.319884113967419e-02, 1.447523850947618e-02, 1.36187132447958e-02, 1.283797901123762e-02, 1.190690789371729e-02, 1.085835322737694e-02, 9.728347882628441e-03, 8.548629470169544e-03, 7.349274586886168e-03, 6.163414567708969e-03, 5.026957485824823e-03, 3.973906394094229e-03, 3.033480374142528e-03, 2.22682161256671e-03, 1.564382459037006e-03, 1.045687939040363e-03, 6.605773814953864e-04, 3.904890618287027e-04, 2.132766385329887e-04, 1.060528302332386e-04, 4.74978587590158e-05, 1.953692481038161e-05, 8.101289495243691e-06, 3.952095539716538e-06, 3.063812528125709e-06, 3.085667913182988e-06, 2.870380740205292e-06, 2.256014795420924e-06, 1.546691350995388e-06, 9.415531962986279e-07, 5.31934347236529e-07, 2.761569533049624e-07, 1.340955293471779e-07, 6.432684784840603e-08, 2.904303642026207e-08, 1.20297185546292e-08, 5.296008076527414e-09, 2.740162541314817e-09, 1.521957559980081e-09, 8.466428114140001e-10, 4.892878324724848e-10, 3.357167321915711e-10, 2.822319600248591e-10, 3.027934014632194e-10, 3.440613349781074e-10, 3.622056266028295e-10]
-pmpSouth.m_flow=[0e+00, 3.541495084762573e+00, 5.228507995605469e+00, 5.277704238891602e+00, 5.183835029602051e+00, 5.115010261535645e+00, 5.076910018920898e+00, 5.063915729522705e+00, 5.070728302001953e+00, 5.092014789581299e+00, 5.122064113616943e+00, 5.155633926391602e+00, 5.186098575592041e+00, 5.221019268035889e+00, 5.256403923034668e+00, 5.289239406585693e+00, 5.31879186630249e+00, 5.345083236694336e+00, 5.368279457092285e+00, 5.388595104217529e+00, 5.40625524520874e+00, 5.421467781066895e+00, 5.434386730194092e+00, 5.445122718811035e+00, 5.453792572021484e+00, 5.460485458374023e+00, 5.465262889862061e+00, 5.777573585510254e+00, 6.105595588684082e+00, 6.243696689605713e+00, 6.263339996337891e+00, 6.234051704406738e+00, 6.194808483123779e+00, 6.159224033355713e+00, 6.1287841796875e+00, 6.101338386535645e+00, 6.074658393859863e+00, 6.046497344970703e+00, 6.015350818634033e+00, 5.982001304626465e+00, 5.945986747741699e+00, 5.90592098236084e+00, 5.860984802246094e+00, 5.81074857711792e+00, 5.754732131958008e+00, 5.692440986633301e+00, 5.623331546783447e+00, 5.546803951263428e+00, 5.462198734283447e+00, 5.368794918060303e+00, 5.265812397003174e+00, 4.085372447967529e+00, 1.604533910751343e+00, 4.961360096931458e-01, 1.001310348510742e-01, 2.150476165115833e-02, 1.347402017563581e-02, 1.256338972598314e-02, 1.181401219218969e-02, 1.097079645842314e-02, 1.003780774772167e-02, 9.035807102918625e-03, 7.986915297806263e-03, 6.913681514561176e-03, 5.842539481818676e-03, 4.804005846381187e-03, 3.828926710411906e-03, 2.945979591459036e-03, 2.178238704800606e-03, 1.539812772534788e-03, 1.034499029628932e-03, 6.560489418916404e-04, 3.888909704983234e-04, 2.127968182321638e-04, 1.059337228070945e-04, 4.747391722048633e-05, 1.95328702830011e-05, 8.216881724365521e-06, 4.311325483286055e-06, 3.566025952750351e-06, 4.120052835787646e-06, 4.623388122126926e-06, 4.079937298229197e-06, 2.893996452257852e-06, 1.772498421814817e-06, 1.000239763015998e-06, 5.172797159502807e-07, 2.497514515198418e-07, 1.189396385825603e-07, 5.323941465462667e-08, 2.184037306562914e-08, 9.517164833994229e-09, 4.873428771645649e-09, 2.679789279369515e-09, 1.476847089065814e-09, 8.463434952865612e-10, 5.764632104998668e-10, 4.81618855907584e-10, 5.140469716558016e-10, 5.81658443632449e-10, 6.102745531144649e-10]
+pmpNorth.m_flow=[2.378667348285082e-27, 3.935720920562744e+00, 5.780197620391846e+00, 5.809207916259766e+00, 5.690208911895752e+00, 5.605244636535645e+00, 5.558028221130371e+00, 5.54117488861084e+00, 5.548323154449463e+00, 5.572461128234863e+00, 5.607491493225098e+00, 5.646372318267822e+00, 5.681722164154053e+00, 5.721938610076904e+00, 5.762417316436768e+00, 5.800228595733643e+00, 5.834200382232666e+00, 5.864231109619141e+00, 5.890649318695068e+00, 5.913698673248291e+00, 5.933658599853516e+00, 5.950778484344482e+00, 5.965266704559326e+00, 5.977293968200684e+00, 5.986995220184326e+00, 5.994473457336426e+00, 5.999799728393555e+00, 6.390233039855957e+00, 6.807071685791016e+00, 6.981000423431396e+00, 7.000596523284912e+00, 6.958053112030029e+00, 6.904642105102539e+00, 6.857927799224854e+00, 6.819052696228027e+00, 6.785079956054688e+00, 6.752789974212646e+00, 6.71652364730835e+00, 6.678958892822266e+00, 6.641191482543945e+00, 6.599569797515869e+00, 6.55250358581543e+00, 6.499249458312988e+00, 6.439381122589111e+00, 6.372344493865967e+00, 6.297480583190918e+00, 6.214085578918457e+00, 6.121389865875244e+00, 6.018561840057373e+00, 5.904717922210693e+00, 5.778934001922607e+00, 4.472178936004639e+00, 1.755366086959839e+00, 5.39050817489624e-01, 1.113728508353233e-01, 2.27554515004158e-02, 1.460924651473761e-02, 1.360122580081224e-02, 1.283691171556711e-02, 1.191046182066202e-02, 1.086067594587803e-02, 9.730293415486813e-03, 8.549905382096767e-03, 7.350257597863674e-03, 6.164310034364462e-03, 5.027292296290398e-03, 3.973382525146008e-03, 3.033255226910114e-03, 2.227202290669084e-03, 1.565223908983171e-03, 1.046526595018804e-03, 6.607057875953615e-04, 3.901496238540858e-04, 2.129078784491867e-04, 1.058724665199406e-04, 4.746972990687937e-05, 1.955745574377943e-05, 8.117656761896797e-06, 3.971438673033845e-06, 3.089183792326367e-06, 3.119336270174244e-06, 2.893134478654247e-06, 2.264911017846316e-06, 1.547914393995597e-06, 9.42044437124423e-07, 5.32124659002875e-07, 2.755375589913456e-07, 1.355953145321109e-07, 6.449749889725354e-08, 2.785592201348663e-08, 1.207603705921656e-08, 5.773486577709264e-09, 2.963616241302702e-09, 1.438397068120878e-09, 7.018946535097825e-10, 3.943382842486187e-10, 3.08703923534992e-10, 3.318858521339507e-10, 3.757141819882293e-10, 3.648207291817585e-10, 3.5140465537431e-10]
+pmpSouth.m_flow=[2.097830940096457e-27, 3.541495800018311e+00, 5.228565692901611e+00, 5.277605533599854e+00, 5.183743953704834e+00, 5.114999771118164e+00, 5.07689905166626e+00, 5.063858509063721e+00, 5.070792198181152e+00, 5.091940402984619e+00, 5.122237205505371e+00, 5.155238151550293e+00, 5.186124324798584e+00, 5.221260547637939e+00, 5.256397247314453e+00, 5.289219856262207e+00, 5.318802833557129e+00, 5.345065116882324e+00, 5.368268013000488e+00, 5.388593196868896e+00, 5.406259059906006e+00, 5.421462059020996e+00, 5.434366226196289e+00, 5.445106029510498e+00, 5.453787803649902e+00, 5.460491180419922e+00, 5.465271472930908e+00, 5.777589321136475e+00, 6.105605602264404e+00, 6.243709087371826e+00, 6.263345241546631e+00, 6.234076976776123e+00, 6.194783210754395e+00, 6.159253597259521e+00, 6.128768920898438e+00, 6.101338386535645e+00, 6.07465934753418e+00, 6.043651103973389e+00, 6.012744426727295e+00, 5.980926990509033e+00, 5.945638656616211e+00, 5.905815601348877e+00, 5.860947132110596e+00, 5.810722827911377e+00, 5.754720687866211e+00, 5.692437648773193e+00, 5.623332500457764e+00, 5.546806335449219e+00, 5.462200164794922e+00, 5.368793964385986e+00, 5.265808582305908e+00, 4.085357666015625e+00, 1.604535579681396e+00, 4.962548911571503e-01, 9.857325255870819e-02, 2.02147401869297e-02, 1.300783455371857e-02, 1.214428152889013e-02, 1.15048261359334e-02, 1.072544790804386e-02, 9.837360121309757e-03, 8.874949999153614e-03, 7.861271500587463e-03, 6.819440517574549e-03, 5.775253754109144e-03, 4.75816335529089e-03, 3.799065481871367e-03, 2.928343368694186e-03, 2.169059356674552e-03, 1.53585069347173e-03, 1.033160951919854e-03, 6.553078419528902e-04, 3.88249900424853e-04, 2.123387093888596e-04, 1.057312110788189e-04, 4.74412772746291e-05, 1.95526208699448e-05, 8.116790013446007e-06, 3.971161277149804e-06, 3.088887524427264e-06, 3.118667791568441e-06, 2.891621761591523e-06, 2.262230736960191e-06, 1.544182623547385e-06, 9.378476306665107e-07, 5.280980417410319e-07, 2.722426017953694e-07, 1.331887915512198e-07, 6.289017306926326e-08, 2.692812195448369e-08, 1.156176399064179e-08, 5.471314512561776e-09, 2.77955880534364e-09, 1.335580535055669e-09, 6.456536416621361e-10, 3.597029341051439e-10, 2.795338682748394e-10, 2.986622338330136e-10, 3.363630762809322e-10, 3.252412783538716e-10, 3.122276881484254e-10]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_FlowSystem_Simplified2.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_FlowSystem_Simplified2.txt
index dee5cc313f..3ae8e521e5 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_FlowSystem_Simplified2.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_FlowSystem_Simplified2.txt
@@ -1,16 +1,16 @@
-last-generated=2021-07-22
+last-generated=2022-08-12
statistics-initialization=
{
- "nonlinear": "0, 0, 8, 0, 0, 0, 0, 1, 0, 1, 1, 1",
+ "nonlinear": "0, 0, 10, 0, 0, 1, 0, 1, 1, 1",
"numerical Jacobians": "0"
}
statistics-simulation=
{
"linear": "24",
- "nonlinear": "0, 0, 8, 0, 1, 0, 1, 1, 1",
+ "nonlinear": "0, 0, 10, 0, 1, 0, 1, 1, 1",
"number of continuous time states": "74",
"numerical Jacobians": "0"
}
time=[0e+00, 1e+03]
-pmpNorth.m_flow=[0e+00, 3.935720205307007e+00, 5.780133724212646e+00, 5.809339046478271e+00, 5.690319538116455e+00, 5.605257511138916e+00, 5.55803918838501e+00, 5.541248321533203e+00, 5.548248767852783e+00, 5.572531700134277e+00, 5.607296466827393e+00, 5.646836757659912e+00, 5.681631565093994e+00, 5.721641063690186e+00, 5.762433528900146e+00, 5.80025577545166e+00, 5.834188938140869e+00, 5.864257335662842e+00, 5.890666961669922e+00, 5.913698673248291e+00, 5.933649063110352e+00, 5.950788974761963e+00, 5.965288162231445e+00, 5.977309703826904e+00, 5.986999034881592e+00, 5.994466781616211e+00, 5.999791145324707e+00, 6.390215396881104e+00, 6.807060241699219e+00, 6.98098611831665e+00, 7.000590324401855e+00, 6.958017349243164e+00, 6.904677867889404e+00, 6.857887268066406e+00, 6.819098472595215e+00, 6.785050392150879e+00, 6.752820491790771e+00, 6.719400405883789e+00, 6.682451725006104e+00, 6.642800807952881e+00, 6.600092887878418e+00, 6.552662372589111e+00, 6.499347686767578e+00, 6.439424991607666e+00, 6.372344493865967e+00, 6.297487258911133e+00, 6.214098453521729e+00, 6.121405124664307e+00, 6.018575191497803e+00, 5.90472412109375e+00, 5.778931617736816e+00, 4.472238540649414e+00, 1.755513787269592e+00, 5.399792194366455e-01, 1.109921261668205e-01, 2.332992479205132e-02, 1.434099860489368e-02, 1.324166916310787e-02, 1.233700476586819e-02, 1.133059523999691e-02, 1.023909635841846e-02, 9.090508334338665e-03, 7.915210910141468e-03, 6.742837373167276e-03, 5.604756064713001e-03, 4.533039871603251e-03, 3.555943956598639e-03, 2.696012612432241e-03, 1.967720221728086e-03, 1.375694642774761e-03, 9.163999347947538e-04, 5.774415913037956e-04, 3.40738333761692e-04, 1.858780160546303e-04, 9.235068137058988e-05, 4.133432958042249e-05, 1.699324457149487e-05, 7.145971721911337e-06, 3.749623374460498e-06, 3.102113623754121e-06, 3.585212652978953e-06, 4.025710950372741e-06, 3.554789145709947e-06, 2.523844386814744e-06, 1.555019593979523e-06, 8.813794920570217e-07, 4.553525911887846e-07, 2.243817078806387e-07, 1.079659384117804e-07, 4.724099511577151e-08, 2.007485910837659e-08, 9.517936661040949e-09, 4.960690080935137e-09, 2.598255832708674e-09, 1.32336974711933e-09, 7.331117934938902e-10, 5.171057471109464e-10, 4.826375965549801e-10, 5.787811341306792e-10, 6.664385154842023e-10, 6.537528851602303e-10]
-pmpSouth.m_flow=[0e+00, 3.541494846343994e+00, 5.228507995605469e+00, 5.277724742889404e+00, 5.183845520019531e+00, 5.115011692047119e+00, 5.076908111572266e+00, 5.063919067382812e+00, 5.070731163024902e+00, 5.09199857711792e+00, 5.122076988220215e+00, 5.155642032623291e+00, 5.186053276062012e+00, 5.221030235290527e+00, 5.256409645080566e+00, 5.289238452911377e+00, 5.318792343139648e+00, 5.345087051391602e+00, 5.368280410766602e+00, 5.388591289520264e+00, 5.406251430511475e+00, 5.421473026275635e+00, 5.434386730194092e+00, 5.445120811462402e+00, 5.45379114151001e+00, 5.460484981536865e+00, 5.465263366699219e+00, 5.777574062347412e+00, 6.10559606552124e+00, 6.243696689605713e+00, 6.263340473175049e+00, 6.234051704406738e+00, 6.194808483123779e+00, 6.159224033355713e+00, 6.128801822662354e+00, 6.101316452026367e+00, 6.074681282043457e+00, 6.043686866760254e+00, 6.0127272605896e+00, 5.980929851531982e+00, 5.945608139038086e+00, 5.905802726745605e+00, 5.86097526550293e+00, 5.810733795166016e+00, 5.754707813262939e+00, 5.692437171936035e+00, 5.623340129852295e+00, 5.546817779541016e+00, 5.462209224700928e+00, 5.368796825408936e+00, 5.265804290771484e+00, 4.085411548614502e+00, 1.604670405387878e+00, 4.971215724945068e-01, 9.823114424943924e-02, 1.976418308913708e-02, 1.213430240750313e-02, 1.137304585427046e-02, 1.070967875421047e-02, 9.926198050379753e-03, 9.053780697286129e-03, 8.120154961943626e-03, 7.14966282248497e-03, 6.164523307234049e-03, 5.189243704080582e-03, 4.251009318977594e-03, 3.376426408067346e-03, 2.589693060144782e-03, 1.909626764245331e-03, 1.346704782918096e-03, 9.033267269842327e-04, 5.721885245293379e-04, 3.388938785064965e-04, 1.85326105565764e-04, 9.221399523084983e-05, 4.130689922021702e-05, 1.698860432952642e-05, 7.043994173727697e-06, 3.436766519371304e-06, 2.664742396518704e-06, 2.683979118955904e-06, 2.496813067409676e-06, 1.961035650310805e-06, 1.342452037533803e-06, 8.188010269805091e-07, 4.617573381437978e-07, 2.373906511365931e-07, 1.162826208656043e-07, 5.554328552648258e-08, 2.409326960162161e-08, 1.013860462251159e-08, 4.756614213619059e-09, 2.452476222103428e-09, 1.270947125320276e-09, 6.408560904169747e-10, 3.517778290884621e-10, 2.461296999545226e-10, 2.281352190491859e-10, 2.719976743836838e-10, 3.117085756176863e-10, 3.046122520888872e-10]
+pmpNorth.m_flow=[2.184594956241301e-15, 3.93571949005127e+00, 5.780115604400635e+00, 5.809210300445557e+00, 5.690201759338379e+00, 5.605241298675537e+00, 5.558027744293213e+00, 5.541175842285156e+00, 5.54830265045166e+00, 5.57248592376709e+00, 5.607398986816406e+00, 5.646416187286377e+00, 5.681888103485107e+00, 5.721856117248535e+00, 5.762374401092529e+00, 5.800230503082275e+00, 5.83418607711792e+00, 5.864240646362305e+00, 5.890644073486328e+00, 5.913690090179443e+00, 5.933657169342041e+00, 5.950785636901855e+00, 5.965280055999756e+00, 5.977309226989746e+00, 5.987007141113281e+00, 5.994473934173584e+00, 5.999794006347656e+00, 6.390220165252686e+00, 6.807062149047852e+00, 6.980987071990967e+00, 7.000590324401855e+00, 6.958017349243164e+00, 6.904678344726562e+00, 6.857886791229248e+00, 6.819098949432373e+00, 6.785050392150879e+00, 6.752820014953613e+00, 6.716577529907227e+00, 6.678925037384033e+00, 6.641193866729736e+00, 6.599531173706055e+00, 6.552485942840576e+00, 6.499286651611328e+00, 6.43939733505249e+00, 6.372331619262695e+00, 6.297479629516602e+00, 6.214093685150146e+00, 6.121401309967041e+00, 6.018571853637695e+00, 5.904721736907959e+00, 5.778929710388184e+00, 4.472226142883301e+00, 1.755295991897583e+00, 5.388302803039551e-01, 1.100064665079117e-01, 2.136855386197567e-02, 1.373832765966654e-02, 1.281266938894987e-02, 1.200071442872286e-02, 1.106668543070555e-02, 1.00282970815897e-02, 8.925735019147396e-03, 7.790409028530121e-03, 6.652123760432005e-03, 5.542024970054626e-03, 4.491506610065699e-03, 3.530323272570968e-03, 2.681469079107046e-03, 1.960165333002806e-03, 1.372430706396699e-03, 9.150321129709482e-04, 5.765304085798562e-04, 3.401842841412872e-04, 1.856021553976461e-04, 9.226070687873289e-05, 4.133603579248302e-05, 1.701491419225931e-05, 7.058180472085951e-06, 3.45237231158535e-06, 2.686547759367386e-06, 2.713838512136135e-06, 2.517038183214027e-06, 1.972262907656841e-06, 1.344852989859646e-06, 8.227568173424515e-07, 4.639928192773368e-07, 2.405738541710889e-07, 1.200843229298698e-07, 5.574095496285736e-08, 2.428775758289703e-08, 1.115262193707167e-08, 5.438469230512055e-09, 2.541622468044125e-09, 1.127090865082891e-09, 5.55060553075748e-10, 3.785734226102733e-10, 3.658716107857174e-10, 3.745532495269543e-10, 3.361970979387507e-10, 3.206156173884978e-10, 3.19502257983828e-10]
+pmpSouth.m_flow=[1.916622107333774e-15, 3.541494369506836e+00, 5.228491306304932e+00, 5.277607440948486e+00, 5.183737754821777e+00, 5.114996910095215e+00, 5.076898574829102e+00, 5.063859462738037e+00, 5.070775985717773e+00, 5.091960906982422e+00, 5.122161388397217e+00, 5.155275821685791e+00, 5.186254501342773e+00, 5.221196174621582e+00, 5.256364822387695e+00, 5.289220809936523e+00, 5.318789958953857e+00, 5.34507417678833e+00, 5.368262767791748e+00, 5.388584613800049e+00, 5.406256675720215e+00, 5.421468257904053e+00, 5.434378623962402e+00, 5.445120811462402e+00, 5.453798770904541e+00, 5.46049165725708e+00, 5.465266227722168e+00, 5.777578353881836e+00, 6.105597496032715e+00, 6.243697643280029e+00, 6.263340473175049e+00, 6.234051704406738e+00, 6.194808959960938e+00, 6.159224033355713e+00, 6.128802299499512e+00, 6.101316452026367e+00, 6.074681282043457e+00, 6.04368782043457e+00, 6.012726783752441e+00, 5.980929851531982e+00, 5.945608139038086e+00, 5.905802249908447e+00, 5.860974311828613e+00, 5.810732841491699e+00, 5.754709243774414e+00, 5.692437648773193e+00, 5.623340129852295e+00, 5.546817302703857e+00, 5.462209224700928e+00, 5.368796825408936e+00, 5.265804767608643e+00, 4.08540153503418e+00, 1.604472160339355e+00, 4.960491061210632e-01, 9.735853224992752e-02, 1.889336481690407e-02, 1.216991432011127e-02, 1.138525176793337e-02, 1.070831716060638e-02, 9.927200153470039e-03, 9.053957648575306e-03, 8.120258338749409e-03, 7.14965583756566e-03, 6.164487451314926e-03, 5.189286079257727e-03, 4.250666126608849e-03, 3.376197069883347e-03, 2.589751966297626e-03, 1.909850398078561e-03, 1.34723202791065e-03, 9.036430274136364e-04, 5.719531327486038e-04, 3.385768795851618e-04, 1.85120981768705e-04, 9.214141027769074e-05, 4.131204332225025e-05, 1.701084693195298e-05, 7.05745151208248e-06, 3.452139480941696e-06, 2.686298785192776e-06, 2.713275989663089e-06, 2.515764663257869e-06, 1.970003950191312e-06, 1.341712049907073e-06, 8.192017162400589e-07, 4.605810488556017e-07, 2.377710046630455e-07, 1.180006279355439e-07, 5.437675554276211e-08, 2.348910044247532e-08, 1.068090238476316e-08, 5.153934168333762e-09, 2.382753550023153e-09, 1.045462605375747e-09, 5.097116062557916e-10, 3.444726448531554e-10, 3.302332296506449e-10, 3.357316369356766e-10, 2.996066728044866e-10, 2.843671409458182e-10, 2.823018208086836e-10]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_FlowSystem_Simplified3.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_FlowSystem_Simplified3.txt
index c1b7b77cfe..28173cbe58 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_FlowSystem_Simplified3.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_FlowSystem_Simplified3.txt
@@ -1,16 +1,16 @@
-last-generated=2021-07-22
+last-generated=2022-08-12
statistics-initialization=
{
- "nonlinear": "0, 0, 1, 1, 6, 1, 1",
+ "nonlinear": "0, 0, 1, 1, 5, 1, 1",
"numerical Jacobians": "0"
}
statistics-simulation=
{
"linear": "24",
- "nonlinear": "0, 0, 1, 1, 6, 1, 1",
+ "nonlinear": "0, 0, 1, 1, 5, 1, 1",
"number of continuous time states": "74",
"numerical Jacobians": "0"
}
time=[0e+00, 1e+03]
-pmpNorth.m_flow=[0e+00, 3.935693740844727e+00, 5.780270576477051e+00, 5.809206962585449e+00, 5.69027042388916e+00, 5.605422496795654e+00, 5.558379650115967e+00, 5.541720867156982e+00, 5.549016952514648e+00, 5.573320865631104e+00, 5.608416080474854e+00, 5.647425651550293e+00, 5.682847023010254e+00, 5.723065853118896e+00, 5.763582229614258e+00, 5.801438808441162e+00, 5.835427761077881e+00, 5.865483283996582e+00, 5.891916751861572e+00, 5.914977073669434e+00, 5.934952735900879e+00, 5.952088356018066e+00, 5.966590404510498e+00, 5.978627681732178e+00, 5.988334655761719e+00, 5.99581241607666e+00, 6.001137256622314e+00, 6.390820980072021e+00, 6.807203769683838e+00, 6.981042861938477e+00, 7.000621795654297e+00, 6.958031177520752e+00, 6.904683113098145e+00, 6.857889652252197e+00, 6.819098949432373e+00, 6.785050868988037e+00, 6.752820491790771e+00, 6.716576099395752e+00, 6.678925514221191e+00, 6.641193389892578e+00, 6.599531650543213e+00, 6.552486419677734e+00, 6.499286651611328e+00, 6.439396381378174e+00, 6.372331619262695e+00, 6.297479629516602e+00, 6.214093208312988e+00, 6.121401309967041e+00, 6.018571853637695e+00, 5.904721260070801e+00, 5.778929710388184e+00, 4.472226619720459e+00, 1.75528609752655e+00, 5.383800864219666e-01, 1.038834750652313e-01, 1.018001232296228e-02, 8.445896091870964e-04, 6.914973346283659e-05, 1.267696825379971e-05, 4.150614927311835e-07, 3.211937666947051e-07, 2.337211491010294e-08, -1.528713156062622e-08, 8.833992204415608e-09, 2.536487686555233e-09, -4.1595205058087e-10, -6.749460434996024e-10, -1.510212926936205e-10, 1.844228936231929e-10, 8.397656181546864e-11, 1.22932402105147e-11, -5.460820164115976e-12, -4.940708866335575e-12, -1.610608456499574e-12, 1.005303154090476e-13, 3.222165102009095e-13, 7.61355835690071e-14, 2.982663258155435e-15, 1.753511990235888e-16, 2.144013104812535e-17, 3.319872017688713e-18, 1.109473263982035e-18, 1.029379291048389e-19, 1.487467713753708e-19, -2.508131170708688e-20, 4.082409680292246e-20, 1.353064826925646e-21, 1.966255975858997e-21, 1.675383749763246e-21, -6.082711307525707e-22, -5.928085987295739e-22, 6.904216160528978e-22, 4.28705941449605e-22, 6.520026889516668e-23, -1.734451306696141e-22, -2.512028976617596e-22, -1.749019863676018e-22, -2.442181721400694e-25, 1.68429502547121e-22, 1.830158814725685e-22, 2.528072324837001e-23]
-pmpSouth.m_flow=[0e+00, 3.541471004486084e+00, 5.228631973266602e+00, 5.277604579925537e+00, 5.183800220489502e+00, 5.115163803100586e+00, 5.077221393585205e+00, 5.064357757568359e+00, 5.071428775787354e+00, 5.09272575378418e+00, 5.123085021972656e+00, 5.156198501586914e+00, 5.187148094177246e+00, 5.222291946411133e+00, 5.257462978363037e+00, 5.290323734283447e+00, 5.319921970367432e+00, 5.346206665039062e+00, 5.369422912597656e+00, 5.389757633209229e+00, 5.407437801361084e+00, 5.42265510559082e+00, 5.435572147369385e+00, 5.446321487426758e+00, 5.455008029937744e+00, 5.461710929870605e+00, 5.466489791870117e+00, 5.778122901916504e+00, 6.105725288391113e+00, 6.243747711181641e+00, 6.263368606567383e+00, 6.234064102172852e+00, 6.194813251495361e+00, 6.159226417541504e+00, 6.12880277633667e+00, 6.101316928863525e+00, 6.074681282043457e+00, 6.043686866760254e+00, 6.0127272605896e+00, 5.980929851531982e+00, 5.945608615875244e+00, 5.905802726745605e+00, 5.860974311828613e+00, 5.810732364654541e+00, 5.754709720611572e+00, 5.692437648773193e+00, 5.623340129852295e+00, 5.546817302703857e+00, 5.46220874786377e+00, 5.368796825408936e+00, 5.265804767608643e+00, 4.085402011871338e+00, 1.604462862014771e+00, 4.956247210502625e-01, 9.160299599170685e-02, 8.995025418698788e-03, 7.480328786186874e-04, 6.144084909465164e-05, 1.131113458541222e-05, 3.723088752849435e-07, 2.899769526720775e-07, 2.126237319544089e-08, -1.402947980011504e-08, 8.186288980027712e-09, 2.375024843459528e-09, -3.936447834362866e-10, -6.454760059781961e-10, -1.45855619249069e-10, 1.796893328576132e-10, 8.243496857351928e-11, 1.21402844374674e-11, -5.417455546663508e-12, -4.917349080008071e-12, -1.606429616066163e-12, 1.004002450296672e-13, 3.220294853261557e-13, 7.611739607756365e-14, 2.982355573437345e-15, 1.753393802669966e-16, 2.143814581465523e-17, 3.319183803419069e-18, 1.108911918538842e-18, 1.028200170934589e-19, 1.483993813674927e-19, -2.497293812214536e-20, 4.052391425109668e-20, 1.337300836440884e-21, 1.932136997023493e-21, 1.634381763892185e-21, -5.882692027801191e-22, -5.677337271566995e-22, 6.54299763555249e-22, 4.019123123582096e-22, 6.047891113386996e-23, -1.59275838281975e-22, -2.285761707112608e-22, -1.578652666310184e-22, -2.187767176933997e-25, 1.50097271255773e-22, 1.623193898720625e-22, 2.233239032498631e-23]
+pmpNorth.m_flow=[0e+00, 3.935694694519043e+00, 5.780154228210449e+00, 5.809367656707764e+00, 5.690287590026855e+00, 5.605447292327881e+00, 5.558409690856934e+00, 5.541728973388672e+00, 5.548970222473145e+00, 5.573373794555664e+00, 5.608276844024658e+00, 5.647496223449707e+00, 5.683110237121582e+00, 5.722925662994385e+00, 5.763546466827393e+00, 5.801443576812744e+00, 5.835417747497559e+00, 5.865492820739746e+00, 5.89191198348999e+00, 5.914976119995117e+00, 5.934957504272461e+00, 5.952096462249756e+00, 5.966598987579346e+00, 5.978635787963867e+00, 5.988339424133301e+00, 5.995809555053711e+00, 6.001132965087891e+00, 6.390816211700439e+00, 6.807199001312256e+00, 6.981039524078369e+00, 7.000619888305664e+00, 6.958029747009277e+00, 6.904683589935303e+00, 6.857888221740723e+00, 6.819099426269531e+00, 6.785050392150879e+00, 6.752820491790771e+00, 6.716578006744385e+00, 6.678924560546875e+00, 6.641193866729736e+00, 6.599531173706055e+00, 6.552485942840576e+00, 6.499286651611328e+00, 6.43939733505249e+00, 6.372331142425537e+00, 6.297479629516602e+00, 6.214093685150146e+00, 6.121401786804199e+00, 6.018571853637695e+00, 5.904721736907959e+00, 5.778929710388184e+00, 4.472226142883301e+00, 1.755283951759338e+00, 5.383865833282471e-01, 1.038656383752823e-01, 1.01801548153162e-02, 8.456346695311368e-04, 6.90711458446458e-05, 1.268326468562009e-05, 4.12457239917785e-07, 3.218171684693516e-07, 2.311933045007208e-08, -1.5268231123855e-08, 8.895319147939063e-09, 2.523842468349358e-09, -4.228830063901512e-10, -6.754835579769747e-10, -1.484994210931845e-10, 1.859641468593409e-10, 8.35797472897859e-11, 1.212138809464358e-11, -5.521493852411741e-12, -4.95483645432393e-12, -1.610096170973074e-12, 1.03014412321592e-13, 3.234663784653508e-13, 7.634284236680486e-14, 2.990790327526104e-15, 1.758156510113699e-16, 2.149546943110515e-17, 3.324812767487492e-18, 1.114121295241547e-18, 1.022373588247948e-19, 1.502126388183913e-19, -2.487734867819434e-20, 4.100450295581572e-20, 1.415903391420987e-21, 1.929675650025008e-21, 1.686812312174206e-21, -6.040247114324277e-22, -5.978505937389632e-22, 6.863704808275641e-22, 4.311639562996268e-22, 6.720332557304215e-23, -1.723850152089674e-22, -2.513795520174311e-22, -1.762438577000445e-22, -2.154407925581624e-24, 1.67207828373085e-22, 1.845022847446222e-22, 2.60359771013068e-23]
+pmpSouth.m_flow=[0e+00, 3.5414719581604e+00, 5.22852611541748e+00, 5.277751445770264e+00, 5.183816909790039e+00, 5.115185260772705e+00, 5.077246189117432e+00, 5.064364433288574e+00, 5.071390151977539e+00, 5.092769145965576e+00, 5.122970581054688e+00, 5.156259536743164e+00, 5.187353610992432e+00, 5.222183227539062e+00, 5.25743579864502e+00, 5.290326118469238e+00, 5.319912910461426e+00, 5.34621524810791e+00, 5.369418144226074e+00, 5.389755725860596e+00, 5.407441139221191e+00, 5.422662258148193e+00, 5.435580730438232e+00, 5.446329593658447e+00, 5.455012321472168e+00, 5.461708068847656e+00, 5.466485977172852e+00, 5.778119087219238e+00, 6.105720996856689e+00, 6.24374532699585e+00, 6.263367176055908e+00, 6.234063148498535e+00, 6.19481372833252e+00, 6.159225463867188e+00, 6.128803253173828e+00, 6.101316452026367e+00, 6.074681282043457e+00, 6.043688297271729e+00, 6.012726783752441e+00, 5.980929851531982e+00, 5.945608139038086e+00, 5.905802249908447e+00, 5.860974311828613e+00, 5.810732841491699e+00, 5.754709243774414e+00, 5.692437648773193e+00, 5.623340129852295e+00, 5.546817302703857e+00, 5.462209224700928e+00, 5.368796825408936e+00, 5.265804767608643e+00, 4.085401058197021e+00, 1.604460835456848e+00, 4.956307709217072e-01, 9.158726781606674e-02, 8.995151147246361e-03, 7.489583804272115e-04, 6.137102172942832e-05, 1.131675162469037e-05, 3.699728665651492e-07, 2.905397593622183e-07, 2.103240603901213e-08, -1.401213456375672e-08, 8.243119076212224e-09, 2.36318475899111e-09, -4.002040365769233e-10, -6.459901502609e-10, -1.434200952443732e-10, 1.8119096500957e-10, 8.204542600864784e-11, 1.197056776619521e-11, -5.477646114471213e-12, -4.931408580099994e-12, -1.605918306321619e-12, 1.028810961119578e-13, 3.23278567544022e-13, 7.632458711272563e-14, 2.990481372258593e-15, 1.758037925501084e-16, 2.14934759258289e-17, 3.324123312446929e-18, 1.113557468256516e-18, 1.021202481446332e-19, 1.498618108410923e-19, -2.476985235706652e-20, 4.07029891601916e-20, 1.399407237041985e-21, 1.896190991087949e-21, 1.645529819987023e-21, -5.841627841825475e-22, -5.72563171483786e-22, 6.504584527089296e-22, 4.04214221101419e-22, 6.233589601564746e-23, -1.583026489821964e-22, -2.287371740665728e-22, -1.590768307636931e-22, -1.930919686827985e-24, 1.490107889082302e-22, 1.636452189291366e-22, 2.299803588997723e-23]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_FlowSystem_Simplified4.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_FlowSystem_Simplified4.txt
index f022755c0e..b7dbb97528 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_FlowSystem_Simplified4.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_FlowSystem_Simplified4.txt
@@ -1,7 +1,7 @@
-last-generated=2021-03-25
+last-generated=2022-08-12
statistics-initialization=
{
- "nonlinear": "0, 0, 1, 1, 5, 1, 1",
+ "nonlinear": "0, 0, 1, 1, 6, 1, 1",
"numerical Jacobians": "0"
}
statistics-simulation=
@@ -12,5 +12,5 @@ statistics-simulation=
"numerical Jacobians": "0"
}
time=[0e+00, 1e+03]
-pmpNorth.m_flow=[-0e+00, 5.476596832275391e+00, 5.134872913360596e+00, 5.241344451904297e+00, 5.336724758148193e+00, 5.422045230865479e+00, 5.498278141021729e+00, 5.566324234008789e+00, 5.627007007598877e+00, 5.681071758270264e+00, 5.729185581207275e+00, 5.771944999694824e+00, 5.80987548828125e+00, 5.843441486358643e+00, 5.873050212860107e+00, 5.899055004119873e+00, 5.921764850616455e+00, 5.94144344329834e+00, 5.958318710327148e+00, 5.972582817077637e+00, 5.984395027160645e+00, 5.993887901306152e+00, 6.001165866851807e+00, 6.006309032440186e+00, 6.009372234344482e+00, 6.010389804840088e+00, 6.009372234344482e+00, 6.842513561248779e+00, 6.83491849899292e+00, 6.824180126190186e+00, 6.810193061828613e+00, 6.792816638946533e+00, 6.771877288818359e+00, 6.747164249420166e+00, 6.718426704406738e+00, 6.685370445251465e+00, 6.647656440734863e+00, 6.60489559173584e+00, 6.556644916534424e+00, 6.502403736114502e+00, 6.441612243652344e+00, 6.373644828796387e+00, 6.297811508178711e+00, 6.213356971740723e+00, 6.119462966918945e+00, 6.01525354385376e+00, 5.899808406829834e+00, 5.772178649902344e+00, 5.63141393661499e+00, 5.476596832275391e+00, 5.306889057159424e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-pmpSouth.m_flow=[-0e+00, 5.018579483032227e+00, 4.72824239730835e+00, 4.816677093505859e+00, 4.896131038665771e+00, 4.967477798461914e+00, 5.031513214111328e+00, 5.0889573097229e+00, 5.140457630157471e+00, 5.186591148376465e+00, 5.227872371673584e+00, 5.264757633209229e+00, 5.297648906707764e+00, 5.326901912689209e+00, 5.352827548980713e+00, 5.375698566436768e+00, 5.395751953125e+00, 5.413193225860596e+00, 5.428199291229248e+00, 5.440919399261475e+00, 5.451479911804199e+00, 5.459984302520752e+00, 5.466515064239502e+00, 5.47113561630249e+00, 5.473890781402588e+00, 5.47480583190918e+00, 5.473890781402588e+00, 6.153408050537109e+00, 6.146831035614014e+00, 6.137541770935059e+00, 6.125458240509033e+00, 6.110471248626709e+00, 6.092447757720947e+00, 6.071224689483643e+00, 6.046609878540039e+00, 6.018378257751465e+00, 5.986271858215332e+00, 5.949994087219238e+00, 5.90920877456665e+00, 5.863537311553955e+00, 5.812554359436035e+00, 5.75578498840332e+00, 5.692702770233154e+00, 5.622726440429688e+00, 5.545217514038086e+00, 5.459481716156006e+00, 5.36476993560791e+00, 5.260281085968018e+00, 5.145174026489258e+00, 5.018579483032227e+00, 4.879621982574463e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+pmpNorth.m_flow=[0e+00, 5.476596832275391e+00, 5.134872913360596e+00, 5.241344451904297e+00, 5.336724758148193e+00, 5.422045230865479e+00, 5.498278141021729e+00, 5.566324234008789e+00, 5.627007007598877e+00, 5.681071758270264e+00, 5.729185581207275e+00, 5.771944999694824e+00, 5.80987548828125e+00, 5.843441486358643e+00, 5.873050212860107e+00, 5.899055004119873e+00, 5.921764850616455e+00, 5.94144344329834e+00, 5.958318710327148e+00, 5.972582817077637e+00, 5.984395027160645e+00, 5.993887901306152e+00, 6.001165866851807e+00, 6.006309032440186e+00, 6.009372234344482e+00, 6.010389804840088e+00, 6.009372234344482e+00, 6.842513561248779e+00, 6.83491849899292e+00, 6.824180126190186e+00, 6.810193061828613e+00, 6.792816638946533e+00, 6.771877288818359e+00, 6.747164249420166e+00, 6.718426704406738e+00, 6.685370445251465e+00, 6.647656440734863e+00, 6.60489559173584e+00, 6.556644916534424e+00, 6.502403736114502e+00, 6.441612243652344e+00, 6.373644828796387e+00, 6.297811508178711e+00, 6.213356971740723e+00, 6.119462966918945e+00, 6.01525354385376e+00, 5.899808406829834e+00, 5.772178649902344e+00, 5.63141393661499e+00, 5.476596832275391e+00, 5.306889057159424e+00, -0e+00, -0e+00, 0e+00, -0e+00, 0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00]
+pmpSouth.m_flow=[0e+00, 5.018579483032227e+00, 4.72824239730835e+00, 4.816677093505859e+00, 4.896131038665771e+00, 4.967477798461914e+00, 5.031513214111328e+00, 5.0889573097229e+00, 5.140457630157471e+00, 5.186591148376465e+00, 5.227872371673584e+00, 5.264757633209229e+00, 5.297648906707764e+00, 5.326901912689209e+00, 5.352827548980713e+00, 5.375698566436768e+00, 5.395751953125e+00, 5.413193225860596e+00, 5.428199291229248e+00, 5.440919399261475e+00, 5.451479911804199e+00, 5.459984302520752e+00, 5.466515064239502e+00, 5.47113561630249e+00, 5.473890781402588e+00, 5.47480583190918e+00, 5.473890781402588e+00, 6.153408050537109e+00, 6.146831035614014e+00, 6.137541770935059e+00, 6.125458240509033e+00, 6.110471248626709e+00, 6.092447757720947e+00, 6.071224689483643e+00, 6.046609878540039e+00, 6.018378257751465e+00, 5.986271858215332e+00, 5.949994087219238e+00, 5.90920877456665e+00, 5.863537311553955e+00, 5.812554359436035e+00, 5.75578498840332e+00, 5.692702770233154e+00, 5.622726440429688e+00, 5.545217514038086e+00, 5.459481716156006e+00, 5.36476993560791e+00, 5.260281085968018e+00, 5.145174026489258e+00, 5.018579483032227e+00, 4.879621982574463e+00, -0e+00, -0e+00, 0e+00, -0e+00, 0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_NegativePressureOrFlow.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_NegativePressureOrFlow.txt
new file mode 100644
index 0000000000..9f7f2cdd33
--- /dev/null
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_NegativePressureOrFlow.txt
@@ -0,0 +1,17 @@
+last-generated=2022-06-06
+statistics-initialization=
+{
+ "nonlinear": "1",
+ "numerical Jacobians": "0"
+}
+statistics-simulation=
+{
+ "linear": " ",
+ "nonlinear": "1",
+ "number of continuous time states": "4",
+ "numerical Jacobians": "0"
+}
+time=[0e+00, 3.6e+03]
+fan.P=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.602490687626414e-05, 1.550893402099609e+02, 2.757143249511719e+02, 3.618750305175781e+02, 4.135714721679688e+02, 4.308035888671875e+02, 4.135714416503906e+02, 3.61875e+02, 2.757142944335938e+02, 1.550892944335938e+02, -1.979852393141357e-11, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+fan.dpMachine=[2.533125e+04, 2.4824625e+04, 2.4318e+04, 2.3811375e+04, 2.330475e+04, 2.2798125e+04, 2.22915e+04, 2.1784875e+04, 2.127825e+04, 2.0771625e+04, 2.0265e+04, 1.9758375e+04, 1.925175e+04, 1.8745125e+04, 1.82385e+04, 1.7731875e+04, 1.722525e+04, 1.6718625e+04, 1.6212e+04, 1.5705375e+04, 1.519875e+04, 1.4692125e+04, 1.41855e+04, 1.3678875e+04, 1.317225e+04, 1.2665625e+04, 1.2159e+04, 1.1652375e+04, 1.114575e+04, 1.0639125e+04, 1.01325e+04, 9.625875e+03, 9.11925e+03, 8.612625e+03, 8.106e+03, 7.599375e+03, 7.09275e+03, 6.586125e+03, 6.0795e+03, 5.572875e+03, 5.06625e+03, 4.559625e+03, 4.053e+03, 3.546375e+03, 3.03975e+03, 2.533125e+03, 2.0265e+03, 1.519875e+03, 1.01325e+03, 5.06625e+02, -1.164153218269348e-10, -5.06625e+02, -1.01325e+03, -1.519875e+03, -2.026500000000003e+03, -2.533125000000003e+03, -3.039750000000003e+03, -3.546375e+03, -4.053e+03, -4.559625e+03, -5.06625e+03, -5.572875e+03, -6.0795e+03, -6.586125e+03, -7.09275e+03, -7.599375e+03, -8.106e+03, -8.612625e+03, -9.11925e+03, -9.625875e+03, -1.01325e+04, -1.0639125e+04, -1.114575e+04, -1.1652375e+04, -1.2159e+04, -1.2665625e+04, -1.317225e+04, -1.3678875e+04, -1.41855e+04, -1.4692125e+04, -1.519875e+04, -1.5705375e+04, -1.6212e+04, -1.6718625e+04, -1.722525e+04, -1.7731875e+04, -1.82385e+04, -1.8745125e+04, -1.925175e+04, -1.9758375e+04, -2.0265e+04, -2.0771625e+04, -2.127825e+04, -2.1784875e+04, -2.22915e+04, -2.2798125e+04, -2.330475e+04, -2.3811375e+04, -2.4318e+04, -2.4824625e+04, -2.533125e+04]
+fan.m_flow=[-4e+03, -7.801083326339722e-01, -7.599992752075195e-01, -7.400004863739014e-01, -7.200003266334534e-01, -7.000000476837158e-01, -6.800011396408081e-01, -6.600016951560974e-01, -6.400005221366882e-01, -6.19999885559082e-01, -5.999999642372131e-01, -5.800000429153442e-01, -5.600000619888306e-01, -5.400001406669617e-01, -5.200000405311584e-01, -5.000000596046448e-01, -4.800000190734863e-01, -4.600000083446503e-01, -4.399999976158142e-01, -4.199999868869781e-01, -4.000000059604645e-01, -3.799999952316284e-01, -3.599999845027924e-01, -3.400000035762787e-01, -3.199999928474426e-01, -2.999999821186066e-01, -2.799999713897705e-01, -2.599999904632568e-01, -2.399999797344207e-01, -2.199999839067459e-01, -1.99999988079071e-01, -1.799999922513962e-01, -1.599999964237213e-01, -1.400000005960464e-01, -1.19999997317791e-01, -9.999999403953552e-02, -7.999999821186066e-02, -5.999999493360519e-02, -3.999999165534973e-02, -1.999999210238457e-02, 7.895016196357574e-09, 2.000000886619091e-02, 4.000000655651093e-02, 6.000000610947609e-02, 8.000000566244125e-02, 1.000000089406967e-01, 1.200000047683716e-01, 1.400000005960464e-01, 1.600000113248825e-01, 1.800000071525574e-01, 2.000000029802322e-01, 2.199999988079071e-01, 2.39999994635582e-01, 2.599999904632568e-01, 2.80000001192093e-01, 3.000000119209291e-01, 3.199999928474427e-01, 3.400000035762787e-01, 3.600000143051147e-01, 3.799999952316284e-01, 4.000000059604645e-01, 4.199999868869781e-01, 4.399999976158142e-01, 4.600000083446503e-01, 4.799999892711639e-01, 5e-01, 5.199999809265137e-01, 5.400000214576721e-01, 5.600000023841858e-01, 5.799999833106995e-01, 6.000000238418579e-01, 6.200000047683716e-01, 6.399999856948853e-01, 6.600000262260437e-01, 6.800000071525574e-01, 6.99999988079071e-01, 7.199999690055847e-01, 7.400000095367432e-01, 7.599999904632568e-01, 7.799999713897705e-01, 8.00000011920929e-01, 8.199999928474426e-01, 8.399999737739563e-01, 8.600000143051147e-01, 8.799999952316284e-01, 8.999999761581421e-01, 9.200000166893005e-01, 9.399999976158142e-01, 9.599999785423279e-01, 9.800000190734863e-01, 1e+00, 1.019999980926514e+00, 1.039999961853027e+00, 1.059999942779541e+00, 1.080000042915344e+00, 1.100000023841858e+00, 1.120000004768372e+00, 1.139999985694885e+00, 1.159999966621399e+00, 1.179999947547913e+00, 1.200000047683716e+00]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_SpeedControlled_Nrpm.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_SpeedControlled_Nrpm.txt
index db12f04375..5243535411 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_SpeedControlled_Nrpm.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_SpeedControlled_Nrpm.txt
@@ -1,7 +1,7 @@
-last-generated=2019-08-15
+last-generated=2022-08-12
statistics-initialization=
{
- "nonlinear": "1, 2",
+ "nonlinear": "1, 0, 1, 0",
"numerical Jacobians": "0"
}
statistics-simulation=
@@ -11,9 +11,9 @@ statistics-simulation=
"number of continuous time states": "3",
"numerical Jacobians": "0"
}
-gain.u=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.8e-01, 9.6e-01, 9.399999999999999e-01, 9.2e-01, 9e-01, 8.8e-01, 8.6e-01, 8.4e-01, 8.2e-01, 8e-01, 7.8e-01, 7.6e-01, 7.4e-01, 7.2e-01, 7e-01, 6.8e-01, 6.6e-01, 6.4e-01, 6.2e-01, 6e-01, 5.8e-01, 5.600000000000001e-01, 5.4e-01, 5.2e-01, 5e-01, 4.799999701981039e-01, 4.59999970198246e-01, 4.399999403962078e-01, 4.200000298016828e-01, 4.00000029801967e-01, 3.800000000000709e-01, 3.600000000002133e-01, 3.399999701981751e-01, 3.199999403965277e-01, 3.00000059603579e-01, 2.800000298018961e-01, 2.599999999998579e-01, 2.399999850990164e-01, 2.199999701982105e-01, 1.999999552972269e-01, 1.800000596036677e-01, 1.600000298018249e-01, 1.400000149008946e-01, 1.199999925493573e-01, 9.999997764865798e-02, 7.99999552972359e-02, 6.00000558784486e-02, 4.000003725226355e-02, 2.000001862613177e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
time=[0e+00, 1e+00]
-floMacDyn.dpMachine=[3.819660034179688e+02, 4.766995551114627e+02, 4.943379824624175e+02, 4.981247254345277e+02, 4.989478454859282e+02, 4.991274413996107e+02, 4.991666564960233e+02, 4.991753540037698e+02, 4.99177215576281e+02, 4.991774291992188e+02, 4.99177490234375e+02, 4.991776123046966e+02, 4.991776733398438e+02, 4.991777038574219e+02, 4.991777038574219e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776428222656e+02, 4.991776428222656e+02, 4.991776428222656e+02, 4.991776428222656e+02, 4.991776428222656e+02, 4.819456914347608e+02, 4.630516866745697e+02, 4.441013206068409e+02, 4.254536894592623e+02, 4.071852938068841e+02, 3.893118938718313e+02, 3.718371458758588e+02, 3.547624123169213e+02, 3.380876218729161e+02, 3.218127345832193e+02, 3.059380412788723e+02, 2.904635693141461e+02, 2.753894887763743e+02, 2.607159827712439e+02, 2.464431999400378e+02, 2.325711621171876e+02, 2.191000040131373e+02, 2.060299012014906e+02, 1.933608521394113e+02, 1.810930337583667e+02, 1.692265570093825e+02, 1.577614580125583e+02, 1.466978491064055e+02, 1.36035883427912e+02, 1.257755584716797e+02, 1.159169982745177e+02, 1.064602790538257e+02, 9.740547710387663e+01, 8.875272665654923e+01, 8.05019780275438e+01, 7.265336792178633e+01, 6.520694980269032e+01, 5.816279611144667e+01, 5.152095642009812e+01, 4.52815277061184e+01, 3.945436522797682e+01, 3.410685593809134e+01, 2.925629970112054e+01, 2.486349086439177e+01, 2.089001718595297e+01, 1.730537361873739e+01, 1.40831064181975e+01, 1.11987877523382e+01, 8.628688242240919e+00, 6.353070134094843e+00, 4.361345678103525e+00, 2.662859173718023e+00, 1.305051941849334e+00, 3.723658880331966e-01, 3.075692802667618e-06, -1.557052847802317e-09, -5.820766091346741e-11, -1.455191522836685e-11, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-floMacSta.dpMachine=[4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.794398617743659e+02, 4.60098378735429e+02, 4.411532615168607e+02, 4.226047515662231e+02, 4.044529938614071e+02, 3.866980632772671e+02, 3.693401366808059e+02, 3.523794165633871e+02, 3.358159238354154e+02, 3.196498318150345e+02, 3.03881339468104e+02, 2.885104442652517e+02, 2.735373770073344e+02, 2.589621987299449e+02, 2.447850577938055e+02, 2.31006037638156e+02, 2.17625242166598e+02, 2.046428466961402e+02, 1.92058850206186e+02, 1.798734141037055e+02, 1.68086649106894e+02, 1.566985918106157e+02, 1.457093695701548e+02, 1.351190895372946e+02, 1.249277725219727e+02, 1.151355423425644e+02, 1.057424675876581e+02, 9.674862455141749e+01, 8.815413186832403e+01, 7.995896343619431e+01, 7.21632250871787e+01, 6.47669855429761e+01, 5.777030580097554e+01, 5.117323161869565e+01, 4.497585973124306e+01, 3.918022580065193e+01, 3.379532490656646e+01, 2.882868923497502e+01, 2.428444630137457e+01, 2.016343911214301e+01, 1.646309634831643e+01, 1.317693850012823e+01, 1.029396252050215e+01, 7.797536307782446e+00, 5.664503184096723e+00, 3.865953326378335e+00, 2.373942729492089e+00, 1.189011777832478e+00, 3.556552820124339e-01, 2.727024161871996e-16, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00]
-floMacSta.VMachine_flow=[8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.179551799330834e-01, 8.012098253604085e-01, 7.844675203252821e-01, 7.677283147381856e-01, 7.509921988664439e-01, 7.342589537458853e-01, 7.175286292588894e-01, 7.008012156472726e-01, 6.840764939988395e-01, 6.673544545648926e-01, 6.506350875641913e-01, 6.339182933405832e-01, 6.172039429126689e-01, 6.004920362800221e-01, 5.837825636319149e-01, 5.670753657677331e-01, 5.503703732797423e-01, 5.336675763383496e-01, 5.169668753863813e-01, 5.00268200996563e-01, 4.835715433205083e-01, 4.668767432339683e-01, 4.501837908951999e-01, 4.334926764397228e-01, 4.168032109737396e-01, 4.001154144414578e-01, 3.834291676330666e-01, 3.667444407458171e-01, 3.500612736084016e-01, 3.33379377938475e-01, 3.166987935734454e-01, 3.00019460908206e-01, 2.833413203380766e-01, 2.666642824562558e-01, 2.499884168513041e-01, 2.333011270105493e-01, 2.165425797956496e-01, 1.996426948237181e-01, 1.825317195393328e-01, 1.651394245822069e-01, 1.47396194194614e-01, 1.292373546042894e-01, 1.106163174348533e-01, 9.153306023404656e-02, 7.209600415124648e-02, 5.264118295486991e-02, 3.392443780500445e-02, 1.744533575602981e-02, 5.264308190498649e-03, 4.040036138492693e-18, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00]
-floMacDyn.VMachine_flow=[1.030056595802307e+00, 8.7216740735283e-01, 8.427700395607741e-01, 8.364588020686494e-01, 8.350869416741311e-01, 8.347876072040732e-01, 8.347222804991619e-01, 8.347077369692162e-01, 8.347046375273059e-01, 8.347042798995972e-01, 8.34704160690352e-01, 8.347039818763555e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347039222717285e-01, 8.347038626672969e-01, 8.347039222717285e-01, 8.347039222717285e-01, 8.347039222717285e-01, 8.347039222717285e-01, 8.347039222717285e-01, 8.347039222717285e-01, 8.347039222717285e-01, 8.136936251909572e-01, 7.960825746137825e-01, 7.792405506055319e-01, 7.625672678357061e-01, 7.459324796546294e-01, 7.293086687615675e-01, 7.126896262523089e-01, 6.960732558690224e-01, 6.794594585702448e-01, 6.62848641509355e-01, 6.462407349682538e-01, 6.296354611416017e-01, 6.130328099245776e-01, 5.964327217121107e-01, 5.798350671509395e-01, 5.632396877072218e-01, 5.4664669245402e-01, 5.300559520173254e-01, 5.134674271136896e-01, 4.968809287725593e-01, 4.802965660196928e-01, 4.637141207955798e-01, 4.471335531218449e-01, 4.30554912403064e-01, 4.139779806137085e-01, 3.974027475606594e-01, 3.808291536381837e-01, 3.642571392416367e-01, 3.476867137257947e-01, 3.311176497556825e-01, 3.145499268930731e-01, 2.979834855327556e-01, 2.814182660701183e-01, 2.648541790976146e-01, 2.482912339266785e-01, 2.316703886620744e-01, 2.145470016825627e-01, 1.9667553029805e-01, 1.781489132197243e-01, 1.590906516778417e-01, 1.396061994858921e-01, 1.198104728362169e-01, 9.986110714079272e-02, 8.001040944168225e-02, 6.064564351885609e-02, 4.235008740178651e-02, 2.593029797545467e-02, 1.251978710299656e-02, 3.280574172424363e-03, -2.050458169833291e-05, 1.036392009516712e-08, 4.241605246411076e-10, 1.129369131630634e-10, 8.747503020653839e-12, 5.247142315270985e-12, 1.74487415420277e-12, -1.231751814028425e-13, 3.687700472042837e-14, 1.969307056258571e-13, -6.84774700807176e-14, 9.157328596163481e-14, -1.738360661515817e-13, -1.378196956119792e-14, -1.19783584064129e-13, 2.519681933430916e-14, 1.989773564104514e-13, 1.187865446558282e-13, -6.738201658868338e-14, -2.112635435909036e-13, -1.644129511726507e-13, -2.057301621810562e-13, -1.869169077346556e-13, 3.980928131561667e-14, 1.942152849598745e-13, -4.123981074032534e-15]
+gain.u=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.8e-01, 9.6e-01, 9.399999999999999e-01, 9.2e-01, 9e-01, 8.8e-01, 8.6e-01, 8.4e-01, 8.2e-01, 8e-01, 7.8e-01, 7.6e-01, 7.4e-01, 7.2e-01, 7e-01, 6.8e-01, 6.6e-01, 6.4e-01, 6.2e-01, 6e-01, 5.8e-01, 5.600000000000001e-01, 5.4e-01, 5.2e-01, 5e-01, 4.799999701981039e-01, 4.59999970198246e-01, 4.399999403962078e-01, 4.200000298016828e-01, 4.00000029801967e-01, 3.800000000000709e-01, 3.600000000002133e-01, 3.399999701981751e-01, 3.199999403965277e-01, 3.00000059603579e-01, 2.800000298018961e-01, 2.599999999998579e-01, 2.399999850990164e-01, 2.199999701982105e-01, 1.999999552972269e-01, 1.800000596036677e-01, 1.600000298018249e-01, 1.400000149008946e-01, 1.199999925493573e-01, 9.999997764865798e-02, 7.99999552972359e-02, 6.00000558784486e-02, 4.000003725226355e-02, 2.000001862613177e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+floMacSta.dpMachine=[4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.794398617743659e+02, 4.60098378735429e+02, 4.411532615168607e+02, 4.226047515662231e+02, 4.044529938614071e+02, 3.866980632772671e+02, 3.693401366808059e+02, 3.523794165633871e+02, 3.358159238354154e+02, 3.196498318150345e+02, 3.03881339468104e+02, 2.885104442652517e+02, 2.735373770073344e+02, 2.589621987299449e+02, 2.447850577938055e+02, 2.31006037638156e+02, 2.17625242166598e+02, 2.046428466961402e+02, 1.92058850206186e+02, 1.798734141037055e+02, 1.68086649106894e+02, 1.566985918106157e+02, 1.457093695701548e+02, 1.351190895372946e+02, 1.249277725219727e+02, 1.151355423425644e+02, 1.057424675876581e+02, 9.674862455141749e+01, 8.815413186832403e+01, 7.995896343619431e+01, 7.21632250871787e+01, 6.47669855429761e+01, 5.777030580097554e+01, 5.117323161869565e+01, 4.497585973124306e+01, 3.918022580065193e+01, 3.379532490656646e+01, 2.882868923497502e+01, 2.428444630137457e+01, 2.016343911214301e+01, 1.646309634831643e+01, 1.317693850012823e+01, 1.029396252050215e+01, 7.797536307782446e+00, 5.664503184096723e+00, 3.865953326378335e+00, 2.373942729492089e+00, 1.189011777832478e+00, 3.556552820124339e-01, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00]
+floMacDyn.dpMachine=[3.819660034179688e+02, 4.766992499358793e+02, 4.943363955481709e+02, 4.981237183545724e+02, 4.989477539332347e+02, 4.991255798274815e+02, 4.991662292500728e+02, 4.991748657225244e+02, 4.991771240235466e+02, 4.991775512693675e+02, 4.991780700682912e+02, 4.991782226562409e+02, 4.99177947997965e+02, 4.99177673339771e+02, 4.991776733398347e+02, 4.991777648924872e+02, 4.991777954101562e+02, 4.991777648926054e+02, 4.99177703857531e+02, 4.991776733398438e+02, 4.991776428222656e+02, 4.991776123046875e+02, 4.991776123047057e+02, 4.991776123047512e+02, 4.991776428222656e+02, 4.991776733398438e+02, 4.819452031532197e+02, 4.630534261794696e+02, 4.441022666518538e+02, 4.254541472229342e+02, 4.071856905353997e+02, 3.893125042234302e+02, 3.718374815688907e+02, 3.54762564905012e+02, 3.380877439432832e+02, 3.21812887171019e+02, 3.059381023140285e+02, 2.904635082790626e+02, 2.753893972236399e+02, 2.607158912185096e+02, 2.464431389047906e+02, 2.325712078935821e+02, 2.191001260834498e+02, 2.060300537893813e+02, 1.933609589508802e+02, 1.810929574643305e+02, 1.69226358645252e+02, 1.577611680955661e+02, 1.466975897070733e+02, 1.360358071337484e+02, 1.257754516601562e+02, 1.159164260692366e+02, 1.064593177506969e+02, 9.740517955879956e+01, 8.875274191509273e+01, 8.050211535650894e+01, 7.265348999210792e+01, 6.520702609656742e+01, 5.816281137017207e+01, 5.152093353176446e+01, 4.528155059352893e+01, 3.945436141349783e+01, 3.410650117095461e+01, 2.925580188373673e+01, 2.486386852004861e+01, 2.089062944515968e+01, 1.730616517009572e+01, 1.408298434764626e+01, 1.119890600817512e+01, 8.629098322079875e+00, 6.353054878150746e+00, 4.361795801581371e+00, 2.662918775992468e+00, 1.305368440178004e+00, 3.715901946611515e-01, -2.317575854249299e-05, 1.625591761384986e-07, -5.398772484419601e-09, -1.062289187180899e-09, -8.731153820694205e-10, -6.839402759373578e-10, -5.093170676877553e-10, -3.201420309424247e-10, -1.45518787997906e-10, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+floMacSta.VMachine_flow=[8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.179551799330834e-01, 8.012098253604085e-01, 7.844675203252821e-01, 7.677283147381856e-01, 7.509921988664439e-01, 7.342589537458853e-01, 7.175286292588894e-01, 7.008012156472726e-01, 6.840764939988395e-01, 6.673544545648926e-01, 6.506350875641913e-01, 6.339182933405832e-01, 6.172039429126689e-01, 6.004920362800221e-01, 5.837825636319149e-01, 5.670753657677331e-01, 5.503703732797423e-01, 5.336675763383496e-01, 5.169668753863813e-01, 5.00268200996563e-01, 4.835715433205083e-01, 4.668767432339683e-01, 4.501837908951999e-01, 4.334926764397228e-01, 4.168032109737396e-01, 4.001154144414578e-01, 3.834291676330666e-01, 3.667444407458171e-01, 3.500612736084016e-01, 3.33379377938475e-01, 3.166987935734454e-01, 3.00019460908206e-01, 2.833413203380766e-01, 2.666642824562558e-01, 2.499884168513041e-01, 2.333011270105493e-01, 2.165425797956496e-01, 1.996426948237181e-01, 1.825317195393328e-01, 1.651394245822069e-01, 1.47396194194614e-01, 1.292373546042894e-01, 1.106163174348533e-01, 9.153306023404656e-02, 7.209600415124648e-02, 5.264118295486991e-02, 3.392443780500445e-02, 1.744533575602981e-02, 5.264308190498649e-03, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00]
+floMacDyn.VMachine_flow=[1.030056595802307e+00, 8.721678841896618e-01, 8.42772662165464e-01, 8.364604709985033e-01, 8.350870608833674e-01, 8.347907066453573e-01, 8.347229361500546e-01, 8.347085118296071e-01, 8.347047567365955e-01, 8.34704101085876e-01, 8.347032666207248e-01, 8.347029685974299e-01, 8.347034454347302e-01, 8.347038626672258e-01, 8.347039222717285e-01, 8.347037434579718e-01, 8.347036838531494e-01, 8.347037434577409e-01, 8.34703803062439e-01, 8.347038626671548e-01, 8.347039222717285e-01, 8.347039818763733e-01, 8.347039818763378e-01, 8.347039818763733e-01, 8.347039222717285e-01, 8.347039222717285e-01, 8.136944596565525e-01, 7.960795347717832e-01, 7.792388816753005e-01, 7.625664333706792e-01, 7.459317643988921e-01, 7.293075362732457e-01, 7.126890302062875e-01, 6.960729578457985e-01, 6.794591605470209e-01, 6.628483434863087e-01, 6.462406157589643e-01, 6.296355803508913e-01, 6.130330483431568e-01, 5.964329601306898e-01, 5.798351863604067e-01, 5.632395684979322e-01, 5.466463944304053e-01, 5.300555347848119e-01, 5.134671290906079e-01, 4.968811373891713e-01, 4.802971024612471e-01, 4.637149552606244e-01, 4.471343577842296e-01, 4.305551508223537e-01, 4.139783382415771e-01, 3.974047145164949e-01, 3.808326405081978e-01, 3.64258271725198e-01, 3.476866541221091e-01, 3.3111708351209e-01, 3.145493904512701e-01, 2.979831577073159e-01, 2.814182064654735e-01, 2.64854298307295e-01, 2.482911147216521e-01, 2.316704333640658e-01, 2.145492815619662e-01, 1.966789873632548e-01, 1.781460521916592e-01, 1.590855405758219e-01, 1.395988830026544e-01, 1.198117468876128e-01, 9.985970642921581e-02, 8.000471719956283e-02, 6.064589678943654e-02, 4.23407371539888e-02, 2.592865146005137e-02, 1.250635008308209e-02, 3.372658913925401e-03, 1.545050909044221e-04, -1.083776081714321e-06, 3.596003283436759e-08, 7.040317728998752e-09, 5.823099285461279e-09, 4.606124933296064e-09, 3.388560389995756e-09, 2.171607801563245e-09, 9.54233552637677e-10, 4.654012055599654e-11, 4.427231439097093e-11, 4.307033202310961e-11, 4.133592514019411e-11, 3.923276939677873e-11, 3.778093614052413e-11, 3.578643442666455e-11, 3.44232142790446e-11, 3.280731137566852e-11, 3.138845483459439e-11, 2.916008325547038e-11, 2.718313176416255e-11, 2.5699724654422e-11, 2.417070321639934e-11, 2.228625286307288e-11, 2.075788413213941e-11, 1.928186776911645e-11]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_SpeedControlled_y.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_SpeedControlled_y.txt
index 6cdf5c8847..249b7954ce 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_SpeedControlled_y.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_SpeedControlled_y.txt
@@ -1,7 +1,7 @@
-last-generated=2019-08-15
+last-generated=2022-08-12
statistics-initialization=
{
- "nonlinear": "1, 2",
+ "nonlinear": "1, 0, 1, 0",
"numerical Jacobians": "0"
}
statistics-simulation=
@@ -11,9 +11,9 @@ statistics-simulation=
"number of continuous time states": "3",
"numerical Jacobians": "0"
}
-gain.u=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.8e-01, 9.6e-01, 9.399999999999999e-01, 9.2e-01, 9e-01, 8.8e-01, 8.6e-01, 8.4e-01, 8.2e-01, 8e-01, 7.8e-01, 7.6e-01, 7.4e-01, 7.2e-01, 7e-01, 6.8e-01, 6.6e-01, 6.4e-01, 6.2e-01, 6e-01, 5.8e-01, 5.600000000000001e-01, 5.4e-01, 5.2e-01, 5e-01, 4.799999701981039e-01, 4.59999970198246e-01, 4.399999403962078e-01, 4.200000298016828e-01, 4.00000029801967e-01, 3.800000000000709e-01, 3.600000000002133e-01, 3.399999701981751e-01, 3.199999403965277e-01, 3.00000059603579e-01, 2.800000298018961e-01, 2.599999999998579e-01, 2.399999850990164e-01, 2.199999701982105e-01, 1.999999552972269e-01, 1.800000596036677e-01, 1.600000298018249e-01, 1.400000149008946e-01, 1.199999925493573e-01, 9.999997764865798e-02, 7.99999552972359e-02, 6.00000558784486e-02, 4.000003725226355e-02, 2.000001862613177e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
time=[0e+00, 1e+00]
-floMacDyn.dpMachine=[3.819660034179688e+02, 4.766995551114627e+02, 4.943379824624175e+02, 4.981247254345277e+02, 4.989478454859282e+02, 4.991274413996107e+02, 4.991666564960233e+02, 4.991753540037698e+02, 4.99177215576281e+02, 4.991774291992188e+02, 4.99177490234375e+02, 4.991776123046966e+02, 4.991776733398438e+02, 4.991777038574219e+02, 4.991777038574219e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776428222656e+02, 4.991776428222656e+02, 4.991776428222656e+02, 4.991776428222656e+02, 4.991776428222656e+02, 4.819456914347608e+02, 4.630516866745697e+02, 4.441013206068409e+02, 4.254536894592623e+02, 4.071852938068841e+02, 3.893118938718313e+02, 3.718371458758588e+02, 3.547624123169213e+02, 3.380876218729161e+02, 3.218127345832193e+02, 3.059380412788723e+02, 2.904635693141461e+02, 2.753894887763743e+02, 2.607159827712439e+02, 2.464431999400378e+02, 2.325711621171876e+02, 2.191000040131373e+02, 2.060299012014906e+02, 1.933608521394113e+02, 1.810930337583667e+02, 1.692265570093825e+02, 1.577614580125583e+02, 1.466978491064055e+02, 1.36035883427912e+02, 1.257755584716797e+02, 1.159169982745177e+02, 1.064602790538257e+02, 9.740547710387663e+01, 8.875272665654923e+01, 8.05019780275438e+01, 7.265336792178633e+01, 6.520694980269032e+01, 5.816279611144667e+01, 5.152095642009812e+01, 4.52815277061184e+01, 3.945436522797682e+01, 3.410685593809134e+01, 2.925629970112054e+01, 2.486349086439177e+01, 2.089001718595297e+01, 1.730537361873739e+01, 1.40831064181975e+01, 1.11987877523382e+01, 8.628688242240919e+00, 6.353070134094843e+00, 4.361345678103525e+00, 2.662859173718023e+00, 1.305051941849334e+00, 3.723658880331966e-01, 3.075692802667618e-06, -1.557052917190082e-09, -7.275929859077615e-11, -1.455191522836685e-11, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-floMacSta.dpMachine=[4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.794398617743659e+02, 4.60098378735429e+02, 4.411532615168607e+02, 4.226047515662231e+02, 4.044529938614071e+02, 3.866980632772671e+02, 3.693401366808059e+02, 3.523794165633871e+02, 3.358159238354154e+02, 3.196498318150345e+02, 3.03881339468104e+02, 2.885104442652517e+02, 2.735373770073344e+02, 2.589621987299449e+02, 2.447850577938055e+02, 2.31006037638156e+02, 2.17625242166598e+02, 2.046428466961402e+02, 1.92058850206186e+02, 1.798734141037055e+02, 1.68086649106894e+02, 1.566985918106157e+02, 1.457093695701548e+02, 1.351190895372946e+02, 1.249277725219727e+02, 1.151355423425644e+02, 1.057424675876581e+02, 9.674862455141749e+01, 8.815413186832403e+01, 7.995896343619431e+01, 7.21632250871787e+01, 6.47669855429761e+01, 5.777030580097554e+01, 5.117323161869565e+01, 4.497585973124306e+01, 3.918022580065193e+01, 3.379532490656646e+01, 2.882868923497502e+01, 2.428444630137457e+01, 2.016343911214301e+01, 1.646309634831643e+01, 1.317693850012823e+01, 1.029396252050215e+01, 7.797536307782446e+00, 5.664503184096723e+00, 3.865953326378335e+00, 2.373942729492089e+00, 1.189011777832478e+00, 3.556552820124339e-01, 2.727179804176054e-16, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00]
-floMacSta.VMachine_flow=[8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.179551799330834e-01, 8.012098253604085e-01, 7.844675203252821e-01, 7.677283147381856e-01, 7.509921988664439e-01, 7.342589537458853e-01, 7.175286292588894e-01, 7.008012156472726e-01, 6.840764939988395e-01, 6.673544545648926e-01, 6.506350875641913e-01, 6.339182933405832e-01, 6.172039429126689e-01, 6.004920362800221e-01, 5.837825636319149e-01, 5.670753657677331e-01, 5.503703732797423e-01, 5.336675763383496e-01, 5.169668753863813e-01, 5.00268200996563e-01, 4.835715433205083e-01, 4.668767432339683e-01, 4.501837908951999e-01, 4.334926764397228e-01, 4.168032109737396e-01, 4.001154144414578e-01, 3.834291676330666e-01, 3.667444407458171e-01, 3.500612736084016e-01, 3.33379377938475e-01, 3.166987935734454e-01, 3.00019460908206e-01, 2.833413203380766e-01, 2.666642824562558e-01, 2.499884168513041e-01, 2.333011270105493e-01, 2.165425797956496e-01, 1.996426948237181e-01, 1.825317195393328e-01, 1.651394245822069e-01, 1.47396194194614e-01, 1.292373546042894e-01, 1.106163174348533e-01, 9.153306023404656e-02, 7.209600415124648e-02, 5.264118295486991e-02, 3.392443780500445e-02, 1.744533575602981e-02, 5.264308190498649e-03, 4.040266508293289e-18, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00]
-floMacDyn.VMachine_flow=[1.030056595802307e+00, 8.7216740735283e-01, 8.427700395607741e-01, 8.364588020686494e-01, 8.350869416741311e-01, 8.347876072040732e-01, 8.347222804991619e-01, 8.347077369692162e-01, 8.347046375273059e-01, 8.347042798995972e-01, 8.34704160690352e-01, 8.347039818763555e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347039222717285e-01, 8.347038626672969e-01, 8.347039222717285e-01, 8.347039222717285e-01, 8.347039222717285e-01, 8.347039222717285e-01, 8.347039222717285e-01, 8.347039222717285e-01, 8.347039222717285e-01, 8.136936251909572e-01, 7.960825746137825e-01, 7.792405506055319e-01, 7.625672678357061e-01, 7.459324796546294e-01, 7.293086687615675e-01, 7.126896262523089e-01, 6.960732558690224e-01, 6.794594585702448e-01, 6.62848641509355e-01, 6.462407349682538e-01, 6.296354611416017e-01, 6.130328099245776e-01, 5.964327217121107e-01, 5.798350671509395e-01, 5.632396877072218e-01, 5.4664669245402e-01, 5.300559520173254e-01, 5.134674271136896e-01, 4.968809287725593e-01, 4.802965660196928e-01, 4.637141207955798e-01, 4.471335531218449e-01, 4.30554912403064e-01, 4.139779806137085e-01, 3.974027475606594e-01, 3.808291536381837e-01, 3.642571392416367e-01, 3.476867137257947e-01, 3.311176497556825e-01, 3.145499268930731e-01, 2.979834855327556e-01, 2.814182660701183e-01, 2.648541790976146e-01, 2.482912339266785e-01, 2.316703886620744e-01, 2.145470016825627e-01, 1.9667553029805e-01, 1.781489132197243e-01, 1.590906516778417e-01, 1.396061994858921e-01, 1.198104728362169e-01, 9.986110714079272e-02, 8.001040944168225e-02, 6.064564351885609e-02, 4.235008740178651e-02, 2.593029797545467e-02, 1.251978710299656e-02, 3.28057393959483e-03, -2.050461262115277e-05, 1.036397871268128e-08, 4.23141851327125e-10, 1.129785042617306e-10, 8.439181432356667e-12, 5.068734436450478e-12, 1.735616001291087e-12, -5.851778064256397e-14, 3.27293151352209e-14, 1.239764447915369e-13, -2.121337731347966e-13, -1.189907928907693e-13, -2.774375132632005e-14, 6.350387285162306e-14, -2.052983208624177e-14, 1.653702518243965e-13, -5.006056154944022e-14, -9.128159691674524e-14, 1.891079140590692e-13, 8.442325228575341e-14, 1.723683333872595e-13, 1.702462672313096e-13, -2.009991120313302e-13, 6.481339925912228e-14, -1.691157624735102e-13, 9.892919274577527e-14]
+gain.u=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.8e-01, 9.6e-01, 9.399999999999999e-01, 9.2e-01, 9e-01, 8.8e-01, 8.6e-01, 8.4e-01, 8.2e-01, 8e-01, 7.8e-01, 7.6e-01, 7.4e-01, 7.2e-01, 7e-01, 6.8e-01, 6.6e-01, 6.4e-01, 6.2e-01, 6e-01, 5.8e-01, 5.600000000000001e-01, 5.4e-01, 5.2e-01, 5e-01, 4.799999701981039e-01, 4.59999970198246e-01, 4.399999403962078e-01, 4.200000298016828e-01, 4.00000029801967e-01, 3.800000000000709e-01, 3.600000000002133e-01, 3.399999701981751e-01, 3.199999403965277e-01, 3.00000059603579e-01, 2.800000298018961e-01, 2.599999999998579e-01, 2.399999850990164e-01, 2.199999701982105e-01, 1.999999552972269e-01, 1.800000596036677e-01, 1.600000298018249e-01, 1.400000149008946e-01, 1.199999925493573e-01, 9.999997764865798e-02, 7.99999552972359e-02, 6.00000558784486e-02, 4.000003725226355e-02, 2.000001862613177e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+floMacSta.dpMachine=[4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.991776733398438e+02, 4.794398617743659e+02, 4.60098378735429e+02, 4.411532615168607e+02, 4.226047515662231e+02, 4.044529938614071e+02, 3.866980632772671e+02, 3.693401366808059e+02, 3.523794165633871e+02, 3.358159238354154e+02, 3.196498318150345e+02, 3.03881339468104e+02, 2.885104442652517e+02, 2.735373770073344e+02, 2.589621987299449e+02, 2.447850577938055e+02, 2.31006037638156e+02, 2.17625242166598e+02, 2.046428466961402e+02, 1.92058850206186e+02, 1.798734141037055e+02, 1.68086649106894e+02, 1.566985918106157e+02, 1.457093695701548e+02, 1.351190895372946e+02, 1.249277725219727e+02, 1.151355423425644e+02, 1.057424675876581e+02, 9.674862455141749e+01, 8.815413186832403e+01, 7.995896343619431e+01, 7.21632250871787e+01, 6.47669855429761e+01, 5.777030580097554e+01, 5.117323161869565e+01, 4.497585973124306e+01, 3.918022580065193e+01, 3.379532490656646e+01, 2.882868923497502e+01, 2.428444630137457e+01, 2.016343911214301e+01, 1.646309634831643e+01, 1.317693850012823e+01, 1.029396252050215e+01, 7.797536307782446e+00, 5.664503184096723e+00, 3.865953326378335e+00, 2.373942729492089e+00, 1.189011777832478e+00, 3.556552820124339e-01, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00]
+floMacDyn.dpMachine=[3.819660034179688e+02, 4.766992499358793e+02, 4.943363955481709e+02, 4.981237183545724e+02, 4.989477539332347e+02, 4.991255798274815e+02, 4.991662292500728e+02, 4.991748657225244e+02, 4.991771240235466e+02, 4.991775512693675e+02, 4.991780700682912e+02, 4.991782226562409e+02, 4.99177947997965e+02, 4.99177673339771e+02, 4.991776733398347e+02, 4.991777648924872e+02, 4.991777954101562e+02, 4.991777648926054e+02, 4.99177703857531e+02, 4.991776733398438e+02, 4.991776428222656e+02, 4.991776123046875e+02, 4.991776123047057e+02, 4.991776123047512e+02, 4.991776428222656e+02, 4.991776733398438e+02, 4.819452031532197e+02, 4.630534261794696e+02, 4.441022666518538e+02, 4.254541472229342e+02, 4.071856905353997e+02, 3.893125042234302e+02, 3.718374815688907e+02, 3.54762564905012e+02, 3.380877439432832e+02, 3.21812887171019e+02, 3.059381023140285e+02, 2.904635082790626e+02, 2.753893972236399e+02, 2.607158912185096e+02, 2.464431389047906e+02, 2.325712078935821e+02, 2.191001260834498e+02, 2.060300537893813e+02, 1.933609589508802e+02, 1.810929574643305e+02, 1.69226358645252e+02, 1.577611680955661e+02, 1.466975897070733e+02, 1.360358071337484e+02, 1.257754516601562e+02, 1.159164260692366e+02, 1.064593177506969e+02, 9.740517955879956e+01, 8.875274191509273e+01, 8.050211535650894e+01, 7.265348999210792e+01, 6.520702609656742e+01, 5.816281137017207e+01, 5.152093353176446e+01, 4.528155059352893e+01, 3.945436141349783e+01, 3.410650117095461e+01, 2.925580188373673e+01, 2.486386852004861e+01, 2.089062944515968e+01, 1.730616517009572e+01, 1.408298434764626e+01, 1.119890600817512e+01, 8.629098322079875e+00, 6.353054878150746e+00, 4.361795801578813e+00, 2.662918775992468e+00, 1.305368440178004e+00, 3.715901946608673e-01, -2.31727899517864e-05, 1.625446244314335e-07, -5.384220707966763e-09, -1.062289187180899e-09, -8.731153820694205e-10, -6.839402759373578e-10, -5.093170676877553e-10, -3.201420309424247e-10, -1.45518787997906e-10, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+floMacSta.VMachine_flow=[8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.347038626670837e-01, 8.179551799330834e-01, 8.012098253604085e-01, 7.844675203252821e-01, 7.677283147381856e-01, 7.509921988664439e-01, 7.342589537458853e-01, 7.175286292588894e-01, 7.008012156472726e-01, 6.840764939988395e-01, 6.673544545648926e-01, 6.506350875641913e-01, 6.339182933405832e-01, 6.172039429126689e-01, 6.004920362800221e-01, 5.837825636319149e-01, 5.670753657677331e-01, 5.503703732797423e-01, 5.336675763383496e-01, 5.169668753863813e-01, 5.00268200996563e-01, 4.835715433205083e-01, 4.668767432339683e-01, 4.501837908951999e-01, 4.334926764397228e-01, 4.168032109737396e-01, 4.001154144414578e-01, 3.834291676330666e-01, 3.667444407458171e-01, 3.500612736084016e-01, 3.33379377938475e-01, 3.166987935734454e-01, 3.00019460908206e-01, 2.833413203380766e-01, 2.666642824562558e-01, 2.499884168513041e-01, 2.333011270105493e-01, 2.165425797956496e-01, 1.996426948237181e-01, 1.825317195393328e-01, 1.651394245822069e-01, 1.47396194194614e-01, 1.292373546042894e-01, 1.106163174348533e-01, 9.153306023404656e-02, 7.209600415124648e-02, 5.264118295486991e-02, 3.392443780500445e-02, 1.744533575602981e-02, 5.264308190498649e-03, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00]
+floMacDyn.VMachine_flow=[1.030056595802307e+00, 8.721678841896618e-01, 8.42772662165464e-01, 8.364604709985033e-01, 8.350870608833674e-01, 8.347907066453573e-01, 8.347229361500546e-01, 8.347085118296071e-01, 8.347047567365955e-01, 8.34704101085876e-01, 8.347032666207248e-01, 8.347029685974299e-01, 8.347034454347302e-01, 8.347038626672258e-01, 8.347039222717285e-01, 8.347037434579718e-01, 8.347036838531494e-01, 8.347037434577409e-01, 8.34703803062439e-01, 8.347038626671548e-01, 8.347039222717285e-01, 8.347039818763733e-01, 8.347039818763378e-01, 8.347039818763733e-01, 8.347039222717285e-01, 8.347039222717285e-01, 8.136944596565525e-01, 7.960795347717832e-01, 7.792388816753005e-01, 7.625664333706792e-01, 7.459317643988921e-01, 7.293075362732457e-01, 7.126890302062875e-01, 6.960729578457985e-01, 6.794591605470209e-01, 6.628483434863087e-01, 6.462406157589643e-01, 6.296355803508913e-01, 6.130330483431568e-01, 5.964329601306898e-01, 5.798351863604067e-01, 5.632395684979322e-01, 5.466463944304053e-01, 5.300555347848119e-01, 5.134671290906079e-01, 4.968811373891713e-01, 4.802971024612471e-01, 4.637149552606244e-01, 4.471343577842296e-01, 4.305551508223537e-01, 4.139783382415771e-01, 3.974047145164949e-01, 3.808326405081978e-01, 3.64258271725198e-01, 3.476866541221091e-01, 3.3111708351209e-01, 3.145493904512701e-01, 2.979831577073159e-01, 2.814182064654735e-01, 2.64854298307295e-01, 2.482911147216521e-01, 2.316704333640658e-01, 2.145492815619662e-01, 1.966789873632548e-01, 1.781460521916592e-01, 1.590855405758219e-01, 1.395988830026544e-01, 1.198117468876128e-01, 9.985970642921581e-02, 8.000471719956283e-02, 6.064589678941434e-02, 4.23407408792791e-02, 2.592864959743286e-02, 1.250635101440466e-02, 3.372657982636132e-03, 1.544852857477963e-04, -1.083631246587161e-06, 3.59360628349922e-08, 7.038012474514057e-09, 5.822612110273987e-09, 4.606116935778119e-09, 3.389405934836711e-09, 2.172943840845432e-09, 9.563679491592524e-10, 4.640085350200311e-11, 4.433723468924273e-11, 4.294325101582919e-11, 4.139776456397266e-11, 3.989284411687186e-11, 3.783378622259321e-11, 3.583767468605102e-11, 3.43205761606144e-11, 3.270824824949588e-11, 3.129242054143819e-11, 2.936949610903533e-11, 2.792973437732623e-11, 2.570040813539709e-11, 2.417135720722423e-11, 2.228687909829734e-11, 2.075848955065734e-11, 1.92824558403748e-11]
diff --git a/IBPSA/Resources/Scripts/Conversion/ConvertIBPSA_from_3.0_to_4.0.mos b/IBPSA/Resources/Scripts/Conversion/ConvertIBPSA_from_3.0_to_4.0.mos
index dcda818dc6..fbbf3e7c74 100644
--- a/IBPSA/Resources/Scripts/Conversion/ConvertIBPSA_from_3.0_to_4.0.mos
+++ b/IBPSA/Resources/Scripts/Conversion/ConvertIBPSA_from_3.0_to_4.0.mos
@@ -9,36 +9,36 @@ convertClear();
convertModifiers("IBPSA.Fluid.Storage.ExpansionVessel", {"p"}, fill("",0), true);
// Conversion for https://github.com/ibpsa/modelica-ibpsa/issues/1542
-convertClass("IBPSA.Airflow.Multizone.MediumColumnDynamic", {"massDynamics"}, fill("",0), true);
-convertClass("IBPSA.Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear", {"massDynamics"}, fill("",0), true);
-convertClass("IBPSA.Fluid.Actuators.Valves.ThreeWayLinear", {"massDynamics"}, fill("",0), true);
-convertClass("IBPSA.Fluid.Actuators.Valves.ThreeWayTable", {"massDynamics"}, fill("",0), true);
-convertClass("IBPSA.Fluid.HeatExchangers.Radiators.RadiatorEN442_2", {"massDynamics"}, fill("",0), true);
-convertClass("IBPSA.Fluid.Movers.FlowControlled_dp", {"massDynamics"}, fill("",0), true);
-convertClass("IBPSA.Fluid.Movers.FlowControlled_m_flow", {"massDynamics"}, fill("",0), true);
-convertClass("IBPSA.Fluid.Movers.SpeedControlled_Nrpm", {"massDynamics"}, fill("",0), true);
-convertClass("IBPSA.Fluid.Movers.SpeedControlled_y", {"massDynamics"}, fill("",0), true);
-convertClass("IBPSA.Fluid.Storage.Stratified", {"massDynamics"}, fill("",0), true);
-convertClass("IBPSA.Fluid.Storage.StratifiedEnhanced", {"massDynamics"}, fill("",0), true);
-convertClass("IBPSA.Fluid.Storage.StratifiedEnhancedInternalHex", {"massDynamics"}, fill("",0), true);
-convertClass("IBPSA.Fluid.HeatExchangers.EvaporatorCondenser", {"massDynamics"}, fill("",0), true);
-convertClass("IBPSA.Fluid.HeatExchangers.HeaterCooler_u", {"massDynamics"}, fill("",0), true);
-convertClass("IBPSA.Fluid.Humidifiers.Humidifier_u", {"massDynamics"}, fill("",0), true);
-convertClass("IBPSA.Fluid.Interfaces.TwoPortHeatMassExchanger", {"massDynamics"}, fill("",0), true);
-convertClass("IBPSA.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.InternalHEXOneUTube", {"massDynamics"}, fill("",0), true);
-convertClass("IBPSA.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.InternalHEXTwoUTube", {"massDynamics"}, fill("",0), true);
-convertClass("IBPSA.Fluid.HeatExchangers.PrescribedOutlet", {"massDynamics"}, fill("",0), true);
-convertClass("IBPSA.Fluid.Interfaces.PrescribedOutlet", {"massDynamics"}, fill("",0), true);
-convertClass("IBPSA.ThermalZones.ReducedOrder.RC.FourElements", {"massDynamics"}, fill("",0), true);
-convertClass("IBPSA.ThermalZones.ReducedOrder.RC.OneElement", {"massDynamics"}, fill("",0), true);
-convertClass("IBPSA.ThermalZones.ReducedOrder.RC.ThreeElements", {"massDynamics"}, fill("",0), true);
-convertClass("IBPSA.ThermalZones.ReducedOrder.RC.TwoElements", {"massDynamics"}, fill("",0), true);
-convertClass("IBPSA.Fluid.HeatExchangers.ActiveBeams.Cooling", {"massDynamics"}, fill("",0), true);
-convertClass("IBPSA.Fluid.HeatExchangers.ActiveBeams.CoolingAndHeating", {"massDynamics"}, fill("",0), true);
-convertClass("IBPSA.Fluid.HeatExchangers.WetCoilEffectivenessNTU", {"massDynamics"}, fill("",0), true);
-convertClass("IBPSA.Fluid.Delays.DelayFirstOrder", {"massDynamics"}, fill("",0), true);
-
-convertClass("IBPSA.Fluid.Storage.StratifiedEnhancedInternalHex", {"massDynamicsHex"}, fill("",0), true);
+convertModifiers("IBPSA.Airflow.Multizone.MediumColumnDynamic", {"massDynamics"}, fill("",0), true);
+convertModifiers("IBPSA.Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear", {"massDynamics"}, fill("",0), true);
+convertModifiers("IBPSA.Fluid.Actuators.Valves.ThreeWayLinear", {"massDynamics"}, fill("",0), true);
+convertModifiers("IBPSA.Fluid.Actuators.Valves.ThreeWayTable", {"massDynamics"}, fill("",0), true);
+convertModifiers("IBPSA.Fluid.HeatExchangers.Radiators.RadiatorEN442_2", {"massDynamics"}, fill("",0), true);
+convertModifiers("IBPSA.Fluid.Movers.FlowControlled_dp", {"massDynamics"}, fill("",0), true);
+convertModifiers("IBPSA.Fluid.Movers.FlowControlled_m_flow", {"massDynamics"}, fill("",0), true);
+convertModifiers("IBPSA.Fluid.Movers.SpeedControlled_Nrpm", {"massDynamics"}, fill("",0), true);
+convertModifiers("IBPSA.Fluid.Movers.SpeedControlled_y", {"massDynamics"}, fill("",0), true);
+convertModifiers("IBPSA.Fluid.Storage.Stratified", {"massDynamics"}, fill("",0), true);
+convertModifiers("IBPSA.Fluid.Storage.StratifiedEnhanced", {"massDynamics"}, fill("",0), true);
+convertModifiers("IBPSA.Fluid.Storage.StratifiedEnhancedInternalHex", {"massDynamics"}, fill("",0), true);
+convertModifiers("IBPSA.Fluid.HeatExchangers.EvaporatorCondenser", {"massDynamics"}, fill("",0), true);
+convertModifiers("IBPSA.Fluid.HeatExchangers.HeaterCooler_u", {"massDynamics"}, fill("",0), true);
+convertModifiers("IBPSA.Fluid.Humidifiers.Humidifier_u", {"massDynamics"}, fill("",0), true);
+convertModifiers("IBPSA.Fluid.Interfaces.TwoPortHeatMassExchanger", {"massDynamics"}, fill("",0), true);
+convertModifiers("IBPSA.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.InternalHEXOneUTube", {"massDynamics"}, fill("",0), true);
+convertModifiers("IBPSA.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.InternalHEXTwoUTube", {"massDynamics"}, fill("",0), true);
+convertModifiers("IBPSA.Fluid.HeatExchangers.PrescribedOutlet", {"massDynamics"}, fill("",0), true);
+convertModifiers("IBPSA.Fluid.Interfaces.PrescribedOutlet", {"massDynamics"}, fill("",0), true);
+convertModifiers("IBPSA.ThermalZones.ReducedOrder.RC.FourElements", {"massDynamics"}, fill("",0), true);
+convertModifiers("IBPSA.ThermalZones.ReducedOrder.RC.OneElement", {"massDynamics"}, fill("",0), true);
+convertModifiers("IBPSA.ThermalZones.ReducedOrder.RC.ThreeElements", {"massDynamics"}, fill("",0), true);
+convertModifiers("IBPSA.ThermalZones.ReducedOrder.RC.TwoElements", {"massDynamics"}, fill("",0), true);
+convertModifiers("IBPSA.Fluid.HeatExchangers.ActiveBeams.Cooling", {"massDynamics"}, fill("",0), true);
+convertModifiers("IBPSA.Fluid.HeatExchangers.ActiveBeams.CoolingAndHeating", {"massDynamics"}, fill("",0), true);
+convertModifiers("IBPSA.Fluid.HeatExchangers.WetCoilEffectivenessNTU", {"massDynamics"}, fill("",0), true);
+convertModifiers("IBPSA.Fluid.Delays.DelayFirstOrder", {"massDynamics"}, fill("",0), true);
+
+convertModifiers("IBPSA.Fluid.Storage.StratifiedEnhancedInternalHex", {"massDynamicsHex"}, fill("",0), true);
convertElement("IBPSA.Fluid.Humidifiers.SteamHumidifier_X",
"massDynamics",
diff --git a/IBPSA/Resources/Scripts/Dymola/Fluid/Movers/Validation/NegativePressureOrFlow.mos b/IBPSA/Resources/Scripts/Dymola/Fluid/Movers/Validation/NegativePressureOrFlow.mos
new file mode 100644
index 0000000000..801e13eb09
--- /dev/null
+++ b/IBPSA/Resources/Scripts/Dymola/Fluid/Movers/Validation/NegativePressureOrFlow.mos
@@ -0,0 +1,34 @@
+simulateModel("IBPSA.Fluid.Movers.Validation.NegativePressureOrFlow",
+ tolerance=1e-6,
+ stopTime=3600,
+ method="CVode",
+ resultFile="NegativePressureOrFlow");
+// Plot commands
+createPlot(id=1,
+ position={56, -6, 666, 645},
+ y={"fan.P"},
+ range={0.0, 4000.0, -500.0, 1000.0},
+ grid=true,
+ subPlot=101,
+ colors={{28,108,200}},
+ timeUnit="s",
+ displayUnits={"W"});
+createPlot(id=1,
+ position={56, -6, 666, 645},
+ y={"fan.dpMachine"},
+ range={0.0, 4000.0, -50000.0, 50000.0},
+ grid=true,
+ subPlot=102,
+ colors={{28,108,200}},
+ timeUnit="s",
+ displayUnits={"Pa"});
+createPlot(id=1,
+ position={56, -6, 666, 645},
+ y={"fan.m_flow"},
+ range={0.0, 4000.0, -2.0, 2.0},
+ autoscale=false,
+ grid=true,
+ subPlot=103,
+ colors={{28,108,200}},
+ timeUnit="s",
+ displayUnits={"kg/s"});
diff --git a/IBPSA/Resources/src/convertEPW/doc/ConvertWeatherData.html b/IBPSA/Resources/src/convertEPW/doc/ConvertWeatherData.html
index d0d2a99076..53ca6cc784 100644
--- a/IBPSA/Resources/src/convertEPW/doc/ConvertWeatherData.html
+++ b/IBPSA/Resources/src/convertEPW/doc/ConvertWeatherData.html
@@ -2,10 +2,10 @@
-
+
ConvertWeatherData
-
+
diff --git a/IBPSA/Resources/src/convertEPW/doc/allclasses-index.html b/IBPSA/Resources/src/convertEPW/doc/allclasses-index.html
index 311ee3a84c..36fa19991e 100644
--- a/IBPSA/Resources/src/convertEPW/doc/allclasses-index.html
+++ b/IBPSA/Resources/src/convertEPW/doc/allclasses-index.html
@@ -2,10 +2,10 @@
-
+
All Classes
-
+
diff --git a/IBPSA/Resources/src/convertEPW/doc/allclasses.html b/IBPSA/Resources/src/convertEPW/doc/allclasses.html
index 16215c43c5..a2bc211298 100644
--- a/IBPSA/Resources/src/convertEPW/doc/allclasses.html
+++ b/IBPSA/Resources/src/convertEPW/doc/allclasses.html
@@ -2,10 +2,10 @@
-
+
All Classes
-
+
diff --git a/IBPSA/Resources/src/convertEPW/doc/allpackages-index.html b/IBPSA/Resources/src/convertEPW/doc/allpackages-index.html
index f5a73b3903..1c922b04ca 100644
--- a/IBPSA/Resources/src/convertEPW/doc/allpackages-index.html
+++ b/IBPSA/Resources/src/convertEPW/doc/allpackages-index.html
@@ -2,10 +2,10 @@
-
+
All Packages
-
+
diff --git a/IBPSA/Resources/src/convertEPW/doc/constant-values.html b/IBPSA/Resources/src/convertEPW/doc/constant-values.html
index 3cec5aa2f7..a6343766e7 100644
--- a/IBPSA/Resources/src/convertEPW/doc/constant-values.html
+++ b/IBPSA/Resources/src/convertEPW/doc/constant-values.html
@@ -2,10 +2,10 @@
-
+
Constant Field Values
-
+
diff --git a/IBPSA/Resources/src/convertEPW/doc/deprecated-list.html b/IBPSA/Resources/src/convertEPW/doc/deprecated-list.html
index 9f8d670969..d209f76a3e 100644
--- a/IBPSA/Resources/src/convertEPW/doc/deprecated-list.html
+++ b/IBPSA/Resources/src/convertEPW/doc/deprecated-list.html
@@ -2,10 +2,10 @@
-
+
Deprecated List
-
+
diff --git a/IBPSA/Resources/src/convertEPW/doc/help-doc.html b/IBPSA/Resources/src/convertEPW/doc/help-doc.html
index 4e2faf0209..924de7b8af 100644
--- a/IBPSA/Resources/src/convertEPW/doc/help-doc.html
+++ b/IBPSA/Resources/src/convertEPW/doc/help-doc.html
@@ -2,10 +2,10 @@
-
+
API Help
-
+
diff --git a/IBPSA/Resources/src/convertEPW/doc/index-all.html b/IBPSA/Resources/src/convertEPW/doc/index-all.html
index dbb2bf3ec7..93c55f0337 100644
--- a/IBPSA/Resources/src/convertEPW/doc/index-all.html
+++ b/IBPSA/Resources/src/convertEPW/doc/index-all.html
@@ -2,10 +2,10 @@
-
+
Index
-
+
diff --git a/IBPSA/Resources/src/convertEPW/doc/index.html b/IBPSA/Resources/src/convertEPW/doc/index.html
index 97611681f0..01d829bba4 100644
--- a/IBPSA/Resources/src/convertEPW/doc/index.html
+++ b/IBPSA/Resources/src/convertEPW/doc/index.html
@@ -2,7 +2,7 @@
-
+
Generated Documentation (Untitled)
diff --git a/IBPSA/Resources/src/convertEPW/doc/jquery/jquery-3.3.1.js b/IBPSA/Resources/src/convertEPW/doc/jquery/jquery-3.3.1.js
deleted file mode 100644
index 9b5206bcc6..0000000000
--- a/IBPSA/Resources/src/convertEPW/doc/jquery/jquery-3.3.1.js
+++ /dev/null
@@ -1,10364 +0,0 @@
-/*!
- * jQuery JavaScript Library v3.3.1
- * https://jquery.com/
- *
- * Includes Sizzle.js
- * https://sizzlejs.com/
- *
- * Copyright JS Foundation and other contributors
- * Released under the MIT license
- * https://jquery.org/license
- *
- * Date: 2018-01-20T17:24Z
- */
-( function( global, factory ) {
-
- "use strict";
-
- if ( typeof module === "object" && typeof module.exports === "object" ) {
-
- // For CommonJS and CommonJS-like environments where a proper `window`
- // is present, execute the factory and get jQuery.
- // For environments that do not have a `window` with a `document`
- // (such as Node.js), expose a factory as module.exports.
- // This accentuates the need for the creation of a real `window`.
- // e.g. var jQuery = require("jquery")(window);
- // See ticket #14549 for more info.
- module.exports = global.document ?
- factory( global, true ) :
- function( w ) {
- if ( !w.document ) {
- throw new Error( "jQuery requires a window with a document" );
- }
- return factory( w );
- };
- } else {
- factory( global );
- }
-
-// Pass this if window is not defined yet
-} )( typeof window !== "undefined" ? window : this, function( window, noGlobal ) {
-
-// Edge <= 12 - 13+, Firefox <=18 - 45+, IE 10 - 11, Safari 5.1 - 9+, iOS 6 - 9.1
-// throw exceptions when non-strict code (e.g., ASP.NET 4.5) accesses strict mode
-// arguments.callee.caller (trac-13335). But as of jQuery 3.0 (2016), strict mode should be common
-// enough that all such attempts are guarded in a try block.
-"use strict";
-
-var arr = [];
-
-var document = window.document;
-
-var getProto = Object.getPrototypeOf;
-
-var slice = arr.slice;
-
-var concat = arr.concat;
-
-var push = arr.push;
-
-var indexOf = arr.indexOf;
-
-var class2type = {};
-
-var toString = class2type.toString;
-
-var hasOwn = class2type.hasOwnProperty;
-
-var fnToString = hasOwn.toString;
-
-var ObjectFunctionString = fnToString.call( Object );
-
-var support = {};
-
-var isFunction = function isFunction( obj ) {
-
- // Support: Chrome <=57, Firefox <=52
- // In some browsers, typeof returns "function" for HTML elements
- // (i.e., `typeof document.createElement( "object" ) === "function"`).
- // We don't want to classify *any* DOM node as a function.
- return typeof obj === "function" && typeof obj.nodeType !== "number";
- };
-
-
-var isWindow = function isWindow( obj ) {
- return obj != null && obj === obj.window;
- };
-
-
-
-
- var preservedScriptAttributes = {
- type: true,
- src: true,
- noModule: true
- };
-
- function DOMEval( code, doc, node ) {
- doc = doc || document;
-
- var i,
- script = doc.createElement( "script" );
-
- script.text = code;
- if ( node ) {
- for ( i in preservedScriptAttributes ) {
- if ( node[ i ] ) {
- script[ i ] = node[ i ];
- }
- }
- }
- doc.head.appendChild( script ).parentNode.removeChild( script );
- }
-
-
-function toType( obj ) {
- if ( obj == null ) {
- return obj + "";
- }
-
- // Support: Android <=2.3 only (functionish RegExp)
- return typeof obj === "object" || typeof obj === "function" ?
- class2type[ toString.call( obj ) ] || "object" :
- typeof obj;
-}
-/* global Symbol */
-// Defining this global in .eslintrc.json would create a danger of using the global
-// unguarded in another place, it seems safer to define global only for this module
-
-
-
-var
- version = "3.3.1",
-
- // Define a local copy of jQuery
- jQuery = function( selector, context ) {
-
- // The jQuery object is actually just the init constructor 'enhanced'
- // Need init if jQuery is called (just allow error to be thrown if not included)
- return new jQuery.fn.init( selector, context );
- },
-
- // Support: Android <=4.0 only
- // Make sure we trim BOM and NBSP
- rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;
-
-jQuery.fn = jQuery.prototype = {
-
- // The current version of jQuery being used
- jquery: version,
-
- constructor: jQuery,
-
- // The default length of a jQuery object is 0
- length: 0,
-
- toArray: function() {
- return slice.call( this );
- },
-
- // Get the Nth element in the matched element set OR
- // Get the whole matched element set as a clean array
- get: function( num ) {
-
- // Return all the elements in a clean array
- if ( num == null ) {
- return slice.call( this );
- }
-
- // Return just the one element from the set
- return num < 0 ? this[ num + this.length ] : this[ num ];
- },
-
- // Take an array of elements and push it onto the stack
- // (returning the new matched element set)
- pushStack: function( elems ) {
-
- // Build a new jQuery matched element set
- var ret = jQuery.merge( this.constructor(), elems );
-
- // Add the old object onto the stack (as a reference)
- ret.prevObject = this;
-
- // Return the newly-formed element set
- return ret;
- },
-
- // Execute a callback for every element in the matched set.
- each: function( callback ) {
- return jQuery.each( this, callback );
- },
-
- map: function( callback ) {
- return this.pushStack( jQuery.map( this, function( elem, i ) {
- return callback.call( elem, i, elem );
- } ) );
- },
-
- slice: function() {
- return this.pushStack( slice.apply( this, arguments ) );
- },
-
- first: function() {
- return this.eq( 0 );
- },
-
- last: function() {
- return this.eq( -1 );
- },
-
- eq: function( i ) {
- var len = this.length,
- j = +i + ( i < 0 ? len : 0 );
- return this.pushStack( j >= 0 && j < len ? [ this[ j ] ] : [] );
- },
-
- end: function() {
- return this.prevObject || this.constructor();
- },
-
- // For internal use only.
- // Behaves like an Array's method, not like a jQuery method.
- push: push,
- sort: arr.sort,
- splice: arr.splice
-};
-
-jQuery.extend = jQuery.fn.extend = function() {
- var options, name, src, copy, copyIsArray, clone,
- target = arguments[ 0 ] || {},
- i = 1,
- length = arguments.length,
- deep = false;
-
- // Handle a deep copy situation
- if ( typeof target === "boolean" ) {
- deep = target;
-
- // Skip the boolean and the target
- target = arguments[ i ] || {};
- i++;
- }
-
- // Handle case when target is a string or something (possible in deep copy)
- if ( typeof target !== "object" && !isFunction( target ) ) {
- target = {};
- }
-
- // Extend jQuery itself if only one argument is passed
- if ( i === length ) {
- target = this;
- i--;
- }
-
- for ( ; i < length; i++ ) {
-
- // Only deal with non-null/undefined values
- if ( ( options = arguments[ i ] ) != null ) {
-
- // Extend the base object
- for ( name in options ) {
- src = target[ name ];
- copy = options[ name ];
-
- // Prevent never-ending loop
- if ( target === copy ) {
- continue;
- }
-
- // Recurse if we're merging plain objects or arrays
- if ( deep && copy && ( jQuery.isPlainObject( copy ) ||
- ( copyIsArray = Array.isArray( copy ) ) ) ) {
-
- if ( copyIsArray ) {
- copyIsArray = false;
- clone = src && Array.isArray( src ) ? src : [];
-
- } else {
- clone = src && jQuery.isPlainObject( src ) ? src : {};
- }
-
- // Never move original objects, clone them
- target[ name ] = jQuery.extend( deep, clone, copy );
-
- // Don't bring in undefined values
- } else if ( copy !== undefined ) {
- target[ name ] = copy;
- }
- }
- }
- }
-
- // Return the modified object
- return target;
-};
-
-jQuery.extend( {
-
- // Unique for each copy of jQuery on the page
- expando: "jQuery" + ( version + Math.random() ).replace( /\D/g, "" ),
-
- // Assume jQuery is ready without the ready module
- isReady: true,
-
- error: function( msg ) {
- throw new Error( msg );
- },
-
- noop: function() {},
-
- isPlainObject: function( obj ) {
- var proto, Ctor;
-
- // Detect obvious negatives
- // Use toString instead of jQuery.type to catch host objects
- if ( !obj || toString.call( obj ) !== "[object Object]" ) {
- return false;
- }
-
- proto = getProto( obj );
-
- // Objects with no prototype (e.g., `Object.create( null )`) are plain
- if ( !proto ) {
- return true;
- }
-
- // Objects with prototype are plain iff they were constructed by a global Object function
- Ctor = hasOwn.call( proto, "constructor" ) && proto.constructor;
- return typeof Ctor === "function" && fnToString.call( Ctor ) === ObjectFunctionString;
- },
-
- isEmptyObject: function( obj ) {
-
- /* eslint-disable no-unused-vars */
- // See https://github.com/eslint/eslint/issues/6125
- var name;
-
- for ( name in obj ) {
- return false;
- }
- return true;
- },
-
- // Evaluates a script in a global context
- globalEval: function( code ) {
- DOMEval( code );
- },
-
- each: function( obj, callback ) {
- var length, i = 0;
-
- if ( isArrayLike( obj ) ) {
- length = obj.length;
- for ( ; i < length; i++ ) {
- if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) {
- break;
- }
- }
- } else {
- for ( i in obj ) {
- if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) {
- break;
- }
- }
- }
-
- return obj;
- },
-
- // Support: Android <=4.0 only
- trim: function( text ) {
- return text == null ?
- "" :
- ( text + "" ).replace( rtrim, "" );
- },
-
- // results is for internal usage only
- makeArray: function( arr, results ) {
- var ret = results || [];
-
- if ( arr != null ) {
- if ( isArrayLike( Object( arr ) ) ) {
- jQuery.merge( ret,
- typeof arr === "string" ?
- [ arr ] : arr
- );
- } else {
- push.call( ret, arr );
- }
- }
-
- return ret;
- },
-
- inArray: function( elem, arr, i ) {
- return arr == null ? -1 : indexOf.call( arr, elem, i );
- },
-
- // Support: Android <=4.0 only, PhantomJS 1 only
- // push.apply(_, arraylike) throws on ancient WebKit
- merge: function( first, second ) {
- var len = +second.length,
- j = 0,
- i = first.length;
-
- for ( ; j < len; j++ ) {
- first[ i++ ] = second[ j ];
- }
-
- first.length = i;
-
- return first;
- },
-
- grep: function( elems, callback, invert ) {
- var callbackInverse,
- matches = [],
- i = 0,
- length = elems.length,
- callbackExpect = !invert;
-
- // Go through the array, only saving the items
- // that pass the validator function
- for ( ; i < length; i++ ) {
- callbackInverse = !callback( elems[ i ], i );
- if ( callbackInverse !== callbackExpect ) {
- matches.push( elems[ i ] );
- }
- }
-
- return matches;
- },
-
- // arg is for internal usage only
- map: function( elems, callback, arg ) {
- var length, value,
- i = 0,
- ret = [];
-
- // Go through the array, translating each of the items to their new values
- if ( isArrayLike( elems ) ) {
- length = elems.length;
- for ( ; i < length; i++ ) {
- value = callback( elems[ i ], i, arg );
-
- if ( value != null ) {
- ret.push( value );
- }
- }
-
- // Go through every key on the object,
- } else {
- for ( i in elems ) {
- value = callback( elems[ i ], i, arg );
-
- if ( value != null ) {
- ret.push( value );
- }
- }
- }
-
- // Flatten any nested arrays
- return concat.apply( [], ret );
- },
-
- // A global GUID counter for objects
- guid: 1,
-
- // jQuery.support is not used in Core but other projects attach their
- // properties to it so it needs to exist.
- support: support
-} );
-
-if ( typeof Symbol === "function" ) {
- jQuery.fn[ Symbol.iterator ] = arr[ Symbol.iterator ];
-}
-
-// Populate the class2type map
-jQuery.each( "Boolean Number String Function Array Date RegExp Object Error Symbol".split( " " ),
-function( i, name ) {
- class2type[ "[object " + name + "]" ] = name.toLowerCase();
-} );
-
-function isArrayLike( obj ) {
-
- // Support: real iOS 8.2 only (not reproducible in simulator)
- // `in` check used to prevent JIT error (gh-2145)
- // hasOwn isn't used here due to false negatives
- // regarding Nodelist length in IE
- var length = !!obj && "length" in obj && obj.length,
- type = toType( obj );
-
- if ( isFunction( obj ) || isWindow( obj ) ) {
- return false;
- }
-
- return type === "array" || length === 0 ||
- typeof length === "number" && length > 0 && ( length - 1 ) in obj;
-}
-var Sizzle =
-/*!
- * Sizzle CSS Selector Engine v2.3.3
- * https://sizzlejs.com/
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: 2016-08-08
- */
-(function( window ) {
-
-var i,
- support,
- Expr,
- getText,
- isXML,
- tokenize,
- compile,
- select,
- outermostContext,
- sortInput,
- hasDuplicate,
-
- // Local document vars
- setDocument,
- document,
- docElem,
- documentIsHTML,
- rbuggyQSA,
- rbuggyMatches,
- matches,
- contains,
-
- // Instance-specific data
- expando = "sizzle" + 1 * new Date(),
- preferredDoc = window.document,
- dirruns = 0,
- done = 0,
- classCache = createCache(),
- tokenCache = createCache(),
- compilerCache = createCache(),
- sortOrder = function( a, b ) {
- if ( a === b ) {
- hasDuplicate = true;
- }
- return 0;
- },
-
- // Instance methods
- hasOwn = ({}).hasOwnProperty,
- arr = [],
- pop = arr.pop,
- push_native = arr.push,
- push = arr.push,
- slice = arr.slice,
- // Use a stripped-down indexOf as it's faster than native
- // https://jsperf.com/thor-indexof-vs-for/5
- indexOf = function( list, elem ) {
- var i = 0,
- len = list.length;
- for ( ; i < len; i++ ) {
- if ( list[i] === elem ) {
- return i;
- }
- }
- return -1;
- },
-
- booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",
-
- // Regular expressions
-
- // http://www.w3.org/TR/css3-selectors/#whitespace
- whitespace = "[\\x20\\t\\r\\n\\f]",
-
- // http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
- identifier = "(?:\\\\.|[\\w-]|[^\0-\\xa0])+",
-
- // Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors
- attributes = "\\[" + whitespace + "*(" + identifier + ")(?:" + whitespace +
- // Operator (capture 2)
- "*([*^$|!~]?=)" + whitespace +
- // "Attribute values must be CSS identifiers [capture 5] or strings [capture 3 or capture 4]"
- "*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" + whitespace +
- "*\\]",
-
- pseudos = ":(" + identifier + ")(?:\\((" +
- // To reduce the number of selectors needing tokenize in the preFilter, prefer arguments:
- // 1. quoted (capture 3; capture 4 or capture 5)
- "('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" +
- // 2. simple (capture 6)
- "((?:\\\\.|[^\\\\()[\\]]|" + attributes + ")*)|" +
- // 3. anything else (capture 2)
- ".*" +
- ")\\)|)",
-
- // Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
- rwhitespace = new RegExp( whitespace + "+", "g" ),
- rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
-
- rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
- rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ),
-
- rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*?)" + whitespace + "*\\]", "g" ),
-
- rpseudo = new RegExp( pseudos ),
- ridentifier = new RegExp( "^" + identifier + "$" ),
-
- matchExpr = {
- "ID": new RegExp( "^#(" + identifier + ")" ),
- "CLASS": new RegExp( "^\\.(" + identifier + ")" ),
- "TAG": new RegExp( "^(" + identifier + "|[*])" ),
- "ATTR": new RegExp( "^" + attributes ),
- "PSEUDO": new RegExp( "^" + pseudos ),
- "CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace +
- "*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
- "*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
- "bool": new RegExp( "^(?:" + booleans + ")$", "i" ),
- // For use in libraries implementing .is()
- // We use this for POS matching in `select`
- "needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" +
- whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
- },
-
- rinputs = /^(?:input|select|textarea|button)$/i,
- rheader = /^h\d$/i,
-
- rnative = /^[^{]+\{\s*\[native \w/,
-
- // Easily-parseable/retrievable ID or TAG or CLASS selectors
- rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
-
- rsibling = /[+~]/,
-
- // CSS escapes
- // http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
- runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ),
- funescape = function( _, escaped, escapedWhitespace ) {
- var high = "0x" + escaped - 0x10000;
- // NaN means non-codepoint
- // Support: Firefox<24
- // Workaround erroneous numeric interpretation of +"0x"
- return high !== high || escapedWhitespace ?
- escaped :
- high < 0 ?
- // BMP codepoint
- String.fromCharCode( high + 0x10000 ) :
- // Supplemental Plane codepoint (surrogate pair)
- String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
- },
-
- // CSS string/identifier serialization
- // https://drafts.csswg.org/cssom/#common-serializing-idioms
- rcssescape = /([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,
- fcssescape = function( ch, asCodePoint ) {
- if ( asCodePoint ) {
-
- // U+0000 NULL becomes U+FFFD REPLACEMENT CHARACTER
- if ( ch === "\0" ) {
- return "\uFFFD";
- }
-
- // Control characters and (dependent upon position) numbers get escaped as code points
- return ch.slice( 0, -1 ) + "\\" + ch.charCodeAt( ch.length - 1 ).toString( 16 ) + " ";
- }
-
- // Other potentially-special ASCII characters get backslash-escaped
- return "\\" + ch;
- },
-
- // Used for iframes
- // See setDocument()
- // Removing the function wrapper causes a "Permission Denied"
- // error in IE
- unloadHandler = function() {
- setDocument();
- },
-
- disabledAncestor = addCombinator(
- function( elem ) {
- return elem.disabled === true && ("form" in elem || "label" in elem);
- },
- { dir: "parentNode", next: "legend" }
- );
-
-// Optimize for push.apply( _, NodeList )
-try {
- push.apply(
- (arr = slice.call( preferredDoc.childNodes )),
- preferredDoc.childNodes
- );
- // Support: Android<4.0
- // Detect silently failing push.apply
- arr[ preferredDoc.childNodes.length ].nodeType;
-} catch ( e ) {
- push = { apply: arr.length ?
-
- // Leverage slice if possible
- function( target, els ) {
- push_native.apply( target, slice.call(els) );
- } :
-
- // Support: IE<9
- // Otherwise append directly
- function( target, els ) {
- var j = target.length,
- i = 0;
- // Can't trust NodeList.length
- while ( (target[j++] = els[i++]) ) {}
- target.length = j - 1;
- }
- };
-}
-
-function Sizzle( selector, context, results, seed ) {
- var m, i, elem, nid, match, groups, newSelector,
- newContext = context && context.ownerDocument,
-
- // nodeType defaults to 9, since context defaults to document
- nodeType = context ? context.nodeType : 9;
-
- results = results || [];
-
- // Return early from calls with invalid selector or context
- if ( typeof selector !== "string" || !selector ||
- nodeType !== 1 && nodeType !== 9 && nodeType !== 11 ) {
-
- return results;
- }
-
- // Try to shortcut find operations (as opposed to filters) in HTML documents
- if ( !seed ) {
-
- if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) {
- setDocument( context );
- }
- context = context || document;
-
- if ( documentIsHTML ) {
-
- // If the selector is sufficiently simple, try using a "get*By*" DOM method
- // (excepting DocumentFragment context, where the methods don't exist)
- if ( nodeType !== 11 && (match = rquickExpr.exec( selector )) ) {
-
- // ID selector
- if ( (m = match[1]) ) {
-
- // Document context
- if ( nodeType === 9 ) {
- if ( (elem = context.getElementById( m )) ) {
-
- // Support: IE, Opera, Webkit
- // TODO: identify versions
- // getElementById can match elements by name instead of ID
- if ( elem.id === m ) {
- results.push( elem );
- return results;
- }
- } else {
- return results;
- }
-
- // Element context
- } else {
-
- // Support: IE, Opera, Webkit
- // TODO: identify versions
- // getElementById can match elements by name instead of ID
- if ( newContext && (elem = newContext.getElementById( m )) &&
- contains( context, elem ) &&
- elem.id === m ) {
-
- results.push( elem );
- return results;
- }
- }
-
- // Type selector
- } else if ( match[2] ) {
- push.apply( results, context.getElementsByTagName( selector ) );
- return results;
-
- // Class selector
- } else if ( (m = match[3]) && support.getElementsByClassName &&
- context.getElementsByClassName ) {
-
- push.apply( results, context.getElementsByClassName( m ) );
- return results;
- }
- }
-
- // Take advantage of querySelectorAll
- if ( support.qsa &&
- !compilerCache[ selector + " " ] &&
- (!rbuggyQSA || !rbuggyQSA.test( selector )) ) {
-
- if ( nodeType !== 1 ) {
- newContext = context;
- newSelector = selector;
-
- // qSA looks outside Element context, which is not what we want
- // Thanks to Andrew Dupont for this workaround technique
- // Support: IE <=8
- // Exclude object elements
- } else if ( context.nodeName.toLowerCase() !== "object" ) {
-
- // Capture the context ID, setting it first if necessary
- if ( (nid = context.getAttribute( "id" )) ) {
- nid = nid.replace( rcssescape, fcssescape );
- } else {
- context.setAttribute( "id", (nid = expando) );
- }
-
- // Prefix every selector in the list
- groups = tokenize( selector );
- i = groups.length;
- while ( i-- ) {
- groups[i] = "#" + nid + " " + toSelector( groups[i] );
- }
- newSelector = groups.join( "," );
-
- // Expand context for sibling selectors
- newContext = rsibling.test( selector ) && testContext( context.parentNode ) ||
- context;
- }
-
- if ( newSelector ) {
- try {
- push.apply( results,
- newContext.querySelectorAll( newSelector )
- );
- return results;
- } catch ( qsaError ) {
- } finally {
- if ( nid === expando ) {
- context.removeAttribute( "id" );
- }
- }
- }
- }
- }
- }
-
- // All others
- return select( selector.replace( rtrim, "$1" ), context, results, seed );
-}
-
-/**
- * Create key-value caches of limited size
- * @returns {function(string, object)} Returns the Object data after storing it on itself with
- * property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength)
- * deleting the oldest entry
- */
-function createCache() {
- var keys = [];
-
- function cache( key, value ) {
- // Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
- if ( keys.push( key + " " ) > Expr.cacheLength ) {
- // Only keep the most recent entries
- delete cache[ keys.shift() ];
- }
- return (cache[ key + " " ] = value);
- }
- return cache;
-}
-
-/**
- * Mark a function for special use by Sizzle
- * @param {Function} fn The function to mark
- */
-function markFunction( fn ) {
- fn[ expando ] = true;
- return fn;
-}
-
-/**
- * Support testing using an element
- * @param {Function} fn Passed the created element and returns a boolean result
- */
-function assert( fn ) {
- var el = document.createElement("fieldset");
-
- try {
- return !!fn( el );
- } catch (e) {
- return false;
- } finally {
- // Remove from its parent by default
- if ( el.parentNode ) {
- el.parentNode.removeChild( el );
- }
- // release memory in IE
- el = null;
- }
-}
-
-/**
- * Adds the same handler for all of the specified attrs
- * @param {String} attrs Pipe-separated list of attributes
- * @param {Function} handler The method that will be applied
- */
-function addHandle( attrs, handler ) {
- var arr = attrs.split("|"),
- i = arr.length;
-
- while ( i-- ) {
- Expr.attrHandle[ arr[i] ] = handler;
- }
-}
-
-/**
- * Checks document order of two siblings
- * @param {Element} a
- * @param {Element} b
- * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b
- */
-function siblingCheck( a, b ) {
- var cur = b && a,
- diff = cur && a.nodeType === 1 && b.nodeType === 1 &&
- a.sourceIndex - b.sourceIndex;
-
- // Use IE sourceIndex if available on both nodes
- if ( diff ) {
- return diff;
- }
-
- // Check if b follows a
- if ( cur ) {
- while ( (cur = cur.nextSibling) ) {
- if ( cur === b ) {
- return -1;
- }
- }
- }
-
- return a ? 1 : -1;
-}
-
-/**
- * Returns a function to use in pseudos for input types
- * @param {String} type
- */
-function createInputPseudo( type ) {
- return function( elem ) {
- var name = elem.nodeName.toLowerCase();
- return name === "input" && elem.type === type;
- };
-}
-
-/**
- * Returns a function to use in pseudos for buttons
- * @param {String} type
- */
-function createButtonPseudo( type ) {
- return function( elem ) {
- var name = elem.nodeName.toLowerCase();
- return (name === "input" || name === "button") && elem.type === type;
- };
-}
-
-/**
- * Returns a function to use in pseudos for :enabled/:disabled
- * @param {Boolean} disabled true for :disabled; false for :enabled
- */
-function createDisabledPseudo( disabled ) {
-
- // Known :disabled false positives: fieldset[disabled] > legend:nth-of-type(n+2) :can-disable
- return function( elem ) {
-
- // Only certain elements can match :enabled or :disabled
- // https://html.spec.whatwg.org/multipage/scripting.html#selector-enabled
- // https://html.spec.whatwg.org/multipage/scripting.html#selector-disabled
- if ( "form" in elem ) {
-
- // Check for inherited disabledness on relevant non-disabled elements:
- // * listed form-associated elements in a disabled fieldset
- // https://html.spec.whatwg.org/multipage/forms.html#category-listed
- // https://html.spec.whatwg.org/multipage/forms.html#concept-fe-disabled
- // * option elements in a disabled optgroup
- // https://html.spec.whatwg.org/multipage/forms.html#concept-option-disabled
- // All such elements have a "form" property.
- if ( elem.parentNode && elem.disabled === false ) {
-
- // Option elements defer to a parent optgroup if present
- if ( "label" in elem ) {
- if ( "label" in elem.parentNode ) {
- return elem.parentNode.disabled === disabled;
- } else {
- return elem.disabled === disabled;
- }
- }
-
- // Support: IE 6 - 11
- // Use the isDisabled shortcut property to check for disabled fieldset ancestors
- return elem.isDisabled === disabled ||
-
- // Where there is no isDisabled, check manually
- /* jshint -W018 */
- elem.isDisabled !== !disabled &&
- disabledAncestor( elem ) === disabled;
- }
-
- return elem.disabled === disabled;
-
- // Try to winnow out elements that can't be disabled before trusting the disabled property.
- // Some victims get caught in our net (label, legend, menu, track), but it shouldn't
- // even exist on them, let alone have a boolean value.
- } else if ( "label" in elem ) {
- return elem.disabled === disabled;
- }
-
- // Remaining elements are neither :enabled nor :disabled
- return false;
- };
-}
-
-/**
- * Returns a function to use in pseudos for positionals
- * @param {Function} fn
- */
-function createPositionalPseudo( fn ) {
- return markFunction(function( argument ) {
- argument = +argument;
- return markFunction(function( seed, matches ) {
- var j,
- matchIndexes = fn( [], seed.length, argument ),
- i = matchIndexes.length;
-
- // Match elements found at the specified indexes
- while ( i-- ) {
- if ( seed[ (j = matchIndexes[i]) ] ) {
- seed[j] = !(matches[j] = seed[j]);
- }
- }
- });
- });
-}
-
-/**
- * Checks a node for validity as a Sizzle context
- * @param {Element|Object=} context
- * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value
- */
-function testContext( context ) {
- return context && typeof context.getElementsByTagName !== "undefined" && context;
-}
-
-// Expose support vars for convenience
-support = Sizzle.support = {};
-
-/**
- * Detects XML nodes
- * @param {Element|Object} elem An element or a document
- * @returns {Boolean} True iff elem is a non-HTML XML node
- */
-isXML = Sizzle.isXML = function( elem ) {
- // documentElement is verified for cases where it doesn't yet exist
- // (such as loading iframes in IE - #4833)
- var documentElement = elem && (elem.ownerDocument || elem).documentElement;
- return documentElement ? documentElement.nodeName !== "HTML" : false;
-};
-
-/**
- * Sets document-related variables once based on the current document
- * @param {Element|Object} [doc] An element or document object to use to set the document
- * @returns {Object} Returns the current document
- */
-setDocument = Sizzle.setDocument = function( node ) {
- var hasCompare, subWindow,
- doc = node ? node.ownerDocument || node : preferredDoc;
-
- // Return early if doc is invalid or already selected
- if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
- return document;
- }
-
- // Update global variables
- document = doc;
- docElem = document.documentElement;
- documentIsHTML = !isXML( document );
-
- // Support: IE 9-11, Edge
- // Accessing iframe documents after unload throws "permission denied" errors (jQuery #13936)
- if ( preferredDoc !== document &&
- (subWindow = document.defaultView) && subWindow.top !== subWindow ) {
-
- // Support: IE 11, Edge
- if ( subWindow.addEventListener ) {
- subWindow.addEventListener( "unload", unloadHandler, false );
-
- // Support: IE 9 - 10 only
- } else if ( subWindow.attachEvent ) {
- subWindow.attachEvent( "onunload", unloadHandler );
- }
- }
-
- /* Attributes
- ---------------------------------------------------------------------- */
-
- // Support: IE<8
- // Verify that getAttribute really returns attributes and not properties
- // (excepting IE8 booleans)
- support.attributes = assert(function( el ) {
- el.className = "i";
- return !el.getAttribute("className");
- });
-
- /* getElement(s)By*
- ---------------------------------------------------------------------- */
-
- // Check if getElementsByTagName("*") returns only elements
- support.getElementsByTagName = assert(function( el ) {
- el.appendChild( document.createComment("") );
- return !el.getElementsByTagName("*").length;
- });
-
- // Support: IE<9
- support.getElementsByClassName = rnative.test( document.getElementsByClassName );
-
- // Support: IE<10
- // Check if getElementById returns elements by name
- // The broken getElementById methods don't pick up programmatically-set names,
- // so use a roundabout getElementsByName test
- support.getById = assert(function( el ) {
- docElem.appendChild( el ).id = expando;
- return !document.getElementsByName || !document.getElementsByName( expando ).length;
- });
-
- // ID filter and find
- if ( support.getById ) {
- Expr.filter["ID"] = function( id ) {
- var attrId = id.replace( runescape, funescape );
- return function( elem ) {
- return elem.getAttribute("id") === attrId;
- };
- };
- Expr.find["ID"] = function( id, context ) {
- if ( typeof context.getElementById !== "undefined" && documentIsHTML ) {
- var elem = context.getElementById( id );
- return elem ? [ elem ] : [];
- }
- };
- } else {
- Expr.filter["ID"] = function( id ) {
- var attrId = id.replace( runescape, funescape );
- return function( elem ) {
- var node = typeof elem.getAttributeNode !== "undefined" &&
- elem.getAttributeNode("id");
- return node && node.value === attrId;
- };
- };
-
- // Support: IE 6 - 7 only
- // getElementById is not reliable as a find shortcut
- Expr.find["ID"] = function( id, context ) {
- if ( typeof context.getElementById !== "undefined" && documentIsHTML ) {
- var node, i, elems,
- elem = context.getElementById( id );
-
- if ( elem ) {
-
- // Verify the id attribute
- node = elem.getAttributeNode("id");
- if ( node && node.value === id ) {
- return [ elem ];
- }
-
- // Fall back on getElementsByName
- elems = context.getElementsByName( id );
- i = 0;
- while ( (elem = elems[i++]) ) {
- node = elem.getAttributeNode("id");
- if ( node && node.value === id ) {
- return [ elem ];
- }
- }
- }
-
- return [];
- }
- };
- }
-
- // Tag
- Expr.find["TAG"] = support.getElementsByTagName ?
- function( tag, context ) {
- if ( typeof context.getElementsByTagName !== "undefined" ) {
- return context.getElementsByTagName( tag );
-
- // DocumentFragment nodes don't have gEBTN
- } else if ( support.qsa ) {
- return context.querySelectorAll( tag );
- }
- } :
-
- function( tag, context ) {
- var elem,
- tmp = [],
- i = 0,
- // By happy coincidence, a (broken) gEBTN appears on DocumentFragment nodes too
- results = context.getElementsByTagName( tag );
-
- // Filter out possible comments
- if ( tag === "*" ) {
- while ( (elem = results[i++]) ) {
- if ( elem.nodeType === 1 ) {
- tmp.push( elem );
- }
- }
-
- return tmp;
- }
- return results;
- };
-
- // Class
- Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) {
- if ( typeof context.getElementsByClassName !== "undefined" && documentIsHTML ) {
- return context.getElementsByClassName( className );
- }
- };
-
- /* QSA/matchesSelector
- ---------------------------------------------------------------------- */
-
- // QSA and matchesSelector support
-
- // matchesSelector(:active) reports false when true (IE9/Opera 11.5)
- rbuggyMatches = [];
-
- // qSa(:focus) reports false when true (Chrome 21)
- // We allow this because of a bug in IE8/9 that throws an error
- // whenever `document.activeElement` is accessed on an iframe
- // So, we allow :focus to pass through QSA all the time to avoid the IE error
- // See https://bugs.jquery.com/ticket/13378
- rbuggyQSA = [];
-
- if ( (support.qsa = rnative.test( document.querySelectorAll )) ) {
- // Build QSA regex
- // Regex strategy adopted from Diego Perini
- assert(function( el ) {
- // Select is set to empty string on purpose
- // This is to test IE's treatment of not explicitly
- // setting a boolean content attribute,
- // since its presence should be enough
- // https://bugs.jquery.com/ticket/12359
- docElem.appendChild( el ).innerHTML = " " +
- "" +
- " ";
-
- // Support: IE8, Opera 11-12.16
- // Nothing should be selected when empty strings follow ^= or $= or *=
- // The test attribute must be unknown in Opera but "safe" for WinRT
- // https://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section
- if ( el.querySelectorAll("[msallowcapture^='']").length ) {
- rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
- }
-
- // Support: IE8
- // Boolean attributes and "value" are not treated correctly
- if ( !el.querySelectorAll("[selected]").length ) {
- rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" );
- }
-
- // Support: Chrome<29, Android<4.4, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.8+
- if ( !el.querySelectorAll( "[id~=" + expando + "-]" ).length ) {
- rbuggyQSA.push("~=");
- }
-
- // Webkit/Opera - :checked should return selected option elements
- // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
- // IE8 throws error here and will not see later tests
- if ( !el.querySelectorAll(":checked").length ) {
- rbuggyQSA.push(":checked");
- }
-
- // Support: Safari 8+, iOS 8+
- // https://bugs.webkit.org/show_bug.cgi?id=136851
- // In-page `selector#id sibling-combinator selector` fails
- if ( !el.querySelectorAll( "a#" + expando + "+*" ).length ) {
- rbuggyQSA.push(".#.+[+~]");
- }
- });
-
- assert(function( el ) {
- el.innerHTML = " " +
- " ";
-
- // Support: Windows 8 Native Apps
- // The type and name attributes are restricted during .innerHTML assignment
- var input = document.createElement("input");
- input.setAttribute( "type", "hidden" );
- el.appendChild( input ).setAttribute( "name", "D" );
-
- // Support: IE8
- // Enforce case-sensitivity of name attribute
- if ( el.querySelectorAll("[name=d]").length ) {
- rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" );
- }
-
- // FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
- // IE8 throws error here and will not see later tests
- if ( el.querySelectorAll(":enabled").length !== 2 ) {
- rbuggyQSA.push( ":enabled", ":disabled" );
- }
-
- // Support: IE9-11+
- // IE's :disabled selector does not pick up the children of disabled fieldsets
- docElem.appendChild( el ).disabled = true;
- if ( el.querySelectorAll(":disabled").length !== 2 ) {
- rbuggyQSA.push( ":enabled", ":disabled" );
- }
-
- // Opera 10-11 does not throw on post-comma invalid pseudos
- el.querySelectorAll("*,:x");
- rbuggyQSA.push(",.*:");
- });
- }
-
- if ( (support.matchesSelector = rnative.test( (matches = docElem.matches ||
- docElem.webkitMatchesSelector ||
- docElem.mozMatchesSelector ||
- docElem.oMatchesSelector ||
- docElem.msMatchesSelector) )) ) {
-
- assert(function( el ) {
- // Check to see if it's possible to do matchesSelector
- // on a disconnected node (IE 9)
- support.disconnectedMatch = matches.call( el, "*" );
-
- // This should fail with an exception
- // Gecko does not error, returns false instead
- matches.call( el, "[s!='']:x" );
- rbuggyMatches.push( "!=", pseudos );
- });
- }
-
- rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") );
- rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") );
-
- /* Contains
- ---------------------------------------------------------------------- */
- hasCompare = rnative.test( docElem.compareDocumentPosition );
-
- // Element contains another
- // Purposefully self-exclusive
- // As in, an element does not contain itself
- contains = hasCompare || rnative.test( docElem.contains ) ?
- function( a, b ) {
- var adown = a.nodeType === 9 ? a.documentElement : a,
- bup = b && b.parentNode;
- return a === bup || !!( bup && bup.nodeType === 1 && (
- adown.contains ?
- adown.contains( bup ) :
- a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
- ));
- } :
- function( a, b ) {
- if ( b ) {
- while ( (b = b.parentNode) ) {
- if ( b === a ) {
- return true;
- }
- }
- }
- return false;
- };
-
- /* Sorting
- ---------------------------------------------------------------------- */
-
- // Document order sorting
- sortOrder = hasCompare ?
- function( a, b ) {
-
- // Flag for duplicate removal
- if ( a === b ) {
- hasDuplicate = true;
- return 0;
- }
-
- // Sort on method existence if only one input has compareDocumentPosition
- var compare = !a.compareDocumentPosition - !b.compareDocumentPosition;
- if ( compare ) {
- return compare;
- }
-
- // Calculate position if both inputs belong to the same document
- compare = ( a.ownerDocument || a ) === ( b.ownerDocument || b ) ?
- a.compareDocumentPosition( b ) :
-
- // Otherwise we know they are disconnected
- 1;
-
- // Disconnected nodes
- if ( compare & 1 ||
- (!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) {
-
- // Choose the first element that is related to our preferred document
- if ( a === document || a.ownerDocument === preferredDoc && contains(preferredDoc, a) ) {
- return -1;
- }
- if ( b === document || b.ownerDocument === preferredDoc && contains(preferredDoc, b) ) {
- return 1;
- }
-
- // Maintain original order
- return sortInput ?
- ( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
- 0;
- }
-
- return compare & 4 ? -1 : 1;
- } :
- function( a, b ) {
- // Exit early if the nodes are identical
- if ( a === b ) {
- hasDuplicate = true;
- return 0;
- }
-
- var cur,
- i = 0,
- aup = a.parentNode,
- bup = b.parentNode,
- ap = [ a ],
- bp = [ b ];
-
- // Parentless nodes are either documents or disconnected
- if ( !aup || !bup ) {
- return a === document ? -1 :
- b === document ? 1 :
- aup ? -1 :
- bup ? 1 :
- sortInput ?
- ( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
- 0;
-
- // If the nodes are siblings, we can do a quick check
- } else if ( aup === bup ) {
- return siblingCheck( a, b );
- }
-
- // Otherwise we need full lists of their ancestors for comparison
- cur = a;
- while ( (cur = cur.parentNode) ) {
- ap.unshift( cur );
- }
- cur = b;
- while ( (cur = cur.parentNode) ) {
- bp.unshift( cur );
- }
-
- // Walk down the tree looking for a discrepancy
- while ( ap[i] === bp[i] ) {
- i++;
- }
-
- return i ?
- // Do a sibling check if the nodes have a common ancestor
- siblingCheck( ap[i], bp[i] ) :
-
- // Otherwise nodes in our document sort first
- ap[i] === preferredDoc ? -1 :
- bp[i] === preferredDoc ? 1 :
- 0;
- };
-
- return document;
-};
-
-Sizzle.matches = function( expr, elements ) {
- return Sizzle( expr, null, null, elements );
-};
-
-Sizzle.matchesSelector = function( elem, expr ) {
- // Set document vars if needed
- if ( ( elem.ownerDocument || elem ) !== document ) {
- setDocument( elem );
- }
-
- // Make sure that attribute selectors are quoted
- expr = expr.replace( rattributeQuotes, "='$1']" );
-
- if ( support.matchesSelector && documentIsHTML &&
- !compilerCache[ expr + " " ] &&
- ( !rbuggyMatches || !rbuggyMatches.test( expr ) ) &&
- ( !rbuggyQSA || !rbuggyQSA.test( expr ) ) ) {
-
- try {
- var ret = matches.call( elem, expr );
-
- // IE 9's matchesSelector returns false on disconnected nodes
- if ( ret || support.disconnectedMatch ||
- // As well, disconnected nodes are said to be in a document
- // fragment in IE 9
- elem.document && elem.document.nodeType !== 11 ) {
- return ret;
- }
- } catch (e) {}
- }
-
- return Sizzle( expr, document, null, [ elem ] ).length > 0;
-};
-
-Sizzle.contains = function( context, elem ) {
- // Set document vars if needed
- if ( ( context.ownerDocument || context ) !== document ) {
- setDocument( context );
- }
- return contains( context, elem );
-};
-
-Sizzle.attr = function( elem, name ) {
- // Set document vars if needed
- if ( ( elem.ownerDocument || elem ) !== document ) {
- setDocument( elem );
- }
-
- var fn = Expr.attrHandle[ name.toLowerCase() ],
- // Don't get fooled by Object.prototype properties (jQuery #13807)
- val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ?
- fn( elem, name, !documentIsHTML ) :
- undefined;
-
- return val !== undefined ?
- val :
- support.attributes || !documentIsHTML ?
- elem.getAttribute( name ) :
- (val = elem.getAttributeNode(name)) && val.specified ?
- val.value :
- null;
-};
-
-Sizzle.escape = function( sel ) {
- return (sel + "").replace( rcssescape, fcssescape );
-};
-
-Sizzle.error = function( msg ) {
- throw new Error( "Syntax error, unrecognized expression: " + msg );
-};
-
-/**
- * Document sorting and removing duplicates
- * @param {ArrayLike} results
- */
-Sizzle.uniqueSort = function( results ) {
- var elem,
- duplicates = [],
- j = 0,
- i = 0;
-
- // Unless we *know* we can detect duplicates, assume their presence
- hasDuplicate = !support.detectDuplicates;
- sortInput = !support.sortStable && results.slice( 0 );
- results.sort( sortOrder );
-
- if ( hasDuplicate ) {
- while ( (elem = results[i++]) ) {
- if ( elem === results[ i ] ) {
- j = duplicates.push( i );
- }
- }
- while ( j-- ) {
- results.splice( duplicates[ j ], 1 );
- }
- }
-
- // Clear input after sorting to release objects
- // See https://github.com/jquery/sizzle/pull/225
- sortInput = null;
-
- return results;
-};
-
-/**
- * Utility function for retrieving the text value of an array of DOM nodes
- * @param {Array|Element} elem
- */
-getText = Sizzle.getText = function( elem ) {
- var node,
- ret = "",
- i = 0,
- nodeType = elem.nodeType;
-
- if ( !nodeType ) {
- // If no nodeType, this is expected to be an array
- while ( (node = elem[i++]) ) {
- // Do not traverse comment nodes
- ret += getText( node );
- }
- } else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
- // Use textContent for elements
- // innerText usage removed for consistency of new lines (jQuery #11153)
- if ( typeof elem.textContent === "string" ) {
- return elem.textContent;
- } else {
- // Traverse its children
- for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
- ret += getText( elem );
- }
- }
- } else if ( nodeType === 3 || nodeType === 4 ) {
- return elem.nodeValue;
- }
- // Do not include comment or processing instruction nodes
-
- return ret;
-};
-
-Expr = Sizzle.selectors = {
-
- // Can be adjusted by the user
- cacheLength: 50,
-
- createPseudo: markFunction,
-
- match: matchExpr,
-
- attrHandle: {},
-
- find: {},
-
- relative: {
- ">": { dir: "parentNode", first: true },
- " ": { dir: "parentNode" },
- "+": { dir: "previousSibling", first: true },
- "~": { dir: "previousSibling" }
- },
-
- preFilter: {
- "ATTR": function( match ) {
- match[1] = match[1].replace( runescape, funescape );
-
- // Move the given value to match[3] whether quoted or unquoted
- match[3] = ( match[3] || match[4] || match[5] || "" ).replace( runescape, funescape );
-
- if ( match[2] === "~=" ) {
- match[3] = " " + match[3] + " ";
- }
-
- return match.slice( 0, 4 );
- },
-
- "CHILD": function( match ) {
- /* matches from matchExpr["CHILD"]
- 1 type (only|nth|...)
- 2 what (child|of-type)
- 3 argument (even|odd|\d*|\d*n([+-]\d+)?|...)
- 4 xn-component of xn+y argument ([+-]?\d*n|)
- 5 sign of xn-component
- 6 x of xn-component
- 7 sign of y-component
- 8 y of y-component
- */
- match[1] = match[1].toLowerCase();
-
- if ( match[1].slice( 0, 3 ) === "nth" ) {
- // nth-* requires argument
- if ( !match[3] ) {
- Sizzle.error( match[0] );
- }
-
- // numeric x and y parameters for Expr.filter.CHILD
- // remember that false/true cast respectively to 0/1
- match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) );
- match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" );
-
- // other types prohibit arguments
- } else if ( match[3] ) {
- Sizzle.error( match[0] );
- }
-
- return match;
- },
-
- "PSEUDO": function( match ) {
- var excess,
- unquoted = !match[6] && match[2];
-
- if ( matchExpr["CHILD"].test( match[0] ) ) {
- return null;
- }
-
- // Accept quoted arguments as-is
- if ( match[3] ) {
- match[2] = match[4] || match[5] || "";
-
- // Strip excess characters from unquoted arguments
- } else if ( unquoted && rpseudo.test( unquoted ) &&
- // Get excess from tokenize (recursively)
- (excess = tokenize( unquoted, true )) &&
- // advance to the next closing parenthesis
- (excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) {
-
- // excess is a negative index
- match[0] = match[0].slice( 0, excess );
- match[2] = unquoted.slice( 0, excess );
- }
-
- // Return only captures needed by the pseudo filter method (type and argument)
- return match.slice( 0, 3 );
- }
- },
-
- filter: {
-
- "TAG": function( nodeNameSelector ) {
- var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase();
- return nodeNameSelector === "*" ?
- function() { return true; } :
- function( elem ) {
- return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
- };
- },
-
- "CLASS": function( className ) {
- var pattern = classCache[ className + " " ];
-
- return pattern ||
- (pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
- classCache( className, function( elem ) {
- return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== "undefined" && elem.getAttribute("class") || "" );
- });
- },
-
- "ATTR": function( name, operator, check ) {
- return function( elem ) {
- var result = Sizzle.attr( elem, name );
-
- if ( result == null ) {
- return operator === "!=";
- }
- if ( !operator ) {
- return true;
- }
-
- result += "";
-
- return operator === "=" ? result === check :
- operator === "!=" ? result !== check :
- operator === "^=" ? check && result.indexOf( check ) === 0 :
- operator === "*=" ? check && result.indexOf( check ) > -1 :
- operator === "$=" ? check && result.slice( -check.length ) === check :
- operator === "~=" ? ( " " + result.replace( rwhitespace, " " ) + " " ).indexOf( check ) > -1 :
- operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" :
- false;
- };
- },
-
- "CHILD": function( type, what, argument, first, last ) {
- var simple = type.slice( 0, 3 ) !== "nth",
- forward = type.slice( -4 ) !== "last",
- ofType = what === "of-type";
-
- return first === 1 && last === 0 ?
-
- // Shortcut for :nth-*(n)
- function( elem ) {
- return !!elem.parentNode;
- } :
-
- function( elem, context, xml ) {
- var cache, uniqueCache, outerCache, node, nodeIndex, start,
- dir = simple !== forward ? "nextSibling" : "previousSibling",
- parent = elem.parentNode,
- name = ofType && elem.nodeName.toLowerCase(),
- useCache = !xml && !ofType,
- diff = false;
-
- if ( parent ) {
-
- // :(first|last|only)-(child|of-type)
- if ( simple ) {
- while ( dir ) {
- node = elem;
- while ( (node = node[ dir ]) ) {
- if ( ofType ?
- node.nodeName.toLowerCase() === name :
- node.nodeType === 1 ) {
-
- return false;
- }
- }
- // Reverse direction for :only-* (if we haven't yet done so)
- start = dir = type === "only" && !start && "nextSibling";
- }
- return true;
- }
-
- start = [ forward ? parent.firstChild : parent.lastChild ];
-
- // non-xml :nth-child(...) stores cache data on `parent`
- if ( forward && useCache ) {
-
- // Seek `elem` from a previously-cached index
-
- // ...in a gzip-friendly way
- node = parent;
- outerCache = node[ expando ] || (node[ expando ] = {});
-
- // Support: IE <9 only
- // Defend against cloned attroperties (jQuery gh-1709)
- uniqueCache = outerCache[ node.uniqueID ] ||
- (outerCache[ node.uniqueID ] = {});
-
- cache = uniqueCache[ type ] || [];
- nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ];
- diff = nodeIndex && cache[ 2 ];
- node = nodeIndex && parent.childNodes[ nodeIndex ];
-
- while ( (node = ++nodeIndex && node && node[ dir ] ||
-
- // Fallback to seeking `elem` from the start
- (diff = nodeIndex = 0) || start.pop()) ) {
-
- // When found, cache indexes on `parent` and break
- if ( node.nodeType === 1 && ++diff && node === elem ) {
- uniqueCache[ type ] = [ dirruns, nodeIndex, diff ];
- break;
- }
- }
-
- } else {
- // Use previously-cached element index if available
- if ( useCache ) {
- // ...in a gzip-friendly way
- node = elem;
- outerCache = node[ expando ] || (node[ expando ] = {});
-
- // Support: IE <9 only
- // Defend against cloned attroperties (jQuery gh-1709)
- uniqueCache = outerCache[ node.uniqueID ] ||
- (outerCache[ node.uniqueID ] = {});
-
- cache = uniqueCache[ type ] || [];
- nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ];
- diff = nodeIndex;
- }
-
- // xml :nth-child(...)
- // or :nth-last-child(...) or :nth(-last)?-of-type(...)
- if ( diff === false ) {
- // Use the same loop as above to seek `elem` from the start
- while ( (node = ++nodeIndex && node && node[ dir ] ||
- (diff = nodeIndex = 0) || start.pop()) ) {
-
- if ( ( ofType ?
- node.nodeName.toLowerCase() === name :
- node.nodeType === 1 ) &&
- ++diff ) {
-
- // Cache the index of each encountered element
- if ( useCache ) {
- outerCache = node[ expando ] || (node[ expando ] = {});
-
- // Support: IE <9 only
- // Defend against cloned attroperties (jQuery gh-1709)
- uniqueCache = outerCache[ node.uniqueID ] ||
- (outerCache[ node.uniqueID ] = {});
-
- uniqueCache[ type ] = [ dirruns, diff ];
- }
-
- if ( node === elem ) {
- break;
- }
- }
- }
- }
- }
-
- // Incorporate the offset, then check against cycle size
- diff -= last;
- return diff === first || ( diff % first === 0 && diff / first >= 0 );
- }
- };
- },
-
- "PSEUDO": function( pseudo, argument ) {
- // pseudo-class names are case-insensitive
- // http://www.w3.org/TR/selectors/#pseudo-classes
- // Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
- // Remember that setFilters inherits from pseudos
- var args,
- fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] ||
- Sizzle.error( "unsupported pseudo: " + pseudo );
-
- // The user may use createPseudo to indicate that
- // arguments are needed to create the filter function
- // just as Sizzle does
- if ( fn[ expando ] ) {
- return fn( argument );
- }
-
- // But maintain support for old signatures
- if ( fn.length > 1 ) {
- args = [ pseudo, pseudo, "", argument ];
- return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
- markFunction(function( seed, matches ) {
- var idx,
- matched = fn( seed, argument ),
- i = matched.length;
- while ( i-- ) {
- idx = indexOf( seed, matched[i] );
- seed[ idx ] = !( matches[ idx ] = matched[i] );
- }
- }) :
- function( elem ) {
- return fn( elem, 0, args );
- };
- }
-
- return fn;
- }
- },
-
- pseudos: {
- // Potentially complex pseudos
- "not": markFunction(function( selector ) {
- // Trim the selector passed to compile
- // to avoid treating leading and trailing
- // spaces as combinators
- var input = [],
- results = [],
- matcher = compile( selector.replace( rtrim, "$1" ) );
-
- return matcher[ expando ] ?
- markFunction(function( seed, matches, context, xml ) {
- var elem,
- unmatched = matcher( seed, null, xml, [] ),
- i = seed.length;
-
- // Match elements unmatched by `matcher`
- while ( i-- ) {
- if ( (elem = unmatched[i]) ) {
- seed[i] = !(matches[i] = elem);
- }
- }
- }) :
- function( elem, context, xml ) {
- input[0] = elem;
- matcher( input, null, xml, results );
- // Don't keep the element (issue #299)
- input[0] = null;
- return !results.pop();
- };
- }),
-
- "has": markFunction(function( selector ) {
- return function( elem ) {
- return Sizzle( selector, elem ).length > 0;
- };
- }),
-
- "contains": markFunction(function( text ) {
- text = text.replace( runescape, funescape );
- return function( elem ) {
- return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
- };
- }),
-
- // "Whether an element is represented by a :lang() selector
- // is based solely on the element's language value
- // being equal to the identifier C,
- // or beginning with the identifier C immediately followed by "-".
- // The matching of C against the element's language value is performed case-insensitively.
- // The identifier C does not have to be a valid language name."
- // http://www.w3.org/TR/selectors/#lang-pseudo
- "lang": markFunction( function( lang ) {
- // lang value must be a valid identifier
- if ( !ridentifier.test(lang || "") ) {
- Sizzle.error( "unsupported lang: " + lang );
- }
- lang = lang.replace( runescape, funescape ).toLowerCase();
- return function( elem ) {
- var elemLang;
- do {
- if ( (elemLang = documentIsHTML ?
- elem.lang :
- elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) {
-
- elemLang = elemLang.toLowerCase();
- return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0;
- }
- } while ( (elem = elem.parentNode) && elem.nodeType === 1 );
- return false;
- };
- }),
-
- // Miscellaneous
- "target": function( elem ) {
- var hash = window.location && window.location.hash;
- return hash && hash.slice( 1 ) === elem.id;
- },
-
- "root": function( elem ) {
- return elem === docElem;
- },
-
- "focus": function( elem ) {
- return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
- },
-
- // Boolean properties
- "enabled": createDisabledPseudo( false ),
- "disabled": createDisabledPseudo( true ),
-
- "checked": function( elem ) {
- // In CSS3, :checked should return both checked and selected elements
- // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
- var nodeName = elem.nodeName.toLowerCase();
- return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
- },
-
- "selected": function( elem ) {
- // Accessing this property makes selected-by-default
- // options in Safari work properly
- if ( elem.parentNode ) {
- elem.parentNode.selectedIndex;
- }
-
- return elem.selected === true;
- },
-
- // Contents
- "empty": function( elem ) {
- // http://www.w3.org/TR/selectors/#empty-pseudo
- // :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5),
- // but not by others (comment: 8; processing instruction: 7; etc.)
- // nodeType < 6 works because attributes (2) do not appear as children
- for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
- if ( elem.nodeType < 6 ) {
- return false;
- }
- }
- return true;
- },
-
- "parent": function( elem ) {
- return !Expr.pseudos["empty"]( elem );
- },
-
- // Element/input types
- "header": function( elem ) {
- return rheader.test( elem.nodeName );
- },
-
- "input": function( elem ) {
- return rinputs.test( elem.nodeName );
- },
-
- "button": function( elem ) {
- var name = elem.nodeName.toLowerCase();
- return name === "input" && elem.type === "button" || name === "button";
- },
-
- "text": function( elem ) {
- var attr;
- return elem.nodeName.toLowerCase() === "input" &&
- elem.type === "text" &&
-
- // Support: IE<8
- // New HTML5 attribute values (e.g., "search") appear with elem.type === "text"
- ( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === "text" );
- },
-
- // Position-in-collection
- "first": createPositionalPseudo(function() {
- return [ 0 ];
- }),
-
- "last": createPositionalPseudo(function( matchIndexes, length ) {
- return [ length - 1 ];
- }),
-
- "eq": createPositionalPseudo(function( matchIndexes, length, argument ) {
- return [ argument < 0 ? argument + length : argument ];
- }),
-
- "even": createPositionalPseudo(function( matchIndexes, length ) {
- var i = 0;
- for ( ; i < length; i += 2 ) {
- matchIndexes.push( i );
- }
- return matchIndexes;
- }),
-
- "odd": createPositionalPseudo(function( matchIndexes, length ) {
- var i = 1;
- for ( ; i < length; i += 2 ) {
- matchIndexes.push( i );
- }
- return matchIndexes;
- }),
-
- "lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
- var i = argument < 0 ? argument + length : argument;
- for ( ; --i >= 0; ) {
- matchIndexes.push( i );
- }
- return matchIndexes;
- }),
-
- "gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
- var i = argument < 0 ? argument + length : argument;
- for ( ; ++i < length; ) {
- matchIndexes.push( i );
- }
- return matchIndexes;
- })
- }
-};
-
-Expr.pseudos["nth"] = Expr.pseudos["eq"];
-
-// Add button/input type pseudos
-for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
- Expr.pseudos[ i ] = createInputPseudo( i );
-}
-for ( i in { submit: true, reset: true } ) {
- Expr.pseudos[ i ] = createButtonPseudo( i );
-}
-
-// Easy API for creating new setFilters
-function setFilters() {}
-setFilters.prototype = Expr.filters = Expr.pseudos;
-Expr.setFilters = new setFilters();
-
-tokenize = Sizzle.tokenize = function( selector, parseOnly ) {
- var matched, match, tokens, type,
- soFar, groups, preFilters,
- cached = tokenCache[ selector + " " ];
-
- if ( cached ) {
- return parseOnly ? 0 : cached.slice( 0 );
- }
-
- soFar = selector;
- groups = [];
- preFilters = Expr.preFilter;
-
- while ( soFar ) {
-
- // Comma and first run
- if ( !matched || (match = rcomma.exec( soFar )) ) {
- if ( match ) {
- // Don't consume trailing commas as valid
- soFar = soFar.slice( match[0].length ) || soFar;
- }
- groups.push( (tokens = []) );
- }
-
- matched = false;
-
- // Combinators
- if ( (match = rcombinators.exec( soFar )) ) {
- matched = match.shift();
- tokens.push({
- value: matched,
- // Cast descendant combinators to space
- type: match[0].replace( rtrim, " " )
- });
- soFar = soFar.slice( matched.length );
- }
-
- // Filters
- for ( type in Expr.filter ) {
- if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
- (match = preFilters[ type ]( match ))) ) {
- matched = match.shift();
- tokens.push({
- value: matched,
- type: type,
- matches: match
- });
- soFar = soFar.slice( matched.length );
- }
- }
-
- if ( !matched ) {
- break;
- }
- }
-
- // Return the length of the invalid excess
- // if we're just parsing
- // Otherwise, throw an error or return tokens
- return parseOnly ?
- soFar.length :
- soFar ?
- Sizzle.error( selector ) :
- // Cache the tokens
- tokenCache( selector, groups ).slice( 0 );
-};
-
-function toSelector( tokens ) {
- var i = 0,
- len = tokens.length,
- selector = "";
- for ( ; i < len; i++ ) {
- selector += tokens[i].value;
- }
- return selector;
-}
-
-function addCombinator( matcher, combinator, base ) {
- var dir = combinator.dir,
- skip = combinator.next,
- key = skip || dir,
- checkNonElements = base && key === "parentNode",
- doneName = done++;
-
- return combinator.first ?
- // Check against closest ancestor/preceding element
- function( elem, context, xml ) {
- while ( (elem = elem[ dir ]) ) {
- if ( elem.nodeType === 1 || checkNonElements ) {
- return matcher( elem, context, xml );
- }
- }
- return false;
- } :
-
- // Check against all ancestor/preceding elements
- function( elem, context, xml ) {
- var oldCache, uniqueCache, outerCache,
- newCache = [ dirruns, doneName ];
-
- // We can't set arbitrary data on XML nodes, so they don't benefit from combinator caching
- if ( xml ) {
- while ( (elem = elem[ dir ]) ) {
- if ( elem.nodeType === 1 || checkNonElements ) {
- if ( matcher( elem, context, xml ) ) {
- return true;
- }
- }
- }
- } else {
- while ( (elem = elem[ dir ]) ) {
- if ( elem.nodeType === 1 || checkNonElements ) {
- outerCache = elem[ expando ] || (elem[ expando ] = {});
-
- // Support: IE <9 only
- // Defend against cloned attroperties (jQuery gh-1709)
- uniqueCache = outerCache[ elem.uniqueID ] || (outerCache[ elem.uniqueID ] = {});
-
- if ( skip && skip === elem.nodeName.toLowerCase() ) {
- elem = elem[ dir ] || elem;
- } else if ( (oldCache = uniqueCache[ key ]) &&
- oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) {
-
- // Assign to newCache so results back-propagate to previous elements
- return (newCache[ 2 ] = oldCache[ 2 ]);
- } else {
- // Reuse newcache so results back-propagate to previous elements
- uniqueCache[ key ] = newCache;
-
- // A match means we're done; a fail means we have to keep checking
- if ( (newCache[ 2 ] = matcher( elem, context, xml )) ) {
- return true;
- }
- }
- }
- }
- }
- return false;
- };
-}
-
-function elementMatcher( matchers ) {
- return matchers.length > 1 ?
- function( elem, context, xml ) {
- var i = matchers.length;
- while ( i-- ) {
- if ( !matchers[i]( elem, context, xml ) ) {
- return false;
- }
- }
- return true;
- } :
- matchers[0];
-}
-
-function multipleContexts( selector, contexts, results ) {
- var i = 0,
- len = contexts.length;
- for ( ; i < len; i++ ) {
- Sizzle( selector, contexts[i], results );
- }
- return results;
-}
-
-function condense( unmatched, map, filter, context, xml ) {
- var elem,
- newUnmatched = [],
- i = 0,
- len = unmatched.length,
- mapped = map != null;
-
- for ( ; i < len; i++ ) {
- if ( (elem = unmatched[i]) ) {
- if ( !filter || filter( elem, context, xml ) ) {
- newUnmatched.push( elem );
- if ( mapped ) {
- map.push( i );
- }
- }
- }
- }
-
- return newUnmatched;
-}
-
-function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) {
- if ( postFilter && !postFilter[ expando ] ) {
- postFilter = setMatcher( postFilter );
- }
- if ( postFinder && !postFinder[ expando ] ) {
- postFinder = setMatcher( postFinder, postSelector );
- }
- return markFunction(function( seed, results, context, xml ) {
- var temp, i, elem,
- preMap = [],
- postMap = [],
- preexisting = results.length,
-
- // Get initial elements from seed or context
- elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ),
-
- // Prefilter to get matcher input, preserving a map for seed-results synchronization
- matcherIn = preFilter && ( seed || !selector ) ?
- condense( elems, preMap, preFilter, context, xml ) :
- elems,
-
- matcherOut = matcher ?
- // If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
- postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
-
- // ...intermediate processing is necessary
- [] :
-
- // ...otherwise use results directly
- results :
- matcherIn;
-
- // Find primary matches
- if ( matcher ) {
- matcher( matcherIn, matcherOut, context, xml );
- }
-
- // Apply postFilter
- if ( postFilter ) {
- temp = condense( matcherOut, postMap );
- postFilter( temp, [], context, xml );
-
- // Un-match failing elements by moving them back to matcherIn
- i = temp.length;
- while ( i-- ) {
- if ( (elem = temp[i]) ) {
- matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
- }
- }
- }
-
- if ( seed ) {
- if ( postFinder || preFilter ) {
- if ( postFinder ) {
- // Get the final matcherOut by condensing this intermediate into postFinder contexts
- temp = [];
- i = matcherOut.length;
- while ( i-- ) {
- if ( (elem = matcherOut[i]) ) {
- // Restore matcherIn since elem is not yet a final match
- temp.push( (matcherIn[i] = elem) );
- }
- }
- postFinder( null, (matcherOut = []), temp, xml );
- }
-
- // Move matched elements from seed to results to keep them synchronized
- i = matcherOut.length;
- while ( i-- ) {
- if ( (elem = matcherOut[i]) &&
- (temp = postFinder ? indexOf( seed, elem ) : preMap[i]) > -1 ) {
-
- seed[temp] = !(results[temp] = elem);
- }
- }
- }
-
- // Add elements to results, through postFinder if defined
- } else {
- matcherOut = condense(
- matcherOut === results ?
- matcherOut.splice( preexisting, matcherOut.length ) :
- matcherOut
- );
- if ( postFinder ) {
- postFinder( null, results, matcherOut, xml );
- } else {
- push.apply( results, matcherOut );
- }
- }
- });
-}
-
-function matcherFromTokens( tokens ) {
- var checkContext, matcher, j,
- len = tokens.length,
- leadingRelative = Expr.relative[ tokens[0].type ],
- implicitRelative = leadingRelative || Expr.relative[" "],
- i = leadingRelative ? 1 : 0,
-
- // The foundational matcher ensures that elements are reachable from top-level context(s)
- matchContext = addCombinator( function( elem ) {
- return elem === checkContext;
- }, implicitRelative, true ),
- matchAnyContext = addCombinator( function( elem ) {
- return indexOf( checkContext, elem ) > -1;
- }, implicitRelative, true ),
- matchers = [ function( elem, context, xml ) {
- var ret = ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
- (checkContext = context).nodeType ?
- matchContext( elem, context, xml ) :
- matchAnyContext( elem, context, xml ) );
- // Avoid hanging onto element (issue #299)
- checkContext = null;
- return ret;
- } ];
-
- for ( ; i < len; i++ ) {
- if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
- matchers = [ addCombinator(elementMatcher( matchers ), matcher) ];
- } else {
- matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
-
- // Return special upon seeing a positional matcher
- if ( matcher[ expando ] ) {
- // Find the next relative operator (if any) for proper handling
- j = ++i;
- for ( ; j < len; j++ ) {
- if ( Expr.relative[ tokens[j].type ] ) {
- break;
- }
- }
- return setMatcher(
- i > 1 && elementMatcher( matchers ),
- i > 1 && toSelector(
- // If the preceding token was a descendant combinator, insert an implicit any-element `*`
- tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" })
- ).replace( rtrim, "$1" ),
- matcher,
- i < j && matcherFromTokens( tokens.slice( i, j ) ),
- j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
- j < len && toSelector( tokens )
- );
- }
- matchers.push( matcher );
- }
- }
-
- return elementMatcher( matchers );
-}
-
-function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
- var bySet = setMatchers.length > 0,
- byElement = elementMatchers.length > 0,
- superMatcher = function( seed, context, xml, results, outermost ) {
- var elem, j, matcher,
- matchedCount = 0,
- i = "0",
- unmatched = seed && [],
- setMatched = [],
- contextBackup = outermostContext,
- // We must always have either seed elements or outermost context
- elems = seed || byElement && Expr.find["TAG"]( "*", outermost ),
- // Use integer dirruns iff this is the outermost matcher
- dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1),
- len = elems.length;
-
- if ( outermost ) {
- outermostContext = context === document || context || outermost;
- }
-
- // Add elements passing elementMatchers directly to results
- // Support: IE<9, Safari
- // Tolerate NodeList properties (IE: "length"; Safari: ) matching elements by id
- for ( ; i !== len && (elem = elems[i]) != null; i++ ) {
- if ( byElement && elem ) {
- j = 0;
- if ( !context && elem.ownerDocument !== document ) {
- setDocument( elem );
- xml = !documentIsHTML;
- }
- while ( (matcher = elementMatchers[j++]) ) {
- if ( matcher( elem, context || document, xml) ) {
- results.push( elem );
- break;
- }
- }
- if ( outermost ) {
- dirruns = dirrunsUnique;
- }
- }
-
- // Track unmatched elements for set filters
- if ( bySet ) {
- // They will have gone through all possible matchers
- if ( (elem = !matcher && elem) ) {
- matchedCount--;
- }
-
- // Lengthen the array for every element, matched or not
- if ( seed ) {
- unmatched.push( elem );
- }
- }
- }
-
- // `i` is now the count of elements visited above, and adding it to `matchedCount`
- // makes the latter nonnegative.
- matchedCount += i;
-
- // Apply set filters to unmatched elements
- // NOTE: This can be skipped if there are no unmatched elements (i.e., `matchedCount`
- // equals `i`), unless we didn't visit _any_ elements in the above loop because we have
- // no element matchers and no seed.
- // Incrementing an initially-string "0" `i` allows `i` to remain a string only in that
- // case, which will result in a "00" `matchedCount` that differs from `i` but is also
- // numerically zero.
- if ( bySet && i !== matchedCount ) {
- j = 0;
- while ( (matcher = setMatchers[j++]) ) {
- matcher( unmatched, setMatched, context, xml );
- }
-
- if ( seed ) {
- // Reintegrate element matches to eliminate the need for sorting
- if ( matchedCount > 0 ) {
- while ( i-- ) {
- if ( !(unmatched[i] || setMatched[i]) ) {
- setMatched[i] = pop.call( results );
- }
- }
- }
-
- // Discard index placeholder values to get only actual matches
- setMatched = condense( setMatched );
- }
-
- // Add matches to results
- push.apply( results, setMatched );
-
- // Seedless set matches succeeding multiple successful matchers stipulate sorting
- if ( outermost && !seed && setMatched.length > 0 &&
- ( matchedCount + setMatchers.length ) > 1 ) {
-
- Sizzle.uniqueSort( results );
- }
- }
-
- // Override manipulation of globals by nested matchers
- if ( outermost ) {
- dirruns = dirrunsUnique;
- outermostContext = contextBackup;
- }
-
- return unmatched;
- };
-
- return bySet ?
- markFunction( superMatcher ) :
- superMatcher;
-}
-
-compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) {
- var i,
- setMatchers = [],
- elementMatchers = [],
- cached = compilerCache[ selector + " " ];
-
- if ( !cached ) {
- // Generate a function of recursive functions that can be used to check each element
- if ( !match ) {
- match = tokenize( selector );
- }
- i = match.length;
- while ( i-- ) {
- cached = matcherFromTokens( match[i] );
- if ( cached[ expando ] ) {
- setMatchers.push( cached );
- } else {
- elementMatchers.push( cached );
- }
- }
-
- // Cache the compiled function
- cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
-
- // Save selector and tokenization
- cached.selector = selector;
- }
- return cached;
-};
-
-/**
- * A low-level selection function that works with Sizzle's compiled
- * selector functions
- * @param {String|Function} selector A selector or a pre-compiled
- * selector function built with Sizzle.compile
- * @param {Element} context
- * @param {Array} [results]
- * @param {Array} [seed] A set of elements to match against
- */
-select = Sizzle.select = function( selector, context, results, seed ) {
- var i, tokens, token, type, find,
- compiled = typeof selector === "function" && selector,
- match = !seed && tokenize( (selector = compiled.selector || selector) );
-
- results = results || [];
-
- // Try to minimize operations if there is only one selector in the list and no seed
- // (the latter of which guarantees us context)
- if ( match.length === 1 ) {
-
- // Reduce context if the leading compound selector is an ID
- tokens = match[0] = match[0].slice( 0 );
- if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
- context.nodeType === 9 && documentIsHTML && Expr.relative[ tokens[1].type ] ) {
-
- context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0];
- if ( !context ) {
- return results;
-
- // Precompiled matchers will still verify ancestry, so step up a level
- } else if ( compiled ) {
- context = context.parentNode;
- }
-
- selector = selector.slice( tokens.shift().value.length );
- }
-
- // Fetch a seed set for right-to-left matching
- i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length;
- while ( i-- ) {
- token = tokens[i];
-
- // Abort if we hit a combinator
- if ( Expr.relative[ (type = token.type) ] ) {
- break;
- }
- if ( (find = Expr.find[ type ]) ) {
- // Search, expanding context for leading sibling combinators
- if ( (seed = find(
- token.matches[0].replace( runescape, funescape ),
- rsibling.test( tokens[0].type ) && testContext( context.parentNode ) || context
- )) ) {
-
- // If seed is empty or no tokens remain, we can return early
- tokens.splice( i, 1 );
- selector = seed.length && toSelector( tokens );
- if ( !selector ) {
- push.apply( results, seed );
- return results;
- }
-
- break;
- }
- }
- }
- }
-
- // Compile and execute a filtering function if one is not provided
- // Provide `match` to avoid retokenization if we modified the selector above
- ( compiled || compile( selector, match ) )(
- seed,
- context,
- !documentIsHTML,
- results,
- !context || rsibling.test( selector ) && testContext( context.parentNode ) || context
- );
- return results;
-};
-
-// One-time assignments
-
-// Sort stability
-support.sortStable = expando.split("").sort( sortOrder ).join("") === expando;
-
-// Support: Chrome 14-35+
-// Always assume duplicates if they aren't passed to the comparison function
-support.detectDuplicates = !!hasDuplicate;
-
-// Initialize against the default document
-setDocument();
-
-// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27)
-// Detached nodes confoundingly follow *each other*
-support.sortDetached = assert(function( el ) {
- // Should return 1, but returns 4 (following)
- return el.compareDocumentPosition( document.createElement("fieldset") ) & 1;
-});
-
-// Support: IE<8
-// Prevent attribute/property "interpolation"
-// https://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
-if ( !assert(function( el ) {
- el.innerHTML = " ";
- return el.firstChild.getAttribute("href") === "#" ;
-}) ) {
- addHandle( "type|href|height|width", function( elem, name, isXML ) {
- if ( !isXML ) {
- return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 );
- }
- });
-}
-
-// Support: IE<9
-// Use defaultValue in place of getAttribute("value")
-if ( !support.attributes || !assert(function( el ) {
- el.innerHTML = " ";
- el.firstChild.setAttribute( "value", "" );
- return el.firstChild.getAttribute( "value" ) === "";
-}) ) {
- addHandle( "value", function( elem, name, isXML ) {
- if ( !isXML && elem.nodeName.toLowerCase() === "input" ) {
- return elem.defaultValue;
- }
- });
-}
-
-// Support: IE<9
-// Use getAttributeNode to fetch booleans when getAttribute lies
-if ( !assert(function( el ) {
- return el.getAttribute("disabled") == null;
-}) ) {
- addHandle( booleans, function( elem, name, isXML ) {
- var val;
- if ( !isXML ) {
- return elem[ name ] === true ? name.toLowerCase() :
- (val = elem.getAttributeNode( name )) && val.specified ?
- val.value :
- null;
- }
- });
-}
-
-return Sizzle;
-
-})( window );
-
-
-
-jQuery.find = Sizzle;
-jQuery.expr = Sizzle.selectors;
-
-// Deprecated
-jQuery.expr[ ":" ] = jQuery.expr.pseudos;
-jQuery.uniqueSort = jQuery.unique = Sizzle.uniqueSort;
-jQuery.text = Sizzle.getText;
-jQuery.isXMLDoc = Sizzle.isXML;
-jQuery.contains = Sizzle.contains;
-jQuery.escapeSelector = Sizzle.escape;
-
-
-
-
-var dir = function( elem, dir, until ) {
- var matched = [],
- truncate = until !== undefined;
-
- while ( ( elem = elem[ dir ] ) && elem.nodeType !== 9 ) {
- if ( elem.nodeType === 1 ) {
- if ( truncate && jQuery( elem ).is( until ) ) {
- break;
- }
- matched.push( elem );
- }
- }
- return matched;
-};
-
-
-var siblings = function( n, elem ) {
- var matched = [];
-
- for ( ; n; n = n.nextSibling ) {
- if ( n.nodeType === 1 && n !== elem ) {
- matched.push( n );
- }
- }
-
- return matched;
-};
-
-
-var rneedsContext = jQuery.expr.match.needsContext;
-
-
-
-function nodeName( elem, name ) {
-
- return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
-
-};
-var rsingleTag = ( /^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i );
-
-
-
-// Implement the identical functionality for filter and not
-function winnow( elements, qualifier, not ) {
- if ( isFunction( qualifier ) ) {
- return jQuery.grep( elements, function( elem, i ) {
- return !!qualifier.call( elem, i, elem ) !== not;
- } );
- }
-
- // Single element
- if ( qualifier.nodeType ) {
- return jQuery.grep( elements, function( elem ) {
- return ( elem === qualifier ) !== not;
- } );
- }
-
- // Arraylike of elements (jQuery, arguments, Array)
- if ( typeof qualifier !== "string" ) {
- return jQuery.grep( elements, function( elem ) {
- return ( indexOf.call( qualifier, elem ) > -1 ) !== not;
- } );
- }
-
- // Filtered directly for both simple and complex selectors
- return jQuery.filter( qualifier, elements, not );
-}
-
-jQuery.filter = function( expr, elems, not ) {
- var elem = elems[ 0 ];
-
- if ( not ) {
- expr = ":not(" + expr + ")";
- }
-
- if ( elems.length === 1 && elem.nodeType === 1 ) {
- return jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [];
- }
-
- return jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) {
- return elem.nodeType === 1;
- } ) );
-};
-
-jQuery.fn.extend( {
- find: function( selector ) {
- var i, ret,
- len = this.length,
- self = this;
-
- if ( typeof selector !== "string" ) {
- return this.pushStack( jQuery( selector ).filter( function() {
- for ( i = 0; i < len; i++ ) {
- if ( jQuery.contains( self[ i ], this ) ) {
- return true;
- }
- }
- } ) );
- }
-
- ret = this.pushStack( [] );
-
- for ( i = 0; i < len; i++ ) {
- jQuery.find( selector, self[ i ], ret );
- }
-
- return len > 1 ? jQuery.uniqueSort( ret ) : ret;
- },
- filter: function( selector ) {
- return this.pushStack( winnow( this, selector || [], false ) );
- },
- not: function( selector ) {
- return this.pushStack( winnow( this, selector || [], true ) );
- },
- is: function( selector ) {
- return !!winnow(
- this,
-
- // If this is a positional/relative selector, check membership in the returned set
- // so $("p:first").is("p:last") won't return true for a doc with two "p".
- typeof selector === "string" && rneedsContext.test( selector ) ?
- jQuery( selector ) :
- selector || [],
- false
- ).length;
- }
-} );
-
-
-// Initialize a jQuery object
-
-
-// A central reference to the root jQuery(document)
-var rootjQuery,
-
- // A simple way to check for HTML strings
- // Prioritize #id over to avoid XSS via location.hash (#9521)
- // Strict HTML recognition (#11290: must start with <)
- // Shortcut simple #id case for speed
- rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/,
-
- init = jQuery.fn.init = function( selector, context, root ) {
- var match, elem;
-
- // HANDLE: $(""), $(null), $(undefined), $(false)
- if ( !selector ) {
- return this;
- }
-
- // Method init() accepts an alternate rootjQuery
- // so migrate can support jQuery.sub (gh-2101)
- root = root || rootjQuery;
-
- // Handle HTML strings
- if ( typeof selector === "string" ) {
- if ( selector[ 0 ] === "<" &&
- selector[ selector.length - 1 ] === ">" &&
- selector.length >= 3 ) {
-
- // Assume that strings that start and end with <> are HTML and skip the regex check
- match = [ null, selector, null ];
-
- } else {
- match = rquickExpr.exec( selector );
- }
-
- // Match html or make sure no context is specified for #id
- if ( match && ( match[ 1 ] || !context ) ) {
-
- // HANDLE: $(html) -> $(array)
- if ( match[ 1 ] ) {
- context = context instanceof jQuery ? context[ 0 ] : context;
-
- // Option to run scripts is true for back-compat
- // Intentionally let the error be thrown if parseHTML is not present
- jQuery.merge( this, jQuery.parseHTML(
- match[ 1 ],
- context && context.nodeType ? context.ownerDocument || context : document,
- true
- ) );
-
- // HANDLE: $(html, props)
- if ( rsingleTag.test( match[ 1 ] ) && jQuery.isPlainObject( context ) ) {
- for ( match in context ) {
-
- // Properties of context are called as methods if possible
- if ( isFunction( this[ match ] ) ) {
- this[ match ]( context[ match ] );
-
- // ...and otherwise set as attributes
- } else {
- this.attr( match, context[ match ] );
- }
- }
- }
-
- return this;
-
- // HANDLE: $(#id)
- } else {
- elem = document.getElementById( match[ 2 ] );
-
- if ( elem ) {
-
- // Inject the element directly into the jQuery object
- this[ 0 ] = elem;
- this.length = 1;
- }
- return this;
- }
-
- // HANDLE: $(expr, $(...))
- } else if ( !context || context.jquery ) {
- return ( context || root ).find( selector );
-
- // HANDLE: $(expr, context)
- // (which is just equivalent to: $(context).find(expr)
- } else {
- return this.constructor( context ).find( selector );
- }
-
- // HANDLE: $(DOMElement)
- } else if ( selector.nodeType ) {
- this[ 0 ] = selector;
- this.length = 1;
- return this;
-
- // HANDLE: $(function)
- // Shortcut for document ready
- } else if ( isFunction( selector ) ) {
- return root.ready !== undefined ?
- root.ready( selector ) :
-
- // Execute immediately if ready is not present
- selector( jQuery );
- }
-
- return jQuery.makeArray( selector, this );
- };
-
-// Give the init function the jQuery prototype for later instantiation
-init.prototype = jQuery.fn;
-
-// Initialize central reference
-rootjQuery = jQuery( document );
-
-
-var rparentsprev = /^(?:parents|prev(?:Until|All))/,
-
- // Methods guaranteed to produce a unique set when starting from a unique set
- guaranteedUnique = {
- children: true,
- contents: true,
- next: true,
- prev: true
- };
-
-jQuery.fn.extend( {
- has: function( target ) {
- var targets = jQuery( target, this ),
- l = targets.length;
-
- return this.filter( function() {
- var i = 0;
- for ( ; i < l; i++ ) {
- if ( jQuery.contains( this, targets[ i ] ) ) {
- return true;
- }
- }
- } );
- },
-
- closest: function( selectors, context ) {
- var cur,
- i = 0,
- l = this.length,
- matched = [],
- targets = typeof selectors !== "string" && jQuery( selectors );
-
- // Positional selectors never match, since there's no _selection_ context
- if ( !rneedsContext.test( selectors ) ) {
- for ( ; i < l; i++ ) {
- for ( cur = this[ i ]; cur && cur !== context; cur = cur.parentNode ) {
-
- // Always skip document fragments
- if ( cur.nodeType < 11 && ( targets ?
- targets.index( cur ) > -1 :
-
- // Don't pass non-elements to Sizzle
- cur.nodeType === 1 &&
- jQuery.find.matchesSelector( cur, selectors ) ) ) {
-
- matched.push( cur );
- break;
- }
- }
- }
- }
-
- return this.pushStack( matched.length > 1 ? jQuery.uniqueSort( matched ) : matched );
- },
-
- // Determine the position of an element within the set
- index: function( elem ) {
-
- // No argument, return index in parent
- if ( !elem ) {
- return ( this[ 0 ] && this[ 0 ].parentNode ) ? this.first().prevAll().length : -1;
- }
-
- // Index in selector
- if ( typeof elem === "string" ) {
- return indexOf.call( jQuery( elem ), this[ 0 ] );
- }
-
- // Locate the position of the desired element
- return indexOf.call( this,
-
- // If it receives a jQuery object, the first element is used
- elem.jquery ? elem[ 0 ] : elem
- );
- },
-
- add: function( selector, context ) {
- return this.pushStack(
- jQuery.uniqueSort(
- jQuery.merge( this.get(), jQuery( selector, context ) )
- )
- );
- },
-
- addBack: function( selector ) {
- return this.add( selector == null ?
- this.prevObject : this.prevObject.filter( selector )
- );
- }
-} );
-
-function sibling( cur, dir ) {
- while ( ( cur = cur[ dir ] ) && cur.nodeType !== 1 ) {}
- return cur;
-}
-
-jQuery.each( {
- parent: function( elem ) {
- var parent = elem.parentNode;
- return parent && parent.nodeType !== 11 ? parent : null;
- },
- parents: function( elem ) {
- return dir( elem, "parentNode" );
- },
- parentsUntil: function( elem, i, until ) {
- return dir( elem, "parentNode", until );
- },
- next: function( elem ) {
- return sibling( elem, "nextSibling" );
- },
- prev: function( elem ) {
- return sibling( elem, "previousSibling" );
- },
- nextAll: function( elem ) {
- return dir( elem, "nextSibling" );
- },
- prevAll: function( elem ) {
- return dir( elem, "previousSibling" );
- },
- nextUntil: function( elem, i, until ) {
- return dir( elem, "nextSibling", until );
- },
- prevUntil: function( elem, i, until ) {
- return dir( elem, "previousSibling", until );
- },
- siblings: function( elem ) {
- return siblings( ( elem.parentNode || {} ).firstChild, elem );
- },
- children: function( elem ) {
- return siblings( elem.firstChild );
- },
- contents: function( elem ) {
- if ( nodeName( elem, "iframe" ) ) {
- return elem.contentDocument;
- }
-
- // Support: IE 9 - 11 only, iOS 7 only, Android Browser <=4.3 only
- // Treat the template element as a regular one in browsers that
- // don't support it.
- if ( nodeName( elem, "template" ) ) {
- elem = elem.content || elem;
- }
-
- return jQuery.merge( [], elem.childNodes );
- }
-}, function( name, fn ) {
- jQuery.fn[ name ] = function( until, selector ) {
- var matched = jQuery.map( this, fn, until );
-
- if ( name.slice( -5 ) !== "Until" ) {
- selector = until;
- }
-
- if ( selector && typeof selector === "string" ) {
- matched = jQuery.filter( selector, matched );
- }
-
- if ( this.length > 1 ) {
-
- // Remove duplicates
- if ( !guaranteedUnique[ name ] ) {
- jQuery.uniqueSort( matched );
- }
-
- // Reverse order for parents* and prev-derivatives
- if ( rparentsprev.test( name ) ) {
- matched.reverse();
- }
- }
-
- return this.pushStack( matched );
- };
-} );
-var rnothtmlwhite = ( /[^\x20\t\r\n\f]+/g );
-
-
-
-// Convert String-formatted options into Object-formatted ones
-function createOptions( options ) {
- var object = {};
- jQuery.each( options.match( rnothtmlwhite ) || [], function( _, flag ) {
- object[ flag ] = true;
- } );
- return object;
-}
-
-/*
- * Create a callback list using the following parameters:
- *
- * options: an optional list of space-separated options that will change how
- * the callback list behaves or a more traditional option object
- *
- * By default a callback list will act like an event callback list and can be
- * "fired" multiple times.
- *
- * Possible options:
- *
- * once: will ensure the callback list can only be fired once (like a Deferred)
- *
- * memory: will keep track of previous values and will call any callback added
- * after the list has been fired right away with the latest "memorized"
- * values (like a Deferred)
- *
- * unique: will ensure a callback can only be added once (no duplicate in the list)
- *
- * stopOnFalse: interrupt callings when a callback returns false
- *
- */
-jQuery.Callbacks = function( options ) {
-
- // Convert options from String-formatted to Object-formatted if needed
- // (we check in cache first)
- options = typeof options === "string" ?
- createOptions( options ) :
- jQuery.extend( {}, options );
-
- var // Flag to know if list is currently firing
- firing,
-
- // Last fire value for non-forgettable lists
- memory,
-
- // Flag to know if list was already fired
- fired,
-
- // Flag to prevent firing
- locked,
-
- // Actual callback list
- list = [],
-
- // Queue of execution data for repeatable lists
- queue = [],
-
- // Index of currently firing callback (modified by add/remove as needed)
- firingIndex = -1,
-
- // Fire callbacks
- fire = function() {
-
- // Enforce single-firing
- locked = locked || options.once;
-
- // Execute callbacks for all pending executions,
- // respecting firingIndex overrides and runtime changes
- fired = firing = true;
- for ( ; queue.length; firingIndex = -1 ) {
- memory = queue.shift();
- while ( ++firingIndex < list.length ) {
-
- // Run callback and check for early termination
- if ( list[ firingIndex ].apply( memory[ 0 ], memory[ 1 ] ) === false &&
- options.stopOnFalse ) {
-
- // Jump to end and forget the data so .add doesn't re-fire
- firingIndex = list.length;
- memory = false;
- }
- }
- }
-
- // Forget the data if we're done with it
- if ( !options.memory ) {
- memory = false;
- }
-
- firing = false;
-
- // Clean up if we're done firing for good
- if ( locked ) {
-
- // Keep an empty list if we have data for future add calls
- if ( memory ) {
- list = [];
-
- // Otherwise, this object is spent
- } else {
- list = "";
- }
- }
- },
-
- // Actual Callbacks object
- self = {
-
- // Add a callback or a collection of callbacks to the list
- add: function() {
- if ( list ) {
-
- // If we have memory from a past run, we should fire after adding
- if ( memory && !firing ) {
- firingIndex = list.length - 1;
- queue.push( memory );
- }
-
- ( function add( args ) {
- jQuery.each( args, function( _, arg ) {
- if ( isFunction( arg ) ) {
- if ( !options.unique || !self.has( arg ) ) {
- list.push( arg );
- }
- } else if ( arg && arg.length && toType( arg ) !== "string" ) {
-
- // Inspect recursively
- add( arg );
- }
- } );
- } )( arguments );
-
- if ( memory && !firing ) {
- fire();
- }
- }
- return this;
- },
-
- // Remove a callback from the list
- remove: function() {
- jQuery.each( arguments, function( _, arg ) {
- var index;
- while ( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) {
- list.splice( index, 1 );
-
- // Handle firing indexes
- if ( index <= firingIndex ) {
- firingIndex--;
- }
- }
- } );
- return this;
- },
-
- // Check if a given callback is in the list.
- // If no argument is given, return whether or not list has callbacks attached.
- has: function( fn ) {
- return fn ?
- jQuery.inArray( fn, list ) > -1 :
- list.length > 0;
- },
-
- // Remove all callbacks from the list
- empty: function() {
- if ( list ) {
- list = [];
- }
- return this;
- },
-
- // Disable .fire and .add
- // Abort any current/pending executions
- // Clear all callbacks and values
- disable: function() {
- locked = queue = [];
- list = memory = "";
- return this;
- },
- disabled: function() {
- return !list;
- },
-
- // Disable .fire
- // Also disable .add unless we have memory (since it would have no effect)
- // Abort any pending executions
- lock: function() {
- locked = queue = [];
- if ( !memory && !firing ) {
- list = memory = "";
- }
- return this;
- },
- locked: function() {
- return !!locked;
- },
-
- // Call all callbacks with the given context and arguments
- fireWith: function( context, args ) {
- if ( !locked ) {
- args = args || [];
- args = [ context, args.slice ? args.slice() : args ];
- queue.push( args );
- if ( !firing ) {
- fire();
- }
- }
- return this;
- },
-
- // Call all the callbacks with the given arguments
- fire: function() {
- self.fireWith( this, arguments );
- return this;
- },
-
- // To know if the callbacks have already been called at least once
- fired: function() {
- return !!fired;
- }
- };
-
- return self;
-};
-
-
-function Identity( v ) {
- return v;
-}
-function Thrower( ex ) {
- throw ex;
-}
-
-function adoptValue( value, resolve, reject, noValue ) {
- var method;
-
- try {
-
- // Check for promise aspect first to privilege synchronous behavior
- if ( value && isFunction( ( method = value.promise ) ) ) {
- method.call( value ).done( resolve ).fail( reject );
-
- // Other thenables
- } else if ( value && isFunction( ( method = value.then ) ) ) {
- method.call( value, resolve, reject );
-
- // Other non-thenables
- } else {
-
- // Control `resolve` arguments by letting Array#slice cast boolean `noValue` to integer:
- // * false: [ value ].slice( 0 ) => resolve( value )
- // * true: [ value ].slice( 1 ) => resolve()
- resolve.apply( undefined, [ value ].slice( noValue ) );
- }
-
- // For Promises/A+, convert exceptions into rejections
- // Since jQuery.when doesn't unwrap thenables, we can skip the extra checks appearing in
- // Deferred#then to conditionally suppress rejection.
- } catch ( value ) {
-
- // Support: Android 4.0 only
- // Strict mode functions invoked without .call/.apply get global-object context
- reject.apply( undefined, [ value ] );
- }
-}
-
-jQuery.extend( {
-
- Deferred: function( func ) {
- var tuples = [
-
- // action, add listener, callbacks,
- // ... .then handlers, argument index, [final state]
- [ "notify", "progress", jQuery.Callbacks( "memory" ),
- jQuery.Callbacks( "memory" ), 2 ],
- [ "resolve", "done", jQuery.Callbacks( "once memory" ),
- jQuery.Callbacks( "once memory" ), 0, "resolved" ],
- [ "reject", "fail", jQuery.Callbacks( "once memory" ),
- jQuery.Callbacks( "once memory" ), 1, "rejected" ]
- ],
- state = "pending",
- promise = {
- state: function() {
- return state;
- },
- always: function() {
- deferred.done( arguments ).fail( arguments );
- return this;
- },
- "catch": function( fn ) {
- return promise.then( null, fn );
- },
-
- // Keep pipe for back-compat
- pipe: function( /* fnDone, fnFail, fnProgress */ ) {
- var fns = arguments;
-
- return jQuery.Deferred( function( newDefer ) {
- jQuery.each( tuples, function( i, tuple ) {
-
- // Map tuples (progress, done, fail) to arguments (done, fail, progress)
- var fn = isFunction( fns[ tuple[ 4 ] ] ) && fns[ tuple[ 4 ] ];
-
- // deferred.progress(function() { bind to newDefer or newDefer.notify })
- // deferred.done(function() { bind to newDefer or newDefer.resolve })
- // deferred.fail(function() { bind to newDefer or newDefer.reject })
- deferred[ tuple[ 1 ] ]( function() {
- var returned = fn && fn.apply( this, arguments );
- if ( returned && isFunction( returned.promise ) ) {
- returned.promise()
- .progress( newDefer.notify )
- .done( newDefer.resolve )
- .fail( newDefer.reject );
- } else {
- newDefer[ tuple[ 0 ] + "With" ](
- this,
- fn ? [ returned ] : arguments
- );
- }
- } );
- } );
- fns = null;
- } ).promise();
- },
- then: function( onFulfilled, onRejected, onProgress ) {
- var maxDepth = 0;
- function resolve( depth, deferred, handler, special ) {
- return function() {
- var that = this,
- args = arguments,
- mightThrow = function() {
- var returned, then;
-
- // Support: Promises/A+ section 2.3.3.3.3
- // https://promisesaplus.com/#point-59
- // Ignore double-resolution attempts
- if ( depth < maxDepth ) {
- return;
- }
-
- returned = handler.apply( that, args );
-
- // Support: Promises/A+ section 2.3.1
- // https://promisesaplus.com/#point-48
- if ( returned === deferred.promise() ) {
- throw new TypeError( "Thenable self-resolution" );
- }
-
- // Support: Promises/A+ sections 2.3.3.1, 3.5
- // https://promisesaplus.com/#point-54
- // https://promisesaplus.com/#point-75
- // Retrieve `then` only once
- then = returned &&
-
- // Support: Promises/A+ section 2.3.4
- // https://promisesaplus.com/#point-64
- // Only check objects and functions for thenability
- ( typeof returned === "object" ||
- typeof returned === "function" ) &&
- returned.then;
-
- // Handle a returned thenable
- if ( isFunction( then ) ) {
-
- // Special processors (notify) just wait for resolution
- if ( special ) {
- then.call(
- returned,
- resolve( maxDepth, deferred, Identity, special ),
- resolve( maxDepth, deferred, Thrower, special )
- );
-
- // Normal processors (resolve) also hook into progress
- } else {
-
- // ...and disregard older resolution values
- maxDepth++;
-
- then.call(
- returned,
- resolve( maxDepth, deferred, Identity, special ),
- resolve( maxDepth, deferred, Thrower, special ),
- resolve( maxDepth, deferred, Identity,
- deferred.notifyWith )
- );
- }
-
- // Handle all other returned values
- } else {
-
- // Only substitute handlers pass on context
- // and multiple values (non-spec behavior)
- if ( handler !== Identity ) {
- that = undefined;
- args = [ returned ];
- }
-
- // Process the value(s)
- // Default process is resolve
- ( special || deferred.resolveWith )( that, args );
- }
- },
-
- // Only normal processors (resolve) catch and reject exceptions
- process = special ?
- mightThrow :
- function() {
- try {
- mightThrow();
- } catch ( e ) {
-
- if ( jQuery.Deferred.exceptionHook ) {
- jQuery.Deferred.exceptionHook( e,
- process.stackTrace );
- }
-
- // Support: Promises/A+ section 2.3.3.3.4.1
- // https://promisesaplus.com/#point-61
- // Ignore post-resolution exceptions
- if ( depth + 1 >= maxDepth ) {
-
- // Only substitute handlers pass on context
- // and multiple values (non-spec behavior)
- if ( handler !== Thrower ) {
- that = undefined;
- args = [ e ];
- }
-
- deferred.rejectWith( that, args );
- }
- }
- };
-
- // Support: Promises/A+ section 2.3.3.3.1
- // https://promisesaplus.com/#point-57
- // Re-resolve promises immediately to dodge false rejection from
- // subsequent errors
- if ( depth ) {
- process();
- } else {
-
- // Call an optional hook to record the stack, in case of exception
- // since it's otherwise lost when execution goes async
- if ( jQuery.Deferred.getStackHook ) {
- process.stackTrace = jQuery.Deferred.getStackHook();
- }
- window.setTimeout( process );
- }
- };
- }
-
- return jQuery.Deferred( function( newDefer ) {
-
- // progress_handlers.add( ... )
- tuples[ 0 ][ 3 ].add(
- resolve(
- 0,
- newDefer,
- isFunction( onProgress ) ?
- onProgress :
- Identity,
- newDefer.notifyWith
- )
- );
-
- // fulfilled_handlers.add( ... )
- tuples[ 1 ][ 3 ].add(
- resolve(
- 0,
- newDefer,
- isFunction( onFulfilled ) ?
- onFulfilled :
- Identity
- )
- );
-
- // rejected_handlers.add( ... )
- tuples[ 2 ][ 3 ].add(
- resolve(
- 0,
- newDefer,
- isFunction( onRejected ) ?
- onRejected :
- Thrower
- )
- );
- } ).promise();
- },
-
- // Get a promise for this deferred
- // If obj is provided, the promise aspect is added to the object
- promise: function( obj ) {
- return obj != null ? jQuery.extend( obj, promise ) : promise;
- }
- },
- deferred = {};
-
- // Add list-specific methods
- jQuery.each( tuples, function( i, tuple ) {
- var list = tuple[ 2 ],
- stateString = tuple[ 5 ];
-
- // promise.progress = list.add
- // promise.done = list.add
- // promise.fail = list.add
- promise[ tuple[ 1 ] ] = list.add;
-
- // Handle state
- if ( stateString ) {
- list.add(
- function() {
-
- // state = "resolved" (i.e., fulfilled)
- // state = "rejected"
- state = stateString;
- },
-
- // rejected_callbacks.disable
- // fulfilled_callbacks.disable
- tuples[ 3 - i ][ 2 ].disable,
-
- // rejected_handlers.disable
- // fulfilled_handlers.disable
- tuples[ 3 - i ][ 3 ].disable,
-
- // progress_callbacks.lock
- tuples[ 0 ][ 2 ].lock,
-
- // progress_handlers.lock
- tuples[ 0 ][ 3 ].lock
- );
- }
-
- // progress_handlers.fire
- // fulfilled_handlers.fire
- // rejected_handlers.fire
- list.add( tuple[ 3 ].fire );
-
- // deferred.notify = function() { deferred.notifyWith(...) }
- // deferred.resolve = function() { deferred.resolveWith(...) }
- // deferred.reject = function() { deferred.rejectWith(...) }
- deferred[ tuple[ 0 ] ] = function() {
- deferred[ tuple[ 0 ] + "With" ]( this === deferred ? undefined : this, arguments );
- return this;
- };
-
- // deferred.notifyWith = list.fireWith
- // deferred.resolveWith = list.fireWith
- // deferred.rejectWith = list.fireWith
- deferred[ tuple[ 0 ] + "With" ] = list.fireWith;
- } );
-
- // Make the deferred a promise
- promise.promise( deferred );
-
- // Call given func if any
- if ( func ) {
- func.call( deferred, deferred );
- }
-
- // All done!
- return deferred;
- },
-
- // Deferred helper
- when: function( singleValue ) {
- var
-
- // count of uncompleted subordinates
- remaining = arguments.length,
-
- // count of unprocessed arguments
- i = remaining,
-
- // subordinate fulfillment data
- resolveContexts = Array( i ),
- resolveValues = slice.call( arguments ),
-
- // the master Deferred
- master = jQuery.Deferred(),
-
- // subordinate callback factory
- updateFunc = function( i ) {
- return function( value ) {
- resolveContexts[ i ] = this;
- resolveValues[ i ] = arguments.length > 1 ? slice.call( arguments ) : value;
- if ( !( --remaining ) ) {
- master.resolveWith( resolveContexts, resolveValues );
- }
- };
- };
-
- // Single- and empty arguments are adopted like Promise.resolve
- if ( remaining <= 1 ) {
- adoptValue( singleValue, master.done( updateFunc( i ) ).resolve, master.reject,
- !remaining );
-
- // Use .then() to unwrap secondary thenables (cf. gh-3000)
- if ( master.state() === "pending" ||
- isFunction( resolveValues[ i ] && resolveValues[ i ].then ) ) {
-
- return master.then();
- }
- }
-
- // Multiple arguments are aggregated like Promise.all array elements
- while ( i-- ) {
- adoptValue( resolveValues[ i ], updateFunc( i ), master.reject );
- }
-
- return master.promise();
- }
-} );
-
-
-// These usually indicate a programmer mistake during development,
-// warn about them ASAP rather than swallowing them by default.
-var rerrorNames = /^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;
-
-jQuery.Deferred.exceptionHook = function( error, stack ) {
-
- // Support: IE 8 - 9 only
- // Console exists when dev tools are open, which can happen at any time
- if ( window.console && window.console.warn && error && rerrorNames.test( error.name ) ) {
- window.console.warn( "jQuery.Deferred exception: " + error.message, error.stack, stack );
- }
-};
-
-
-
-
-jQuery.readyException = function( error ) {
- window.setTimeout( function() {
- throw error;
- } );
-};
-
-
-
-
-// The deferred used on DOM ready
-var readyList = jQuery.Deferred();
-
-jQuery.fn.ready = function( fn ) {
-
- readyList
- .then( fn )
-
- // Wrap jQuery.readyException in a function so that the lookup
- // happens at the time of error handling instead of callback
- // registration.
- .catch( function( error ) {
- jQuery.readyException( error );
- } );
-
- return this;
-};
-
-jQuery.extend( {
-
- // Is the DOM ready to be used? Set to true once it occurs.
- isReady: false,
-
- // A counter to track how many items to wait for before
- // the ready event fires. See #6781
- readyWait: 1,
-
- // Handle when the DOM is ready
- ready: function( wait ) {
-
- // Abort if there are pending holds or we're already ready
- if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
- return;
- }
-
- // Remember that the DOM is ready
- jQuery.isReady = true;
-
- // If a normal DOM Ready event fired, decrement, and wait if need be
- if ( wait !== true && --jQuery.readyWait > 0 ) {
- return;
- }
-
- // If there are functions bound, to execute
- readyList.resolveWith( document, [ jQuery ] );
- }
-} );
-
-jQuery.ready.then = readyList.then;
-
-// The ready event handler and self cleanup method
-function completed() {
- document.removeEventListener( "DOMContentLoaded", completed );
- window.removeEventListener( "load", completed );
- jQuery.ready();
-}
-
-// Catch cases where $(document).ready() is called
-// after the browser event has already occurred.
-// Support: IE <=9 - 10 only
-// Older IE sometimes signals "interactive" too soon
-if ( document.readyState === "complete" ||
- ( document.readyState !== "loading" && !document.documentElement.doScroll ) ) {
-
- // Handle it asynchronously to allow scripts the opportunity to delay ready
- window.setTimeout( jQuery.ready );
-
-} else {
-
- // Use the handy event callback
- document.addEventListener( "DOMContentLoaded", completed );
-
- // A fallback to window.onload, that will always work
- window.addEventListener( "load", completed );
-}
-
-
-
-
-// Multifunctional method to get and set values of a collection
-// The value/s can optionally be executed if it's a function
-var access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
- var i = 0,
- len = elems.length,
- bulk = key == null;
-
- // Sets many values
- if ( toType( key ) === "object" ) {
- chainable = true;
- for ( i in key ) {
- access( elems, fn, i, key[ i ], true, emptyGet, raw );
- }
-
- // Sets one value
- } else if ( value !== undefined ) {
- chainable = true;
-
- if ( !isFunction( value ) ) {
- raw = true;
- }
-
- if ( bulk ) {
-
- // Bulk operations run against the entire set
- if ( raw ) {
- fn.call( elems, value );
- fn = null;
-
- // ...except when executing function values
- } else {
- bulk = fn;
- fn = function( elem, key, value ) {
- return bulk.call( jQuery( elem ), value );
- };
- }
- }
-
- if ( fn ) {
- for ( ; i < len; i++ ) {
- fn(
- elems[ i ], key, raw ?
- value :
- value.call( elems[ i ], i, fn( elems[ i ], key ) )
- );
- }
- }
- }
-
- if ( chainable ) {
- return elems;
- }
-
- // Gets
- if ( bulk ) {
- return fn.call( elems );
- }
-
- return len ? fn( elems[ 0 ], key ) : emptyGet;
-};
-
-
-// Matches dashed string for camelizing
-var rmsPrefix = /^-ms-/,
- rdashAlpha = /-([a-z])/g;
-
-// Used by camelCase as callback to replace()
-function fcamelCase( all, letter ) {
- return letter.toUpperCase();
-}
-
-// Convert dashed to camelCase; used by the css and data modules
-// Support: IE <=9 - 11, Edge 12 - 15
-// Microsoft forgot to hump their vendor prefix (#9572)
-function camelCase( string ) {
- return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
-}
-var acceptData = function( owner ) {
-
- // Accepts only:
- // - Node
- // - Node.ELEMENT_NODE
- // - Node.DOCUMENT_NODE
- // - Object
- // - Any
- return owner.nodeType === 1 || owner.nodeType === 9 || !( +owner.nodeType );
-};
-
-
-
-
-function Data() {
- this.expando = jQuery.expando + Data.uid++;
-}
-
-Data.uid = 1;
-
-Data.prototype = {
-
- cache: function( owner ) {
-
- // Check if the owner object already has a cache
- var value = owner[ this.expando ];
-
- // If not, create one
- if ( !value ) {
- value = {};
-
- // We can accept data for non-element nodes in modern browsers,
- // but we should not, see #8335.
- // Always return an empty object.
- if ( acceptData( owner ) ) {
-
- // If it is a node unlikely to be stringify-ed or looped over
- // use plain assignment
- if ( owner.nodeType ) {
- owner[ this.expando ] = value;
-
- // Otherwise secure it in a non-enumerable property
- // configurable must be true to allow the property to be
- // deleted when data is removed
- } else {
- Object.defineProperty( owner, this.expando, {
- value: value,
- configurable: true
- } );
- }
- }
- }
-
- return value;
- },
- set: function( owner, data, value ) {
- var prop,
- cache = this.cache( owner );
-
- // Handle: [ owner, key, value ] args
- // Always use camelCase key (gh-2257)
- if ( typeof data === "string" ) {
- cache[ camelCase( data ) ] = value;
-
- // Handle: [ owner, { properties } ] args
- } else {
-
- // Copy the properties one-by-one to the cache object
- for ( prop in data ) {
- cache[ camelCase( prop ) ] = data[ prop ];
- }
- }
- return cache;
- },
- get: function( owner, key ) {
- return key === undefined ?
- this.cache( owner ) :
-
- // Always use camelCase key (gh-2257)
- owner[ this.expando ] && owner[ this.expando ][ camelCase( key ) ];
- },
- access: function( owner, key, value ) {
-
- // In cases where either:
- //
- // 1. No key was specified
- // 2. A string key was specified, but no value provided
- //
- // Take the "read" path and allow the get method to determine
- // which value to return, respectively either:
- //
- // 1. The entire cache object
- // 2. The data stored at the key
- //
- if ( key === undefined ||
- ( ( key && typeof key === "string" ) && value === undefined ) ) {
-
- return this.get( owner, key );
- }
-
- // When the key is not a string, or both a key and value
- // are specified, set or extend (existing objects) with either:
- //
- // 1. An object of properties
- // 2. A key and value
- //
- this.set( owner, key, value );
-
- // Since the "set" path can have two possible entry points
- // return the expected data based on which path was taken[*]
- return value !== undefined ? value : key;
- },
- remove: function( owner, key ) {
- var i,
- cache = owner[ this.expando ];
-
- if ( cache === undefined ) {
- return;
- }
-
- if ( key !== undefined ) {
-
- // Support array or space separated string of keys
- if ( Array.isArray( key ) ) {
-
- // If key is an array of keys...
- // We always set camelCase keys, so remove that.
- key = key.map( camelCase );
- } else {
- key = camelCase( key );
-
- // If a key with the spaces exists, use it.
- // Otherwise, create an array by matching non-whitespace
- key = key in cache ?
- [ key ] :
- ( key.match( rnothtmlwhite ) || [] );
- }
-
- i = key.length;
-
- while ( i-- ) {
- delete cache[ key[ i ] ];
- }
- }
-
- // Remove the expando if there's no more data
- if ( key === undefined || jQuery.isEmptyObject( cache ) ) {
-
- // Support: Chrome <=35 - 45
- // Webkit & Blink performance suffers when deleting properties
- // from DOM nodes, so set to undefined instead
- // https://bugs.chromium.org/p/chromium/issues/detail?id=378607 (bug restricted)
- if ( owner.nodeType ) {
- owner[ this.expando ] = undefined;
- } else {
- delete owner[ this.expando ];
- }
- }
- },
- hasData: function( owner ) {
- var cache = owner[ this.expando ];
- return cache !== undefined && !jQuery.isEmptyObject( cache );
- }
-};
-var dataPriv = new Data();
-
-var dataUser = new Data();
-
-
-
-// Implementation Summary
-//
-// 1. Enforce API surface and semantic compatibility with 1.9.x branch
-// 2. Improve the module's maintainability by reducing the storage
-// paths to a single mechanism.
-// 3. Use the same single mechanism to support "private" and "user" data.
-// 4. _Never_ expose "private" data to user code (TODO: Drop _data, _removeData)
-// 5. Avoid exposing implementation details on user objects (eg. expando properties)
-// 6. Provide a clear path for implementation upgrade to WeakMap in 2014
-
-var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,
- rmultiDash = /[A-Z]/g;
-
-function getData( data ) {
- if ( data === "true" ) {
- return true;
- }
-
- if ( data === "false" ) {
- return false;
- }
-
- if ( data === "null" ) {
- return null;
- }
-
- // Only convert to a number if it doesn't change the string
- if ( data === +data + "" ) {
- return +data;
- }
-
- if ( rbrace.test( data ) ) {
- return JSON.parse( data );
- }
-
- return data;
-}
-
-function dataAttr( elem, key, data ) {
- var name;
-
- // If nothing was found internally, try to fetch any
- // data from the HTML5 data-* attribute
- if ( data === undefined && elem.nodeType === 1 ) {
- name = "data-" + key.replace( rmultiDash, "-$&" ).toLowerCase();
- data = elem.getAttribute( name );
-
- if ( typeof data === "string" ) {
- try {
- data = getData( data );
- } catch ( e ) {}
-
- // Make sure we set the data so it isn't changed later
- dataUser.set( elem, key, data );
- } else {
- data = undefined;
- }
- }
- return data;
-}
-
-jQuery.extend( {
- hasData: function( elem ) {
- return dataUser.hasData( elem ) || dataPriv.hasData( elem );
- },
-
- data: function( elem, name, data ) {
- return dataUser.access( elem, name, data );
- },
-
- removeData: function( elem, name ) {
- dataUser.remove( elem, name );
- },
-
- // TODO: Now that all calls to _data and _removeData have been replaced
- // with direct calls to dataPriv methods, these can be deprecated.
- _data: function( elem, name, data ) {
- return dataPriv.access( elem, name, data );
- },
-
- _removeData: function( elem, name ) {
- dataPriv.remove( elem, name );
- }
-} );
-
-jQuery.fn.extend( {
- data: function( key, value ) {
- var i, name, data,
- elem = this[ 0 ],
- attrs = elem && elem.attributes;
-
- // Gets all values
- if ( key === undefined ) {
- if ( this.length ) {
- data = dataUser.get( elem );
-
- if ( elem.nodeType === 1 && !dataPriv.get( elem, "hasDataAttrs" ) ) {
- i = attrs.length;
- while ( i-- ) {
-
- // Support: IE 11 only
- // The attrs elements can be null (#14894)
- if ( attrs[ i ] ) {
- name = attrs[ i ].name;
- if ( name.indexOf( "data-" ) === 0 ) {
- name = camelCase( name.slice( 5 ) );
- dataAttr( elem, name, data[ name ] );
- }
- }
- }
- dataPriv.set( elem, "hasDataAttrs", true );
- }
- }
-
- return data;
- }
-
- // Sets multiple values
- if ( typeof key === "object" ) {
- return this.each( function() {
- dataUser.set( this, key );
- } );
- }
-
- return access( this, function( value ) {
- var data;
-
- // The calling jQuery object (element matches) is not empty
- // (and therefore has an element appears at this[ 0 ]) and the
- // `value` parameter was not undefined. An empty jQuery object
- // will result in `undefined` for elem = this[ 0 ] which will
- // throw an exception if an attempt to read a data cache is made.
- if ( elem && value === undefined ) {
-
- // Attempt to get data from the cache
- // The key will always be camelCased in Data
- data = dataUser.get( elem, key );
- if ( data !== undefined ) {
- return data;
- }
-
- // Attempt to "discover" the data in
- // HTML5 custom data-* attrs
- data = dataAttr( elem, key );
- if ( data !== undefined ) {
- return data;
- }
-
- // We tried really hard, but the data doesn't exist.
- return;
- }
-
- // Set the data...
- this.each( function() {
-
- // We always store the camelCased key
- dataUser.set( this, key, value );
- } );
- }, null, value, arguments.length > 1, null, true );
- },
-
- removeData: function( key ) {
- return this.each( function() {
- dataUser.remove( this, key );
- } );
- }
-} );
-
-
-jQuery.extend( {
- queue: function( elem, type, data ) {
- var queue;
-
- if ( elem ) {
- type = ( type || "fx" ) + "queue";
- queue = dataPriv.get( elem, type );
-
- // Speed up dequeue by getting out quickly if this is just a lookup
- if ( data ) {
- if ( !queue || Array.isArray( data ) ) {
- queue = dataPriv.access( elem, type, jQuery.makeArray( data ) );
- } else {
- queue.push( data );
- }
- }
- return queue || [];
- }
- },
-
- dequeue: function( elem, type ) {
- type = type || "fx";
-
- var queue = jQuery.queue( elem, type ),
- startLength = queue.length,
- fn = queue.shift(),
- hooks = jQuery._queueHooks( elem, type ),
- next = function() {
- jQuery.dequeue( elem, type );
- };
-
- // If the fx queue is dequeued, always remove the progress sentinel
- if ( fn === "inprogress" ) {
- fn = queue.shift();
- startLength--;
- }
-
- if ( fn ) {
-
- // Add a progress sentinel to prevent the fx queue from being
- // automatically dequeued
- if ( type === "fx" ) {
- queue.unshift( "inprogress" );
- }
-
- // Clear up the last queue stop function
- delete hooks.stop;
- fn.call( elem, next, hooks );
- }
-
- if ( !startLength && hooks ) {
- hooks.empty.fire();
- }
- },
-
- // Not public - generate a queueHooks object, or return the current one
- _queueHooks: function( elem, type ) {
- var key = type + "queueHooks";
- return dataPriv.get( elem, key ) || dataPriv.access( elem, key, {
- empty: jQuery.Callbacks( "once memory" ).add( function() {
- dataPriv.remove( elem, [ type + "queue", key ] );
- } )
- } );
- }
-} );
-
-jQuery.fn.extend( {
- queue: function( type, data ) {
- var setter = 2;
-
- if ( typeof type !== "string" ) {
- data = type;
- type = "fx";
- setter--;
- }
-
- if ( arguments.length < setter ) {
- return jQuery.queue( this[ 0 ], type );
- }
-
- return data === undefined ?
- this :
- this.each( function() {
- var queue = jQuery.queue( this, type, data );
-
- // Ensure a hooks for this queue
- jQuery._queueHooks( this, type );
-
- if ( type === "fx" && queue[ 0 ] !== "inprogress" ) {
- jQuery.dequeue( this, type );
- }
- } );
- },
- dequeue: function( type ) {
- return this.each( function() {
- jQuery.dequeue( this, type );
- } );
- },
- clearQueue: function( type ) {
- return this.queue( type || "fx", [] );
- },
-
- // Get a promise resolved when queues of a certain type
- // are emptied (fx is the type by default)
- promise: function( type, obj ) {
- var tmp,
- count = 1,
- defer = jQuery.Deferred(),
- elements = this,
- i = this.length,
- resolve = function() {
- if ( !( --count ) ) {
- defer.resolveWith( elements, [ elements ] );
- }
- };
-
- if ( typeof type !== "string" ) {
- obj = type;
- type = undefined;
- }
- type = type || "fx";
-
- while ( i-- ) {
- tmp = dataPriv.get( elements[ i ], type + "queueHooks" );
- if ( tmp && tmp.empty ) {
- count++;
- tmp.empty.add( resolve );
- }
- }
- resolve();
- return defer.promise( obj );
- }
-} );
-var pnum = ( /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/ ).source;
-
-var rcssNum = new RegExp( "^(?:([+-])=|)(" + pnum + ")([a-z%]*)$", "i" );
-
-
-var cssExpand = [ "Top", "Right", "Bottom", "Left" ];
-
-var isHiddenWithinTree = function( elem, el ) {
-
- // isHiddenWithinTree might be called from jQuery#filter function;
- // in that case, element will be second argument
- elem = el || elem;
-
- // Inline style trumps all
- return elem.style.display === "none" ||
- elem.style.display === "" &&
-
- // Otherwise, check computed style
- // Support: Firefox <=43 - 45
- // Disconnected elements can have computed display: none, so first confirm that elem is
- // in the document.
- jQuery.contains( elem.ownerDocument, elem ) &&
-
- jQuery.css( elem, "display" ) === "none";
- };
-
-var swap = function( elem, options, callback, args ) {
- var ret, name,
- old = {};
-
- // Remember the old values, and insert the new ones
- for ( name in options ) {
- old[ name ] = elem.style[ name ];
- elem.style[ name ] = options[ name ];
- }
-
- ret = callback.apply( elem, args || [] );
-
- // Revert the old values
- for ( name in options ) {
- elem.style[ name ] = old[ name ];
- }
-
- return ret;
-};
-
-
-
-
-function adjustCSS( elem, prop, valueParts, tween ) {
- var adjusted, scale,
- maxIterations = 20,
- currentValue = tween ?
- function() {
- return tween.cur();
- } :
- function() {
- return jQuery.css( elem, prop, "" );
- },
- initial = currentValue(),
- unit = valueParts && valueParts[ 3 ] || ( jQuery.cssNumber[ prop ] ? "" : "px" ),
-
- // Starting value computation is required for potential unit mismatches
- initialInUnit = ( jQuery.cssNumber[ prop ] || unit !== "px" && +initial ) &&
- rcssNum.exec( jQuery.css( elem, prop ) );
-
- if ( initialInUnit && initialInUnit[ 3 ] !== unit ) {
-
- // Support: Firefox <=54
- // Halve the iteration target value to prevent interference from CSS upper bounds (gh-2144)
- initial = initial / 2;
-
- // Trust units reported by jQuery.css
- unit = unit || initialInUnit[ 3 ];
-
- // Iteratively approximate from a nonzero starting point
- initialInUnit = +initial || 1;
-
- while ( maxIterations-- ) {
-
- // Evaluate and update our best guess (doubling guesses that zero out).
- // Finish if the scale equals or crosses 1 (making the old*new product non-positive).
- jQuery.style( elem, prop, initialInUnit + unit );
- if ( ( 1 - scale ) * ( 1 - ( scale = currentValue() / initial || 0.5 ) ) <= 0 ) {
- maxIterations = 0;
- }
- initialInUnit = initialInUnit / scale;
-
- }
-
- initialInUnit = initialInUnit * 2;
- jQuery.style( elem, prop, initialInUnit + unit );
-
- // Make sure we update the tween properties later on
- valueParts = valueParts || [];
- }
-
- if ( valueParts ) {
- initialInUnit = +initialInUnit || +initial || 0;
-
- // Apply relative offset (+=/-=) if specified
- adjusted = valueParts[ 1 ] ?
- initialInUnit + ( valueParts[ 1 ] + 1 ) * valueParts[ 2 ] :
- +valueParts[ 2 ];
- if ( tween ) {
- tween.unit = unit;
- tween.start = initialInUnit;
- tween.end = adjusted;
- }
- }
- return adjusted;
-}
-
-
-var defaultDisplayMap = {};
-
-function getDefaultDisplay( elem ) {
- var temp,
- doc = elem.ownerDocument,
- nodeName = elem.nodeName,
- display = defaultDisplayMap[ nodeName ];
-
- if ( display ) {
- return display;
- }
-
- temp = doc.body.appendChild( doc.createElement( nodeName ) );
- display = jQuery.css( temp, "display" );
-
- temp.parentNode.removeChild( temp );
-
- if ( display === "none" ) {
- display = "block";
- }
- defaultDisplayMap[ nodeName ] = display;
-
- return display;
-}
-
-function showHide( elements, show ) {
- var display, elem,
- values = [],
- index = 0,
- length = elements.length;
-
- // Determine new display value for elements that need to change
- for ( ; index < length; index++ ) {
- elem = elements[ index ];
- if ( !elem.style ) {
- continue;
- }
-
- display = elem.style.display;
- if ( show ) {
-
- // Since we force visibility upon cascade-hidden elements, an immediate (and slow)
- // check is required in this first loop unless we have a nonempty display value (either
- // inline or about-to-be-restored)
- if ( display === "none" ) {
- values[ index ] = dataPriv.get( elem, "display" ) || null;
- if ( !values[ index ] ) {
- elem.style.display = "";
- }
- }
- if ( elem.style.display === "" && isHiddenWithinTree( elem ) ) {
- values[ index ] = getDefaultDisplay( elem );
- }
- } else {
- if ( display !== "none" ) {
- values[ index ] = "none";
-
- // Remember what we're overwriting
- dataPriv.set( elem, "display", display );
- }
- }
- }
-
- // Set the display of the elements in a second loop to avoid constant reflow
- for ( index = 0; index < length; index++ ) {
- if ( values[ index ] != null ) {
- elements[ index ].style.display = values[ index ];
- }
- }
-
- return elements;
-}
-
-jQuery.fn.extend( {
- show: function() {
- return showHide( this, true );
- },
- hide: function() {
- return showHide( this );
- },
- toggle: function( state ) {
- if ( typeof state === "boolean" ) {
- return state ? this.show() : this.hide();
- }
-
- return this.each( function() {
- if ( isHiddenWithinTree( this ) ) {
- jQuery( this ).show();
- } else {
- jQuery( this ).hide();
- }
- } );
- }
-} );
-var rcheckableType = ( /^(?:checkbox|radio)$/i );
-
-var rtagName = ( /<([a-z][^\/\0>\x20\t\r\n\f]+)/i );
-
-var rscriptType = ( /^$|^module$|\/(?:java|ecma)script/i );
-
-
-
-// We have to close these tags to support XHTML (#13200)
-var wrapMap = {
-
- // Support: IE <=9 only
- option: [ 1, "", " " ],
-
- // XHTML parsers do not magically insert elements in the
- // same way that tag soup parsers do. So we cannot shorten
- // this by omitting or other required elements.
- thead: [ 1, "" ],
- col: [ 2, "" ],
- tr: [ 2, "" ],
- td: [ 3, "" ],
-
- _default: [ 0, "", "" ]
-};
-
-// Support: IE <=9 only
-wrapMap.optgroup = wrapMap.option;
-
-wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
-wrapMap.th = wrapMap.td;
-
-
-function getAll( context, tag ) {
-
- // Support: IE <=9 - 11 only
- // Use typeof to avoid zero-argument method invocation on host objects (#15151)
- var ret;
-
- if ( typeof context.getElementsByTagName !== "undefined" ) {
- ret = context.getElementsByTagName( tag || "*" );
-
- } else if ( typeof context.querySelectorAll !== "undefined" ) {
- ret = context.querySelectorAll( tag || "*" );
-
- } else {
- ret = [];
- }
-
- if ( tag === undefined || tag && nodeName( context, tag ) ) {
- return jQuery.merge( [ context ], ret );
- }
-
- return ret;
-}
-
-
-// Mark scripts as having already been evaluated
-function setGlobalEval( elems, refElements ) {
- var i = 0,
- l = elems.length;
-
- for ( ; i < l; i++ ) {
- dataPriv.set(
- elems[ i ],
- "globalEval",
- !refElements || dataPriv.get( refElements[ i ], "globalEval" )
- );
- }
-}
-
-
-var rhtml = /<|?\w+;/;
-
-function buildFragment( elems, context, scripts, selection, ignored ) {
- var elem, tmp, tag, wrap, contains, j,
- fragment = context.createDocumentFragment(),
- nodes = [],
- i = 0,
- l = elems.length;
-
- for ( ; i < l; i++ ) {
- elem = elems[ i ];
-
- if ( elem || elem === 0 ) {
-
- // Add nodes directly
- if ( toType( elem ) === "object" ) {
-
- // Support: Android <=4.0 only, PhantomJS 1 only
- // push.apply(_, arraylike) throws on ancient WebKit
- jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem );
-
- // Convert non-html into a text node
- } else if ( !rhtml.test( elem ) ) {
- nodes.push( context.createTextNode( elem ) );
-
- // Convert html into DOM nodes
- } else {
- tmp = tmp || fragment.appendChild( context.createElement( "div" ) );
-
- // Deserialize a standard representation
- tag = ( rtagName.exec( elem ) || [ "", "" ] )[ 1 ].toLowerCase();
- wrap = wrapMap[ tag ] || wrapMap._default;
- tmp.innerHTML = wrap[ 1 ] + jQuery.htmlPrefilter( elem ) + wrap[ 2 ];
-
- // Descend through wrappers to the right content
- j = wrap[ 0 ];
- while ( j-- ) {
- tmp = tmp.lastChild;
- }
-
- // Support: Android <=4.0 only, PhantomJS 1 only
- // push.apply(_, arraylike) throws on ancient WebKit
- jQuery.merge( nodes, tmp.childNodes );
-
- // Remember the top-level container
- tmp = fragment.firstChild;
-
- // Ensure the created nodes are orphaned (#12392)
- tmp.textContent = "";
- }
- }
- }
-
- // Remove wrapper from fragment
- fragment.textContent = "";
-
- i = 0;
- while ( ( elem = nodes[ i++ ] ) ) {
-
- // Skip elements already in the context collection (trac-4087)
- if ( selection && jQuery.inArray( elem, selection ) > -1 ) {
- if ( ignored ) {
- ignored.push( elem );
- }
- continue;
- }
-
- contains = jQuery.contains( elem.ownerDocument, elem );
-
- // Append to fragment
- tmp = getAll( fragment.appendChild( elem ), "script" );
-
- // Preserve script evaluation history
- if ( contains ) {
- setGlobalEval( tmp );
- }
-
- // Capture executables
- if ( scripts ) {
- j = 0;
- while ( ( elem = tmp[ j++ ] ) ) {
- if ( rscriptType.test( elem.type || "" ) ) {
- scripts.push( elem );
- }
- }
- }
- }
-
- return fragment;
-}
-
-
-( function() {
- var fragment = document.createDocumentFragment(),
- div = fragment.appendChild( document.createElement( "div" ) ),
- input = document.createElement( "input" );
-
- // Support: Android 4.0 - 4.3 only
- // Check state lost if the name is set (#11217)
- // Support: Windows Web Apps (WWA)
- // `name` and `type` must use .setAttribute for WWA (#14901)
- input.setAttribute( "type", "radio" );
- input.setAttribute( "checked", "checked" );
- input.setAttribute( "name", "t" );
-
- div.appendChild( input );
-
- // Support: Android <=4.1 only
- // Older WebKit doesn't clone checked state correctly in fragments
- support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked;
-
- // Support: IE <=11 only
- // Make sure textarea (and checkbox) defaultValue is properly cloned
- div.innerHTML = "";
- support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue;
-} )();
-var documentElement = document.documentElement;
-
-
-
-var
- rkeyEvent = /^key/,
- rmouseEvent = /^(?:mouse|pointer|contextmenu|drag|drop)|click/,
- rtypenamespace = /^([^.]*)(?:\.(.+)|)/;
-
-function returnTrue() {
- return true;
-}
-
-function returnFalse() {
- return false;
-}
-
-// Support: IE <=9 only
-// See #13393 for more info
-function safeActiveElement() {
- try {
- return document.activeElement;
- } catch ( err ) { }
-}
-
-function on( elem, types, selector, data, fn, one ) {
- var origFn, type;
-
- // Types can be a map of types/handlers
- if ( typeof types === "object" ) {
-
- // ( types-Object, selector, data )
- if ( typeof selector !== "string" ) {
-
- // ( types-Object, data )
- data = data || selector;
- selector = undefined;
- }
- for ( type in types ) {
- on( elem, type, selector, data, types[ type ], one );
- }
- return elem;
- }
-
- if ( data == null && fn == null ) {
-
- // ( types, fn )
- fn = selector;
- data = selector = undefined;
- } else if ( fn == null ) {
- if ( typeof selector === "string" ) {
-
- // ( types, selector, fn )
- fn = data;
- data = undefined;
- } else {
-
- // ( types, data, fn )
- fn = data;
- data = selector;
- selector = undefined;
- }
- }
- if ( fn === false ) {
- fn = returnFalse;
- } else if ( !fn ) {
- return elem;
- }
-
- if ( one === 1 ) {
- origFn = fn;
- fn = function( event ) {
-
- // Can use an empty set, since event contains the info
- jQuery().off( event );
- return origFn.apply( this, arguments );
- };
-
- // Use same guid so caller can remove using origFn
- fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
- }
- return elem.each( function() {
- jQuery.event.add( this, types, fn, data, selector );
- } );
-}
-
-/*
- * Helper functions for managing events -- not part of the public interface.
- * Props to Dean Edwards' addEvent library for many of the ideas.
- */
-jQuery.event = {
-
- global: {},
-
- add: function( elem, types, handler, data, selector ) {
-
- var handleObjIn, eventHandle, tmp,
- events, t, handleObj,
- special, handlers, type, namespaces, origType,
- elemData = dataPriv.get( elem );
-
- // Don't attach events to noData or text/comment nodes (but allow plain objects)
- if ( !elemData ) {
- return;
- }
-
- // Caller can pass in an object of custom data in lieu of the handler
- if ( handler.handler ) {
- handleObjIn = handler;
- handler = handleObjIn.handler;
- selector = handleObjIn.selector;
- }
-
- // Ensure that invalid selectors throw exceptions at attach time
- // Evaluate against documentElement in case elem is a non-element node (e.g., document)
- if ( selector ) {
- jQuery.find.matchesSelector( documentElement, selector );
- }
-
- // Make sure that the handler has a unique ID, used to find/remove it later
- if ( !handler.guid ) {
- handler.guid = jQuery.guid++;
- }
-
- // Init the element's event structure and main handler, if this is the first
- if ( !( events = elemData.events ) ) {
- events = elemData.events = {};
- }
- if ( !( eventHandle = elemData.handle ) ) {
- eventHandle = elemData.handle = function( e ) {
-
- // Discard the second event of a jQuery.event.trigger() and
- // when an event is called after a page has unloaded
- return typeof jQuery !== "undefined" && jQuery.event.triggered !== e.type ?
- jQuery.event.dispatch.apply( elem, arguments ) : undefined;
- };
- }
-
- // Handle multiple events separated by a space
- types = ( types || "" ).match( rnothtmlwhite ) || [ "" ];
- t = types.length;
- while ( t-- ) {
- tmp = rtypenamespace.exec( types[ t ] ) || [];
- type = origType = tmp[ 1 ];
- namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort();
-
- // There *must* be a type, no attaching namespace-only handlers
- if ( !type ) {
- continue;
- }
-
- // If event changes its type, use the special event handlers for the changed type
- special = jQuery.event.special[ type ] || {};
-
- // If selector defined, determine special event api type, otherwise given type
- type = ( selector ? special.delegateType : special.bindType ) || type;
-
- // Update special based on newly reset type
- special = jQuery.event.special[ type ] || {};
-
- // handleObj is passed to all event handlers
- handleObj = jQuery.extend( {
- type: type,
- origType: origType,
- data: data,
- handler: handler,
- guid: handler.guid,
- selector: selector,
- needsContext: selector && jQuery.expr.match.needsContext.test( selector ),
- namespace: namespaces.join( "." )
- }, handleObjIn );
-
- // Init the event handler queue if we're the first
- if ( !( handlers = events[ type ] ) ) {
- handlers = events[ type ] = [];
- handlers.delegateCount = 0;
-
- // Only use addEventListener if the special events handler returns false
- if ( !special.setup ||
- special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
-
- if ( elem.addEventListener ) {
- elem.addEventListener( type, eventHandle );
- }
- }
- }
-
- if ( special.add ) {
- special.add.call( elem, handleObj );
-
- if ( !handleObj.handler.guid ) {
- handleObj.handler.guid = handler.guid;
- }
- }
-
- // Add to the element's handler list, delegates in front
- if ( selector ) {
- handlers.splice( handlers.delegateCount++, 0, handleObj );
- } else {
- handlers.push( handleObj );
- }
-
- // Keep track of which events have ever been used, for event optimization
- jQuery.event.global[ type ] = true;
- }
-
- },
-
- // Detach an event or set of events from an element
- remove: function( elem, types, handler, selector, mappedTypes ) {
-
- var j, origCount, tmp,
- events, t, handleObj,
- special, handlers, type, namespaces, origType,
- elemData = dataPriv.hasData( elem ) && dataPriv.get( elem );
-
- if ( !elemData || !( events = elemData.events ) ) {
- return;
- }
-
- // Once for each type.namespace in types; type may be omitted
- types = ( types || "" ).match( rnothtmlwhite ) || [ "" ];
- t = types.length;
- while ( t-- ) {
- tmp = rtypenamespace.exec( types[ t ] ) || [];
- type = origType = tmp[ 1 ];
- namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort();
-
- // Unbind all events (on this namespace, if provided) for the element
- if ( !type ) {
- for ( type in events ) {
- jQuery.event.remove( elem, type + types[ t ], handler, selector, true );
- }
- continue;
- }
-
- special = jQuery.event.special[ type ] || {};
- type = ( selector ? special.delegateType : special.bindType ) || type;
- handlers = events[ type ] || [];
- tmp = tmp[ 2 ] &&
- new RegExp( "(^|\\.)" + namespaces.join( "\\.(?:.*\\.|)" ) + "(\\.|$)" );
-
- // Remove matching events
- origCount = j = handlers.length;
- while ( j-- ) {
- handleObj = handlers[ j ];
-
- if ( ( mappedTypes || origType === handleObj.origType ) &&
- ( !handler || handler.guid === handleObj.guid ) &&
- ( !tmp || tmp.test( handleObj.namespace ) ) &&
- ( !selector || selector === handleObj.selector ||
- selector === "**" && handleObj.selector ) ) {
- handlers.splice( j, 1 );
-
- if ( handleObj.selector ) {
- handlers.delegateCount--;
- }
- if ( special.remove ) {
- special.remove.call( elem, handleObj );
- }
- }
- }
-
- // Remove generic event handler if we removed something and no more handlers exist
- // (avoids potential for endless recursion during removal of special event handlers)
- if ( origCount && !handlers.length ) {
- if ( !special.teardown ||
- special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
-
- jQuery.removeEvent( elem, type, elemData.handle );
- }
-
- delete events[ type ];
- }
- }
-
- // Remove data and the expando if it's no longer used
- if ( jQuery.isEmptyObject( events ) ) {
- dataPriv.remove( elem, "handle events" );
- }
- },
-
- dispatch: function( nativeEvent ) {
-
- // Make a writable jQuery.Event from the native event object
- var event = jQuery.event.fix( nativeEvent );
-
- var i, j, ret, matched, handleObj, handlerQueue,
- args = new Array( arguments.length ),
- handlers = ( dataPriv.get( this, "events" ) || {} )[ event.type ] || [],
- special = jQuery.event.special[ event.type ] || {};
-
- // Use the fix-ed jQuery.Event rather than the (read-only) native event
- args[ 0 ] = event;
-
- for ( i = 1; i < arguments.length; i++ ) {
- args[ i ] = arguments[ i ];
- }
-
- event.delegateTarget = this;
-
- // Call the preDispatch hook for the mapped type, and let it bail if desired
- if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
- return;
- }
-
- // Determine handlers
- handlerQueue = jQuery.event.handlers.call( this, event, handlers );
-
- // Run delegates first; they may want to stop propagation beneath us
- i = 0;
- while ( ( matched = handlerQueue[ i++ ] ) && !event.isPropagationStopped() ) {
- event.currentTarget = matched.elem;
-
- j = 0;
- while ( ( handleObj = matched.handlers[ j++ ] ) &&
- !event.isImmediatePropagationStopped() ) {
-
- // Triggered event must either 1) have no namespace, or 2) have namespace(s)
- // a subset or equal to those in the bound event (both can have no namespace).
- if ( !event.rnamespace || event.rnamespace.test( handleObj.namespace ) ) {
-
- event.handleObj = handleObj;
- event.data = handleObj.data;
-
- ret = ( ( jQuery.event.special[ handleObj.origType ] || {} ).handle ||
- handleObj.handler ).apply( matched.elem, args );
-
- if ( ret !== undefined ) {
- if ( ( event.result = ret ) === false ) {
- event.preventDefault();
- event.stopPropagation();
- }
- }
- }
- }
- }
-
- // Call the postDispatch hook for the mapped type
- if ( special.postDispatch ) {
- special.postDispatch.call( this, event );
- }
-
- return event.result;
- },
-
- handlers: function( event, handlers ) {
- var i, handleObj, sel, matchedHandlers, matchedSelectors,
- handlerQueue = [],
- delegateCount = handlers.delegateCount,
- cur = event.target;
-
- // Find delegate handlers
- if ( delegateCount &&
-
- // Support: IE <=9
- // Black-hole SVG instance trees (trac-13180)
- cur.nodeType &&
-
- // Support: Firefox <=42
- // Suppress spec-violating clicks indicating a non-primary pointer button (trac-3861)
- // https://www.w3.org/TR/DOM-Level-3-Events/#event-type-click
- // Support: IE 11 only
- // ...but not arrow key "clicks" of radio inputs, which can have `button` -1 (gh-2343)
- !( event.type === "click" && event.button >= 1 ) ) {
-
- for ( ; cur !== this; cur = cur.parentNode || this ) {
-
- // Don't check non-elements (#13208)
- // Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
- if ( cur.nodeType === 1 && !( event.type === "click" && cur.disabled === true ) ) {
- matchedHandlers = [];
- matchedSelectors = {};
- for ( i = 0; i < delegateCount; i++ ) {
- handleObj = handlers[ i ];
-
- // Don't conflict with Object.prototype properties (#13203)
- sel = handleObj.selector + " ";
-
- if ( matchedSelectors[ sel ] === undefined ) {
- matchedSelectors[ sel ] = handleObj.needsContext ?
- jQuery( sel, this ).index( cur ) > -1 :
- jQuery.find( sel, this, null, [ cur ] ).length;
- }
- if ( matchedSelectors[ sel ] ) {
- matchedHandlers.push( handleObj );
- }
- }
- if ( matchedHandlers.length ) {
- handlerQueue.push( { elem: cur, handlers: matchedHandlers } );
- }
- }
- }
- }
-
- // Add the remaining (directly-bound) handlers
- cur = this;
- if ( delegateCount < handlers.length ) {
- handlerQueue.push( { elem: cur, handlers: handlers.slice( delegateCount ) } );
- }
-
- return handlerQueue;
- },
-
- addProp: function( name, hook ) {
- Object.defineProperty( jQuery.Event.prototype, name, {
- enumerable: true,
- configurable: true,
-
- get: isFunction( hook ) ?
- function() {
- if ( this.originalEvent ) {
- return hook( this.originalEvent );
- }
- } :
- function() {
- if ( this.originalEvent ) {
- return this.originalEvent[ name ];
- }
- },
-
- set: function( value ) {
- Object.defineProperty( this, name, {
- enumerable: true,
- configurable: true,
- writable: true,
- value: value
- } );
- }
- } );
- },
-
- fix: function( originalEvent ) {
- return originalEvent[ jQuery.expando ] ?
- originalEvent :
- new jQuery.Event( originalEvent );
- },
-
- special: {
- load: {
-
- // Prevent triggered image.load events from bubbling to window.load
- noBubble: true
- },
- focus: {
-
- // Fire native event if possible so blur/focus sequence is correct
- trigger: function() {
- if ( this !== safeActiveElement() && this.focus ) {
- this.focus();
- return false;
- }
- },
- delegateType: "focusin"
- },
- blur: {
- trigger: function() {
- if ( this === safeActiveElement() && this.blur ) {
- this.blur();
- return false;
- }
- },
- delegateType: "focusout"
- },
- click: {
-
- // For checkbox, fire native event so checked state will be right
- trigger: function() {
- if ( this.type === "checkbox" && this.click && nodeName( this, "input" ) ) {
- this.click();
- return false;
- }
- },
-
- // For cross-browser consistency, don't fire native .click() on links
- _default: function( event ) {
- return nodeName( event.target, "a" );
- }
- },
-
- beforeunload: {
- postDispatch: function( event ) {
-
- // Support: Firefox 20+
- // Firefox doesn't alert if the returnValue field is not set.
- if ( event.result !== undefined && event.originalEvent ) {
- event.originalEvent.returnValue = event.result;
- }
- }
- }
- }
-};
-
-jQuery.removeEvent = function( elem, type, handle ) {
-
- // This "if" is needed for plain objects
- if ( elem.removeEventListener ) {
- elem.removeEventListener( type, handle );
- }
-};
-
-jQuery.Event = function( src, props ) {
-
- // Allow instantiation without the 'new' keyword
- if ( !( this instanceof jQuery.Event ) ) {
- return new jQuery.Event( src, props );
- }
-
- // Event object
- if ( src && src.type ) {
- this.originalEvent = src;
- this.type = src.type;
-
- // Events bubbling up the document may have been marked as prevented
- // by a handler lower down the tree; reflect the correct value.
- this.isDefaultPrevented = src.defaultPrevented ||
- src.defaultPrevented === undefined &&
-
- // Support: Android <=2.3 only
- src.returnValue === false ?
- returnTrue :
- returnFalse;
-
- // Create target properties
- // Support: Safari <=6 - 7 only
- // Target should not be a text node (#504, #13143)
- this.target = ( src.target && src.target.nodeType === 3 ) ?
- src.target.parentNode :
- src.target;
-
- this.currentTarget = src.currentTarget;
- this.relatedTarget = src.relatedTarget;
-
- // Event type
- } else {
- this.type = src;
- }
-
- // Put explicitly provided properties onto the event object
- if ( props ) {
- jQuery.extend( this, props );
- }
-
- // Create a timestamp if incoming event doesn't have one
- this.timeStamp = src && src.timeStamp || Date.now();
-
- // Mark it as fixed
- this[ jQuery.expando ] = true;
-};
-
-// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
-// https://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
-jQuery.Event.prototype = {
- constructor: jQuery.Event,
- isDefaultPrevented: returnFalse,
- isPropagationStopped: returnFalse,
- isImmediatePropagationStopped: returnFalse,
- isSimulated: false,
-
- preventDefault: function() {
- var e = this.originalEvent;
-
- this.isDefaultPrevented = returnTrue;
-
- if ( e && !this.isSimulated ) {
- e.preventDefault();
- }
- },
- stopPropagation: function() {
- var e = this.originalEvent;
-
- this.isPropagationStopped = returnTrue;
-
- if ( e && !this.isSimulated ) {
- e.stopPropagation();
- }
- },
- stopImmediatePropagation: function() {
- var e = this.originalEvent;
-
- this.isImmediatePropagationStopped = returnTrue;
-
- if ( e && !this.isSimulated ) {
- e.stopImmediatePropagation();
- }
-
- this.stopPropagation();
- }
-};
-
-// Includes all common event props including KeyEvent and MouseEvent specific props
-jQuery.each( {
- altKey: true,
- bubbles: true,
- cancelable: true,
- changedTouches: true,
- ctrlKey: true,
- detail: true,
- eventPhase: true,
- metaKey: true,
- pageX: true,
- pageY: true,
- shiftKey: true,
- view: true,
- "char": true,
- charCode: true,
- key: true,
- keyCode: true,
- button: true,
- buttons: true,
- clientX: true,
- clientY: true,
- offsetX: true,
- offsetY: true,
- pointerId: true,
- pointerType: true,
- screenX: true,
- screenY: true,
- targetTouches: true,
- toElement: true,
- touches: true,
-
- which: function( event ) {
- var button = event.button;
-
- // Add which for key events
- if ( event.which == null && rkeyEvent.test( event.type ) ) {
- return event.charCode != null ? event.charCode : event.keyCode;
- }
-
- // Add which for click: 1 === left; 2 === middle; 3 === right
- if ( !event.which && button !== undefined && rmouseEvent.test( event.type ) ) {
- if ( button & 1 ) {
- return 1;
- }
-
- if ( button & 2 ) {
- return 3;
- }
-
- if ( button & 4 ) {
- return 2;
- }
-
- return 0;
- }
-
- return event.which;
- }
-}, jQuery.event.addProp );
-
-// Create mouseenter/leave events using mouseover/out and event-time checks
-// so that event delegation works in jQuery.
-// Do the same for pointerenter/pointerleave and pointerover/pointerout
-//
-// Support: Safari 7 only
-// Safari sends mouseenter too often; see:
-// https://bugs.chromium.org/p/chromium/issues/detail?id=470258
-// for the description of the bug (it existed in older Chrome versions as well).
-jQuery.each( {
- mouseenter: "mouseover",
- mouseleave: "mouseout",
- pointerenter: "pointerover",
- pointerleave: "pointerout"
-}, function( orig, fix ) {
- jQuery.event.special[ orig ] = {
- delegateType: fix,
- bindType: fix,
-
- handle: function( event ) {
- var ret,
- target = this,
- related = event.relatedTarget,
- handleObj = event.handleObj;
-
- // For mouseenter/leave call the handler if related is outside the target.
- // NB: No relatedTarget if the mouse left/entered the browser window
- if ( !related || ( related !== target && !jQuery.contains( target, related ) ) ) {
- event.type = handleObj.origType;
- ret = handleObj.handler.apply( this, arguments );
- event.type = fix;
- }
- return ret;
- }
- };
-} );
-
-jQuery.fn.extend( {
-
- on: function( types, selector, data, fn ) {
- return on( this, types, selector, data, fn );
- },
- one: function( types, selector, data, fn ) {
- return on( this, types, selector, data, fn, 1 );
- },
- off: function( types, selector, fn ) {
- var handleObj, type;
- if ( types && types.preventDefault && types.handleObj ) {
-
- // ( event ) dispatched jQuery.Event
- handleObj = types.handleObj;
- jQuery( types.delegateTarget ).off(
- handleObj.namespace ?
- handleObj.origType + "." + handleObj.namespace :
- handleObj.origType,
- handleObj.selector,
- handleObj.handler
- );
- return this;
- }
- if ( typeof types === "object" ) {
-
- // ( types-object [, selector] )
- for ( type in types ) {
- this.off( type, selector, types[ type ] );
- }
- return this;
- }
- if ( selector === false || typeof selector === "function" ) {
-
- // ( types [, fn] )
- fn = selector;
- selector = undefined;
- }
- if ( fn === false ) {
- fn = returnFalse;
- }
- return this.each( function() {
- jQuery.event.remove( this, types, fn, selector );
- } );
- }
-} );
-
-
-var
-
- /* eslint-disable max-len */
-
- // See https://github.com/eslint/eslint/issues/3229
- rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,
-
- /* eslint-enable */
-
- // Support: IE <=10 - 11, Edge 12 - 13 only
- // In IE/Edge using regex groups here causes severe slowdowns.
- // See https://connect.microsoft.com/IE/feedback/details/1736512/
- rnoInnerhtml = /
diff --git a/IBPSA/Resources/src/convertEPW/doc/package-search-index.zip b/IBPSA/Resources/src/convertEPW/doc/package-search-index.zip
index 3feb00da61..d8b2bf28bb 100644
Binary files a/IBPSA/Resources/src/convertEPW/doc/package-search-index.zip and b/IBPSA/Resources/src/convertEPW/doc/package-search-index.zip differ
diff --git a/IBPSA/Resources/src/convertEPW/doc/package-summary.html b/IBPSA/Resources/src/convertEPW/doc/package-summary.html
index 228ae79473..057fa32a4a 100644
--- a/IBPSA/Resources/src/convertEPW/doc/package-summary.html
+++ b/IBPSA/Resources/src/convertEPW/doc/package-summary.html
@@ -2,10 +2,10 @@
-
+
<Unnamed>
-
+
diff --git a/IBPSA/Resources/src/convertEPW/doc/package-tree.html b/IBPSA/Resources/src/convertEPW/doc/package-tree.html
index 9a81c6b564..435501ba72 100644
--- a/IBPSA/Resources/src/convertEPW/doc/package-tree.html
+++ b/IBPSA/Resources/src/convertEPW/doc/package-tree.html
@@ -2,10 +2,10 @@
-
+
Class Hierarchy
-
+
diff --git a/IBPSA/Resources/src/convertEPW/doc/resources/inherit.gif b/IBPSA/Resources/src/convertEPW/doc/resources/inherit.gif
deleted file mode 100644
index c814867a13..0000000000
Binary files a/IBPSA/Resources/src/convertEPW/doc/resources/inherit.gif and /dev/null differ
diff --git a/IBPSA/Resources/src/convertEPW/doc/type-search-index.zip b/IBPSA/Resources/src/convertEPW/doc/type-search-index.zip
index ae042af494..1b83c392f8 100644
Binary files a/IBPSA/Resources/src/convertEPW/doc/type-search-index.zip and b/IBPSA/Resources/src/convertEPW/doc/type-search-index.zip differ
diff --git a/IBPSA/Utilities/Math/Functions/BaseClasses/der_spliceFunction.mo b/IBPSA/Utilities/Math/Functions/BaseClasses/der_spliceFunction.mo
index 663c337b6b..68cbd9cd33 100644
--- a/IBPSA/Utilities/Math/Functions/BaseClasses/der_spliceFunction.mo
+++ b/IBPSA/Utilities/Math/Functions/BaseClasses/der_spliceFunction.mo
@@ -11,6 +11,7 @@ function der_spliceFunction "Derivative of splice function"
input Real ddeltax=0;
output Real out;
protected
+ constant Real lim = 0.9999999999 "Limit in criterion for smoothing range";
Real scaledX1 "x scaled to -1 ... 1 interval";
Real scaledXp "x scaled to -pi/2 ... pi/2 interval";
Real scaledXt "x scaled to -inf ... inf interval";
@@ -18,9 +19,9 @@ protected
Real y;
algorithm
scaledX1 := x/deltax;
- if scaledX1 <= -0.9999999999 then
+ if scaledX1 <= -lim then
y := 0.0;
- elseif scaledX1 >= 0.9999999999 then
+ elseif scaledX1 >= lim then
y := 1.0;
else
scaledXp := scaledX1*0.5*Modelica.Constants.pi;
@@ -29,7 +30,7 @@ algorithm
end if;
out := dpos*y + (1 - y)*dneg;
- if (abs(scaledX1) < 1) then
+ if (abs(scaledX1) < lim) then
dscaledX1 := (dx - scaledX1*ddeltax)/deltax;
out := out + (pos - neg)*dscaledX1*0.25*Modelica.Constants.pi*(1 - Modelica.Math.tanh(scaledXt)^2)*(scaledXt^2 + 1);
end if;
@@ -47,6 +48,11 @@ IBPSA.Utilities.Math.Functions.spliceFunction.
revisions="
+September 27, 2022, by Matthis Thorade:
+Changed limits.
+This is for IBPSA, issue #1640 .
+
+
October 13, 2021, by Michael Wetter:
Changed implementation to not use cosh
which overflows around 800 .
This is for
diff --git a/IBPSA/Utilities/Math/Functions/Examples/CubicHermite.mo b/IBPSA/Utilities/Math/Functions/Examples/CubicHermite.mo
index 946693f008..255e7180cc 100644
--- a/IBPSA/Utilities/Math/Functions/Examples/CubicHermite.mo
+++ b/IBPSA/Utilities/Math/Functions/Examples/CubicHermite.mo
@@ -61,7 +61,7 @@ The example use interpolation with two different settings: One settings
produces a monotone cubic hermite, whereas the other setting
does not enforce monotonicity.
The resulting plot should look as shown below, where for better visibility, the support points have been marked with black dots.
-Notice that the red curve is monotone increasing.
+Notice that the red curve is monotonically increasing.
", revisions="
diff --git a/IBPSA/Utilities/Math/Functions/powerLinearized.mo b/IBPSA/Utilities/Math/Functions/powerLinearized.mo
index 727cd07f97..9fe590a86b 100644
--- a/IBPSA/Utilities/Math/Functions/powerLinearized.mo
+++ b/IBPSA/Utilities/Math/Functions/powerLinearized.mo
@@ -18,7 +18,7 @@ algorithm
Function that approximates y=xn
where 0 < n so that
-the function is defined and monotone increasing for all x .
+the function is defined and monotonically increasing for all x .
dy/dx is bounded and continuous everywhere (for n < 1 ).
diff --git a/IBPSA/Utilities/Math/Functions/regStep.mo b/IBPSA/Utilities/Math/Functions/regStep.mo
index 597fbb7d74..ae6a214ecb 100644
--- a/IBPSA/Utilities/Math/Functions/regStep.mo
+++ b/IBPSA/Utilities/Math/Functions/regStep.mo
@@ -20,12 +20,12 @@ algorithm
by Marcus Fuchs:
Add function with Inline = true
in annotations to package for better performance,
as suggested in #300 .
-April 29, 2008
- by Martin Otter :
- Designed and implemented.
August 12, 2008
by Michael Sielemann :
Minor modification to cover the limit case x_small -> 0
without division by zero.
+April 29, 2008
+ by Martin Otter :
+ Designed and implemented.
", info="
diff --git a/IBPSA/Utilities/Math/Functions/spliceFunction.mo b/IBPSA/Utilities/Math/Functions/spliceFunction.mo
index 03f188a05f..e3ce9da8da 100644
--- a/IBPSA/Utilities/Math/Functions/spliceFunction.mo
+++ b/IBPSA/Utilities/Math/Functions/spliceFunction.mo
@@ -7,14 +7,15 @@ function spliceFunction
input Real deltax "Half width of transition interval";
output Real out "Smoothed value";
protected
+ constant Real lim = 0.9999999999;
Real scaledX1;
Real y;
constant Real asin1 = Modelica.Math.asin(1);
algorithm
scaledX1 := x/deltax;
- if scaledX1 <= -0.999999999 then
+ if scaledX1 <= -lim then
out := neg;
- elseif scaledX1 >= 0.999999999 then
+ elseif scaledX1 >= lim then
out := pos;
else
y := (Modelica.Math.tanh(Modelica.Math.tan(scaledX1*asin1)) + 1)/2;
@@ -37,6 +38,11 @@ for easier accessability to model developers.
", revisions="
+September 27, 2022, by Matthis Thorade:
+Changed limits.
+This is for IBPSA, issue #1640 .
+
+
May 10, 2013, by Michael Wetter:
Reformulated implementation to avoid unrequired computations.
diff --git a/IBPSA/Utilities/Math/Functions/splineDerivatives.mo b/IBPSA/Utilities/Math/Functions/splineDerivatives.mo
index dc0506d0b2..c3115444fb 100644
--- a/IBPSA/Utilities/Math/Functions/splineDerivatives.mo
+++ b/IBPSA/Utilities/Math/Functions/splineDerivatives.mo
@@ -2,7 +2,7 @@ within IBPSA.Utilities.Math.Functions;
function splineDerivatives
"Function to compute the derivatives for cubic hermite spline interpolation"
extends Modelica.Icons.Function;
- input Real x[:] "Support point, strict monotone increasing";
+ input Real x[:] "Support point, strictly increasing";
input Real y[size(x, 1)] "Function values at x";
input Boolean ensureMonotonicity=isMonotonic(y, strict=false)
"Set to true to ensure monotonicity of the cubic hermite";
@@ -21,10 +21,10 @@ algorithm
x[" + String(n) + "] = " + String(x[n]));
// Check data
assert(isMonotonic(x, strict=true),
- "x-values must be strictly monontone increasing or decreasing.");
+ "x-values must be strictly increasing or decreasing.");
if ensureMonotonicity then
assert(isMonotonic(y, strict=false),
- "If ensureMonotonicity=true, y-values must be monontone increasing or decreasing.");
+ "If ensureMonotonicity=true, y-values must be strictly increasing or decreasing.");
end if;
end if;
@@ -76,8 +76,8 @@ that can be used as input for evaluating a cubic hermite spline.
If ensureMonotonicity=true
, then the support points yi
-need to be monotone increasing (or increasing), and the computed derivatives
-di are such that the cubic hermite is monotone increasing (or decreasing).
+need to be monotonically increasing (or increasing), and the computed derivatives
+di are such that the cubic hermite is monotonically increasing (or decreasing).
The algorithm to ensure monotonicity is based on the method described in Fritsch and Carlson (1980) for
ρ = ρ2 .
diff --git a/IBPSA/Utilities/Math/PowerLinearized.mo b/IBPSA/Utilities/Math/PowerLinearized.mo
index 5b3bfa4bfb..a1a66f6259 100644
--- a/IBPSA/Utilities/Math/PowerLinearized.mo
+++ b/IBPSA/Utilities/Math/PowerLinearized.mo
@@ -15,7 +15,7 @@ equation
Function that approximates y=xn
where 0 < n so that
-the function is defined and monotone increasing for all x .
+the function is defined and monotonically increasing for all x .
dy/dx is bounded and continuous everywhere (for n < 1 ).