Mercurial > repos > public > sbplib
annotate +blockmatrix/toMatrix.m @ 1031:2ef20d00b386 feature/advectionRV
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 | 2501067f2fc7 |
children |
rev | line source |
---|---|
206
50a323da7c7f
blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff
changeset
|
1 function A = toMatrix(bm) |
50a323da7c7f
blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff
changeset
|
2 if ~blockmatrix.isBlockmatrix(bm) |
50a323da7c7f
blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff
changeset
|
3 error('blockmatrix:toMatrix:NotABlockmatrix', 'Input is not a blockmatrix'); |
50a323da7c7f
blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff
changeset
|
4 end |
50a323da7c7f
blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff
changeset
|
5 |
50a323da7c7f
blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff
changeset
|
6 div = blockmatrix.getDivision(bm); |
50a323da7c7f
blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff
changeset
|
7 n = div{1}; |
50a323da7c7f
blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff
changeset
|
8 m = div{2}; |
50a323da7c7f
blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff
changeset
|
9 |
50a323da7c7f
blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff
changeset
|
10 N = sum(n); |
50a323da7c7f
blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff
changeset
|
11 M = sum(m); |
50a323da7c7f
blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff
changeset
|
12 |
50a323da7c7f
blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff
changeset
|
13 A = sparse(N,M); |
50a323da7c7f
blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff
changeset
|
14 |
50a323da7c7f
blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff
changeset
|
15 for i = 1:size(bm,1) |
50a323da7c7f
blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff
changeset
|
16 for j = 1:size(bm,2) |
620 | 17 if isempty(bm{i,j}) |
606
c14875cf7ae6
Make blockMatrix.toMatrix faster for large matrices.
Martin Almquist <malmquist@stanford.edu>
parents:
342
diff
changeset
|
18 bm{i,j} = sparse(n(i),m(j)); |
206
50a323da7c7f
blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff
changeset
|
19 end |
50a323da7c7f
blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff
changeset
|
20 end |
50a323da7c7f
blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff
changeset
|
21 end |
606
c14875cf7ae6
Make blockMatrix.toMatrix faster for large matrices.
Martin Almquist <malmquist@stanford.edu>
parents:
342
diff
changeset
|
22 A = cell2mat(bm); |
206
50a323da7c7f
blockmatrix: Added function to convert blockmatrix to a regular matrix.
Jonatan Werpers <jonatan@werpers.com>
parents:
diff
changeset
|
23 end |