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.

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

3D fixes for the python interface #2374

Merged
merged 385 commits into from
Jul 7, 2021
Merged

Conversation

dschwoerer
Copy link
Contributor

No description provided.

dschwoerer and others added 30 commits April 3, 2020 22:46
Use spaces not tabs
constexpr need to be known at compile time
Fixed with:
grep not\ metric_3d tests -r --include=runtest|cut -d: -f1 |sed  's/runtest/CMakeLists.txt/' | xargs -n 1  sed -e '3 i \  REQUIRES NOT BOUT_USE_METRIC_3D'
dschwoerer and others added 27 commits June 30, 2021 16:07
* next:
  Mark unused function arguments with MAYBE_UNUSED
  De-abbreviate exception message
  Use constants in setting default_dz for Coordinates unit test
  Fix expectation for default value
  Do not ignore default value
  Fix mpark_submodule if not called from local directory
  Add additional targets for submodules
  Some basic tests of Coordinates inputs
  Basic tests of Coordinates
  Enable FakeGridDataSource to provide values to Mesh
strings ending in -NOTFOUND are False

Co-authored-by: Peter Hill <zed.three@gmail.com>
Update documentation for ctest and Github Actions
CMake: Add SOVERSION; fix FindSUNDIALS
Guard use of FFTW constants

Fixes #2370
Copy-paste error, extracting data from wrong Vec
Shouldn't have affected any results, since only affects
preconditioner, but might have made preconditioners less effective
than they could have been.
Vec is locked by PETSc (at least in 3.20), so need read-only access.
Since `load_vars` takes a `BoutReal*`, a `const_cast` is needed for
now.
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

There were too many comments to post at once. Showing the first 25 out of 204. Check the log or trigger a new build to see more.


BoutReal zlength() const { return dz * nz; } ///< Length of the Z domain. Used for FFTs
FieldMetric dx, dy, dz; ///< Mesh spacing in x, y and 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: member variable dx has public visibility [cppcoreguidelines-non-private-member-variables-in-classes]

FieldMetric dx, dy, dz; ///< Mesh spacing in x, y and z
            ^


BoutReal zlength() const { return dz * nz; } ///< Length of the Z domain. Used for FFTs
FieldMetric dx, dy, dz; ///< Mesh spacing in x, y and 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: member variable dy has public visibility [cppcoreguidelines-non-private-member-variables-in-classes]

FieldMetric dx, dy, dz; ///< Mesh spacing in x, y and z
                ^


BoutReal zlength() const { return dz * nz; } ///< Length of the Z domain. Used for FFTs
FieldMetric dx, dy, dz; ///< Mesh spacing in x, y and 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: member variable dz has public visibility [cppcoreguidelines-non-private-member-variables-in-classes]

FieldMetric dx, dy, dz; ///< Mesh spacing in x, y and z
                    ^


Field2D J; ///< Coordinate system Jacobian, so volume of cell is J*dx*dy*dz
/// 2nd-order correction for non-uniform meshes d/di(1/dx), d/di(1/dy) and d/di(1/dz)
FieldMetric d1_dx, d1_dy, d1_dz;
Copy link
Contributor

Choose a reason for hiding this comment

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

warning: member variable d1_dx has public visibility [cppcoreguidelines-non-private-member-variables-in-classes]

FieldMetric d1_dx, d1_dy, d1_dz;
            ^


Field2D J; ///< Coordinate system Jacobian, so volume of cell is J*dx*dy*dz
/// 2nd-order correction for non-uniform meshes d/di(1/dx), d/di(1/dy) and d/di(1/dz)
FieldMetric d1_dx, d1_dy, d1_dz;
Copy link
Contributor

Choose a reason for hiding this comment

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

warning: member variable d1_dy has public visibility [cppcoreguidelines-non-private-member-variables-in-classes]

FieldMetric d1_dx, d1_dy, d1_dz;
                   ^

Field2D G1, G2, G3;

Field2D ShiftTorsion; ///< d pitch angle / dx. Needed for vector differentials (Curl)
FieldMetric G1_11, G1_22, G1_33, G1_12, G1_13, G1_23;
Copy link
Contributor

Choose a reason for hiding this comment

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

warning: member variable G1_11 has public visibility [cppcoreguidelines-non-private-member-variables-in-classes]

FieldMetric G1_11, G1_22, G1_33, G1_12, G1_13, G1_23;
            ^

Field2D G1, G2, G3;

Field2D ShiftTorsion; ///< d pitch angle / dx. Needed for vector differentials (Curl)
FieldMetric G1_11, G1_22, G1_33, G1_12, G1_13, G1_23;
Copy link
Contributor

Choose a reason for hiding this comment

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

warning: member variable G1_22 has public visibility [cppcoreguidelines-non-private-member-variables-in-classes]

FieldMetric G1_11, G1_22, G1_33, G1_12, G1_13, G1_23;
                   ^

Field2D G1, G2, G3;

Field2D ShiftTorsion; ///< d pitch angle / dx. Needed for vector differentials (Curl)
FieldMetric G1_11, G1_22, G1_33, G1_12, G1_13, G1_23;
Copy link
Contributor

Choose a reason for hiding this comment

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

warning: member variable G1_33 has public visibility [cppcoreguidelines-non-private-member-variables-in-classes]

FieldMetric G1_11, G1_22, G1_33, G1_12, G1_13, G1_23;
                          ^

Field2D G1, G2, G3;

Field2D ShiftTorsion; ///< d pitch angle / dx. Needed for vector differentials (Curl)
FieldMetric G1_11, G1_22, G1_33, G1_12, G1_13, G1_23;
Copy link
Contributor

Choose a reason for hiding this comment

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

warning: member variable G1_12 has public visibility [cppcoreguidelines-non-private-member-variables-in-classes]

FieldMetric G1_11, G1_22, G1_33, G1_12, G1_13, G1_23;
                                 ^

Field2D G1, G2, G3;

Field2D ShiftTorsion; ///< d pitch angle / dx. Needed for vector differentials (Curl)
FieldMetric G1_11, G1_22, G1_33, G1_12, G1_13, G1_23;
Copy link
Contributor

Choose a reason for hiding this comment

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

warning: member variable G1_13 has public visibility [cppcoreguidelines-non-private-member-variables-in-classes]

FieldMetric G1_11, G1_22, G1_33, G1_12, G1_13, G1_23;
                                        ^

@dschwoerer dschwoerer merged commit 2252990 into boutcore-jinja Jul 7, 2021
@dschwoerer dschwoerer deleted the boutcore-jinja-3d branch July 7, 2021 12:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants