Skip to content
Snippets Groups Projects
Commit 7d76a1ad authored by Norihiro Watanabe's avatar Norihiro Watanabe
Browse files

remove "using LocalAssembler"

parent de48937f
No related branches found
No related tags found
No related merge requests found
...@@ -48,17 +48,14 @@ public: ...@@ -48,17 +48,14 @@ public:
//! @} //! @}
private: private:
using LocalAssemblerInterface =
GroundwaterFlowLocalAssemblerInterface;
using GlobalAssembler = NumLib::VectorMatrixAssembler< using GlobalAssembler = NumLib::VectorMatrixAssembler<
LocalAssemblerInterface, GroundwaterFlowLocalAssemblerInterface,
NumLib::ODESystemTag::FirstOrderImplicitQuasilinear>; NumLib::ODESystemTag::FirstOrderImplicitQuasilinear>;
using ExtrapolatorInterface = NumLib::Extrapolator< using ExtrapolatorInterface = NumLib::Extrapolator<
IntegrationPointValue, LocalAssemblerInterface>; IntegrationPointValue, GroundwaterFlowLocalAssemblerInterface>;
using ExtrapolatorImplementation = NumLib::LocalLinearLeastSquaresExtrapolator< using ExtrapolatorImplementation = NumLib::LocalLinearLeastSquaresExtrapolator<
IntegrationPointValue, LocalAssemblerInterface>; IntegrationPointValue, GroundwaterFlowLocalAssemblerInterface>;
void initializeConcreteProcess( void initializeConcreteProcess(
NumLib::LocalToGlobalIndexMap const& dof_table, NumLib::LocalToGlobalIndexMap const& dof_table,
...@@ -72,7 +69,7 @@ private: ...@@ -72,7 +69,7 @@ private:
GroundwaterFlowProcessData _process_data; GroundwaterFlowProcessData _process_data;
std::unique_ptr<GlobalAssembler> _global_assembler; std::unique_ptr<GlobalAssembler> _global_assembler;
std::vector<std::unique_ptr<LocalAssemblerInterface>> _local_assemblers; std::vector<std::unique_ptr<GroundwaterFlowLocalAssemblerInterface>> _local_assemblers;
std::unique_ptr<ExtrapolatorInterface> _extrapolator; std::unique_ptr<ExtrapolatorInterface> _extrapolator;
}; };
......
...@@ -75,17 +75,15 @@ private: ...@@ -75,17 +75,15 @@ private:
/// the #_function. /// the #_function.
unsigned const _integration_order; unsigned const _integration_order;
using LocalAssembler = LocalNeumannBcAsmDataInterface;
using GlobalAssembler = using GlobalAssembler =
NumLib::VectorMatrixAssembler< NumLib::VectorMatrixAssembler<
LocalAssembler, LocalNeumannBcAsmDataInterface,
NumLib::ODESystemTag::NeumannBC>; NumLib::ODESystemTag::NeumannBC>;
std::unique_ptr<GlobalAssembler> _global_assembler; std::unique_ptr<GlobalAssembler> _global_assembler;
/// Local assemblers for each element of #_elements. /// Local assemblers for each element of #_elements.
std::vector<std::unique_ptr<LocalAssembler>> _local_assemblers; std::vector<std::unique_ptr<LocalNeumannBcAsmDataInterface>> _local_assemblers;
}; };
......
...@@ -304,7 +304,7 @@ NumLib::IterationResult TESProcess::postIteration( ...@@ -304,7 +304,7 @@ NumLib::IterationResult TESProcess::postIteration(
std::vector<double> local_x_prev_ts_cache; std::vector<double> local_x_prev_ts_cache;
auto check_variable_bounds = [&](std::size_t id, auto check_variable_bounds = [&](std::size_t id,
LocalAssembler& loc_asm) { TESLocalAssemblerInterface& loc_asm) {
auto const r_c_indices = getRowColumnIndices_( auto const r_c_indices = getRowColumnIndices_(
id, *this->_local_to_global_index_map, indices_cache); id, *this->_local_to_global_index_map, indices_cache);
getVectorValues(x, r_c_indices, local_x_cache); getVectorValues(x, r_c_indices, local_x_cache);
......
...@@ -52,18 +52,15 @@ public: ...@@ -52,18 +52,15 @@ public:
bool isLinear() const override { return false; } bool isLinear() const override { return false; }
private: private:
using LocalAssembler =
TESLocalAssemblerInterface;
using GlobalAssembler = NumLib::VectorMatrixAssembler< using GlobalAssembler = NumLib::VectorMatrixAssembler<
LocalAssembler, TESLocalAssemblerInterface,
NumLib::ODESystemTag::FirstOrderImplicitQuasilinear>; NumLib::ODESystemTag::FirstOrderImplicitQuasilinear>;
using ExtrapolatorInterface = using ExtrapolatorInterface =
NumLib::Extrapolator<TESIntPtVariables, LocalAssembler>; NumLib::Extrapolator<TESIntPtVariables, TESLocalAssemblerInterface>;
using ExtrapolatorImplementation = using ExtrapolatorImplementation =
NumLib::LocalLinearLeastSquaresExtrapolator< NumLib::LocalLinearLeastSquaresExtrapolator<
TESIntPtVariables, LocalAssembler>; TESIntPtVariables, TESLocalAssemblerInterface>;
void initializeConcreteProcess( void initializeConcreteProcess(
NumLib::LocalToGlobalIndexMap const& dof_table, NumLib::LocalToGlobalIndexMap const& dof_table,
...@@ -89,7 +86,7 @@ private: ...@@ -89,7 +86,7 @@ private:
std::unique_ptr<GlobalVector>& result_cache); std::unique_ptr<GlobalVector>& result_cache);
std::unique_ptr<GlobalAssembler> _global_assembler; std::unique_ptr<GlobalAssembler> _global_assembler;
std::vector<std::unique_ptr<LocalAssembler>> _local_assemblers; std::vector<std::unique_ptr<TESLocalAssemblerInterface>> _local_assemblers;
AssemblyParams _assembly_params; AssemblyParams _assembly_params;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment