From 4749172737a856b4e9591c55a7cbaded639c193e Mon Sep 17 00:00:00 2001 From: Weixiong Zheng Date: Wed, 26 Jul 2017 12:38:57 -0700 Subject: [PATCH] Tiding TransportBase #10 --- src/common/bart_driver.cc | 17 ++--------------- src/transport/transport_base.cc | 4 +++- src/transport/transport_base.h | 3 +++ 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/common/bart_driver.cc b/src/common/bart_driver.cc index b9dc377a2..462ee5032 100644 --- a/src/common/bart_driver.cc +++ b/src/common/bart_driver.cc @@ -43,7 +43,8 @@ pcout(std::cout, (Utilities::MPI::this_mpi_process(mpi_communicator) == 0)) { - initialize_aq (prm); + 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 (); @@ -58,20 +59,6 @@ BartDriver::~BartDriver () dof_handler.clear(); } -template -void BartDriver::process_input () -{ - // from angular quadrature data - -} - -template -void BartDriver::initialize_aq (ParameterHandler &prm) -{ - aqd_ptr = build_aq_model (prm) - aqd_ptr->make_aq (prm); -} - template void BartDriver::report_system () { diff --git a/src/transport/transport_base.cc b/src/transport/transport_base.cc index 16a0ee81e..7ec81cdfb 100644 --- a/src/transport/transport_base.cc +++ b/src/transport/transport_base.cc @@ -139,7 +139,9 @@ void TransportBase::assemble_ho_system () } template -void TransportBase::initialize_assembly_related_objects () +void TransportBase::initialize_assembly_related_objects +(DoFHandler &dof_handler, + FE_Poly,dim,dim>* fe) { // we need to input ptr to fe, dof_handler diff --git a/src/transport/transport_base.h b/src/transport/transport_base.h index b86841436..9f48cfe9e 100644 --- a/src/transport/transport_base.h +++ b/src/transport/transport_base.h @@ -123,6 +123,9 @@ class TransportBase void scale_fiss_transfer_matrices (); void renormalize_sflx (std::vector &target_sflxes); void initialize_aq (ParameterHandler &prm); + void initialize_assembly_related_objects + (DoFHandler &dof_handler, + FE_Poly,dim,dim>* fe); double estimate_k (double &fiss_source, double &fiss_source_prev_gen,