Skip to content

Replace matrix with Matrix in various cyclic inversions #900

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
d7919 merged 21 commits into from
Mar 2, 2018
Merged

Replace matrix with Matrix in various cyclic inversions #900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
e146c9c
Change cyclic_reduction public routines to take Matrix
d7919 Feb 22, 2018
e43eed0
Replace matrix with Matrix in LaplaceXY
d7919 Feb 22, 2018
cb21629
Replace a number of matrices with Matrices in cylcic_reduction
d7919 Feb 22, 2018
49f9037
Make sure output is available
d7919 Feb 22, 2018
81288f3
Replace some raw blocks with Array
d7919 Feb 22, 2018
46f728e
Replace some direct access to Matrix data with () access
d7919 Feb 22, 2018
ed27e64
Remove deprecated uses of Matrix indexing in cyclic Laplace
d7919 Feb 23, 2018
74ff62f
Remove deprecated Matrix indexing in cyclic parderiv
d7919 Feb 23, 2018
f36544d
Merge branch 'origin-next' into remove_matrix_cyclic
d7919 Feb 23, 2018
b5b18f8
Fix merge
d7919 Feb 23, 2018
a6b3595
Replace last matrix with Matrix in cyclic reduction
d7919 Feb 23, 2018
c1ebed3
Remove more deprecated Matrix accesses in cyclic-reduction
d7919 Feb 23, 2018
6da400a
Remove deprecated Matrix access in laplacexz cyclic
d7919 Feb 23, 2018
7ef7435
No longer need to pass in problem size for cyclic reduction
d7919 Feb 24, 2018
87dac6a
Restore old interfaces in cyclic_reduction but mark as deprecated
d7919 Feb 26, 2018
50c3314
Add interface to setCoefs/solve that take Arrays instead of Matrices
d7919 Feb 26, 2018
bf9ee50
Add interface to setCoefs/solve that take Arrays instead of Matrices
d7919 Feb 26, 2018
0c457f6
Merge branch 'remove_matrix_cyclic' of https://github.com/boutproject…
d7919 Feb 26, 2018
70f3760
Fix bad merge/commit ammend
d7919 Feb 26, 2018
41bf552
Fix ASSERTs in cyclic_reduction
d7919 Feb 26, 2018
7ee5c81
Remove uses of deprecated freeMemory in cyclic_reduction.
d7919 Feb 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion include/bout/invert/laplacexy.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ class LaplaceXY {
#include <bout/mesh.hxx>
#include <bout/petsclib.hxx>
#include <cyclic_reduction.hxx>
#include "utils.hxx"

class LaplaceXY {
public:
Expand Down Expand Up @@ -117,7 +118,7 @@ private:
// Preconditioner
int xstart, xend;
int nloc, nsys;
BoutReal **acoef, **bcoef, **ccoef, **xvals, **bvals;
Matrix<BoutReal> acoef, bcoef, ccoef, xvals, bvals;
CyclicReduce<BoutReal> *cr; ///< Tridiagonal solver

// Y derivatives
Expand Down
Loading