From 9e9e9221e5ce83463ccec7fd7f20ae486e0129a6 Mon Sep 17 00:00:00 2001 From: landinjm Date: Sun, 8 Sep 2024 15:30:47 -0400 Subject: [PATCH 01/10] Fixes to assert in equation dependency parser --- src/EquationDependencyParser/EquationDependencyParser.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/EquationDependencyParser/EquationDependencyParser.cc b/src/EquationDependencyParser/EquationDependencyParser.cc index 672110c43..0a7f4d51c 100644 --- a/src/EquationDependencyParser/EquationDependencyParser.cc +++ b/src/EquationDependencyParser/EquationDependencyParser.cc @@ -329,7 +329,7 @@ EquationDependencyParser::parseDependencyListLHS( change_flags[dependency_variable_index] |= dealii::EvaluationFlags::values; dependency_entry_assigned = true; - Assert(variable_index != dependency_variable_index, + Assert(variable_index == dependency_variable_index, dealii::StandardExceptions::ExcMessage( "PRISMS-PF Error: Dependency entry " + dependency + " is not valid because the change in a variable can " @@ -342,7 +342,7 @@ EquationDependencyParser::parseDependencyListLHS( dealii::EvaluationFlags::gradients; dependency_entry_assigned = true; - Assert(variable_index != dependency_variable_index, + Assert(variable_index == dependency_variable_index, dealii::StandardExceptions::ExcMessage( "PRISMS-PF Error: Dependency entry " + dependency + " is not valid because the change in a variable can " @@ -355,7 +355,7 @@ EquationDependencyParser::parseDependencyListLHS( dealii::EvaluationFlags::hessians; dependency_entry_assigned = true; - Assert(variable_index != dependency_variable_index, + Assert(variable_index == dependency_variable_index, dealii::StandardExceptions::ExcMessage( "PRISMS-PF Error: Dependency entry " + dependency + " is not valid because the change in a variable can " From bda80579624d0f56d9f88636dce9914bdc60275f Mon Sep 17 00:00:00 2001 From: landinjm Date: Tue, 10 Sep 2024 09:46:47 -0400 Subject: [PATCH 02/10] adding overrides --- .../pfield/interpolation/Hexahedron.hh | 80 ++++++++++--------- .../pfield/interpolation/Quad.hh | 56 ++++++------- include/initialConditions.h | 5 +- include/nonUniformDirichletBC.h | 5 +- include/vectorBCFunction.h | 5 +- 5 files changed, 79 insertions(+), 72 deletions(-) diff --git a/include/IntegrationTools/pfield/interpolation/Hexahedron.hh b/include/IntegrationTools/pfield/interpolation/Hexahedron.hh index 5b54610f3..82720e6eb 100644 --- a/include/IntegrationTools/pfield/interpolation/Hexahedron.hh +++ b/include/IntegrationTools/pfield/interpolation/Hexahedron.hh @@ -13,7 +13,7 @@ namespace PRISMS class Hexahedron_f : public PSimpleBase>, double> { double - eval(const std::vector> &var) const + eval(const std::vector> &var) const override { // var[0]: coordinate to be evaluated // var[1]: nodal coordinate @@ -35,7 +35,7 @@ namespace PRISMS } Hexahedron_f * - clone() const + clone() const override { return new Hexahedron_f(*this); } @@ -44,7 +44,7 @@ namespace PRISMS class Hexahedron_grad_0 : public PSimpleBase>, double> { double - eval(const std::vector> &var) const + eval(const std::vector> &var) const override { return -var[3][0] * (1.0 - var[3][1] * (var[0][1] - var[1][1]) / var[2][1]) * (1.0 - var[3][2] * (var[0][2] - var[1][2]) / var[2][2]) / var[2][0]; @@ -57,7 +57,7 @@ namespace PRISMS } Hexahedron_grad_0 * - clone() const + clone() const override { return new Hexahedron_grad_0(*this); } @@ -66,7 +66,7 @@ namespace PRISMS class Hexahedron_grad_1 : public PSimpleBase>, double> { double - eval(const std::vector> &var) const + eval(const std::vector> &var) const override { return -var[3][1] * (1.0 - var[3][0] * (var[0][0] - var[1][0]) / var[2][0]) * (1.0 - var[3][2] * (var[0][2] - var[1][2]) / var[2][2]) / var[2][1]; @@ -79,7 +79,7 @@ namespace PRISMS } Hexahedron_grad_1 * - clone() const + clone() const override { return new Hexahedron_grad_1(*this); } @@ -88,7 +88,7 @@ namespace PRISMS class Hexahedron_grad_2 : public PSimpleBase>, double> { double - eval(const std::vector> &var) const + eval(const std::vector> &var) const override { return -var[3][2] * (1.0 - var[3][0] * (var[0][0] - var[1][0]) / var[2][0]) * (1.0 - var[3][1] * (var[0][1] - var[1][1]) / var[2][1]) / var[2][2]; @@ -101,7 +101,7 @@ namespace PRISMS } Hexahedron_grad_2 * - clone() const + clone() const override { return new Hexahedron_grad_2(*this); } @@ -111,7 +111,7 @@ namespace PRISMS : public PSimpleBase>, double> { double - eval(const std::vector> &var) const + eval(const std::vector> &var) const override { return 0.0; } @@ -123,7 +123,7 @@ namespace PRISMS } Hexahedron_hess_0_0 * - clone() const + clone() const override { return new Hexahedron_hess_0_0(*this); } @@ -133,7 +133,7 @@ namespace PRISMS : public PSimpleBase>, double> { double - eval(const std::vector> &var) const + eval(const std::vector> &var) const override { return var[3][0] * var[3][1] / var[2][0] / var[2][1]; } @@ -145,7 +145,7 @@ namespace PRISMS } Hexahedron_hess_0_1 * - clone() const + clone() const override { return new Hexahedron_hess_0_1(*this); } @@ -155,7 +155,7 @@ namespace PRISMS : public PSimpleBase>, double> { double - eval(const std::vector> &var) const + eval(const std::vector> &var) const override { return var[3][0] * var[3][2] / var[2][0] / var[2][2]; } @@ -167,7 +167,7 @@ namespace PRISMS } Hexahedron_hess_0_2 * - clone() const + clone() const override { return new Hexahedron_hess_0_2(*this); } @@ -177,7 +177,7 @@ namespace PRISMS : public PSimpleBase>, double> { double - eval(const std::vector> &var) const + eval(const std::vector> &var) const override { return var[3][1] * var[3][0] / var[2][1] / var[2][0]; } @@ -189,7 +189,7 @@ namespace PRISMS } Hexahedron_hess_1_0 * - clone() const + clone() const override { return new Hexahedron_hess_1_0(*this); } @@ -199,7 +199,7 @@ namespace PRISMS : public PSimpleBase>, double> { double - eval(const std::vector> &var) const + eval(const std::vector> &var) const override { return 0.0; } @@ -211,7 +211,7 @@ namespace PRISMS } Hexahedron_hess_1_1 * - clone() const + clone() const override { return new Hexahedron_hess_1_1(*this); } @@ -221,7 +221,7 @@ namespace PRISMS : public PSimpleBase>, double> { double - eval(const std::vector> &var) const + eval(const std::vector> &var) const override { return var[3][1] * var[3][2] / var[2][1] / var[2][2]; } @@ -233,7 +233,7 @@ namespace PRISMS } Hexahedron_hess_1_2 * - clone() const + clone() const override { return new Hexahedron_hess_1_2(*this); } @@ -243,7 +243,7 @@ namespace PRISMS : public PSimpleBase>, double> { double - eval(const std::vector> &var) const + eval(const std::vector> &var) const override { return var[3][2] * var[3][0] / var[2][2] / var[2][0]; } @@ -255,7 +255,7 @@ namespace PRISMS } Hexahedron_hess_2_0 * - clone() const + clone() const override { return new Hexahedron_hess_2_0(*this); } @@ -265,7 +265,7 @@ namespace PRISMS : public PSimpleBase>, double> { double - eval(const std::vector> &var) const + eval(const std::vector> &var) const override { return var[3][2] * var[3][1] / var[2][2] / var[2][1]; } @@ -277,7 +277,7 @@ namespace PRISMS } Hexahedron_hess_2_1 * - clone() const + clone() const override { return new Hexahedron_hess_2_1(*this); } @@ -287,7 +287,7 @@ namespace PRISMS : public PSimpleBase>, double> { double - eval(const std::vector> &var) const + eval(const std::vector> &var) const override { return 0.0; } @@ -299,7 +299,7 @@ namespace PRISMS } Hexahedron_hess_2_2 * - clone() const + clone() const override { return new Hexahedron_hess_2_2(*this); } @@ -347,63 +347,65 @@ namespace PRISMS } Hexahedron * - clone() const + clone() const override { return new Hexahedron(*this); } PSimpleFunction>, double> - simplefunction() const + simplefunction() const override { return PSimpleFunction>, double>(*_val); } PSimpleFunction>, double> - grad_simplefunction(size_type di) const + grad_simplefunction(size_type di) const override { return PSimpleFunction>, double>(*_grad_val[di]); } PSimpleFunction>, double> - hess_simplefunction(size_type di, size_type dj) const + hess_simplefunction(size_type di, size_type dj) const override { return PSimpleFunction>, double>( *_hess_val[di][dj]); } double - operator()(const std::vector> &var) + operator()(const std::vector> &var) override { return (*_val)(var); } double - grad(const std::vector> &var, size_type di) + grad(const std::vector> &var, size_type di) override { return (*_grad_val[di])(var); } double - hess(const std::vector> &var, size_type di, size_type dj) + hess(const std::vector> &var, + size_type di, + size_type dj) override { return (*_hess_val[di][dj])(var); } void - eval(const std::vector> &var) + eval(const std::vector> &var) override { (*_val)(var); } void - eval_grad(const std::vector> &var) + eval_grad(const std::vector> &var) override { (*_grad_val[0])(var); (*_grad_val[1])(var); } void - eval_hess(const std::vector> &var) + eval_hess(const std::vector> &var) override { (*_hess_val[0][0])(var); (*_hess_val[0][1])(var); @@ -412,19 +414,19 @@ namespace PRISMS } double - operator()() const + operator()() const override { return (*_val)(); } double - grad(size_type di) const + grad(size_type di) const override { return (*_grad_val[di])(); } double - hess(size_type di, size_type dj) const + hess(size_type di, size_type dj) const override { return (*_hess_val[di][dj])(); } diff --git a/include/IntegrationTools/pfield/interpolation/Quad.hh b/include/IntegrationTools/pfield/interpolation/Quad.hh index 31eb786a6..3976672a4 100644 --- a/include/IntegrationTools/pfield/interpolation/Quad.hh +++ b/include/IntegrationTools/pfield/interpolation/Quad.hh @@ -13,7 +13,7 @@ namespace PRISMS class Quad_f : public PSimpleBase>, double> { double - eval(const std::vector> &var) const + eval(const std::vector> &var) const override { // var[0]: coordinate to be evaluated // var[1]: nodal coordinate @@ -34,7 +34,7 @@ namespace PRISMS } Quad_f * - clone() const + clone() const override { return new Quad_f(*this); } @@ -43,7 +43,7 @@ namespace PRISMS class Quad_grad_0 : public PSimpleBase>, double> { double - eval(const std::vector> &var) const + eval(const std::vector> &var) const override { return -var[3][0] * (1.0 - var[3][1] * (var[0][1] - var[1][1]) / var[2][1]) / var[2][0]; @@ -56,7 +56,7 @@ namespace PRISMS } Quad_grad_0 * - clone() const + clone() const override { return new Quad_grad_0(*this); } @@ -65,7 +65,7 @@ namespace PRISMS class Quad_grad_1 : public PSimpleBase>, double> { double - eval(const std::vector> &var) const + eval(const std::vector> &var) const override { return -var[3][1] * (1.0 - var[3][0] * (var[0][0] - var[1][0]) / var[2][0]) / var[2][1]; @@ -78,7 +78,7 @@ namespace PRISMS } Quad_grad_1 * - clone() const + clone() const override { return new Quad_grad_1(*this); } @@ -87,7 +87,7 @@ namespace PRISMS class Quad_hess_0_0 : public PSimpleBase>, double> { double - eval(const std::vector> &var) const + eval(const std::vector> &var) const override { return 0.0; } @@ -99,7 +99,7 @@ namespace PRISMS } Quad_hess_0_0 * - clone() const + clone() const override { return new Quad_hess_0_0(*this); } @@ -108,7 +108,7 @@ namespace PRISMS class Quad_hess_0_1 : public PSimpleBase>, double> { double - eval(const std::vector> &var) const + eval(const std::vector> &var) const override { return var[3][0] * var[3][1] / var[2][0] / var[2][1]; } @@ -120,7 +120,7 @@ namespace PRISMS } Quad_hess_0_1 * - clone() const + clone() const override { return new Quad_hess_0_1(*this); } @@ -129,7 +129,7 @@ namespace PRISMS class Quad_hess_1_0 : public PSimpleBase>, double> { double - eval(const std::vector> &var) const + eval(const std::vector> &var) const override { return var[3][0] * var[3][1] / var[2][0] / var[2][1]; } @@ -141,7 +141,7 @@ namespace PRISMS } Quad_hess_1_0 * - clone() const + clone() const override { return new Quad_hess_1_0(*this); } @@ -150,7 +150,7 @@ namespace PRISMS class Quad_hess_1_1 : public PSimpleBase>, double> { double - eval(const std::vector> &var) const + eval(const std::vector> &var) const override { return 0.0; } @@ -162,7 +162,7 @@ namespace PRISMS } Quad_hess_1_1 * - clone() const + clone() const override { return new Quad_hess_1_1(*this); } @@ -205,63 +205,65 @@ namespace PRISMS } Quad * - clone() const + clone() const override { return new Quad(*this); } PSimpleFunction>, double> - simplefunction() const + simplefunction() const override { return PSimpleFunction>, double>(*_val); } PSimpleFunction>, double> - grad_simplefunction(size_type di) const + grad_simplefunction(size_type di) const override { return PSimpleFunction>, double>(*_grad_val[di]); } PSimpleFunction>, double> - hess_simplefunction(size_type di, size_type dj) const + hess_simplefunction(size_type di, size_type dj) const override { return PSimpleFunction>, double>( *_hess_val[di][dj]); } double - operator()(const std::vector> &var) + operator()(const std::vector> &var) override { return (*_val)(var); } double - grad(const std::vector> &var, size_type di) + grad(const std::vector> &var, size_type di) override { return (*_grad_val[di])(var); } double - hess(const std::vector> &var, size_type di, size_type dj) + hess(const std::vector> &var, + size_type di, + size_type dj) override { return (*_hess_val[di][dj])(var); } void - eval(const std::vector> &var) + eval(const std::vector> &var) override { (*_val)(var); } void - eval_grad(const std::vector> &var) + eval_grad(const std::vector> &var) override { (*_grad_val[0])(var); (*_grad_val[1])(var); } void - eval_hess(const std::vector> &var) + eval_hess(const std::vector> &var) override { (*_hess_val[0][0])(var); (*_hess_val[0][1])(var); @@ -270,19 +272,19 @@ namespace PRISMS } double - operator()() const + operator()() const override { return (*_val)(); } double - grad(size_type di) const + grad(size_type di) const override { return (*_grad_val[di])(); } double - hess(size_type di, size_type dj) const + hess(size_type di, size_type dj) const override { return (*_hess_val[di][dj])(); } diff --git a/include/initialConditions.h b/include/initialConditions.h index 543a066b7..0dfb332d3 100644 --- a/include/initialConditions.h +++ b/include/initialConditions.h @@ -32,7 +32,7 @@ class InitialCondition : public dealii::Function // IC for scalar values double - value(const dealii::Point &p, const unsigned int component = 0) const + value(const dealii::Point &p, const unsigned int component = 0) const override { double scalar_IC = 0.0; dealii::Vector vector_IC(dim); @@ -66,7 +66,8 @@ class InitialConditionVector : public dealii::Function // IC for vector values void - vector_value(const dealii::Point &p, dealii::Vector &vector_IC) const + vector_value(const dealii::Point &p, + dealii::Vector &vector_IC) const override { double scalar_IC = 0.0; vector_IC.reinit(dim); diff --git a/include/nonUniformDirichletBC.h b/include/nonUniformDirichletBC.h index 1729006e4..a14e3d0f5 100644 --- a/include/nonUniformDirichletBC.h +++ b/include/nonUniformDirichletBC.h @@ -25,7 +25,7 @@ class NonUniformDirichletBC : public dealii::Function // IC for scalar values double - value(const dealii::Point &p, const unsigned int component = 0) const + value(const dealii::Point &p, const unsigned int component = 0) const override { double scalar_BC = 0.0; dealii::Vector vector_BC(dim); @@ -64,7 +64,8 @@ class NonUniformDirichletBCVector : public dealii::Function // IC for vector values void - vector_value(const dealii::Point &p, dealii::Vector &vector_BC) const + vector_value(const dealii::Point &p, + dealii::Vector &vector_BC) const override { double scalar_BC = 0.0; diff --git a/include/vectorBCFunction.h b/include/vectorBCFunction.h index ff37903c6..d504c9116 100644 --- a/include/vectorBCFunction.h +++ b/include/vectorBCFunction.h @@ -18,11 +18,12 @@ class vectorBCFunction : public dealii::Function public: vectorBCFunction(const std::vector BC_values); virtual void - vector_value(const dealii::Point &p, dealii::Vector &values) const; + vector_value(const dealii::Point &p, + dealii::Vector &values) const override; virtual void vector_value_list(const std::vector> &points, - std::vector> &value_list) const; + std::vector> &value_list) const override; private: const std::vector BC_values; From 79aa0a2e87d0855089a78901549ed4a1966e925f Mon Sep 17 00:00:00 2001 From: landinjm Date: Tue, 10 Sep 2024 10:08:33 -0400 Subject: [PATCH 03/10] adding more overrides --- include/IntegrationTools/pfield/PField.hh | 20 +++++++++---------- .../pfield/interpolation/Hexahedron.hh | 12 +++++------ .../pfield/interpolation/Quad.hh | 12 +++++------ src/matrixfree/initialConditions.cc | 2 +- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/include/IntegrationTools/pfield/PField.hh b/include/IntegrationTools/pfield/PField.hh index e31e33f49..4b9d828dd 100644 --- a/include/IntegrationTools/pfield/PField.hh +++ b/include/IntegrationTools/pfield/PField.hh @@ -67,7 +67,7 @@ namespace PRISMS // Clone PField * - clone() const + clone() const override { return new PField(*this); } @@ -75,28 +75,28 @@ namespace PRISMS // ---------------------------------------------------------- // Use these functions if you want to evaluate a single value FieldType - operator()(const Coordinate &coord); + operator()(const Coordinate &coord) override; FieldType - grad(const Coordinate &coord, size_type di); + grad(const Coordinate &coord, size_type di) override; FieldType - hess(const Coordinate &coord, size_type di, size_type dj); + hess(const Coordinate &coord, size_type di, size_type dj) override; // ---------------------------------------------------------- // Use these functions to evaluate several values, then use 'get' methods to access // results void - eval(const Coordinate &coord); + eval(const Coordinate &coord) override; void - eval_grad(const Coordinate &coord); + eval_grad(const Coordinate &coord) override; void - eval_hess(const Coordinate &coord); + eval_hess(const Coordinate &coord) override; FieldType - operator()() const; + operator()() const override; FieldType - grad(size_type di) const; + grad(size_type di) const override; FieldType - hess(size_type di, size_type dj) const; + hess(size_type di, size_type dj) const override; // PField unique members ------------------------------------------ diff --git a/include/IntegrationTools/pfield/interpolation/Hexahedron.hh b/include/IntegrationTools/pfield/interpolation/Hexahedron.hh index 82720e6eb..2fa073cb6 100644 --- a/include/IntegrationTools/pfield/interpolation/Hexahedron.hh +++ b/include/IntegrationTools/pfield/interpolation/Hexahedron.hh @@ -562,7 +562,7 @@ namespace PRISMS } PRISMS::Coordinate<3> - min() const + min() const override { PRISMS::Coordinate<3> coord = _var[1]; @@ -577,7 +577,7 @@ namespace PRISMS } PRISMS::Coordinate<3> - max() const + max() const override { PRISMS::Coordinate<3> coord = _var[1]; @@ -592,7 +592,7 @@ namespace PRISMS } bool - is_in_range(const Coordinate &coord) + is_in_range(const Coordinate &coord) override { _var[0][0] = coord[0]; _var[0][1] = coord[1]; @@ -624,7 +624,7 @@ namespace PRISMS // you are expected to KNOW that the coord is_in_range!!! double - operator()(const Coordinate &coord) + operator()(const Coordinate &coord) override { _var[0][0] = coord[0]; _var[0][1] = coord[1]; @@ -633,7 +633,7 @@ namespace PRISMS } double - grad(const Coordinate &coord, size_type di) + grad(const Coordinate &coord, size_type di) override { _var[0][0] = coord[0]; _var[0][1] = coord[1]; @@ -642,7 +642,7 @@ namespace PRISMS } double - hess(const Coordinate &coord, size_type di, size_type dj) + hess(const Coordinate &coord, size_type di, size_type dj) override { _var[0][0] = coord[0]; _var[0][1] = coord[1]; diff --git a/include/IntegrationTools/pfield/interpolation/Quad.hh b/include/IntegrationTools/pfield/interpolation/Quad.hh index 3976672a4..d0cdad5a5 100644 --- a/include/IntegrationTools/pfield/interpolation/Quad.hh +++ b/include/IntegrationTools/pfield/interpolation/Quad.hh @@ -395,7 +395,7 @@ namespace PRISMS } PRISMS::Coordinate<2> - min() const + min() const override { PRISMS::Coordinate<2> coord = _var[1]; @@ -408,7 +408,7 @@ namespace PRISMS } PRISMS::Coordinate<2> - max() const + max() const override { PRISMS::Coordinate<2> coord = _var[1]; @@ -421,7 +421,7 @@ namespace PRISMS } bool - is_in_range(const Coordinate &coord) + is_in_range(const Coordinate &coord) override { _var[0][0] = coord[0]; _var[0][1] = coord[1]; @@ -452,7 +452,7 @@ namespace PRISMS // you are expected to KNOW that the coord is_in_range!!! double - operator()(const Coordinate &coord) + operator()(const Coordinate &coord) override { _var[0][0] = coord[0]; _var[0][1] = coord[1]; @@ -460,7 +460,7 @@ namespace PRISMS } double - grad(const Coordinate &coord, size_type di) + grad(const Coordinate &coord, size_type di) override { _var[0][0] = coord[0]; _var[0][1] = coord[1]; @@ -468,7 +468,7 @@ namespace PRISMS } double - hess(const Coordinate &coord, size_type di, size_type dj) + hess(const Coordinate &coord, size_type di, size_type dj) override { _var[0][0] = coord[0]; _var[0][1] = coord[1]; diff --git a/src/matrixfree/initialConditions.cc b/src/matrixfree/initialConditions.cc index 567517002..0e0105302 100644 --- a/src/matrixfree/initialConditions.cc +++ b/src/matrixfree/initialConditions.cc @@ -22,7 +22,7 @@ class InitialConditionPField : public Function {} double - value(const Point &p, const unsigned int component = 0) const + value(const Point &p, const unsigned int component = 0) const override { double scalar_IC; From 92d01e6c9e5e47f649cbbea84e8509b83cce0352 Mon Sep 17 00:00:00 2001 From: landinjm Date: Tue, 10 Sep 2024 10:19:55 -0400 Subject: [PATCH 04/10] base class initialization --- include/IntegrationTools/pfield/interpolation/Hexahedron.hh | 2 ++ include/IntegrationTools/pfield/interpolation/Quad.hh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/include/IntegrationTools/pfield/interpolation/Hexahedron.hh b/include/IntegrationTools/pfield/interpolation/Hexahedron.hh index 2fa073cb6..c87ab3aee 100644 --- a/include/IntegrationTools/pfield/interpolation/Hexahedron.hh +++ b/include/IntegrationTools/pfield/interpolation/Hexahedron.hh @@ -313,11 +313,13 @@ namespace PRISMS public: Hexahedron() + : PFuncBase>, double>() { construct(); } Hexahedron(const Hexahedron &RHS) + : PFuncBase>, double>(RHS) { construct(); } diff --git a/include/IntegrationTools/pfield/interpolation/Quad.hh b/include/IntegrationTools/pfield/interpolation/Quad.hh index d0cdad5a5..bc7ad7349 100644 --- a/include/IntegrationTools/pfield/interpolation/Quad.hh +++ b/include/IntegrationTools/pfield/interpolation/Quad.hh @@ -178,11 +178,13 @@ namespace PRISMS typedef PFuncBase>, double>::size_type size_type; Quad() + : PFuncBase>, double>() { construct(); } Quad(const Quad &RHS) + : PFuncBase>, double>(RHS) { construct(); } From 039f28a70d73d800f11dc8c2d614a8d1555d34be Mon Sep 17 00:00:00 2001 From: landinjm Date: Tue, 10 Sep 2024 11:06:34 -0400 Subject: [PATCH 05/10] snprintf ignore truncation --- src/matrixfree/outputResults.cc | 59 +++++++++++++++++---------------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/src/matrixfree/outputResults.cc b/src/matrixfree/outputResults.cc index 707790fe2..779863dda 100644 --- a/src/matrixfree/outputResults.cc +++ b/src/matrixfree/outputResults.cc @@ -158,23 +158,26 @@ MatrixFreePDE::outputResults() data_out.build_patches(degree); + // Defining snprintf with no warnings because we don't can about truncation +#define snprintf_nowarn(...) (snprintf(__VA_ARGS__) < 0 ? abort() : (void) 0) + // write to results file // file name std::ostringstream cycleAsString; cycleAsString << std::setw(std::floor(std::log10(userInputs.totalIncrements)) + 1) << std::setfill('0') << currentIncrement; char baseFileName[100], vtuFileName[100]; - snprintf(baseFileName, - sizeof(baseFileName), - "%s-%s", - userInputs.output_file_name.c_str(), - cycleAsString.str().c_str()); - snprintf(vtuFileName, - sizeof(vtuFileName), - "%s.%u.%s", - baseFileName, - Utilities::MPI::this_mpi_process(MPI_COMM_WORLD), - userInputs.output_file_type.c_str()); + snprintf_nowarn(baseFileName, + sizeof(baseFileName), + "%s-%s", + userInputs.output_file_name.c_str(), + cycleAsString.str().c_str()); + snprintf_nowarn(vtuFileName, + sizeof(vtuFileName), + "%s.%u.%s", + baseFileName, + Utilities::MPI::this_mpi_process(MPI_COMM_WORLD), + userInputs.output_file_type.c_str()); // Write to file in either vtu or vtk format if (userInputs.output_file_type == "vtu") @@ -202,21 +205,21 @@ MatrixFreePDE::outputResults() ++i) { char vtuProcFileName[100]; - snprintf(vtuProcFileName, - sizeof(vtuProcFileName), - "%s-%s.%u.%s", - userInputs.output_file_name.c_str(), - cycleAsString.str().c_str(), - i, - userInputs.output_file_type.c_str()); + snprintf_nowarn(vtuProcFileName, + sizeof(vtuProcFileName), + "%s-%s.%u.%s", + userInputs.output_file_name.c_str(), + cycleAsString.str().c_str(), + i, + userInputs.output_file_type.c_str()); filenames.push_back(vtuProcFileName); } char pvtuFileName[100]; - snprintf(pvtuFileName, - sizeof(pvtuFileName), - "%s.p%s", - baseFileName, - userInputs.output_file_type.c_str()); + snprintf_nowarn(pvtuFileName, + sizeof(pvtuFileName), + "%s.p%s", + baseFileName, + userInputs.output_file_type.c_str()); std::ofstream master_output(pvtuFileName); data_out.write_pvtu_record(master_output, filenames); @@ -227,11 +230,11 @@ MatrixFreePDE::outputResults() { // Write the results to a file shared between all processes char svtuFileName[100]; - snprintf(svtuFileName, - sizeof(svtuFileName), - "%s.%s", - baseFileName, - userInputs.output_file_type.c_str()); + snprintf_nowarn(svtuFileName, + sizeof(svtuFileName), + "%s.%s", + baseFileName, + userInputs.output_file_type.c_str()); data_out.write_vtu_in_parallel(svtuFileName, MPI_COMM_WORLD); pcout << "Output written to:" << svtuFileName << "\n\n"; } From f731bec55f5f0b7961a3bb4ac857f0719892da5b Mon Sep 17 00:00:00 2001 From: landinjm Date: Tue, 10 Sep 2024 11:10:35 -0400 Subject: [PATCH 06/10] missed header --- src/EquationDependencyParser/EquationDependencyParser.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/EquationDependencyParser/EquationDependencyParser.cc b/src/EquationDependencyParser/EquationDependencyParser.cc index 0a7f4d51c..6ab77473d 100644 --- a/src/EquationDependencyParser/EquationDependencyParser.cc +++ b/src/EquationDependencyParser/EquationDependencyParser.cc @@ -1,5 +1,6 @@ #include "../../include/EquationDependencyParser.h" +#include #include #include From c7121041c1f6a1b49d52dcd206396bfc04f41fee Mon Sep 17 00:00:00 2001 From: landinjm Date: Tue, 10 Sep 2024 11:15:19 -0400 Subject: [PATCH 07/10] reorder AMR class --- include/matrixFreePDE.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/matrixFreePDE.h b/include/matrixFreePDE.h index 4e72df840..d76e9b7d6 100644 --- a/include/matrixFreePDE.h +++ b/include/matrixFreePDE.h @@ -267,9 +267,6 @@ class MatrixFreePDE : public Subscriptor void applyBCs(unsigned int fieldIndex); - /*AMR methods*/ - AdaptiveRefinement AMR; - /*Method to compute the right hand side (RHS) residual vectors*/ void computeExplicitRHS(); @@ -480,6 +477,9 @@ class MatrixFreePDE : public Subscriptor double integrated_var; unsigned int integral_index; std::mutex assembler_lock; + + /*AMR methods*/ + AdaptiveRefinement AMR; }; #endif From eb5c59ddc90e85ecefeb7349cc4ba62639de9785 Mon Sep 17 00:00:00 2001 From: landinjm Date: Tue, 10 Sep 2024 13:37:09 -0400 Subject: [PATCH 08/10] fixed warnings for unit tests --- .../EquationDependencyParser.cc | 6 ++-- src/FloodFiller/FloodFiller.cc | 1 - .../OrderParameterRemapper.cc | 5 ---- .../SimplifiedGrainRepresentation.cc | 2 -- src/matrixfree/boundaryConditions.cc | 16 ++++++----- tests/unit_tests/test_FloodFiller.h | 2 +- .../unit_tests/test_OrderParameterRemapper.h | 28 +------------------ tests/unit_tests/test_invM.h | 10 +++---- .../test_setRigidBodyModeConstraints.h | 10 +++---- 9 files changed, 24 insertions(+), 56 deletions(-) diff --git a/src/EquationDependencyParser/EquationDependencyParser.cc b/src/EquationDependencyParser/EquationDependencyParser.cc index 6ab77473d..47cc63f8e 100644 --- a/src/EquationDependencyParser/EquationDependencyParser.cc +++ b/src/EquationDependencyParser/EquationDependencyParser.cc @@ -145,7 +145,7 @@ EquationDependencyParser::parseDependencyListRHS( for (const auto &dependency : split_dependency_list) { // Flag to make sure we have assigned a dependency entry - bool dependency_entry_assigned = false; + [[maybe_unused]] bool dependency_entry_assigned = false; // Loop through all known variable names [x, grad(x), and hess(x)] to see which ones // are on our dependency list. If we have two variables x and y this will loop twice @@ -254,7 +254,7 @@ EquationDependencyParser::parseDependencyListLHS( for (const auto &dependency : split_dependency_list) { // Flag to make sure we have assigned a dependency entry - bool dependency_entry_assigned = false; + [[maybe_unused]] bool dependency_entry_assigned = false; // Loop through all known variable names [x, grad(x), and hess(x)] to see which ones // are on our dependency list. If we have two variables x and y this will loop twice @@ -442,7 +442,7 @@ EquationDependencyParser::parseDependencyListPP( for (const auto &dependency : split_dependency_list) { // Flag to make sure we have assigned a dependency entry - bool dependency_entry_assigned = false; + [[maybe_unused]] bool dependency_entry_assigned = false; // Loop through all known variable names [x, grad(x), and hess(x)] to see which ones // are on our dependency list. If we have two variables x and y this will loop twice diff --git a/src/FloodFiller/FloodFiller.cc b/src/FloodFiller/FloodFiller.cc index 757415284..8379fe1dc 100644 --- a/src/FloodFiller/FloodFiller.cc +++ b/src/FloodFiller/FloodFiller.cc @@ -188,7 +188,6 @@ FloodFiller::createGlobalGrainSetList( std::vector> &grain_sets) const { int numProcs = dealii::Utilities::MPI::n_mpi_processes(MPI_COMM_WORLD); - int thisProc = dealii::Utilities::MPI::this_mpi_process(MPI_COMM_WORLD); unsigned int num_grains_local = grain_sets.size(); diff --git a/src/OrderParameterRemapper/OrderParameterRemapper.cc b/src/OrderParameterRemapper/OrderParameterRemapper.cc index 039e2e204..819dbd9cf 100644 --- a/src/OrderParameterRemapper/OrderParameterRemapper.cc +++ b/src/OrderParameterRemapper/OrderParameterRemapper.cc @@ -67,7 +67,6 @@ OrderParameterRemapper::remap( { if (dof->is_locally_owned()) { - unsigned int op_new = grain_representations.at(g).getOrderParameterId(); unsigned int op_old = grain_representations.at(g).getOldOrderParameterId(); @@ -126,9 +125,6 @@ OrderParameterRemapper::remap_from_index_field( double transfer_buffer = std::max(0.0, grain_representations.at(g).getDistanceToNeighbor() / 2.0); - typename dealii::DoFHandler::active_cell_iterator di = - dof_handler.begin_active(); - // For now I have two loops, one where I copy the values from the old // order parameter to the new one and a second where I zero out the old // order parameter. This separation prevents writing zero-out values to @@ -139,7 +135,6 @@ OrderParameterRemapper::remap_from_index_field( if (dof->is_locally_owned()) { unsigned int op_new = grain_representations.at(g).getOrderParameterId(); - unsigned int op_old = grain_representations.at(g).getOldOrderParameterId(); // Check if the cell is within the simplified grain representation bool in_grain = true; diff --git a/src/SimplifiedGrainRepresentation/SimplifiedGrainRepresentation.cc b/src/SimplifiedGrainRepresentation/SimplifiedGrainRepresentation.cc index bc68f9260..d82e8da43 100644 --- a/src/SimplifiedGrainRepresentation/SimplifiedGrainRepresentation.cc +++ b/src/SimplifiedGrainRepresentation/SimplifiedGrainRepresentation.cc @@ -147,8 +147,6 @@ SimplifiedGrainManipulator::reassignGrains( double buffer_distance, std::vector order_parameter_id_list) { - int thisProc = dealii::Utilities::MPI::this_mpi_process(MPI_COMM_WORLD); - for (int cycle = order_parameter_id_list.size(); cycle >= 0; cycle--) { for (unsigned int g_base = 0; g_base < grain_representations.size(); g_base++) diff --git a/src/matrixfree/boundaryConditions.cc b/src/matrixfree/boundaryConditions.cc index 343f0bada..9eea4f1c4 100644 --- a/src/matrixfree/boundaryConditions.cc +++ b/src/matrixfree/boundaryConditions.cc @@ -190,9 +190,10 @@ MatrixFreePDE::applyDirichletBCs() } } - // VectorTools::interpolate_boundary_values (*dofHandlersSet[currentFieldIndex],\ - // direction, NonUniformDirichletBC(currentFieldIndex,direction,currentTime,this), *(AffineConstraints*) \ - // constraintsDirichletSet[currentFieldIndex],mask); + // VectorTools::interpolate_boundary_values + // (*dofHandlersSet[currentFieldIndex],direction, + // NonUniformDirichletBC(currentFieldIndex,direction,currentTime,this), + // *(AffineConstraints*)constraintsDirichletSet[currentFieldIndex],mask); VectorTools::interpolate_boundary_values( *dofHandlersSet[currentFieldIndex], direction, @@ -368,10 +369,11 @@ MatrixFreePDE::setRigidBodyModeConstraints( component_num < rigidBodyModeComponents.size(); component_num++) { - unsigned int nodeID = cell->vertex_dof_index(i, component_num); - // Temporarily disabling the addition of inhomogeneous - // constraints constraints->add_line(nodeID); - // constraints->set_inhomogeneity(nodeID,0.0); + // unsigned int nodeID = cell->vertex_dof_index(i, + // component_num); + // Temporarily disabling the addition of inhomogeneous + // constraints constraints->add_line(nodeID); + // constraints->set_inhomogeneity(nodeID,0.0); } } } diff --git a/tests/unit_tests/test_FloodFiller.h b/tests/unit_tests/test_FloodFiller.h index 7cd0dbd2e..c0cbb1f3b 100644 --- a/tests/unit_tests/test_FloodFiller.h +++ b/tests/unit_tests/test_FloodFiller.h @@ -12,7 +12,7 @@ class InitialConditionFloodFill : public dealii::Function } double - value(const dealii::Point &p, const unsigned int component = 0) const + value(const dealii::Point &p, const unsigned int component = 0) const override { double val; if (p[1] < 0.6 and p[0] > p[1] + 1.0e-10) diff --git a/tests/unit_tests/test_OrderParameterRemapper.h b/tests/unit_tests/test_OrderParameterRemapper.h index 07e01877e..cd6e86876 100644 --- a/tests/unit_tests/test_OrderParameterRemapper.h +++ b/tests/unit_tests/test_OrderParameterRemapper.h @@ -12,7 +12,7 @@ class InitialConditionOrderParameterRemapper : public dealii::Function } double - value(const dealii::Point &p, const unsigned int component = 0) const + value(const dealii::Point &p, const unsigned int component = 0) const override { double val; @@ -49,8 +49,6 @@ template bool unitTest::test_OrderParameterRemapper() { - int thisProc = dealii::Utilities::MPI::this_mpi_process(MPI_COMM_WORLD); - char buffer[100]; std::cout << "\nTesting 'OrderParameterRemapper'... " << std::endl; @@ -164,17 +162,6 @@ unitTest::test_OrderParameterRemapper() order_parameter_id_list); // ---------- The actual test run of OrderParameterRemapper ----------- - /* - for (unsigned int g=0; gprint(std::cout); - // std::cout << "Field 1, core" << thisProc << std::endl; - // solution_fields.at(1)->print(std::cout); - OrderParameterRemapper order_parameter_remapper; order_parameter_remapper.remap(simplified_grain_representations, solution_fields, @@ -182,19 +169,6 @@ unitTest::test_OrderParameterRemapper() fe.dofs_per_cell, 0.001); - /* - for (unsigned int g=0; gprint(std::cout); - // std::cout << "Field 1, core" << thisProc << std::endl; - // solution_fields.at(1)->print(std::cout); - // ---------- Check the result ----------- pass = true; diff --git a/tests/unit_tests/test_invM.h b/tests/unit_tests/test_invM.h index 66c9e65a3..b0a768a17 100644 --- a/tests/unit_tests/test_invM.h +++ b/tests/unit_tests/test_invM.h @@ -40,7 +40,7 @@ class testInvM : public MatrixFreePDE setInitialCondition(const dealii::Point &p, const unsigned int index, double &scalar_IC, - dealii::Vector &vector_IC) {}; + dealii::Vector &vector_IC) override {}; // Function to set the non-uniform Dirichlet boundary conditions (in // ICs_and_BCs.h) @@ -50,7 +50,7 @@ class testInvM : public MatrixFreePDE const unsigned int direction, const double time, double &scalar_BC, - dealii::Vector &vector_BC) {}; + dealii::Vector &vector_BC) override {}; private: // RHS implementation for explicit solve @@ -65,20 +65,20 @@ class testInvM : public MatrixFreePDE void explicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const {}; + dealii::Point> q_point_loc) const override {}; // Function to set the RHS of the governing equations for all other equations // (in equations.h) void nonExplicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const {}; + dealii::Point> q_point_loc) const override {}; // Function to set the LHS of the governing equations (in equations.h) void equationLHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const {}; + dealii::Point> q_point_loc) const override {}; }; template diff --git a/tests/unit_tests/test_setRigidBodyModeConstraints.h b/tests/unit_tests/test_setRigidBodyModeConstraints.h index 9f31fbd75..fb5dbb5a5 100644 --- a/tests/unit_tests/test_setRigidBodyModeConstraints.h +++ b/tests/unit_tests/test_setRigidBodyModeConstraints.h @@ -37,7 +37,7 @@ class setRigidBodyModeConstraintsTest : public MatrixFreePDE setInitialCondition(const dealii::Point &p, const unsigned int index, double &scalar_IC, - dealii::Vector &vector_IC) {}; + dealii::Vector &vector_IC) override {}; // Function to set the non-uniform Dirichlet boundary conditions (in // ICs_and_BCs.h) @@ -47,7 +47,7 @@ class setRigidBodyModeConstraintsTest : public MatrixFreePDE const unsigned int direction, const double time, double &scalar_BC, - dealii::Vector &vector_BC) {}; + dealii::Vector &vector_BC) override {}; private: // RHS implementation for explicit solve @@ -62,20 +62,20 @@ class setRigidBodyModeConstraintsTest : public MatrixFreePDE void explicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const {}; + dealii::Point> q_point_loc) const override {}; // Function to set the RHS of the governing equations for all other equations // (in equations.h) void nonExplicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const {}; + dealii::Point> q_point_loc) const override {}; // Function to set the LHS of the governing equations (in equations.h) void equationLHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const {}; + dealii::Point> q_point_loc) const override {}; }; template From 6f8b4d8ff0226132ec02dbb2576b0c4dc109af86 Mon Sep 17 00:00:00 2001 From: landinjm Date: Tue, 10 Sep 2024 13:50:53 -0400 Subject: [PATCH 09/10] fix warnings for applications --- applications/CHAC_anisotropy/customPDE.h | 15 ++++++++------- .../CHAC_anisotropyRegularized/customPDE.h | 15 ++++++++------- applications/CHAC_performance_test/customPDE.h | 15 ++++++++------- applications/CHiMaD_benchmark1a/customPDE.h | 15 ++++++++------- applications/CHiMaD_benchmark2a/customPDE.h | 15 ++++++++------- applications/CHiMaD_benchmark3/customPDE.h | 15 ++++++++------- applications/CHiMaD_benchmark6a/customPDE.h | 15 ++++++++------- applications/CHiMaD_benchmark6b/customPDE.h | 15 ++++++++------- applications/CHiMaD_benchmark7/customPDE.h | 15 ++++++++------- .../MgNd_precipitate_single_Bppp/customPDE.h | 15 ++++++++------- applications/allenCahn/customPDE.h | 15 ++++++++------- applications/allenCahn_conserved/customPDE.h | 15 ++++++++------- applications/alloySolidification/customPDE.h | 15 ++++++++------- .../alloySolidification_uniform/customPDE.h | 15 ++++++++------- applications/anisotropyFacet/customPDE.h | 15 ++++++++------- applications/cahnHilliard/customPDE.h | 15 ++++++++------- applications/corrosion/customPDE.h | 15 ++++++++------- applications/corrosion_microgalvanic/customPDE.h | 15 ++++++++------- .../coupledCahnHilliardAllenCahn/customPDE.h | 15 ++++++++------- applications/dendriticSolidification/customPDE.h | 15 ++++++++------- applications/eshelbyInclusion/customPDE.h | 15 ++++++++------- applications/fickianDiffusion/customPDE.h | 15 ++++++++------- applications/grainGrowth/customPDE.h | 15 ++++++++------- applications/grainGrowth_dream3d/customPDE.h | 15 ++++++++------- applications/mechanics/customPDE.h | 15 ++++++++------- applications/nucleationModel/customPDE.h | 14 +++++++------- .../nucleationModel_preferential/customPDE.h | 14 +++++++------- applications/precipitateEvolution/customPDE.h | 15 ++++++++------- .../precipitateEvolution_pfunction/customPDE.h | 15 ++++++++------- applications/spinodalDecomposition/customPDE.h | 15 ++++++++------- applications/steadyStateAllenCahn/customPDE.h | 15 ++++++++------- 31 files changed, 246 insertions(+), 217 deletions(-) diff --git a/applications/CHAC_anisotropy/customPDE.h b/applications/CHAC_anisotropy/customPDE.h index 1aca9767b..d18a3aa86 100644 --- a/applications/CHAC_anisotropy/customPDE.h +++ b/applications/CHAC_anisotropy/customPDE.h @@ -14,7 +14,7 @@ class customPDE : public MatrixFreePDE setInitialCondition(const dealii::Point &p, const unsigned int index, double &scalar_IC, - dealii::Vector &vector_IC); + dealii::Vector &vector_IC) override; // Function to set the non-uniform Dirichlet boundary conditions (in // ICs_and_BCs.h) @@ -24,7 +24,7 @@ class customPDE : public MatrixFreePDE const unsigned int direction, const double time, double &scalar_BC, - dealii::Vector &vector_BC); + dealii::Vector &vector_BC) override; private: #include "../../include/typeDefs.h" @@ -36,20 +36,20 @@ class customPDE : public MatrixFreePDE void explicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the RHS of the governing equations for all other equations // (in equations.h) void nonExplicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the LHS of the governing equations (in equations.h) void equationLHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set postprocessing expressions (in postprocess.h) #ifdef POSTPROCESS_FILE_EXISTS @@ -57,13 +57,14 @@ class customPDE : public MatrixFreePDE postProcessedFields( const variableContainer> &variable_list, variableContainer> &pp_variable_list, - const dealii::Point> q_point_loc) const; + const dealii::Point> q_point_loc) const override; #endif // Function to set the nucleation probability (in nucleation.h) #ifdef NUCLEATION_FILE_EXISTS double - getNucleationProbability(variableValueContainer variable_value, double dV) const; + getNucleationProbability(variableValueContainer variable_value, + double dV) const override; #endif // ================================================================ diff --git a/applications/CHAC_anisotropyRegularized/customPDE.h b/applications/CHAC_anisotropyRegularized/customPDE.h index 4ef826afb..273cf505e 100644 --- a/applications/CHAC_anisotropyRegularized/customPDE.h +++ b/applications/CHAC_anisotropyRegularized/customPDE.h @@ -14,7 +14,7 @@ class customPDE : public MatrixFreePDE setInitialCondition(const dealii::Point &p, const unsigned int index, double &scalar_IC, - dealii::Vector &vector_IC); + dealii::Vector &vector_IC) override; // Function to set the non-uniform Dirichlet boundary conditions (in // ICs_and_BCs.h) @@ -24,7 +24,7 @@ class customPDE : public MatrixFreePDE const unsigned int direction, const double time, double &scalar_BC, - dealii::Vector &vector_BC); + dealii::Vector &vector_BC) override; private: #include "../../include/typeDefs.h" @@ -36,20 +36,20 @@ class customPDE : public MatrixFreePDE void explicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the RHS of the governing equations for all other equations // (in equations.h) void nonExplicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the LHS of the governing equations (in equations.h) void equationLHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set postprocessing expressions (in postprocess.h) #ifdef POSTPROCESS_FILE_EXISTS @@ -57,13 +57,14 @@ class customPDE : public MatrixFreePDE postProcessedFields( const variableContainer> &variable_list, variableContainer> &pp_variable_list, - const dealii::Point> q_point_loc) const; + const dealii::Point> q_point_loc) const override; #endif // Function to set the nucleation probability (in nucleation.h) #ifdef NUCLEATION_FILE_EXISTS double - getNucleationProbability(variableValueContainer variable_value, double dV) const; + getNucleationProbability(variableValueContainer variable_value, + double dV) const override; #endif // ================================================================ diff --git a/applications/CHAC_performance_test/customPDE.h b/applications/CHAC_performance_test/customPDE.h index d98dbc6f0..10a46802c 100644 --- a/applications/CHAC_performance_test/customPDE.h +++ b/applications/CHAC_performance_test/customPDE.h @@ -14,7 +14,7 @@ class customPDE : public MatrixFreePDE setInitialCondition(const dealii::Point &p, const unsigned int index, double &scalar_IC, - dealii::Vector &vector_IC); + dealii::Vector &vector_IC) override; // Function to set the non-uniform Dirichlet boundary conditions (in // ICs_and_BCs.h) @@ -24,7 +24,7 @@ class customPDE : public MatrixFreePDE const unsigned int direction, const double time, double &scalar_BC, - dealii::Vector &vector_BC); + dealii::Vector &vector_BC) override; private: #include "../../include/typeDefs.h" @@ -36,20 +36,20 @@ class customPDE : public MatrixFreePDE void explicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the RHS of the governing equations for all other equations // (in equations.h) void nonExplicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the LHS of the governing equations (in equations.h) void equationLHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set postprocessing expressions (in postprocess.h) #ifdef POSTPROCESS_FILE_EXISTS @@ -57,13 +57,14 @@ class customPDE : public MatrixFreePDE postProcessedFields( const variableContainer> &variable_list, variableContainer> &pp_variable_list, - const dealii::Point> q_point_loc) const; + const dealii::Point> q_point_loc) const override; #endif // Function to set the nucleation probability (in nucleation.h) #ifdef NUCLEATION_FILE_EXISTS double - getNucleationProbability(variableValueContainer variable_value, double dV) const; + getNucleationProbability(variableValueContainer variable_value, + double dV) const override; #endif // ================================================================ diff --git a/applications/CHiMaD_benchmark1a/customPDE.h b/applications/CHiMaD_benchmark1a/customPDE.h index ed9048fc4..c783cc254 100644 --- a/applications/CHiMaD_benchmark1a/customPDE.h +++ b/applications/CHiMaD_benchmark1a/customPDE.h @@ -14,7 +14,7 @@ class customPDE : public MatrixFreePDE setInitialCondition(const dealii::Point &p, const unsigned int index, double &scalar_IC, - dealii::Vector &vector_IC); + dealii::Vector &vector_IC) override; // Function to set the non-uniform Dirichlet boundary conditions (in // ICs_and_BCs.h) @@ -24,7 +24,7 @@ class customPDE : public MatrixFreePDE const unsigned int direction, const double time, double &scalar_BC, - dealii::Vector &vector_BC); + dealii::Vector &vector_BC) override; private: #include "../../include/typeDefs.h" @@ -36,20 +36,20 @@ class customPDE : public MatrixFreePDE void explicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the RHS of the governing equations for all other equations // (in equations.h) void nonExplicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the LHS of the governing equations (in equations.h) void equationLHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set postprocessing expressions (in postprocess.h) #ifdef POSTPROCESS_FILE_EXISTS @@ -57,13 +57,14 @@ class customPDE : public MatrixFreePDE postProcessedFields( const variableContainer> &variable_list, variableContainer> &pp_variable_list, - const dealii::Point> q_point_loc) const; + const dealii::Point> q_point_loc) const override; #endif // Function to set the nucleation probability (in nucleation.h) #ifdef NUCLEATION_FILE_EXISTS double - getNucleationProbability(variableValueContainer variable_value, double dV) const; + getNucleationProbability(variableValueContainer variable_value, + double dV) const override; #endif // ================================================================ diff --git a/applications/CHiMaD_benchmark2a/customPDE.h b/applications/CHiMaD_benchmark2a/customPDE.h index 2c74a00ad..593cc8ab5 100644 --- a/applications/CHiMaD_benchmark2a/customPDE.h +++ b/applications/CHiMaD_benchmark2a/customPDE.h @@ -14,7 +14,7 @@ class customPDE : public MatrixFreePDE setInitialCondition(const dealii::Point &p, const unsigned int index, double &scalar_IC, - dealii::Vector &vector_IC); + dealii::Vector &vector_IC) override; // Function to set the non-uniform Dirichlet boundary conditions (in // ICs_and_BCs.h) @@ -24,7 +24,7 @@ class customPDE : public MatrixFreePDE const unsigned int direction, const double time, double &scalar_BC, - dealii::Vector &vector_BC); + dealii::Vector &vector_BC) override; private: #include "../../include/typeDefs.h" @@ -36,20 +36,20 @@ class customPDE : public MatrixFreePDE void explicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the RHS of the governing equations for all other equations // (in equations.h) void nonExplicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the LHS of the governing equations (in equations.h) void equationLHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set postprocessing expressions (in postprocess.h) #ifdef POSTPROCESS_FILE_EXISTS @@ -57,13 +57,14 @@ class customPDE : public MatrixFreePDE postProcessedFields( const variableContainer> &variable_list, variableContainer> &pp_variable_list, - const dealii::Point> q_point_loc) const; + const dealii::Point> q_point_loc) const override; #endif // Function to set the nucleation probability (in nucleation.h) #ifdef NUCLEATION_FILE_EXISTS double - getNucleationProbability(variableValueContainer variable_value, double dV) const; + getNucleationProbability(variableValueContainer variable_value, + double dV) const override; #endif // ================================================================ diff --git a/applications/CHiMaD_benchmark3/customPDE.h b/applications/CHiMaD_benchmark3/customPDE.h index 8509dc1df..eb0b135b5 100644 --- a/applications/CHiMaD_benchmark3/customPDE.h +++ b/applications/CHiMaD_benchmark3/customPDE.h @@ -14,7 +14,7 @@ class customPDE : public MatrixFreePDE setInitialCondition(const dealii::Point &p, const unsigned int index, double &scalar_IC, - dealii::Vector &vector_IC); + dealii::Vector &vector_IC) override; // Function to set the non-uniform Dirichlet boundary conditions (in // ICs_and_BCs.h) @@ -24,7 +24,7 @@ class customPDE : public MatrixFreePDE const unsigned int direction, const double time, double &scalar_BC, - dealii::Vector &vector_BC); + dealii::Vector &vector_BC) override; private: #include "../../include/typeDefs.h" @@ -36,20 +36,20 @@ class customPDE : public MatrixFreePDE void explicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the RHS of the governing equations for all other equations // (in equations.h) void nonExplicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the LHS of the governing equations (in equations.h) void equationLHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set postprocessing expressions (in postprocess.h) #ifdef POSTPROCESS_FILE_EXISTS @@ -57,13 +57,14 @@ class customPDE : public MatrixFreePDE postProcessedFields( const variableContainer> &variable_list, variableContainer> &pp_variable_list, - const dealii::Point> q_point_loc) const; + const dealii::Point> q_point_loc) const override; #endif // Function to set the nucleation probability (in nucleation.h) #ifdef NUCLEATION_FILE_EXISTS double - getNucleationProbability(variableValueContainer variable_value, double dV) const; + getNucleationProbability(variableValueContainer variable_value, + double dV) const override; #endif // ================================================================ diff --git a/applications/CHiMaD_benchmark6a/customPDE.h b/applications/CHiMaD_benchmark6a/customPDE.h index 8d161107f..0d156881e 100644 --- a/applications/CHiMaD_benchmark6a/customPDE.h +++ b/applications/CHiMaD_benchmark6a/customPDE.h @@ -14,7 +14,7 @@ class customPDE : public MatrixFreePDE setInitialCondition(const dealii::Point &p, const unsigned int index, double &scalar_IC, - dealii::Vector &vector_IC); + dealii::Vector &vector_IC) override; // Function to set the non-uniform Dirichlet boundary conditions (in // ICs_and_BCs.h) @@ -24,7 +24,7 @@ class customPDE : public MatrixFreePDE const unsigned int direction, const double time, double &scalar_BC, - dealii::Vector &vector_BC); + dealii::Vector &vector_BC) override; private: #include "../../include/typeDefs.h" @@ -36,20 +36,20 @@ class customPDE : public MatrixFreePDE void explicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the RHS of the governing equations for all other equations // (in equations.h) void nonExplicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the LHS of the governing equations (in equations.h) void equationLHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set postprocessing expressions (in postprocess.h) #ifdef POSTPROCESS_FILE_EXISTS @@ -57,13 +57,14 @@ class customPDE : public MatrixFreePDE postProcessedFields( const variableContainer> &variable_list, variableContainer> &pp_variable_list, - const dealii::Point> q_point_loc) const; + const dealii::Point> q_point_loc) const override; #endif // Function to set the nucleation probability (in nucleation.h) #ifdef NUCLEATION_FILE_EXISTS double - getNucleationProbability(variableValueContainer variable_value, double dV) const; + getNucleationProbability(variableValueContainer variable_value, + double dV) const override; #endif // ================================================================ diff --git a/applications/CHiMaD_benchmark6b/customPDE.h b/applications/CHiMaD_benchmark6b/customPDE.h index 35c7e7eeb..ad5d57acf 100644 --- a/applications/CHiMaD_benchmark6b/customPDE.h +++ b/applications/CHiMaD_benchmark6b/customPDE.h @@ -14,7 +14,7 @@ class customPDE : public MatrixFreePDE setInitialCondition(const dealii::Point &p, const unsigned int index, double &scalar_IC, - dealii::Vector &vector_IC); + dealii::Vector &vector_IC) override; // Function to set the non-uniform Dirichlet boundary conditions (in // ICs_and_BCs.h) @@ -24,7 +24,7 @@ class customPDE : public MatrixFreePDE const unsigned int direction, const double time, double &scalar_BC, - dealii::Vector &vector_BC); + dealii::Vector &vector_BC) override; private: #include "../../include/typeDefs.h" @@ -36,20 +36,20 @@ class customPDE : public MatrixFreePDE void explicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the RHS of the governing equations for all other equations // (in equations.h) void nonExplicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the LHS of the governing equations (in equations.h) void equationLHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set postprocessing expressions (in postprocess.h) #ifdef POSTPROCESS_FILE_EXISTS @@ -57,13 +57,14 @@ class customPDE : public MatrixFreePDE postProcessedFields( const variableContainer> &variable_list, variableContainer> &pp_variable_list, - const dealii::Point> q_point_loc) const; + const dealii::Point> q_point_loc) const override; #endif // Function to set the nucleation probability (in nucleation.h) #ifdef NUCLEATION_FILE_EXISTS double - getNucleationProbability(variableValueContainer variable_value, double dV) const; + getNucleationProbability(variableValueContainer variable_value, + double dV) const override; #endif // ================================================================ diff --git a/applications/CHiMaD_benchmark7/customPDE.h b/applications/CHiMaD_benchmark7/customPDE.h index 4bc4913fd..9899e9078 100644 --- a/applications/CHiMaD_benchmark7/customPDE.h +++ b/applications/CHiMaD_benchmark7/customPDE.h @@ -14,7 +14,7 @@ class customPDE : public MatrixFreePDE setInitialCondition(const dealii::Point &p, const unsigned int index, double &scalar_IC, - dealii::Vector &vector_IC); + dealii::Vector &vector_IC) override; // Function to set the non-uniform Dirichlet boundary conditions (in // ICs_and_BCs.h) @@ -24,7 +24,7 @@ class customPDE : public MatrixFreePDE const unsigned int direction, const double time, double &scalar_BC, - dealii::Vector &vector_BC); + dealii::Vector &vector_BC) override; private: #include "../../include/typeDefs.h" @@ -36,20 +36,20 @@ class customPDE : public MatrixFreePDE void explicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the RHS of the governing equations for all other equations // (in equations.h) void nonExplicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the LHS of the governing equations (in equations.h) void equationLHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set postprocessing expressions (in postprocess.h) #ifdef POSTPROCESS_FILE_EXISTS @@ -57,13 +57,14 @@ class customPDE : public MatrixFreePDE postProcessedFields( const variableContainer> &variable_list, variableContainer> &pp_variable_list, - const dealii::Point> q_point_loc) const; + const dealii::Point> q_point_loc) const override; #endif // Function to set the nucleation probability (in nucleation.h) #ifdef NUCLEATION_FILE_EXISTS double - getNucleationProbability(variableValueContainer variable_value, double dV) const; + getNucleationProbability(variableValueContainer variable_value, + double dV) const override; #endif // ================================================================ // Methods specific to this subclass diff --git a/applications/MgNd_precipitate_single_Bppp/customPDE.h b/applications/MgNd_precipitate_single_Bppp/customPDE.h index f55e1a947..2d2cf2962 100644 --- a/applications/MgNd_precipitate_single_Bppp/customPDE.h +++ b/applications/MgNd_precipitate_single_Bppp/customPDE.h @@ -26,7 +26,7 @@ class customPDE : public MatrixFreePDE setInitialCondition(const dealii::Point &p, const unsigned int index, double &scalar_IC, - dealii::Vector &vector_IC); + dealii::Vector &vector_IC) override; // Function to set the non-uniform Dirichlet boundary conditions (in // ICs_and_BCs.h) @@ -36,7 +36,7 @@ class customPDE : public MatrixFreePDE const unsigned int direction, const double time, double &scalar_BC, - dealii::Vector &vector_BC); + dealii::Vector &vector_BC) override; private: #include "../../include/typeDefs.h" @@ -48,20 +48,20 @@ class customPDE : public MatrixFreePDE void explicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the RHS of the governing equations for all other equations // (in equations.h) void nonExplicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the LHS of the governing equations (in equations.h) void equationLHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set postprocessing expressions (in postprocess.h) #ifdef POSTPROCESS_FILE_EXISTS @@ -69,13 +69,14 @@ class customPDE : public MatrixFreePDE postProcessedFields( const variableContainer> &variable_list, variableContainer> &pp_variable_list, - const dealii::Point> q_point_loc) const; + const dealii::Point> q_point_loc) const override; #endif // Function to set the nucleation probability (in nucleation.h) #ifdef NUCLEATION_FILE_EXISTS double - getNucleationProbability(variableValueContainer variable_value, double dV) const; + getNucleationProbability(variableValueContainer variable_value, + double dV) const override; #endif // ================================================================ diff --git a/applications/allenCahn/customPDE.h b/applications/allenCahn/customPDE.h index 450e14e3f..1ecc75ffa 100644 --- a/applications/allenCahn/customPDE.h +++ b/applications/allenCahn/customPDE.h @@ -14,7 +14,7 @@ class customPDE : public MatrixFreePDE setInitialCondition(const dealii::Point &p, const unsigned int index, double &scalar_IC, - dealii::Vector &vector_IC); + dealii::Vector &vector_IC) override; // Function to set the non-uniform Dirichlet boundary conditions (in // ICs_and_BCs.h) @@ -24,7 +24,7 @@ class customPDE : public MatrixFreePDE const unsigned int direction, const double time, double &scalar_BC, - dealii::Vector &vector_BC); + dealii::Vector &vector_BC) override; private: #include "../../include/typeDefs.h" @@ -36,20 +36,20 @@ class customPDE : public MatrixFreePDE void explicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the RHS of the governing equations for all other equations // (in equations.cc) void nonExplicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the LHS of the governing equations (in equations.cc) void equationLHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set postprocessing expressions (in postprocess.h) #ifdef POSTPROCESS_FILE_EXISTS @@ -57,13 +57,14 @@ class customPDE : public MatrixFreePDE postProcessedFields( const variableContainer> &variable_list, variableContainer> &pp_variable_list, - const dealii::Point> q_point_loc) const; + const dealii::Point> q_point_loc) const override; #endif // Function to set the nucleation probability (in nucleation.h) #ifdef NUCLEATION_FILE_EXISTS double - getNucleationProbability(variableValueContainer variable_value, double dV) const; + getNucleationProbability(variableValueContainer variable_value, + double dV) const override; #endif // ================================================================ diff --git a/applications/allenCahn_conserved/customPDE.h b/applications/allenCahn_conserved/customPDE.h index e029d0f59..b0d1cd842 100644 --- a/applications/allenCahn_conserved/customPDE.h +++ b/applications/allenCahn_conserved/customPDE.h @@ -14,7 +14,7 @@ class customPDE : public MatrixFreePDE setInitialCondition(const dealii::Point &p, const unsigned int index, double &scalar_IC, - dealii::Vector &vector_IC); + dealii::Vector &vector_IC) override; // Function to set the non-uniform Dirichlet boundary conditions (in // ICs_and_BCs.h) @@ -24,7 +24,7 @@ class customPDE : public MatrixFreePDE const unsigned int direction, const double time, double &scalar_BC, - dealii::Vector &vector_BC); + dealii::Vector &vector_BC) override; private: #include "../../include/typeDefs.h" @@ -36,20 +36,20 @@ class customPDE : public MatrixFreePDE void explicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the RHS of the governing equations for all other equations // (in equations.h) void nonExplicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the LHS of the governing equations (in equations.h) void equationLHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set postprocessing expressions (in postprocess.h) #ifdef POSTPROCESS_FILE_EXISTS @@ -57,13 +57,14 @@ class customPDE : public MatrixFreePDE postProcessedFields( const variableContainer> &variable_list, variableContainer> &pp_variable_list, - const dealii::Point> q_point_loc) const; + const dealii::Point> q_point_loc) const override; #endif // Function to set the nucleation probability (in nucleation.h) #ifdef NUCLEATION_FILE_EXISTS double - getNucleationProbability(variableValueContainer variable_value, double dV) const; + getNucleationProbability(variableValueContainer variable_value, + double dV) const override; #endif // ================================================================ diff --git a/applications/alloySolidification/customPDE.h b/applications/alloySolidification/customPDE.h index 0362a9733..f6db39fd0 100644 --- a/applications/alloySolidification/customPDE.h +++ b/applications/alloySolidification/customPDE.h @@ -14,7 +14,7 @@ class customPDE : public MatrixFreePDE setInitialCondition(const dealii::Point &p, const unsigned int index, double &scalar_IC, - dealii::Vector &vector_IC); + dealii::Vector &vector_IC) override; // Function to set the non-uniform Dirichlet boundary conditions (in // ICs_and_BCs.h) @@ -24,7 +24,7 @@ class customPDE : public MatrixFreePDE const unsigned int direction, const double time, double &scalar_BC, - dealii::Vector &vector_BC); + dealii::Vector &vector_BC) override; private: #include "../../include/typeDefs.h" @@ -36,20 +36,20 @@ class customPDE : public MatrixFreePDE void explicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the RHS of the governing equations for all other equations // (in equations.h) void nonExplicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the LHS of the governing equations (in equations.h) void equationLHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set postprocessing expressions (in postprocess.h) #ifdef POSTPROCESS_FILE_EXISTS @@ -57,13 +57,14 @@ class customPDE : public MatrixFreePDE postProcessedFields( const variableContainer> &variable_list, variableContainer> &pp_variable_list, - const dealii::Point> q_point_loc) const; + const dealii::Point> q_point_loc) const override; #endif // Function to set the nucleation probability (in nucleation.h) #ifdef NUCLEATION_FILE_EXISTS double - getNucleationProbability(variableValueContainer variable_value, double dV) const; + getNucleationProbability(variableValueContainer variable_value, + double dV) const override; #endif // ================================================================ diff --git a/applications/alloySolidification_uniform/customPDE.h b/applications/alloySolidification_uniform/customPDE.h index ca88d7938..1d0e51c67 100644 --- a/applications/alloySolidification_uniform/customPDE.h +++ b/applications/alloySolidification_uniform/customPDE.h @@ -14,7 +14,7 @@ class customPDE : public MatrixFreePDE setInitialCondition(const dealii::Point &p, const unsigned int index, double &scalar_IC, - dealii::Vector &vector_IC); + dealii::Vector &vector_IC) override; // Function to set the non-uniform Dirichlet boundary conditions (in // ICs_and_BCs.h) @@ -24,7 +24,7 @@ class customPDE : public MatrixFreePDE const unsigned int direction, const double time, double &scalar_BC, - dealii::Vector &vector_BC); + dealii::Vector &vector_BC) override; private: #include "../../include/typeDefs.h" @@ -36,20 +36,20 @@ class customPDE : public MatrixFreePDE void explicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the RHS of the governing equations for all other equations // (in equations.h) void nonExplicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the LHS of the governing equations (in equations.h) void equationLHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set postprocessing expressions (in postprocess.h) #ifdef POSTPROCESS_FILE_EXISTS @@ -57,13 +57,14 @@ class customPDE : public MatrixFreePDE postProcessedFields( const variableContainer> &variable_list, variableContainer> &pp_variable_list, - const dealii::Point> q_point_loc) const; + const dealii::Point> q_point_loc) const override; #endif // Function to set the nucleation probability (in nucleation.h) #ifdef NUCLEATION_FILE_EXISTS double - getNucleationProbability(variableValueContainer variable_value, double dV) const; + getNucleationProbability(variableValueContainer variable_value, + double dV) const override; #endif // ================================================================ diff --git a/applications/anisotropyFacet/customPDE.h b/applications/anisotropyFacet/customPDE.h index c27fd2086..ce332c1ca 100644 --- a/applications/anisotropyFacet/customPDE.h +++ b/applications/anisotropyFacet/customPDE.h @@ -14,7 +14,7 @@ class customPDE : public MatrixFreePDE setInitialCondition(const dealii::Point &p, const unsigned int index, double &scalar_IC, - dealii::Vector &vector_IC); + dealii::Vector &vector_IC) override; // Function to set the non-uniform Dirichlet boundary conditions (in // ICs_and_BCs.h) @@ -24,7 +24,7 @@ class customPDE : public MatrixFreePDE const unsigned int direction, const double time, double &scalar_BC, - dealii::Vector &vector_BC); + dealii::Vector &vector_BC) override; private: #include "../../include/typeDefs.h" @@ -36,20 +36,20 @@ class customPDE : public MatrixFreePDE void explicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the RHS of the governing equations for all other equations // (in equations.h) void nonExplicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the LHS of the governing equations (in equations.h) void equationLHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set postprocessing expressions (in postprocess.h) #ifdef POSTPROCESS_FILE_EXISTS @@ -57,13 +57,14 @@ class customPDE : public MatrixFreePDE postProcessedFields( const variableContainer> &variable_list, variableContainer> &pp_variable_list, - const dealii::Point> q_point_loc) const; + const dealii::Point> q_point_loc) const override; #endif // Function to set the nucleation probability (in nucleation.h) #ifdef NUCLEATION_FILE_EXISTS double - getNucleationProbability(variableValueContainer variable_value, double dV) const; + getNucleationProbability(variableValueContainer variable_value, + double dV) const override; #endif // ================================================================ diff --git a/applications/cahnHilliard/customPDE.h b/applications/cahnHilliard/customPDE.h index ed9048fc4..c783cc254 100644 --- a/applications/cahnHilliard/customPDE.h +++ b/applications/cahnHilliard/customPDE.h @@ -14,7 +14,7 @@ class customPDE : public MatrixFreePDE setInitialCondition(const dealii::Point &p, const unsigned int index, double &scalar_IC, - dealii::Vector &vector_IC); + dealii::Vector &vector_IC) override; // Function to set the non-uniform Dirichlet boundary conditions (in // ICs_and_BCs.h) @@ -24,7 +24,7 @@ class customPDE : public MatrixFreePDE const unsigned int direction, const double time, double &scalar_BC, - dealii::Vector &vector_BC); + dealii::Vector &vector_BC) override; private: #include "../../include/typeDefs.h" @@ -36,20 +36,20 @@ class customPDE : public MatrixFreePDE void explicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the RHS of the governing equations for all other equations // (in equations.h) void nonExplicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the LHS of the governing equations (in equations.h) void equationLHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set postprocessing expressions (in postprocess.h) #ifdef POSTPROCESS_FILE_EXISTS @@ -57,13 +57,14 @@ class customPDE : public MatrixFreePDE postProcessedFields( const variableContainer> &variable_list, variableContainer> &pp_variable_list, - const dealii::Point> q_point_loc) const; + const dealii::Point> q_point_loc) const override; #endif // Function to set the nucleation probability (in nucleation.h) #ifdef NUCLEATION_FILE_EXISTS double - getNucleationProbability(variableValueContainer variable_value, double dV) const; + getNucleationProbability(variableValueContainer variable_value, + double dV) const override; #endif // ================================================================ diff --git a/applications/corrosion/customPDE.h b/applications/corrosion/customPDE.h index b0ee6082c..7818dd064 100644 --- a/applications/corrosion/customPDE.h +++ b/applications/corrosion/customPDE.h @@ -14,7 +14,7 @@ class customPDE : public MatrixFreePDE setInitialCondition(const dealii::Point &p, const unsigned int index, double &scalar_IC, - dealii::Vector &vector_IC); + dealii::Vector &vector_IC) override; // Function to set the non-uniform Dirichlet boundary conditions (in // ICs_and_BCs.h) @@ -24,7 +24,7 @@ class customPDE : public MatrixFreePDE const unsigned int direction, const double time, double &scalar_BC, - dealii::Vector &vector_BC); + dealii::Vector &vector_BC) override; private: #include "../../include/typeDefs.h" @@ -36,20 +36,20 @@ class customPDE : public MatrixFreePDE void explicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the RHS of the governing equations for all other equations // (in equations.h) void nonExplicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the LHS of the governing equations (in equations.h) void equationLHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set postprocessing expressions (in postprocess.h) #ifdef POSTPROCESS_FILE_EXISTS @@ -57,13 +57,14 @@ class customPDE : public MatrixFreePDE postProcessedFields( const variableContainer> &variable_list, variableContainer> &pp_variable_list, - const dealii::Point> q_point_loc) const; + const dealii::Point> q_point_loc) const override; #endif // Function to set the nucleation probability (in nucleation.h) #ifdef NUCLEATION_FILE_EXISTS double - getNucleationProbability(variableValueContainer variable_value, double dV) const; + getNucleationProbability(variableValueContainer variable_value, + double dV) const override; #endif // ================================================================ diff --git a/applications/corrosion_microgalvanic/customPDE.h b/applications/corrosion_microgalvanic/customPDE.h index c1a6432a4..b3bdc13cf 100644 --- a/applications/corrosion_microgalvanic/customPDE.h +++ b/applications/corrosion_microgalvanic/customPDE.h @@ -17,7 +17,7 @@ class customPDE : public MatrixFreePDE setInitialCondition(const dealii::Point &p, const unsigned int index, double &scalar_IC, - dealii::Vector &vector_IC); + dealii::Vector &vector_IC) override; // Function to set the non-uniform Dirichlet // boundary conditions (in ICs_and_BCs.h) @@ -27,7 +27,7 @@ class customPDE : public MatrixFreePDE const unsigned int direction, const double time, double &scalar_BC, - dealii::Vector &vector_BC); + dealii::Vector &vector_BC) override; private: #include "../../include/typeDefs.h" @@ -40,20 +40,20 @@ class customPDE : public MatrixFreePDE void explicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the RHS of the governing equations // for all other equations (in equations.h) void nonExplicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the LHS of the governing equations (in equations.h) void equationLHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set postprocessing expressions (in postprocess.h) @@ -62,14 +62,15 @@ class customPDE : public MatrixFreePDE postProcessedFields( const variableContainer> &variable_list, variableContainer> &pp_variable_list, - const dealii::Point> q_point_loc) const; + const dealii::Point> q_point_loc) const override; #endif // Function to set the nucleation probability (in nucleation.h) // Not useful for this application #ifdef NUCLEATION_FILE_EXISTS double - getNucleationProbability(variableValueContainer variable_value, double dV) const; + getNucleationProbability(variableValueContainer variable_value, + double dV) const override; #endif // ================================================================ diff --git a/applications/coupledCahnHilliardAllenCahn/customPDE.h b/applications/coupledCahnHilliardAllenCahn/customPDE.h index d98dbc6f0..10a46802c 100644 --- a/applications/coupledCahnHilliardAllenCahn/customPDE.h +++ b/applications/coupledCahnHilliardAllenCahn/customPDE.h @@ -14,7 +14,7 @@ class customPDE : public MatrixFreePDE setInitialCondition(const dealii::Point &p, const unsigned int index, double &scalar_IC, - dealii::Vector &vector_IC); + dealii::Vector &vector_IC) override; // Function to set the non-uniform Dirichlet boundary conditions (in // ICs_and_BCs.h) @@ -24,7 +24,7 @@ class customPDE : public MatrixFreePDE const unsigned int direction, const double time, double &scalar_BC, - dealii::Vector &vector_BC); + dealii::Vector &vector_BC) override; private: #include "../../include/typeDefs.h" @@ -36,20 +36,20 @@ class customPDE : public MatrixFreePDE void explicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the RHS of the governing equations for all other equations // (in equations.h) void nonExplicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the LHS of the governing equations (in equations.h) void equationLHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set postprocessing expressions (in postprocess.h) #ifdef POSTPROCESS_FILE_EXISTS @@ -57,13 +57,14 @@ class customPDE : public MatrixFreePDE postProcessedFields( const variableContainer> &variable_list, variableContainer> &pp_variable_list, - const dealii::Point> q_point_loc) const; + const dealii::Point> q_point_loc) const override; #endif // Function to set the nucleation probability (in nucleation.h) #ifdef NUCLEATION_FILE_EXISTS double - getNucleationProbability(variableValueContainer variable_value, double dV) const; + getNucleationProbability(variableValueContainer variable_value, + double dV) const override; #endif // ================================================================ diff --git a/applications/dendriticSolidification/customPDE.h b/applications/dendriticSolidification/customPDE.h index 8509dc1df..eb0b135b5 100644 --- a/applications/dendriticSolidification/customPDE.h +++ b/applications/dendriticSolidification/customPDE.h @@ -14,7 +14,7 @@ class customPDE : public MatrixFreePDE setInitialCondition(const dealii::Point &p, const unsigned int index, double &scalar_IC, - dealii::Vector &vector_IC); + dealii::Vector &vector_IC) override; // Function to set the non-uniform Dirichlet boundary conditions (in // ICs_and_BCs.h) @@ -24,7 +24,7 @@ class customPDE : public MatrixFreePDE const unsigned int direction, const double time, double &scalar_BC, - dealii::Vector &vector_BC); + dealii::Vector &vector_BC) override; private: #include "../../include/typeDefs.h" @@ -36,20 +36,20 @@ class customPDE : public MatrixFreePDE void explicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the RHS of the governing equations for all other equations // (in equations.h) void nonExplicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the LHS of the governing equations (in equations.h) void equationLHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set postprocessing expressions (in postprocess.h) #ifdef POSTPROCESS_FILE_EXISTS @@ -57,13 +57,14 @@ class customPDE : public MatrixFreePDE postProcessedFields( const variableContainer> &variable_list, variableContainer> &pp_variable_list, - const dealii::Point> q_point_loc) const; + const dealii::Point> q_point_loc) const override; #endif // Function to set the nucleation probability (in nucleation.h) #ifdef NUCLEATION_FILE_EXISTS double - getNucleationProbability(variableValueContainer variable_value, double dV) const; + getNucleationProbability(variableValueContainer variable_value, + double dV) const override; #endif // ================================================================ diff --git a/applications/eshelbyInclusion/customPDE.h b/applications/eshelbyInclusion/customPDE.h index 568e7b41b..3f2872c50 100644 --- a/applications/eshelbyInclusion/customPDE.h +++ b/applications/eshelbyInclusion/customPDE.h @@ -14,7 +14,7 @@ class customPDE : public MatrixFreePDE setInitialCondition(const dealii::Point &p, const unsigned int index, double &scalar_IC, - dealii::Vector &vector_IC); + dealii::Vector &vector_IC) override; // Function to set the non-uniform Dirichlet boundary conditions (in // ICs_and_BCs.h) @@ -24,7 +24,7 @@ class customPDE : public MatrixFreePDE const unsigned int direction, const double time, double &scalar_BC, - dealii::Vector &vector_BC); + dealii::Vector &vector_BC) override; private: #include "../../include/typeDefs.h" @@ -36,20 +36,20 @@ class customPDE : public MatrixFreePDE void explicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the RHS of the governing equations for all other equations // (in equations.h) void nonExplicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the LHS of the governing equations (in equations.h) void equationLHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set postprocessing expressions (in postprocess.h) #ifdef POSTPROCESS_FILE_EXISTS @@ -57,13 +57,14 @@ class customPDE : public MatrixFreePDE postProcessedFields( const variableContainer> &variable_list, variableContainer> &pp_variable_list, - const dealii::Point> q_point_loc) const; + const dealii::Point> q_point_loc) const override; #endif // Function to set the nucleation probability (in nucleation.h) #ifdef NUCLEATION_FILE_EXISTS double - getNucleationProbability(variableValueContainer variable_value, double dV) const; + getNucleationProbability(variableValueContainer variable_value, + double dV) const override; #endif // ================================================================ diff --git a/applications/fickianDiffusion/customPDE.h b/applications/fickianDiffusion/customPDE.h index 7f2cfe3f7..18a924707 100644 --- a/applications/fickianDiffusion/customPDE.h +++ b/applications/fickianDiffusion/customPDE.h @@ -14,7 +14,7 @@ class customPDE : public MatrixFreePDE setInitialCondition(const dealii::Point &p, const unsigned int index, double &scalar_IC, - dealii::Vector &vector_IC); + dealii::Vector &vector_IC) override; // Function to set the non-uniform Dirichlet boundary conditions (in // ICs_and_BCs.h) @@ -24,7 +24,7 @@ class customPDE : public MatrixFreePDE const unsigned int direction, const double time, double &scalar_BC, - dealii::Vector &vector_BC); + dealii::Vector &vector_BC) override; private: #include "../../include/typeDefs.h" @@ -36,20 +36,20 @@ class customPDE : public MatrixFreePDE void explicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the RHS of the governing equations for all other equations // (in equations.h) void nonExplicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the LHS of the governing equations (in equations.h) void equationLHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set postprocessing expressions (in postprocess.h) #ifdef POSTPROCESS_FILE_EXISTS @@ -57,13 +57,14 @@ class customPDE : public MatrixFreePDE postProcessedFields( const variableContainer> &variable_list, variableContainer> &pp_variable_list, - const dealii::Point> q_point_loc) const; + const dealii::Point> q_point_loc) const override; #endif // Function to set the nucleation probability (in nucleation.h) #ifdef NUCLEATION_FILE_EXISTS double - getNucleationProbability(variableValueContainer variable_value, double dV) const; + getNucleationProbability(variableValueContainer variable_value, + double dV) const override; #endif // ================================================================ diff --git a/applications/grainGrowth/customPDE.h b/applications/grainGrowth/customPDE.h index 425587d56..4a1d07dee 100644 --- a/applications/grainGrowth/customPDE.h +++ b/applications/grainGrowth/customPDE.h @@ -14,7 +14,7 @@ class customPDE : public MatrixFreePDE setInitialCondition(const dealii::Point &p, const unsigned int index, double &scalar_IC, - dealii::Vector &vector_IC); + dealii::Vector &vector_IC) override; // Function to set the non-uniform Dirichlet boundary conditions (in // ICs_and_BCs.h) @@ -24,7 +24,7 @@ class customPDE : public MatrixFreePDE const unsigned int direction, const double time, double &scalar_BC, - dealii::Vector &vector_BC); + dealii::Vector &vector_BC) override; private: #include "../../include/typeDefs.h" @@ -36,20 +36,20 @@ class customPDE : public MatrixFreePDE void explicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the RHS of the governing equations for all other equations // (in equations.h) void nonExplicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the LHS of the governing equations (in equations.h) void equationLHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set postprocessing expressions (in postprocess.h) #ifdef POSTPROCESS_FILE_EXISTS @@ -57,13 +57,14 @@ class customPDE : public MatrixFreePDE postProcessedFields( const variableContainer> &variable_list, variableContainer> &pp_variable_list, - const dealii::Point> q_point_loc) const; + const dealii::Point> q_point_loc) const override; #endif // Function to set the nucleation probability (in nucleation.h) #ifdef NUCLEATION_FILE_EXISTS double - getNucleationProbability(variableValueContainer variable_value, double dV) const; + getNucleationProbability(variableValueContainer variable_value, + double dV) const override; #endif // ================================================================ diff --git a/applications/grainGrowth_dream3d/customPDE.h b/applications/grainGrowth_dream3d/customPDE.h index 425587d56..4a1d07dee 100644 --- a/applications/grainGrowth_dream3d/customPDE.h +++ b/applications/grainGrowth_dream3d/customPDE.h @@ -14,7 +14,7 @@ class customPDE : public MatrixFreePDE setInitialCondition(const dealii::Point &p, const unsigned int index, double &scalar_IC, - dealii::Vector &vector_IC); + dealii::Vector &vector_IC) override; // Function to set the non-uniform Dirichlet boundary conditions (in // ICs_and_BCs.h) @@ -24,7 +24,7 @@ class customPDE : public MatrixFreePDE const unsigned int direction, const double time, double &scalar_BC, - dealii::Vector &vector_BC); + dealii::Vector &vector_BC) override; private: #include "../../include/typeDefs.h" @@ -36,20 +36,20 @@ class customPDE : public MatrixFreePDE void explicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the RHS of the governing equations for all other equations // (in equations.h) void nonExplicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the LHS of the governing equations (in equations.h) void equationLHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set postprocessing expressions (in postprocess.h) #ifdef POSTPROCESS_FILE_EXISTS @@ -57,13 +57,14 @@ class customPDE : public MatrixFreePDE postProcessedFields( const variableContainer> &variable_list, variableContainer> &pp_variable_list, - const dealii::Point> q_point_loc) const; + const dealii::Point> q_point_loc) const override; #endif // Function to set the nucleation probability (in nucleation.h) #ifdef NUCLEATION_FILE_EXISTS double - getNucleationProbability(variableValueContainer variable_value, double dV) const; + getNucleationProbability(variableValueContainer variable_value, + double dV) const override; #endif // ================================================================ diff --git a/applications/mechanics/customPDE.h b/applications/mechanics/customPDE.h index 568e7b41b..3f2872c50 100644 --- a/applications/mechanics/customPDE.h +++ b/applications/mechanics/customPDE.h @@ -14,7 +14,7 @@ class customPDE : public MatrixFreePDE setInitialCondition(const dealii::Point &p, const unsigned int index, double &scalar_IC, - dealii::Vector &vector_IC); + dealii::Vector &vector_IC) override; // Function to set the non-uniform Dirichlet boundary conditions (in // ICs_and_BCs.h) @@ -24,7 +24,7 @@ class customPDE : public MatrixFreePDE const unsigned int direction, const double time, double &scalar_BC, - dealii::Vector &vector_BC); + dealii::Vector &vector_BC) override; private: #include "../../include/typeDefs.h" @@ -36,20 +36,20 @@ class customPDE : public MatrixFreePDE void explicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the RHS of the governing equations for all other equations // (in equations.h) void nonExplicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the LHS of the governing equations (in equations.h) void equationLHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set postprocessing expressions (in postprocess.h) #ifdef POSTPROCESS_FILE_EXISTS @@ -57,13 +57,14 @@ class customPDE : public MatrixFreePDE postProcessedFields( const variableContainer> &variable_list, variableContainer> &pp_variable_list, - const dealii::Point> q_point_loc) const; + const dealii::Point> q_point_loc) const override; #endif // Function to set the nucleation probability (in nucleation.h) #ifdef NUCLEATION_FILE_EXISTS double - getNucleationProbability(variableValueContainer variable_value, double dV) const; + getNucleationProbability(variableValueContainer variable_value, + double dV) const override; #endif // ================================================================ diff --git a/applications/nucleationModel/customPDE.h b/applications/nucleationModel/customPDE.h index 1dd80daef..2591b3ba8 100644 --- a/applications/nucleationModel/customPDE.h +++ b/applications/nucleationModel/customPDE.h @@ -13,7 +13,7 @@ class customPDE : public MatrixFreePDE setInitialCondition(const dealii::Point &p, const unsigned int index, double &scalar_IC, - dealii::Vector &vector_IC); + dealii::Vector &vector_IC) override; // Function to set the non-uniform Dirichlet boundary conditions (in // ICs_and_BCs.h) @@ -23,7 +23,7 @@ class customPDE : public MatrixFreePDE const unsigned int direction, const double time, double &scalar_BC, - dealii::Vector &vector_BC); + dealii::Vector &vector_BC) override; private: #include "../../include/typeDefs.h" @@ -35,20 +35,20 @@ class customPDE : public MatrixFreePDE void explicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the RHS of the governing equations for all other equations // (in equations.h) void nonExplicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the LHS of the governing equations (in equations.h) void equationLHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set postprocessing expressions (in postprocess.h) #ifdef POSTPROCESS_FILE_EXISTS @@ -56,7 +56,7 @@ class customPDE : public MatrixFreePDE postProcessedFields( const variableContainer> &variable_list, variableContainer> &pp_variable_list, - const dealii::Point> q_point_loc) const; + const dealii::Point> q_point_loc) const override; #endif // Virtual method in MatrixFreePDE that we override if we need nucleation @@ -65,7 +65,7 @@ class customPDE : public MatrixFreePDE getNucleationProbability(variableValueContainer variable_value, double dV, dealii::Point p, - unsigned int variable_index) const; + unsigned int variable_index) const override; #endif // ================================================================ diff --git a/applications/nucleationModel_preferential/customPDE.h b/applications/nucleationModel_preferential/customPDE.h index 9f298e034..9ade53dd6 100644 --- a/applications/nucleationModel_preferential/customPDE.h +++ b/applications/nucleationModel_preferential/customPDE.h @@ -13,7 +13,7 @@ class customPDE : public MatrixFreePDE setInitialCondition(const dealii::Point &p, const unsigned int index, double &scalar_IC, - dealii::Vector &vector_IC); + dealii::Vector &vector_IC) override; // Function to set the non-uniform Dirichlet boundary conditions (in // ICs_and_BCs.h) @@ -23,7 +23,7 @@ class customPDE : public MatrixFreePDE const unsigned int direction, const double time, double &scalar_BC, - dealii::Vector &vector_BC); + dealii::Vector &vector_BC) override; private: #include "../../include/typeDefs.h" @@ -35,20 +35,20 @@ class customPDE : public MatrixFreePDE void explicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the RHS of the governing equations for all other equations // (in equations.h) void nonExplicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the LHS of the governing equations (in equations.h) void equationLHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set postprocessing expressions (in postprocess.h) #ifdef POSTPROCESS_FILE_EXISTS @@ -56,7 +56,7 @@ class customPDE : public MatrixFreePDE postProcessedFields( const variableContainer> &variable_list, variableContainer> &pp_variable_list, - const dealii::Point> q_point_loc) const; + const dealii::Point> q_point_loc) const override; #endif // Virtual method in MatrixFreePDE that we override if we need nucleation @@ -65,7 +65,7 @@ class customPDE : public MatrixFreePDE getNucleationProbability(variableValueContainer variable_value, double dV, dealii::Point p, - unsigned int variable_index) const; + unsigned int variable_index) const override; #endif // ================================================================ diff --git a/applications/precipitateEvolution/customPDE.h b/applications/precipitateEvolution/customPDE.h index 45c4d5c97..a94b6e898 100644 --- a/applications/precipitateEvolution/customPDE.h +++ b/applications/precipitateEvolution/customPDE.h @@ -12,7 +12,7 @@ class customPDE : public MatrixFreePDE setInitialCondition(const dealii::Point &p, const unsigned int index, double &scalar_IC, - dealii::Vector &vector_IC); + dealii::Vector &vector_IC) override; // Function to set the non-uniform Dirichlet boundary conditions (in // ICs_and_BCs.h) @@ -22,7 +22,7 @@ class customPDE : public MatrixFreePDE const unsigned int direction, const double time, double &scalar_BC, - dealii::Vector &vector_BC); + dealii::Vector &vector_BC) override; private: #include "../../include/typeDefs.h" @@ -34,20 +34,20 @@ class customPDE : public MatrixFreePDE void explicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the RHS of the governing equations for all other equations // (in equations.h) void nonExplicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the LHS of the governing equations (in equations.h) void equationLHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set postprocessing expressions (in postprocess.h) #ifdef POSTPROCESS_FILE_EXISTS @@ -55,13 +55,14 @@ class customPDE : public MatrixFreePDE postProcessedFields( const variableContainer> &variable_list, variableContainer> &pp_variable_list, - const dealii::Point> q_point_loc) const; + const dealii::Point> q_point_loc) const override; #endif // Function to set the nucleation probability (in nucleation.h) #ifdef NUCLEATION_FILE_EXISTS double - getNucleationProbability(variableValueContainer variable_value, double dV) const; + getNucleationProbability(variableValueContainer variable_value, + double dV) const override; #endif // ================================================================ diff --git a/applications/precipitateEvolution_pfunction/customPDE.h b/applications/precipitateEvolution_pfunction/customPDE.h index 486e77ccc..7154a5168 100644 --- a/applications/precipitateEvolution_pfunction/customPDE.h +++ b/applications/precipitateEvolution_pfunction/customPDE.h @@ -24,7 +24,7 @@ class customPDE : public MatrixFreePDE setInitialCondition(const dealii::Point &p, const unsigned int index, double &scalar_IC, - dealii::Vector &vector_IC); + dealii::Vector &vector_IC) override; // Function to set the non-uniform Dirichlet boundary conditions (in // ICs_and_BCs.h) @@ -34,7 +34,7 @@ class customPDE : public MatrixFreePDE const unsigned int direction, const double time, double &scalar_BC, - dealii::Vector &vector_BC); + dealii::Vector &vector_BC) override; private: #include "../../include/typeDefs.h" @@ -46,20 +46,20 @@ class customPDE : public MatrixFreePDE void explicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the RHS of the governing equations for all other equations // (in equations.h) void nonExplicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the LHS of the governing equations (in equations.h) void equationLHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set postprocessing expressions (in postprocess.h) #ifdef POSTPROCESS_FILE_EXISTS @@ -67,13 +67,14 @@ class customPDE : public MatrixFreePDE postProcessedFields( const variableContainer> &variable_list, variableContainer> &pp_variable_list, - const dealii::Point> q_point_loc) const; + const dealii::Point> q_point_loc) const override; #endif // Function to set the nucleation probability (in nucleation.h) #ifdef NUCLEATION_FILE_EXISTS double - getNucleationProbability(variableValueContainer variable_value, double dV) const; + getNucleationProbability(variableValueContainer variable_value, + double dV) const override; #endif // ================================================================ diff --git a/applications/spinodalDecomposition/customPDE.h b/applications/spinodalDecomposition/customPDE.h index eb84b8ff2..8a6fb55f2 100644 --- a/applications/spinodalDecomposition/customPDE.h +++ b/applications/spinodalDecomposition/customPDE.h @@ -23,7 +23,7 @@ class customPDE : public MatrixFreePDE setInitialCondition(const dealii::Point &p, const unsigned int index, double &scalar_IC, - dealii::Vector &vector_IC); + dealii::Vector &vector_IC) override; // Function to set the non-uniform Dirichlet boundary conditions (in // ICs_and_BCs.h) @@ -33,7 +33,7 @@ class customPDE : public MatrixFreePDE const unsigned int direction, const double time, double &scalar_BC, - dealii::Vector &vector_BC); + dealii::Vector &vector_BC) override; typedef std::mt19937_64 engine; typedef std::uniform_real_distribution distribution; @@ -48,20 +48,20 @@ class customPDE : public MatrixFreePDE void explicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the RHS of the governing equations for all other equations // (in equations.h) void nonExplicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the LHS of the governing equations (in equations.h) void equationLHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set postprocessing expressions (in postprocess.h) #ifdef POSTPROCESS_FILE_EXISTS @@ -69,13 +69,14 @@ class customPDE : public MatrixFreePDE postProcessedFields( const variableContainer> &variable_list, variableContainer> &pp_variable_list, - const dealii::Point> q_point_loc) const; + const dealii::Point> q_point_loc) const override; #endif // Function to set the nucleation probability (in nucleation.h) #ifdef NUCLEATION_FILE_EXISTS double - getNucleationProbability(variableValueContainer variable_value, double dV) const; + getNucleationProbability(variableValueContainer variable_value, + double dV) const override; #endif // ================================================================ diff --git a/applications/steadyStateAllenCahn/customPDE.h b/applications/steadyStateAllenCahn/customPDE.h index 29592f466..e71f4bf56 100644 --- a/applications/steadyStateAllenCahn/customPDE.h +++ b/applications/steadyStateAllenCahn/customPDE.h @@ -14,7 +14,7 @@ class customPDE : public MatrixFreePDE setInitialCondition(const dealii::Point &p, const unsigned int index, double &scalar_IC, - dealii::Vector &vector_IC); + dealii::Vector &vector_IC) override; // Function to set the non-uniform Dirichlet boundary conditions (in // ICs_and_BCs.h) @@ -24,7 +24,7 @@ class customPDE : public MatrixFreePDE const unsigned int direction, const double time, double &scalar_BC, - dealii::Vector &vector_BC); + dealii::Vector &vector_BC) override; private: #include "../../include/typeDefs.h" @@ -36,20 +36,20 @@ class customPDE : public MatrixFreePDE void explicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the RHS of the governing equations for all other equations // (in equations.h) void nonExplicitEquationRHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set the LHS of the governing equations (in equations.h) void equationLHS( variableContainer> &variable_list, - dealii::Point> q_point_loc) const; + dealii::Point> q_point_loc) const override; // Function to set postprocessing expressions (in postprocess.h) #ifdef POSTPROCESS_FILE_EXISTS @@ -57,13 +57,14 @@ class customPDE : public MatrixFreePDE postProcessedFields( const variableContainer> &variable_list, variableContainer> &pp_variable_list, - const dealii::Point> q_point_loc) const; + const dealii::Point> q_point_loc) const override; #endif // Function to set the nucleation probability (in nucleation.h) #ifdef NUCLEATION_FILE_EXISTS double - getNucleationProbability(variableValueContainer variable_value, double dV) const; + getNucleationProbability(variableValueContainer variable_value, + double dV) const override; #endif // ================================================================ From ed9694e6d5a63c0dd8ca513af0ae00ec3211aba3 Mon Sep 17 00:00:00 2001 From: landinjm Date: Tue, 10 Sep 2024 13:57:16 -0400 Subject: [PATCH 10/10] unused variable --- applications/precipitateEvolution/postprocess.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/applications/precipitateEvolution/postprocess.cc b/applications/precipitateEvolution/postprocess.cc index 727a498b7..368e82657 100644 --- a/applications/precipitateEvolution/postprocess.cc +++ b/applications/precipitateEvolution/postprocess.cc @@ -39,8 +39,7 @@ customPDE::postProcessedFields( // --- Getting the values and derivatives of the model variables --- // The concentration and its derivatives - scalarvalueType c = variable_list.get_scalar_value(0); - scalargradType cx = variable_list.get_scalar_gradient(0); + scalarvalueType c = variable_list.get_scalar_value(0); // The first order parameter and its derivatives scalarvalueType n1 = variable_list.get_scalar_value(1);