Changed aq and builders SlaybaughLab#10

wzheng21 · Jul 27, 2017 · c3b144b · c3b144b
1 parent 2c24803
commit c3b144b
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 64 deletions.
diff --git a/src/aqdata/aq_base.cc b/src/aqdata/aq_base.cc
@@ -14,6 +14,7 @@ n_group(prm.get_integer("number of groups")),
 n_azi(prm.get_integer("angular quadrature order")),
 have_reflective_bc(prm.get_bool("have reflective BC"))
 {
+  this->make_aq (prm);
 }
 
 template <int dim>

diff --git a/src/aqdata/aq_base.h b/src/aqdata/aq_base.h
@@ -21,8 +21,6 @@ class AQBase
   virtual void produce_angular_quad ();
   virtual void initialize_component_index ();
   void print_angular_quad ();
-
-  void make_aq (ParameterHandler &prm);
 
   unsigned int get_sn_order ();
   unsigned int get_n_dir ();
@@ -59,6 +57,7 @@ class AQBase
   reflective_direction_index;
 
 private:
+  void make_aq (ParameterHandler &prm);
   std::string produce_quadrature_name ();
   void initialize_ref_bc_index ();
 

diff --git a/src/common/bart_driver.cc b/src/common/bart_driver.cc
@@ -42,7 +42,6 @@ pcout(std::cout,
       Utilities::MPI::this_mpi_process(MPI_COMM_WORLD)==0)
 {
   aqd_ptr = build_aq_model (prm)
-  aqd_ptr->make_aq (prm);
   n_total_ho_vars = aqd_ptr->get_n_total_ho_vars ();
   n_azi = aqd_ptr->get_sn_order ();
   n_dir = aqd_ptr->get_n_dir ();

diff --git a/src/common/bart_tools.cc b/src/common/bart_tools.cc
@@ -14,9 +14,17 @@ std_cxx11::shared_ptr<MeshGenerator<dim> > build_mesh (ParameterHandler &prm)
   return mesh_class;
 }
 
+std_cxx11::shared_ptr<MaterialProperties> build_material (ParameterHandler &prm)
+{
+  std_cxx11::shared_ptr<MaterialProperties> material_class =
+  std_cxx11::shared_ptr<MaterialProperties>
+  (new MaterialProperties (prm));
+  return material_class;
+}
+
 template <int dim>
 std_cxx11::shared_ptr<IterationBase<dim> >
-build_iterative_solver (ParameterHandler &prm,
+build_transport_iteration (ParameterHandler &prm,
                         const std_cxx11::shared_ptr<MeshGenerator<dim> > msh_ptr,
                         const std_cxx11::shared_ptr<AQBase<dim> > aqd_ptr)
 {

diff --git a/src/common/bart_tools.h b/src/common/bart_tools.h
@@ -14,6 +14,8 @@ template <int dim>
 std_cxx11::shared_ptr<MeshGenerator<dim> >
 build_mesh (ParameterHandler &prm);
 
+std_cxx11::shared_ptr<MaterialProperties> build_material (ParameterHandler &prm);
+
 template <int dim>
 std_cxx11::shared_ptr<IterationBase<dim> >
 build_iterative_solver (ParameterHandler &prm,