Skip to content

Commit b895eaa

Browse files
vrugeOpenModelica-Hudson
authored andcommitted
fixed whitespace
1 parent 3467f5c commit b895eaa

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

simulation/modelica/nonlinear_system/nlsTestPackage.mo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ package nonlinear_system
144144
x[3]/a = -b + (a^2+ b^2)* x[2]/a - a + log(time+1) - (a^2+ b^2)* x[1]/a + 1/a;
145145

146146
y[1] = abs(x[1] - (b*x[2]^2 + b * x[3] + cos(time)*b));
147-
y[2] = abs(x[2]^2*b - (b^2 + x[1] - a*b*x[2]^2 + a*b));
147+
y[2] = abs(x[2]^2*b - (b^2 + x[1] - a*b*x[2]^2 + a*b));
148148
y[3] = abs(x[3] -( -b*a + (a^2+ b^2)* x[2] - a^2 + log(time+1)*a - (a^2+ b^2)* x[1] + 1));
149149

150150
end problem11;

simulation/modelica/nonlinear_system/problem11.mos

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ val(x[1],{0.0, 0.5, 1.0, 1.5, 5});
4949
// x[2]
5050
// ------------
5151
// update eqn[2]
52-
// x[1] = b * (x[2] ^ 2.0 + x[3] + cos(time))
53-
// => b * (cos(time) + x[2] ^ 2.0 + x[3]) - x[1] = 0.0
52+
// x[1] = b * (x[2] ^ 2.0 + x[3] + cos(time)) --old--
53+
// => - b * (cos(time) + x[2] ^ 2.0 + x[3]) - x[1] = 0.0 --new--
5454
// update eqn[3]
55-
// x[2] ^ 2.0 = b + x[1] / b + a - a * x[2] ^ 2.0
56-
// => x[1] - b * x[2] ^ 2.0 * (1.0 + a) = ((-b) - a) * b
55+
// x[2] ^ 2.0 = b + x[1] / b + a - a * x[2] ^ 2.0 --old--
56+
// => - x[1] - b * x[2] ^ 2.0 * (1.0 + a) = ((-b) - a) * b --new--
5757
// update eqn[4]
58-
// x[3] / a = (a ^ 2.0 + b ^ 2.0) * x[2] / a + log(1.0 + time) + ((-a ^ 2.0) - b ^ 2.0) * x[1] / a + 1.0 / a + (-a) - b
59-
// => (a ^ 2.0 + b ^ 2.0) * x[2] + ((-a ^ 2.0) - b ^ 2.0) * x[1] - x[3] = -1.0 + a ^ 2.0 + (b - log(1.0 + time)) * a
58+
// x[3] / a = (a ^ 2.0 + b ^ 2.0) * x[2] / a + log(1.0 + time) + ((-a ^ 2.0) - b ^ 2.0) * x[1] / a + 1.0 / a + (-a) - b --old--
59+
// => - (a ^ 2.0 + b ^ 2.0) * x[2] + ((-a ^ 2.0) - b ^ 2.0) * x[1] - x[3] = -1.0 + a ^ 2.0 + (b - log(1.0 + time)) * a --new--
6060
// END: simplifyLoops
6161
// record SimulationResult
6262
// resultFile = "nonlinear_system.problem11_res.mat",
@@ -75,19 +75,19 @@ val(x[1],{0.0, 0.5, 1.0, 1.5, 5});
7575
// x[2]
7676
// ------------
7777
// update eqn[2]
78-
// x[1] = b * (x[2] ^ 2.0 + x[3] + cos(time))
79-
// __OMC__1$LOOPT = cos(time)
80-
// => b * (__OMC__1$LOOPT + x[2] ^ 2.0 + x[3]) - x[1] = 0.0
78+
// x[1] = b * (x[2] ^ 2.0 + x[3] + cos(time)) --old--
79+
// __OMC__1$LOOPT = cos(time) -- new--
80+
// => - b * (__OMC__1$LOOPT + x[2] ^ 2.0 + x[3]) - x[1] = 0.0 --new--
8181
// update eqn[3]
82-
// x[2] ^ 2.0 = b + x[1] / b + a - a * x[2] ^ 2.0
83-
// __OMC__2$LOOPT = ((-b) - a) * b
84-
// => x[1] - b * x[2] ^ 2.0 * (1.0 + a) = __OMC__2$LOOPT
82+
// x[2] ^ 2.0 = b + x[1] / b + a - a * x[2] ^ 2.0 --old--
83+
// __OMC__2$LOOPT = ((-b) - a) * b -- new--
84+
// => - x[1] - b * x[2] ^ 2.0 * (1.0 + a) = __OMC__2$LOOPT --new--
8585
// update eqn[4]
86-
// x[3] / a = (a ^ 2.0 + b ^ 2.0) * x[2] / a + log(1.0 + time) + ((-a ^ 2.0) - b ^ 2.0) * x[1] / a + 1.0 / a + (-a) - b
87-
// __OMC__3$LOOPT = -1.0 + a ^ 2.0 + (b - log(1.0 + time)) * a
88-
// __OMC__4$LOOPF = (-a ^ 2.0) - b ^ 2.0
89-
// __OMC__5$LOOPF = a ^ 2.0 + b ^ 2.0
90-
// => __OMC__5$LOOPF * x[2] + __OMC__4$LOOPF * x[1] - x[3] = __OMC__3$LOOPT
86+
// x[3] / a = (a ^ 2.0 + b ^ 2.0) * x[2] / a + log(1.0 + time) + ((-a ^ 2.0) - b ^ 2.0) * x[1] / a + 1.0 / a + (-a) - b --old--
87+
// __OMC__3$LOOPT = -1.0 + a ^ 2.0 + (b - log(1.0 + time)) * a -- new--
88+
// __OMC__4$LOOPF = (-a ^ 2.0) - b ^ 2.0 -- new--
89+
// __OMC__5$LOOPF = a ^ 2.0 + b ^ 2.0 -- new--
90+
// => - __OMC__5$LOOPF * x[2] + __OMC__4$LOOPF * x[1] - x[3] = __OMC__3$LOOPT --new--
9191
// END: simplifyLoops
9292
// record SimulationResult
9393
// resultFile = "nonlinear_system.problem11_res.mat",

0 commit comments

Comments
 (0)