Skip to content

Bugfixes from shiftedmetric-update #1306

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
ZedThree merged 4 commits into from
Oct 11, 2018
Merged

Bugfixes from shiftedmetric-update #1306

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
e9e0008
Remove mixed field-aligned/non-field-aligned derivatives
johnomotani May 14, 2018
90648ba
Add missing fromFieldAligned calls
johnomotani May 14, 2018
54494d4
Fix f->f_fa
johnomotani Jul 3, 2018
1342d87
Set location of result as soon as it is declared in index_derivs.cxx
johnomotani Jul 3, 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
55 changes: 5 additions & 50 deletions src/mesh/difops.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,58 +342,11 @@ const Field3D Vpar_Grad_par_LCtoC(const Field3D &v, const Field3D &f, REGION reg
}
}
}
else if (vUseUpDown) {
// Only v has up/down fields
// f must shift to field aligned coordinates
Field3D f_fa = vMesh->toFieldAligned(f);

BOUT_OMP(parallel) {
stencil fval, vval;
BOUT_FOR_INNER(i, vMesh->getRegion3D(region_str)) {
fval.mm = f_fa[i.ymm()];
fval.m = f_fa[i.ym()];
fval.c = f_fa[i];
fval.p = f_fa[i.yp()];
fval.pp = f_fa[i.ypp()];

vval.m = v.ydown()[i.ym()];
vval.c = v[i];
vval.p = v.yup()[i.yp()];

// Left side
result[i] = (vval.c >= 0.0) ? vval.c * fval.m : vval.c * fval.c;
// Right side
result[i] -= (vval.p >= 0.0) ? vval.p * fval.c : vval.p * fval.p;
}
}
}
else if (fUseUpDown) {
// Only f has up/down fields
// v must shift to field aligned coordinates
Field3D v_fa = vMesh->toFieldAligned(v);

BOUT_OMP(parallel) {
stencil fval, vval;
BOUT_FOR_INNER(i, vMesh->getRegion3D(region_str)) {
fval.m = f.ydown()[i.ym()];
fval.c = f[i];
fval.p = f.yup()[i.yp()];

vval.mm = v_fa[i.ymm()];
vval.m = v_fa[i.ym()];
vval.c = v_fa[i];
vval.p = v_fa[i.yp()];
vval.pp = v_fa[i.ypp()];

// Left side
result[i] = (vval.c >= 0.0) ? vval.c * fval.m : vval.c * fval.c;
// Right side
result[i] -= (vval.p >= 0.0) ? vval.p * fval.c : vval.p * fval.p;
}
}
}
else {
// Both must shift to field aligned
// (even if one of v and f has yup/ydown fields, it doesn't make sense to
// multiply them with one in field-aligned and one in non-field-aligned
// coordinates)
Field3D v_fa = vMesh->toFieldAligned(v);

@d7919 d7919 Oct 10, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Forgive me if this is a silly suggestion, but here we're transforming both input fields and then transforming back because one or other don't have yup/ydown -- would we rather call calcYupYdown on one or more of the inputs instead? This would avoid having to duplicate code and should avoid the need to transform the result field so I think might be faster (assuming toFieldAligned costs about the same as a calcYup/down)?

Field3D f_fa = vMesh->toFieldAligned(f);

Expand All @@ -413,6 +366,8 @@ const Field3D Vpar_Grad_par_LCtoC(const Field3D &v, const Field3D &f, REGION reg
// Right side
result[i] -= (vval.p >= 0.0) ? vval.p * fval.c : vval.p * fval.p;
}

result = vMesh->fromFieldAligned(result);
}
}

Expand Down
Loading