Delete redundant function arguments after data structure change Slayb…

…aughLab#10
wzheng21 · Sep 2, 2017 · 6a655db · 6a655db
1 parent c697ce7
commit 6a655db
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/src/transport/equation_base.cc b/src/transport/equation_base.cc
@@ -169,8 +169,7 @@ void EquationBase<dim>::initialize_assembly_related_objects
 template <int dim>
 void EquationBase<dim>::assemble_system
 (std::vector<typename DoFHandler<dim>::active_cell_iterator> &local_cells,
- std::vector<bool> &is_cell_at_bd,
- std::vector<PETScWrappers::MPI::SparseMatrix*> &sys_mats)
+ std::vector<bool> &is_cell_at_bd)
 {
   radio ("Assemble volumetric bilinear forms");
   assemble_volume_boundary_bilinear_form (local_cells, is_cell_at_bd);

diff --git a/src/transport/equation_base.h b/src/transport/equation_base.h
@@ -62,18 +62,15 @@ class EquationBase
 
   virtual void assemble_bilinear_form
   (std::vector<typename DoFHandler<dim>::active_cell_iterator> &local_cells,
-   std::vector<bool> &is_cell_at_bd,
-   std::vector<PETScWrappers::MPI::SparseMatrix*> &sys_mats);
+   std::vector<bool> &is_cell_at_bd);
 
   virtual void assemble_volume_boundary_bilinear_form
   (std::vector<typename DoFHandler<dim>::active_cell_iterator> &local_cells,
-   std::vector<bool> &is_cell_at_bd,
-   std::vector<PETScWrappers::MPI::SparseMatrix*> &sys_mats);
+   std::vector<bool> &is_cell_at_bd);
 
   virtual void assemble_interface_bilinear_form
   (std::vector<typename DoFHandler<dim>::active_cell_iterator> &local_cells,
-   std::vector<bool> &is_cell_at_bd,
-   std::vector<PETScWrappers::MPI::SparseMatrix*> &sys_mats);
+   std::vector<bool> &is_cell_at_bd);
 
   virtual void pre_assemble_cell_matrices
   (typename DoFHandler<dim>::active_cell_iterator &cell,

diff --git a/src/transport/even_parity.cc b/src/transport/even_parity.cc
@@ -2,13 +2,16 @@
 
 template <int dim>
 EvenParity<dim>::EvenParity
-(ParameterHandler &prm,
+(std::string equation_name,
+ ParameterHandler &prm,
  const std_cxx11::shared_ptr<MeshGenerator<dim> > msh_ptr,
  const std_cxx11::shared_ptr<AQBase<dim> > aqd_ptr,
  const std_cxx11::shared_ptr<MaterialProperties> mat_ptr)
 :
-EquationBase<dim>(prm, msh_ptr, aqd_ptr, mat_ptr)
+EquationBase<dim>(equation_name, prm, msh_ptr, aqd_ptr, mat_ptr)
 {
+  AssertThrow(equation_name=="ep",
+              ExcMessage("equation built incorrectly"));
   if (this->discretization=="dfem")
   {
     for (unsigned int i=0; i<this->n_dir; ++i)

diff --git a/src/transport/even_parity.h b/src/transport/even_parity.h
@@ -7,7 +7,8 @@ template<int dim>
 class EvenParity : public EquationBase<dim>
 {
 public:
-  EvenParity (ParameterHandler &prm,
+  EvenParity (std::string equation_name,
+              ParameterHandler &prm,
               const std_cxx11::shared_ptr<MeshGenerator<dim> > msh_ptr,
               const std_cxx11::shared_ptr<AQBase<dim> > aqd_ptr,
               const std_cxx11::shared_ptr<MaterialProperties> mat_ptr);