Skip to content
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

Jump to bottom

Coordinates: Replacing sqrt(g_22) with JB #3027

Open
wants to merge 2 commits into
base: refactor-coordinates
Choose a base branch
from
Open

Coordinates: Replacing sqrt(g_22) with JB #3027

wants to merge 2 commits into from

Conversation

bendudson
Copy link
Contributor

Aiming to consistently handle left-handed coordinate systems, where J is negative. These happen in the standard BOUT++ field-aligned coordinates when the poloidal field is negative.

Implemented on top of refactor-coordinates #2873

@bendudson
Coordinates: Replacing sqrt(g_22) with JB
14e7eda 
Aiming to consistently handle left-handed coordinate systems,
where J is negative. These happen in the standard BOUT++
field-aligned coordinates when the poloidal field is negative.
github-actions[bot]
github-actions bot reviewed Nov 16, 2024
View reviewed changes
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

clang-tidy made some suggestions

src/mesh/difops.cxx
BoutReal by = 1. / sqrt(metric->g_22(x, y, z));

// Note: by is negative in a left-handed coordinate system
BoutReal by = 1. / (metric->J(x, y, z) * metric->Bxy(x, y, z));
Copy link
Contributor

Choose a reason for hiding this comment

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

warning: no viable conversion from 'Field2D' to 'BoutReal' (aka 'double') [clang-diagnostic-error]

        BoutReal by = 1. / (metric->J(x, y, z) * metric->Bxy(x, y, z));
                 ^

src/mesh/difops.cxx
BoutReal by = 1. / sqrt(metric->g_22(x, y, z));

// Note: by is negative in a left-handed coordinate system
BoutReal by = 1. / (metric->J(x, y, z) * metric->Bxy(x, y, z));
Copy link
Contributor

Choose a reason for hiding this comment

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

warning: variable name 'by' is too short, expected at least 3 characters [readability-identifier-length]

        BoutReal by = 1. / (metric->J(x, y, z) * metric->Bxy(x, y, z));
                 ^

src/mesh/difops.cxx
BoutReal by = 1. / sqrt(metric->g_22(x, y, z));

// Note: by is negative in a left-handed coordinate system
BoutReal by = 1. / (metric->J(x, y, z) * metric->Bxy(x, y, z));
Copy link
Contributor

Choose a reason for hiding this comment

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

warning: too many arguments to function call, expected 0, have 3 [clang-diagnostic-error]

        BoutReal by = 1. / (metric->J(x, y, z) * metric->Bxy(x, y, z));
                                                             ^
Additional context

include/bout/coordinates.hxx:237: 'Bxy' declared here

  const FieldMetric& Bxy() const { return Bxy_; }
                     ^

src/mesh/difops.cxx
@@ -258,14 +260,13 @@
BoutReal const vR = 0.5 * (v(i, j, k) + v.yup()(i, j + 1, k));

// Calculate flux at right boundary (y+1/2)
// Note: Magnitude of B at the midpoint used rather than J/sqrt(g_22)
BoutReal const fluxRight =
Copy link
Contributor

Choose a reason for hiding this comment

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

warning: no viable conversion from 'Field2D' to 'const BoutReal' (aka 'const double') [clang-diagnostic-error]

        BoutReal const fluxRight =
                       ^

src/mesh/difops.cxx
BoutReal const fluxRight =
fR * vR * (coord->J(i, j, k) + coord->J(i, j + 1, k))
/ (sqrt(coord->g_22(i, j, k)) + sqrt(coord->g_22(i, j + 1, k)));
fR * vR * 2 / (coord->Bxy(i, j, k) + coord->Bxy(i, j + 1, k));
Copy link
Contributor

Choose a reason for hiding this comment

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

warning: too many arguments to function call, expected 0, have 3 [clang-diagnostic-error]

            fR * vR * 2 / (coord->Bxy(i, j, k) + coord->Bxy(i, j + 1, k));
                                      ^
Additional context

include/bout/coordinates.hxx:237: 'Bxy' declared here

  const FieldMetric& Bxy() const { return Bxy_; }
                     ^

src/mesh/difops.cxx
BoutReal const fluxRight =
fR * vR * (coord->J(i, j, k) + coord->J(i, j + 1, k))
/ (sqrt(coord->g_22(i, j, k)) + sqrt(coord->g_22(i, j + 1, k)));
fR * vR * 2 / (coord->Bxy(i, j, k) + coord->Bxy(i, j + 1, k));
Copy link
Contributor

Choose a reason for hiding this comment

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

warning: too many arguments to function call, expected 0, have 3 [clang-diagnostic-error]

            fR * vR * 2 / (coord->Bxy(i, j, k) + coord->Bxy(i, j + 1, k));
                                                            ^
Additional context

include/bout/coordinates.hxx:237: 'Bxy' declared here

  const FieldMetric& Bxy() const { return Bxy_; }
                     ^

src/mesh/difops.cxx
BoutReal const fluxRight =
fR * vR * (coord->J(i, j, k) + coord->J(i, j + 1, k))
/ (sqrt(coord->g_22(i, j, k)) + sqrt(coord->g_22(i, j + 1, k)));
fR * vR * 2 / (coord->Bxy(i, j, k) + coord->Bxy(i, j + 1, k));

// Calculate at left boundary (y-1/2)
BoutReal const fluxLeft =
Copy link
Contributor

Choose a reason for hiding this comment

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

warning: no viable conversion from 'Field2D' to 'const BoutReal' (aka 'const double') [clang-diagnostic-error]

        BoutReal const fluxLeft =
                       ^

src/mesh/difops.cxx

// Calculate at left boundary (y-1/2)
BoutReal const fluxLeft =
fL * vL * (coord->J(i, j, k) + coord->J(i, j - 1, k))
/ (sqrt(coord->g_22(i, j, k)) + sqrt(coord->g_22(i, j - 1, k)));
fL * vL * 2 / (coord->Bxy(i, j, k) + coord->Bxy(i, j - 1, k));
Copy link
Contributor

Choose a reason for hiding this comment

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

warning: too many arguments to function call, expected 0, have 3 [clang-diagnostic-error]

            fL * vL * 2 / (coord->Bxy(i, j, k) + coord->Bxy(i, j - 1, k));
                                      ^
Additional context

include/bout/coordinates.hxx:237: 'Bxy' declared here

  const FieldMetric& Bxy() const { return Bxy_; }
                     ^

src/mesh/difops.cxx

// Calculate at left boundary (y-1/2)
BoutReal const fluxLeft =
fL * vL * (coord->J(i, j, k) + coord->J(i, j - 1, k))
/ (sqrt(coord->g_22(i, j, k)) + sqrt(coord->g_22(i, j - 1, k)));
fL * vL * 2 / (coord->Bxy(i, j, k) + coord->Bxy(i, j - 1, k));
Copy link
Contributor

Choose a reason for hiding this comment

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

warning: too many arguments to function call, expected 0, have 3 [clang-diagnostic-error]

            fL * vL * 2 / (coord->Bxy(i, j, k) + coord->Bxy(i, j - 1, k));
                                                            ^
Additional context

include/bout/coordinates.hxx:237: 'Bxy' declared here

  const FieldMetric& Bxy() const { return Bxy_; }
                     ^

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@github-actions github-actions[bot] github-actions[bot] left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@bendudson