Skip to content

Set location in LaplaceCyclic::solve() and DC() #1367

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
johnomotani merged 4 commits into from
Nov 13, 2018
+5 −3
Merged

Set location in LaplaceCyclic::solve() and DC() #1367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eeb9689
Changing README example to use cross rather than ^
bendudson Oct 27, 2018
7e36894
Merge pull request #1357 from boutproject/fix_to_master
bendudson Nov 9, 2018
a2679d1
Set location of result in DC()
johnomotani Nov 13, 2018
ca2afe2
Set location in LaplaceCyclic::solve(Field3D,Field3D)
johnomotani Nov 13, 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
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ can be written simply as:
```cpp
ddt(rho) = -V_dot_Grad(v, rho) - rho*Div(v);
ddt(p) = -V_dot_Grad(v, p) - g*p*Div(v);
ddt(v) = -V_dot_Grad(v, v) + ((Curl(B)^B) - Grad(p))/rho;
ddt(B) = Curl(v^B);
ddt(v) = -V_dot_Grad(v, v) + (cross(Curl(B),B) - Grad(p))/rho;
ddt(B) = Curl(cross(v,B));
```

The full code for this example can be found in the [orszag-tang
Expand Down
1 change: 1 addition & 0 deletions src/field/field3d.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1234,6 +1234,7 @@ Field2D DC(const Field3D &f, REGION rgn) {
Mesh *localmesh = f.getMesh();
Field2D result(localmesh);
result.allocate();
result.setLocation(f.getLocation());

const Region<Ind2D> &region = localmesh->getRegion2D(REGION_STRING(rgn));

Expand Down
3 changes: 2 additions & 1 deletion src/invert/laplace/impls/cyclic/cyclic_laplace.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,8 +256,9 @@ const Field3D LaplaceCyclic::solve(const Field3D &rhs, const Field3D &x0) {
Mesh *mesh = rhs.getMesh();
Field3D x(mesh); // Result
x.allocate();
x.setLocation(location);

Coordinates *coord = mesh->getCoordinates();
Coordinates *coord = mesh->getCoordinates(location);

// Get the width of the boundary

Expand Down