Skip to content

Commit

Permalink
Merge pull request prisms-center#235 from landinjm/fix_warnings
Browse files Browse the repository at this point in the history
Fixed warnings & EquationDependencyParser logic
  • Loading branch information
landinjm authored Sep 10, 2024
2 parents b6ae462 + ed9694e commit 9bfe086
Show file tree
Hide file tree
Showing 50 changed files with 415 additions and 404 deletions.
15 changes: 8 additions & 7 deletions applications/CHAC_anisotropy/customPDE.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class customPDE : public MatrixFreePDE<dim, degree>
setInitialCondition(const dealii::Point<dim> &p,
const unsigned int index,
double &scalar_IC,
dealii::Vector<double> &vector_IC);
dealii::Vector<double> &vector_IC) override;

// Function to set the non-uniform Dirichlet boundary conditions (in
// ICs_and_BCs.h)
Expand All @@ -24,7 +24,7 @@ class customPDE : public MatrixFreePDE<dim, degree>
const unsigned int direction,
const double time,
double &scalar_BC,
dealii::Vector<double> &vector_BC);
dealii::Vector<double> &vector_BC) override;

private:
#include "../../include/typeDefs.h"
Expand All @@ -36,34 +36,35 @@ class customPDE : public MatrixFreePDE<dim, degree>
void
explicitEquationRHS(
variableContainer<dim, degree, dealii::VectorizedArray<double>> &variable_list,
dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const;
dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const override;

// Function to set the RHS of the governing equations for all other equations
// (in equations.h)
void
nonExplicitEquationRHS(
variableContainer<dim, degree, dealii::VectorizedArray<double>> &variable_list,
dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const;
dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const override;

// Function to set the LHS of the governing equations (in equations.h)
void
equationLHS(
variableContainer<dim, degree, dealii::VectorizedArray<double>> &variable_list,
dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const;
dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const override;

// Function to set postprocessing expressions (in postprocess.h)
#ifdef POSTPROCESS_FILE_EXISTS
void
postProcessedFields(
const variableContainer<dim, degree, dealii::VectorizedArray<double>> &variable_list,
variableContainer<dim, degree, dealii::VectorizedArray<double>> &pp_variable_list,
const dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const;
const dealii::Point<dim, dealii::VectorizedArray<double>> 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

// ================================================================
Expand Down
15 changes: 8 additions & 7 deletions applications/CHAC_anisotropyRegularized/customPDE.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class customPDE : public MatrixFreePDE<dim, degree>
setInitialCondition(const dealii::Point<dim> &p,
const unsigned int index,
double &scalar_IC,
dealii::Vector<double> &vector_IC);
dealii::Vector<double> &vector_IC) override;

// Function to set the non-uniform Dirichlet boundary conditions (in
// ICs_and_BCs.h)
Expand All @@ -24,7 +24,7 @@ class customPDE : public MatrixFreePDE<dim, degree>
const unsigned int direction,
const double time,
double &scalar_BC,
dealii::Vector<double> &vector_BC);
dealii::Vector<double> &vector_BC) override;

private:
#include "../../include/typeDefs.h"
Expand All @@ -36,34 +36,35 @@ class customPDE : public MatrixFreePDE<dim, degree>
void
explicitEquationRHS(
variableContainer<dim, degree, dealii::VectorizedArray<double>> &variable_list,
dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const;
dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const override;

// Function to set the RHS of the governing equations for all other equations
// (in equations.h)
void
nonExplicitEquationRHS(
variableContainer<dim, degree, dealii::VectorizedArray<double>> &variable_list,
dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const;
dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const override;

// Function to set the LHS of the governing equations (in equations.h)
void
equationLHS(
variableContainer<dim, degree, dealii::VectorizedArray<double>> &variable_list,
dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const;
dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const override;

// Function to set postprocessing expressions (in postprocess.h)
#ifdef POSTPROCESS_FILE_EXISTS
void
postProcessedFields(
const variableContainer<dim, degree, dealii::VectorizedArray<double>> &variable_list,
variableContainer<dim, degree, dealii::VectorizedArray<double>> &pp_variable_list,
const dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const;
const dealii::Point<dim, dealii::VectorizedArray<double>> 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

// ================================================================
Expand Down
15 changes: 8 additions & 7 deletions applications/CHAC_performance_test/customPDE.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class customPDE : public MatrixFreePDE<dim, degree>
setInitialCondition(const dealii::Point<dim> &p,
const unsigned int index,
double &scalar_IC,
dealii::Vector<double> &vector_IC);
dealii::Vector<double> &vector_IC) override;

// Function to set the non-uniform Dirichlet boundary conditions (in
// ICs_and_BCs.h)
Expand All @@ -24,7 +24,7 @@ class customPDE : public MatrixFreePDE<dim, degree>
const unsigned int direction,
const double time,
double &scalar_BC,
dealii::Vector<double> &vector_BC);
dealii::Vector<double> &vector_BC) override;

private:
#include "../../include/typeDefs.h"
Expand All @@ -36,34 +36,35 @@ class customPDE : public MatrixFreePDE<dim, degree>
void
explicitEquationRHS(
variableContainer<dim, degree, dealii::VectorizedArray<double>> &variable_list,
dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const;
dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const override;

// Function to set the RHS of the governing equations for all other equations
// (in equations.h)
void
nonExplicitEquationRHS(
variableContainer<dim, degree, dealii::VectorizedArray<double>> &variable_list,
dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const;
dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const override;

// Function to set the LHS of the governing equations (in equations.h)
void
equationLHS(
variableContainer<dim, degree, dealii::VectorizedArray<double>> &variable_list,
dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const;
dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const override;

// Function to set postprocessing expressions (in postprocess.h)
#ifdef POSTPROCESS_FILE_EXISTS
void
postProcessedFields(
const variableContainer<dim, degree, dealii::VectorizedArray<double>> &variable_list,
variableContainer<dim, degree, dealii::VectorizedArray<double>> &pp_variable_list,
const dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const;
const dealii::Point<dim, dealii::VectorizedArray<double>> 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

// ================================================================
Expand Down
15 changes: 8 additions & 7 deletions applications/CHiMaD_benchmark1a/customPDE.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class customPDE : public MatrixFreePDE<dim, degree>
setInitialCondition(const dealii::Point<dim> &p,
const unsigned int index,
double &scalar_IC,
dealii::Vector<double> &vector_IC);
dealii::Vector<double> &vector_IC) override;

// Function to set the non-uniform Dirichlet boundary conditions (in
// ICs_and_BCs.h)
Expand All @@ -24,7 +24,7 @@ class customPDE : public MatrixFreePDE<dim, degree>
const unsigned int direction,
const double time,
double &scalar_BC,
dealii::Vector<double> &vector_BC);
dealii::Vector<double> &vector_BC) override;

private:
#include "../../include/typeDefs.h"
Expand All @@ -36,34 +36,35 @@ class customPDE : public MatrixFreePDE<dim, degree>
void
explicitEquationRHS(
variableContainer<dim, degree, dealii::VectorizedArray<double>> &variable_list,
dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const;
dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const override;

// Function to set the RHS of the governing equations for all other equations
// (in equations.h)
void
nonExplicitEquationRHS(
variableContainer<dim, degree, dealii::VectorizedArray<double>> &variable_list,
dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const;
dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const override;

// Function to set the LHS of the governing equations (in equations.h)
void
equationLHS(
variableContainer<dim, degree, dealii::VectorizedArray<double>> &variable_list,
dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const;
dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const override;

// Function to set postprocessing expressions (in postprocess.h)
#ifdef POSTPROCESS_FILE_EXISTS
void
postProcessedFields(
const variableContainer<dim, degree, dealii::VectorizedArray<double>> &variable_list,
variableContainer<dim, degree, dealii::VectorizedArray<double>> &pp_variable_list,
const dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const;
const dealii::Point<dim, dealii::VectorizedArray<double>> 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

// ================================================================
Expand Down
15 changes: 8 additions & 7 deletions applications/CHiMaD_benchmark2a/customPDE.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class customPDE : public MatrixFreePDE<dim, degree>
setInitialCondition(const dealii::Point<dim> &p,
const unsigned int index,
double &scalar_IC,
dealii::Vector<double> &vector_IC);
dealii::Vector<double> &vector_IC) override;

// Function to set the non-uniform Dirichlet boundary conditions (in
// ICs_and_BCs.h)
Expand All @@ -24,7 +24,7 @@ class customPDE : public MatrixFreePDE<dim, degree>
const unsigned int direction,
const double time,
double &scalar_BC,
dealii::Vector<double> &vector_BC);
dealii::Vector<double> &vector_BC) override;

private:
#include "../../include/typeDefs.h"
Expand All @@ -36,34 +36,35 @@ class customPDE : public MatrixFreePDE<dim, degree>
void
explicitEquationRHS(
variableContainer<dim, degree, dealii::VectorizedArray<double>> &variable_list,
dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const;
dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const override;

// Function to set the RHS of the governing equations for all other equations
// (in equations.h)
void
nonExplicitEquationRHS(
variableContainer<dim, degree, dealii::VectorizedArray<double>> &variable_list,
dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const;
dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const override;

// Function to set the LHS of the governing equations (in equations.h)
void
equationLHS(
variableContainer<dim, degree, dealii::VectorizedArray<double>> &variable_list,
dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const;
dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const override;

// Function to set postprocessing expressions (in postprocess.h)
#ifdef POSTPROCESS_FILE_EXISTS
void
postProcessedFields(
const variableContainer<dim, degree, dealii::VectorizedArray<double>> &variable_list,
variableContainer<dim, degree, dealii::VectorizedArray<double>> &pp_variable_list,
const dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const;
const dealii::Point<dim, dealii::VectorizedArray<double>> 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

// ================================================================
Expand Down
15 changes: 8 additions & 7 deletions applications/CHiMaD_benchmark3/customPDE.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class customPDE : public MatrixFreePDE<dim, degree>
setInitialCondition(const dealii::Point<dim> &p,
const unsigned int index,
double &scalar_IC,
dealii::Vector<double> &vector_IC);
dealii::Vector<double> &vector_IC) override;

// Function to set the non-uniform Dirichlet boundary conditions (in
// ICs_and_BCs.h)
Expand All @@ -24,7 +24,7 @@ class customPDE : public MatrixFreePDE<dim, degree>
const unsigned int direction,
const double time,
double &scalar_BC,
dealii::Vector<double> &vector_BC);
dealii::Vector<double> &vector_BC) override;

private:
#include "../../include/typeDefs.h"
Expand All @@ -36,34 +36,35 @@ class customPDE : public MatrixFreePDE<dim, degree>
void
explicitEquationRHS(
variableContainer<dim, degree, dealii::VectorizedArray<double>> &variable_list,
dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const;
dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const override;

// Function to set the RHS of the governing equations for all other equations
// (in equations.h)
void
nonExplicitEquationRHS(
variableContainer<dim, degree, dealii::VectorizedArray<double>> &variable_list,
dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const;
dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const override;

// Function to set the LHS of the governing equations (in equations.h)
void
equationLHS(
variableContainer<dim, degree, dealii::VectorizedArray<double>> &variable_list,
dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const;
dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const override;

// Function to set postprocessing expressions (in postprocess.h)
#ifdef POSTPROCESS_FILE_EXISTS
void
postProcessedFields(
const variableContainer<dim, degree, dealii::VectorizedArray<double>> &variable_list,
variableContainer<dim, degree, dealii::VectorizedArray<double>> &pp_variable_list,
const dealii::Point<dim, dealii::VectorizedArray<double>> q_point_loc) const;
const dealii::Point<dim, dealii::VectorizedArray<double>> 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

// ================================================================
Expand Down
Loading

0 comments on commit 9bfe086

Please sign in to comment.