Mercurial > repos > public > sbplib

annotate reshapeToPlotMatrixTest.m @ 1031:2ef20d00b386 feature/advectionRV

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
For easier comparison, return both the first order and residual viscosity when evaluating the residual. Add the first order and residual viscosity to the state of the RungekuttaRV time steppers
author Vidar Stiernström <vidar.stiernstrom@it.uu.se>
date Thu, 17 Jan 2019 10:25:06 +0100
parents 51aaf67a7df5
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
163
51aaf67a7df5 Fixed naming and added functions for converting vectors to matrices for structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents: 162
diff changeset
1 function tests = reshapeToPlotMatrixTest()
161
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
2 tests = functiontests(localfunctions);
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
3 end
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
4
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
5 function test1D(testCase)
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
6 inGf = [1 2 3 4 5]';
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
7 inM = 5;
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
8 out = [1 2 3 4 5]';
163
51aaf67a7df5 Fixed naming and added functions for converting vectors to matrices for structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents: 162
diff changeset
9 testCase.verifyEqual(reshapeToPlotMatrix(inGf, inM),out);
161
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
10 end
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
11
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
12 function test2D(testCase)
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
13 x = 1:2;
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
14 y = 1:3;
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
15
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
16 f = @(x,y) x + y*10;
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
17
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
18 xx = [1; 1; 1; 2; 2; 2];
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
19 yy = [1; 2; 3; 1; 2; 3];
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
20 inGf = f(xx,yy);
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
21
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
22 [X,Y] = meshgrid(x,y);
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
23 out = f(X,Y);
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
24
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
25 inM = [2, 3];
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
26
163
51aaf67a7df5 Fixed naming and added functions for converting vectors to matrices for structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents: 162
diff changeset
27 testCase.verifyEqual(reshapeToPlotMatrix(inGf, inM),out);
161
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
28 end
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
29
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
30 function test3D(testCase)
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
31 x = 1:2;
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
32 y = 1:3;
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
33 z = 1:4;
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
34
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
35 f = @(x,y,z) x + y*10 + z*100;
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
36
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
37 xx = [repmat(1, [12, 1]); repmat(2, [12, 1])];
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
38 yy = repmat([1; 1; 1; 1; 2; 2; 2; 2; 3; 3; 3; 3], [2, 1]);
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
39 zz = repmat([1; 2; 3; 4], [6, 1]);
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
40 inGf = f(xx,yy,zz);
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
41
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
42 [X,Y,Z] = meshgrid(x,y,z);
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
43 out = f(X,Y,Z);
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
44
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
45 inM = [2, 3, 4];
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
46
163
51aaf67a7df5 Fixed naming and added functions for converting vectors to matrices for structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents: 162
diff changeset
47 testCase.verifyEqual(reshapeToPlotMatrix(inGf, inM),out);
161
73bc43c7379e Added function for reshaping grid functions. Added size() method to structured grid.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
48 end