Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed warnings & EquationDependencyParser logic #235

Merged
merged 12 commits into from
Sep 10, 2024
Merged

Fixed warnings & EquationDependencyParser logic #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9e9e922
Fixes to assert in equation dependency parser
landinjm Sep 8, 2024
38d17f9
Merge remote-tracking branch 'upstream/development' into fix_warnings
landinjm Sep 8, 2024
bda8057
adding overrides
landinjm Sep 10, 2024
79aa0a2
adding more overrides
landinjm Sep 10, 2024
92d01e6
base class initialization
landinjm Sep 10, 2024
039f28a
snprintf ignore truncation
landinjm Sep 10, 2024
f731bec
missed header
landinjm Sep 10, 2024
c712104
reorder AMR class
landinjm Sep 10, 2024
eb5c59d
fixed warnings for unit tests
landinjm Sep 10, 2024
4cd31ee
Merge remote-tracking branch 'upstream/development' into fix_warnings
landinjm Sep 10, 2024
6f8b4d8
fix warnings for applications
landinjm Sep 10, 2024
ed9694e
unused variable
landinjm Sep 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions applications/CHAC_anisotropy/customPDE.h
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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