From 4ff8508b6cbbed0b3f79e3e6f31aebf6dce51b70 Mon Sep 17 00:00:00 2001 From: tomc271 Date: Sun, 26 Nov 2023 10:26:00 +0000 Subject: [PATCH] Add field 'mesh' to DifferentialOperators. --- include/bout/differential_operators.hxx | 3 ++- src/mesh/differential_operators.cxx | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/bout/differential_operators.hxx b/include/bout/differential_operators.hxx index 9ad89127a8..669bc49458 100644 --- a/include/bout/differential_operators.hxx +++ b/include/bout/differential_operators.hxx @@ -17,7 +17,7 @@ public: using FieldMetric = Field2D; #endif - DifferentialOperators(CELL_LOC& location, FieldMetric& dx, FieldMetric& dy, + DifferentialOperators(Mesh* mesh, CELL_LOC& location, FieldMetric& dx, FieldMetric& dy, FieldMetric& dz); FieldMetric DDX(const Field2D& f, CELL_LOC outloc = CELL_DEFAULT, @@ -98,6 +98,7 @@ public: Field2D Laplace_perpXY(const Field2D& A, const Field2D& f); private: + Mesh* mesh; CELL_LOC& location; FieldMetric& dx; FieldMetric& dy; diff --git a/src/mesh/differential_operators.cxx b/src/mesh/differential_operators.cxx index 176cd09450..369b115ec9 100644 --- a/src/mesh/differential_operators.cxx +++ b/src/mesh/differential_operators.cxx @@ -1,9 +1,10 @@ #include "bout/differential_operators.hxx" -DifferentialOperators::DifferentialOperators(CELL_LOC& location, FieldMetric& dx, - FieldMetric& dy, FieldMetric& dz) - : location(location), dx(dx), dy(dy), dz(dz) {} +DifferentialOperators::DifferentialOperators(Mesh* mesh, CELL_LOC& location, + FieldMetric& dx, FieldMetric& dy, + FieldMetric& dz) + : mesh(mesh), location(location), dx(dx), dy(dy), dz(dz) {} DifferentialOperators::FieldMetric DifferentialOperators::DDX(const Field2D& f, CELL_LOC loc, @@ -51,7 +52,7 @@ DifferentialOperators::DDZ(const Field2D& f, CELL_LOC loc, const std::string& UNUSED(method), const std::string& UNUSED(region)) { ASSERT1(location == loc || loc == CELL_DEFAULT) - ASSERT1(f.getMesh() == localmesh) + ASSERT1(f.getMesh() == mesh) if (loc == CELL_DEFAULT) { loc = f.getLocation(); }