Skip to content

Commit 91d439c

Browse files
committed
Steven's changes all implemented.
1 parent 6445c3c commit 91d439c

File tree

5 files changed

+14
-13
lines changed

5 files changed

+14
-13
lines changed

src/+otp/+kuramotosivashinsky/KuramotoSivashinskyProblem.m

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
end
88

99
methods
10-
function soly = solution2real(soly)
10+
function soly = convert2grid(soly)
1111

1212
if isstruct(soly)
1313
soly.y = real(ifft(soly.y));
@@ -31,14 +31,15 @@ function onSettingsChanged(obj)
3131
k = (1i*[0:(N/2 - 1), 0, (-N/2 + 1):-1].'/div);
3232
k2 = k.^2;
3333
k4 = k.^4;
34+
k24 = k2 + k4;
3435

35-
obj.Rhs = otp.Rhs(@(t, u) otp.kuramotosivashinsky.f(t, u, k, k2, k4), ...
36+
obj.Rhs = otp.Rhs(@(t, u) otp.kuramotosivashinsky.f(t, u, k, k24), ...
3637
otp.Rhs.FieldNames.Jacobian, ...
37-
@(t, u) otp.kuramotosivashinsky.jac(t,u, k, k2, k4), ...
38+
@(t, u) otp.kuramotosivashinsky.jac(t,u, k, k24), ...
3839
otp.Rhs.FieldNames.JacobianVectorProduct, ...
39-
@(t, u, v) otp.kuramotosivashinsky.jvp(t, u, v, k, k2, k4), ...
40+
@(t, u, v) otp.kuramotosivashinsky.jvp(t, u, v, k, k24), ...
4041
otp.Rhs.FieldNames.JacobianAdjointVectorProduct, ...
41-
@(t, u, v) otp.kuramotosivashinsky.javp(t, u, v, k, k2, k4));
42+
@(t, u, v) otp.kuramotosivashinsky.javp(t, u, v, k, k24));
4243

4344
end
4445

src/+otp/+kuramotosivashinsky/f.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
function ut = f(~, u, k, k2, k4)
1+
function ut = f(~, u, k, k24)
22

33
u2 = fft(real(ifft(u)).^2);
44

5-
ut = - k2.*u - k4.*u -(k/2).*u2;
5+
ut = -k24.*u - (k/2).*u2;
66

77
end
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
function j = jac(~, u, k, k2, k4)
1+
function j = jac(~, u, k, k24)
22

3-
j = -diag(k2) - diag(k4) - diag(k)*ifft(fft(diag(ifft(u))).').';
3+
j = -diag(k24) - k.*ifft(fft(diag(ifft(u))).').';
44

55
end
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
function jv = javp(~, u, v, k, k2, k4)
1+
function jv = javp(~, u, v, k, k24)
22

3-
jv = -k2.*v - k4.*v - fft(real(ifft(u)).*ifft(conj(k).*v));
3+
jv = -k24.*v - fft(real(ifft(u)).*ifft(conj(k).*v));
44

55
end
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
function jv = jvp(~, u, v, k, k2, k4)
1+
function jv = jvp(~, u, v, k, k24)
22

3-
jv = -k2.*v - k4.*v - k.*fft(real(ifft(u)).*ifft(v));
3+
jv = -k24.*v - k.*fft(real(ifft(u)).*ifft(v));
44

55
end

0 commit comments

Comments
 (0)