user-facing equations.cc

prisms-center · Jan 16, 2025 · 01989d4 · 01989d4
1 parent f648b24
commit 01989d4
Show file tree

Hide file tree

Showing 22 changed files with 116 additions and 357 deletions.
diff --git a/applications/multigrid_test/CMakeLists.txt b/applications/multigrid_test/CMakeLists.txt
@@ -133,7 +133,7 @@ include_directories(${CMAKE_SOURCE_DIR}/../../src)
 include_directories(${CMAKE_SOURCE_DIR})
 
 # Set the location of the main.cc file
-set(TARGET_SRC "${CMAKE_SOURCE_DIR}/main.cc")
+set(TARGET_SRC "${CMAKE_SOURCE_DIR}/main.cc" "${CMAKE_SOURCE_DIR}/equations.cc")
 
 # Check if there has been updates to main library
 set(dir ${PROJECT_SOURCE_DIR}/../..)

diff --git a/applications/multigrid_test/custom_PDE.h b/applications/multigrid_test/custom_PDE.h
@@ -1,3 +1,6 @@
+#ifndef CUSTOM_PDE_H_
+#define CUSTOM_PDE_H_
+
 #include <core/matrix_free_operator.h>
 
 using namespace dealii;
@@ -51,29 +54,4 @@ class customPDE : public matrixFreeOperator<dim, degree, number>
                             &q_point_loc) const override;
 };
 
-template <int dim, int degree, typename number>
-void
-customPDE<dim, degree, number>::compute_explicit_RHS(
-  variableContainer<dim, degree, number>    &variable_list,
-  const Point<dim, VectorizedArray<number>> &q_point_loc) const
-{}
-
-template <int dim, int degree, typename number>
-void
-customPDE<dim, degree, number>::compute_nonexplicit_RHS(
-  variableContainer<dim, degree, number>    &variable_list,
-  const Point<dim, VectorizedArray<number>> &q_point_loc) const
-{
-  scalarGrad phi = variable_list.get_scalar_gradient(0);
-
-  scalarValue coefficient = 1.0 / (0.05 + 2.0 * q_point_loc.square());
-
-  variable_list.set_scalar_gradient_term(0, phi * coefficient);
-}
-
-template <int dim, int degree, typename number>
-void
-customPDE<dim, degree, number>::compute_nonexplicit_LHS(
-  variableContainer<dim, degree, number>    &variable_list,
-  const Point<dim, VectorizedArray<number>> &q_point_loc) const
-{}
+#endif
diff --git a/applications/multigrid_test/equations.cc b/applications/multigrid_test/equations.cc
@@ -0,0 +1,32 @@
+#include "custom_PDE.h"
+
+#include <config.h>
+
+template <int dim, int degree, typename number>
+void
+customPDE<dim, degree, number>::compute_explicit_RHS(
+  variableContainer<dim, degree, number>    &variable_list,
+  const Point<dim, VectorizedArray<number>> &q_point_loc) const
+{}
+
+template <int dim, int degree, typename number>
+void
+customPDE<dim, degree, number>::compute_nonexplicit_RHS(
+  variableContainer<dim, degree, number>    &variable_list,
+  const Point<dim, VectorizedArray<number>> &q_point_loc) const
+{
+  scalarGrad phi = variable_list.get_scalar_gradient(0);
+
+  scalarValue coefficient = 1.0 / (0.05 + 2.0 * q_point_loc.square());
+
+  variable_list.set_scalar_gradient_term(0, phi * coefficient);
+}
+
+template <int dim, int degree, typename number>
+void
+customPDE<dim, degree, number>::compute_nonexplicit_LHS(
+  variableContainer<dim, degree, number>    &variable_list,
+  const Point<dim, VectorizedArray<number>> &q_point_loc) const
+{}
+
+INSTANTIATE_TRI_TEMPLATE(customPDE)
diff --git a/include/config.h.in b/include/config.h.in
@@ -10,4 +10,46 @@
 
 #cmakedefine PRISMS_PF_WITH_CALIPER
 
+// Macro for template instantations with <dim, degree, number>
+#define INSTANTIATE_TRI_TEMPLATE(class_name) \
+  template class class_name<2, 1, float>;    \
+  template class class_name<2, 2, float>;    \
+  template class class_name<2, 3, float>;    \
+  template class class_name<2, 4, float>;    \
+  template class class_name<2, 5, float>;    \
+  template class class_name<2, 6, float>;    \
+  template class class_name<2, 1, double>;   \
+  template class class_name<2, 2, double>;   \
+  template class class_name<2, 3, double>;   \
+  template class class_name<2, 4, double>;   \
+  template class class_name<2, 5, double>;   \
+  template class class_name<2, 6, double>;   \
+  template class class_name<3, 1, float>;    \
+  template class class_name<3, 2, float>;    \
+  template class class_name<3, 3, float>;    \
+  template class class_name<3, 4, float>;    \
+  template class class_name<3, 5, float>;    \
+  template class class_name<3, 6, float>;    \
+  template class class_name<3, 1, double>;   \
+  template class class_name<3, 2, double>;   \
+  template class class_name<3, 3, double>;   \
+  template class class_name<3, 4, double>;   \
+  template class class_name<3, 5, double>;   \
+  template class class_name<3, 6, double>;
+
+// Macro for template instantations with <dim, degree>
+#define INSTANTIATE_BI_TEMPLATE(class_name) \
+  template class class_name<2, 1>;          \
+  template class class_name<2, 2>;          \
+  template class class_name<2, 3>;          \
+  template class class_name<2, 4>;          \
+  template class class_name<2, 5>;          \
+  template class class_name<2, 6>;          \
+  template class class_name<3, 1>;          \
+  template class class_name<3, 2>;          \
+  template class class_name<3, 3>;          \
+  template class class_name<3, 4>;          \
+  template class class_name<3, 5>;          \
+  template class class_name<3, 6>;
+
 #endif
diff --git a/src/core/boundary_conditions/boundaryConditions.cc b/src/core/boundary_conditions/boundaryConditions.cc
@@ -1,3 +1,4 @@
+#include <config.h>
 #include <core/boundary_conditions/nonUniformDirichletBC.h>
 #include <core/boundary_conditions/varBCs.h>
 #include <core/boundary_conditions/vectorBCFunction.h>
@@ -313,20 +314,4 @@ MatrixFreePDE<dim, degree>::set_rigid_body_mode_constraints(
     }
 }
 
-template class MatrixFreePDE<2, 1>;
-template class MatrixFreePDE<3, 1>;
-
-template class MatrixFreePDE<2, 2>;
-template class MatrixFreePDE<3, 2>;
-
-template class MatrixFreePDE<3, 3>;
-template class MatrixFreePDE<2, 3>;
-
-template class MatrixFreePDE<3, 4>;
-template class MatrixFreePDE<2, 4>;
-
-template class MatrixFreePDE<3, 5>;
-template class MatrixFreePDE<2, 5>;
-
-template class MatrixFreePDE<3, 6>;
-template class MatrixFreePDE<2, 6>;
+INSTANTIATE_BI_TEMPLATE(MatrixFreePDE)
diff --git a/src/core/boundary_conditions/markBoundaries.cc b/src/core/boundary_conditions/markBoundaries.cc
@@ -1,5 +1,4 @@
-// methods to mark boundaries
-
+#include <config.h>
 #include <core/initial_conditions/initialConditions.h>
 #include <core/matrixFreePDE.h>
 
@@ -32,20 +31,4 @@ MatrixFreePDE<dim, degree>::markBoundaries(
     }
 }
 
-template class MatrixFreePDE<2, 1>;
-template class MatrixFreePDE<3, 1>;
-
-template class MatrixFreePDE<2, 2>;
-template class MatrixFreePDE<3, 2>;
-
-template class MatrixFreePDE<3, 3>;
-template class MatrixFreePDE<2, 3>;
-
-template class MatrixFreePDE<3, 4>;
-template class MatrixFreePDE<2, 4>;
-
-template class MatrixFreePDE<3, 5>;
-template class MatrixFreePDE<2, 5>;
-
-template class MatrixFreePDE<3, 6>;
-template class MatrixFreePDE<2, 6>;
+INSTANTIATE_BI_TEMPLATE(MatrixFreePDE)
diff --git a/src/core/buildFields.cc b/src/core/buildFields.cc
@@ -1,14 +1,8 @@
-/*
- * buildFields.cc
- *
- *  Created on: Feb 22, 2017
- *      Author: stephendewitt
- */
-
-// =====================================================================
+//================================================================
 // FUNCTION TO BUILD THE VECTOR OF FIELDS
 // =====================================================================
 
+#include <config.h>
 #include <core/matrixFreePDE.h>
 
 template <int dim, int degree>
@@ -22,20 +16,4 @@ MatrixFreePDE<dim, degree>::buildFields()
     }
 }
 
-template class MatrixFreePDE<2, 1>;
-template class MatrixFreePDE<3, 1>;
-
-template class MatrixFreePDE<2, 2>;
-template class MatrixFreePDE<3, 2>;
-
-template class MatrixFreePDE<3, 3>;
-template class MatrixFreePDE<2, 3>;
-
-template class MatrixFreePDE<3, 4>;
-template class MatrixFreePDE<2, 4>;
-
-template class MatrixFreePDE<3, 5>;
-template class MatrixFreePDE<2, 5>;
-
-template class MatrixFreePDE<3, 6>;
-template class MatrixFreePDE<2, 6>;
+INSTANTIATE_BI_TEMPLATE(MatrixFreePDE)
diff --git a/src/core/checkpoint.cc b/src/core/checkpoint.cc
@@ -1,6 +1,7 @@
 #include <boost/archive/binary_iarchive.hpp>
 #include <boost/archive/binary_oarchive.hpp>
 
+#include <config.h>
 #include <core/conditional_ostreams.h>
 #include <core/exceptions.h>
 #include <core/matrixFreePDE.h>
@@ -273,20 +274,4 @@ MatrixFreePDE<dim, degree>::verify_checkpoint_file_exists(const std::string &fil
     }
 }
 
-template class MatrixFreePDE<2, 1>;
-template class MatrixFreePDE<3, 1>;
-
-template class MatrixFreePDE<2, 2>;
-template class MatrixFreePDE<3, 2>;
-
-template class MatrixFreePDE<3, 3>;
-template class MatrixFreePDE<2, 3>;
-
-template class MatrixFreePDE<3, 4>;
-template class MatrixFreePDE<2, 4>;
-
-template class MatrixFreePDE<3, 5>;
-template class MatrixFreePDE<2, 5>;
-
-template class MatrixFreePDE<3, 6>;
-template class MatrixFreePDE<2, 6>;
+INSTANTIATE_BI_TEMPLATE(MatrixFreePDE)
diff --git a/src/core/init.cc b/src/core/init.cc
@@ -1,5 +1,6 @@
 #include <deal.II/grid/grid_generator.h>
 
+#include <config.h>
 #include <core/boundary_conditions/varBCs.h>
 #include <core/conditional_ostreams.h>
 #include <core/matrixFreePDE.h>
@@ -439,20 +440,4 @@ MatrixFreePDE<dim, degree>::compute_element_volume()
     }
 }
 
-template class MatrixFreePDE<2, 1>;
-template class MatrixFreePDE<3, 1>;
-
-template class MatrixFreePDE<2, 2>;
-template class MatrixFreePDE<3, 2>;
-
-template class MatrixFreePDE<3, 3>;
-template class MatrixFreePDE<2, 3>;
-
-template class MatrixFreePDE<3, 4>;
-template class MatrixFreePDE<2, 4>;
-
-template class MatrixFreePDE<3, 5>;
-template class MatrixFreePDE<2, 5>;
-
-template class MatrixFreePDE<3, 6>;
-template class MatrixFreePDE<2, 6>;
+INSTANTIATE_BI_TEMPLATE(MatrixFreePDE)
diff --git a/src/core/initial_conditions/initialConditions.cc b/src/core/initial_conditions/initialConditions.cc
@@ -1,4 +1,5 @@
 #include <cmath>
+#include <config.h>
 #include <core/conditional_ostreams.h>
 #include <core/exceptions.h>
 #include <core/initial_conditions/initialConditions.h>
@@ -434,20 +435,4 @@ MatrixFreePDE<dim, degree>::applyInitialConditions()
     }
 }
 
-template class MatrixFreePDE<2, 1>;
-template class MatrixFreePDE<3, 1>;
-
-template class MatrixFreePDE<2, 2>;
-template class MatrixFreePDE<3, 2>;
-
-template class MatrixFreePDE<3, 3>;
-template class MatrixFreePDE<2, 3>;
-
-template class MatrixFreePDE<3, 4>;
-template class MatrixFreePDE<2, 4>;
-
-template class MatrixFreePDE<3, 5>;
-template class MatrixFreePDE<2, 5>;
-
-template class MatrixFreePDE<3, 6>;
-template class MatrixFreePDE<2, 6>;
+INSTANTIATE_BI_TEMPLATE(MatrixFreePDE)
diff --git a/src/core/invM.cc b/src/core/invM.cc
@@ -1,5 +1,6 @@
 #include <deal.II/matrix_free/evaluation_flags.h>
 
+#include <config.h>
 #include <core/conditional_ostreams.h>
 #include <core/matrixFreePDE.h>
 
@@ -146,20 +147,4 @@ MatrixFreePDE<dim, degree>::computeInvM()
     << parabolicVectorFieldIndex << ")\n";
 }
 
-template class MatrixFreePDE<2, 1>;
-template class MatrixFreePDE<3, 1>;
-
-template class MatrixFreePDE<2, 2>;
-template class MatrixFreePDE<3, 2>;
-
-template class MatrixFreePDE<3, 3>;
-template class MatrixFreePDE<2, 3>;
-
-template class MatrixFreePDE<3, 4>;
-template class MatrixFreePDE<2, 4>;
-
-template class MatrixFreePDE<3, 5>;
-template class MatrixFreePDE<2, 5>;
-
-template class MatrixFreePDE<3, 6>;
-template class MatrixFreePDE<2, 6>;
+INSTANTIATE_BI_TEMPLATE(MatrixFreePDE)
diff --git a/src/core/matrixFreePDE.cc b/src/core/matrixFreePDE.cc
@@ -1,3 +1,4 @@
+#include <config.h>
 #include <core/conditional_ostreams.h>
 #include <core/matrixFreePDE.h>
 
@@ -70,20 +71,4 @@ MatrixFreePDE<dim, degree>::~MatrixFreePDE()
     }
 }
 
-template class MatrixFreePDE<2, 1>;
-template class MatrixFreePDE<3, 1>;
-
-template class MatrixFreePDE<2, 2>;
-template class MatrixFreePDE<3, 2>;
-
-template class MatrixFreePDE<3, 3>;
-template class MatrixFreePDE<2, 3>;
-
-template class MatrixFreePDE<3, 4>;
-template class MatrixFreePDE<2, 4>;
-
-template class MatrixFreePDE<3, 5>;
-template class MatrixFreePDE<2, 5>;
-
-template class MatrixFreePDE<3, 6>;
-template class MatrixFreePDE<2, 6>;
+INSTANTIATE_BI_TEMPLATE(MatrixFreePDE)