From 10b6839fe053682117ece49168b6ca54765f754d Mon Sep 17 00:00:00 2001 From: David Bold Date: Tue, 10 Dec 2024 10:53:02 +0100 Subject: [PATCH 1/2] Avoid some warnings for 3D Metrics --- src/mesh/boundary_standard.cxx | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/mesh/boundary_standard.cxx b/src/mesh/boundary_standard.cxx index 80c2053f39..fad7ccde6d 100644 --- a/src/mesh/boundary_standard.cxx +++ b/src/mesh/boundary_standard.cxx @@ -1593,7 +1593,7 @@ BoundaryOp* BoundaryNeumann_NonOrthogonal::clone(BoundaryRegion* region, return new BoundaryNeumann_NonOrthogonal(region); } -void BoundaryNeumann_NonOrthogonal::apply(Field2D& f) { +void BoundaryNeumann_NonOrthogonal::apply([[maybe_unused]] Field2D& f) { #if not(BOUT_USE_METRIC_3D) Mesh* mesh = bndry->localmesh; ASSERT1(mesh == f.getMesh()); @@ -2222,7 +2222,7 @@ void BoundaryNeumann_NonOrthogonal::apply(Field3D& f) { void BoundaryNeumann_O4::apply(Field2D & f) { BoundaryNeumann_O4::apply(f, 0.); } - void BoundaryNeumann_O4::apply(Field2D & f, BoutReal t) { + void BoundaryNeumann_O4::apply([[maybe_unused]] Field2D & f, [[maybe_unused]] BoutReal t) { #if not(BOUT_USE_METRIC_3D) Mesh* mesh = bndry->localmesh; ASSERT1(mesh == f.getMesh()); @@ -2354,7 +2354,7 @@ void BoundaryNeumann_NonOrthogonal::apply(Field3D& f) { return new BoundaryNeumann_4thOrder(region); } - void BoundaryNeumann_4thOrder::apply(Field2D & f) { + void BoundaryNeumann_4thOrder::apply([[maybe_unused]] Field2D & f) { #if not(BOUT_USE_METRIC_3D) Coordinates* metric = f.getCoordinates(); // Set (at 4th order) the gradient at the mid-point between the guard cell and the @@ -2444,7 +2444,7 @@ void BoundaryNeumann_NonOrthogonal::apply(Field3D& f) { return new BoundaryNeumannPar(region); } - void BoundaryNeumannPar::apply(Field2D & f) { + void BoundaryNeumannPar::apply([[maybe_unused]] Field2D & f) { #if not(BOUT_USE_METRIC_3D) Coordinates* metric = f.getCoordinates(); // Loop over all elements and set equal to the next point in @@ -2596,7 +2596,7 @@ void BoundaryNeumann_NonOrthogonal::apply(Field3D& f) { return new BoundaryZeroLaplace(region); } - void BoundaryZeroLaplace::apply(Field2D & f) { + void BoundaryZeroLaplace::apply([[maybe_unused]] Field2D & f) { #if not(BOUT_USE_METRIC_3D) Coordinates* metric = f.getCoordinates(); if ((bndry->location != BNDRY_XIN) && (bndry->location != BNDRY_XOUT)) { @@ -2625,7 +2625,7 @@ void BoundaryNeumann_NonOrthogonal::apply(Field3D& f) { #endif } - void BoundaryZeroLaplace::apply(Field3D & f) { + void BoundaryZeroLaplace::apply([[maybe_unused]] Field3D & f) { #if not(BOUT_USE_METRIC_3D) Mesh* mesh = bndry->localmesh; ASSERT1(mesh == f.getMesh()); @@ -2697,7 +2697,7 @@ void BoundaryNeumann_NonOrthogonal::apply(Field3D& f) { return new BoundaryZeroLaplace2(region); } - void BoundaryZeroLaplace2::apply(Field2D & f) { + void BoundaryZeroLaplace2::apply([[maybe_unused]] Field2D & f) { #if not(BOUT_USE_METRIC_3D) if ((bndry->location != BNDRY_XIN) && (bndry->location != BNDRY_XOUT)) { // Can't apply this boundary condition to non-X boundaries @@ -2728,7 +2728,7 @@ void BoundaryNeumann_NonOrthogonal::apply(Field3D& f) { #endif } - void BoundaryZeroLaplace2::apply(Field3D & f) { + void BoundaryZeroLaplace2::apply([[maybe_unused]] Field3D & f) { #if not(BOUT_USE_METRIC_3D) Mesh* mesh = bndry->localmesh; ASSERT1(mesh == f.getMesh()); @@ -2831,7 +2831,7 @@ void BoundaryNeumann_NonOrthogonal::apply(Field3D& f) { } } - void BoundaryConstLaplace::apply(Field3D & f) { + void BoundaryConstLaplace::apply([[maybe_unused]] Field3D & f) { #if not(BOUT_USE_METRIC_3D) if ((bndry->location != BNDRY_XIN) && (bndry->location != BNDRY_XOUT)) { // Can't apply this boundary condition to non-X boundaries @@ -2916,7 +2916,7 @@ void BoundaryNeumann_NonOrthogonal::apply(Field3D& f) { throw BoutException("ERROR: DivCurl boundary not yet implemented for 2D vectors\n"); } - void BoundaryDivCurl::apply(Vector3D & var) { + void BoundaryDivCurl::apply([[maybe_unused]] Vector3D & var) { #if not(BOUT_USE_METRIC_3D) Mesh* mesh = bndry->localmesh; ASSERT1(mesh == var.getMesh()); From 4694d778531c23b5160f9faa85aa76a172df92dc Mon Sep 17 00:00:00 2001 From: dschwoerer Date: Tue, 7 Jan 2025 11:16:46 +0000 Subject: [PATCH 2/2] Apply clang-format changes --- src/mesh/boundary_standard.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mesh/boundary_standard.cxx b/src/mesh/boundary_standard.cxx index fad7ccde6d..c12901e53a 100644 --- a/src/mesh/boundary_standard.cxx +++ b/src/mesh/boundary_standard.cxx @@ -2222,7 +2222,8 @@ void BoundaryNeumann_NonOrthogonal::apply(Field3D& f) { void BoundaryNeumann_O4::apply(Field2D & f) { BoundaryNeumann_O4::apply(f, 0.); } - void BoundaryNeumann_O4::apply([[maybe_unused]] Field2D & f, [[maybe_unused]] BoutReal t) { + void BoundaryNeumann_O4::apply([[maybe_unused]] Field2D & f, + [[maybe_unused]] BoutReal t) { #if not(BOUT_USE_METRIC_3D) Mesh* mesh = bndry->localmesh; ASSERT1(mesh == f.getMesh());