diff --git a/ProcessLib/SmallDeformation/SmallDeformationProcess-impl.h b/ProcessLib/SmallDeformation/SmallDeformationProcess-impl.h
new file mode 100644
index 0000000000000000000000000000000000000000..63ca0f4aec4b7c231787d234f66e7d7320b0a34c
--- /dev/null
+++ b/ProcessLib/SmallDeformation/SmallDeformationProcess-impl.h
@@ -0,0 +1,198 @@
+/**
+ * \copyright
+ * Copyright (c) 2012-2017, OpenGeoSys Community (http://www.opengeosys.org)
+ * Distributed under a Modified BSD License.
+ * See accompanying file LICENSE.txt or
+ * http://www.opengeosys.org/project/license
+ *
+ */
+
+#pragma once
+
+#include <cassert>
+
+#include "ProcessLib/Process.h"
+#include "ProcessLib/SmallDeformation/CreateLocalAssemblers.h"
+
+#include "SmallDeformationFEM.h"
+
+namespace ProcessLib
+{
+namespace SmallDeformation
+{
+template <int DisplacementDim>
+SmallDeformationProcess<DisplacementDim>::SmallDeformationProcess(
+ MeshLib::Mesh& mesh,
+ std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler,
+ std::vector<std::unique_ptr<ParameterBase>> const& parameters,
+ unsigned const integration_order,
+ std::vector<std::reference_wrapper<ProcessVariable>>&& process_variables,
+ SmallDeformationProcessData<DisplacementDim>&& process_data,
+ SecondaryVariableCollection&& secondary_variables,
+ NumLib::NamedFunctionCaller&& named_function_caller)
+ : Process(mesh, std::move(jacobian_assembler), parameters,
+ integration_order, std::move(process_variables),
+ std::move(secondary_variables), std::move(named_function_caller)),
+ _process_data(std::move(process_data))
+{
+ _nodal_forces = MeshLib::getOrCreateMeshProperty<double>(
+ mesh, "NodalForces", MeshLib::MeshItemType::Node, DisplacementDim);
+}
+
+template <int DisplacementDim>
+bool SmallDeformationProcess<DisplacementDim>::isLinear() const
+{
+ return false;
+}
+
+template <int DisplacementDim>
+void SmallDeformationProcess<DisplacementDim>::initializeConcreteProcess(
+ NumLib::LocalToGlobalIndexMap const& dof_table,
+ MeshLib::Mesh const& mesh,
+ unsigned const integration_order)
+{
+ ProcessLib::SmallDeformation::createLocalAssemblers<DisplacementDim,
+ LocalAssemblerData>(
+ mesh.getDimension(), mesh.getElements(), dof_table, _local_assemblers,
+ mesh.isAxiallySymmetric(), integration_order, _process_data);
+
+ // TODO move the two data members somewhere else.
+ // for extrapolation of secondary variables
+ std::vector<MeshLib::MeshSubsets> all_mesh_subsets_single_component;
+ all_mesh_subsets_single_component.emplace_back(
+ _mesh_subset_all_nodes.get());
+ _local_to_global_index_map_single_component =
+ std::make_unique<NumLib::LocalToGlobalIndexMap>(
+ std::move(all_mesh_subsets_single_component),
+ // by location order is needed for output
+ NumLib::ComponentOrder::BY_LOCATION);
+ _nodal_forces->resize(DisplacementDim * mesh.getNumberOfNodes());
+
+ Base::_secondary_variables.addSecondaryVariable(
+ "sigma_xx", 1,
+ makeExtrapolator(
+ getExtrapolator(), _local_assemblers,
+ &SmallDeformationLocalAssemblerInterface::getIntPtSigmaXX));
+
+ Base::_secondary_variables.addSecondaryVariable(
+ "sigma_yy", 1,
+ makeExtrapolator(
+ getExtrapolator(), _local_assemblers,
+ &SmallDeformationLocalAssemblerInterface::getIntPtSigmaYY));
+
+ Base::_secondary_variables.addSecondaryVariable(
+ "sigma_zz", 1,
+ makeExtrapolator(
+ getExtrapolator(), _local_assemblers,
+ &SmallDeformationLocalAssemblerInterface::getIntPtSigmaZZ));
+
+ Base::_secondary_variables.addSecondaryVariable(
+ "sigma_xy", 1,
+ makeExtrapolator(
+ getExtrapolator(), _local_assemblers,
+ &SmallDeformationLocalAssemblerInterface::getIntPtSigmaXY));
+
+ if (DisplacementDim == 3)
+ {
+ Base::_secondary_variables.addSecondaryVariable(
+ "sigma_xz", 1,
+ makeExtrapolator(
+ getExtrapolator(), _local_assemblers,
+ &SmallDeformationLocalAssemblerInterface::getIntPtSigmaXZ));
+
+ Base::_secondary_variables.addSecondaryVariable(
+ "sigma_yz", 1,
+ makeExtrapolator(
+ getExtrapolator(), _local_assemblers,
+ &SmallDeformationLocalAssemblerInterface::getIntPtSigmaYZ));
+ }
+
+ Base::_secondary_variables.addSecondaryVariable(
+ "epsilon_xx", 1,
+ makeExtrapolator(
+ getExtrapolator(), _local_assemblers,
+ &SmallDeformationLocalAssemblerInterface::getIntPtEpsilonXX));
+
+ Base::_secondary_variables.addSecondaryVariable(
+ "epsilon_yy", 1,
+ makeExtrapolator(
+ getExtrapolator(), _local_assemblers,
+ &SmallDeformationLocalAssemblerInterface::getIntPtEpsilonYY));
+
+ Base::_secondary_variables.addSecondaryVariable(
+ "epsilon_zz", 1,
+ makeExtrapolator(
+ getExtrapolator(), _local_assemblers,
+ &SmallDeformationLocalAssemblerInterface::getIntPtEpsilonZZ));
+
+ Base::_secondary_variables.addSecondaryVariable(
+ "epsilon_xy", 1,
+ makeExtrapolator(
+ getExtrapolator(), _local_assemblers,
+ &SmallDeformationLocalAssemblerInterface::getIntPtEpsilonXY));
+ if (DisplacementDim == 3)
+ {
+ Base::_secondary_variables.addSecondaryVariable(
+ "epsilon_yz", 1,
+ makeExtrapolator(
+ getExtrapolator(), _local_assemblers,
+ &SmallDeformationLocalAssemblerInterface::getIntPtEpsilonYZ));
+
+ Base::_secondary_variables.addSecondaryVariable(
+ "epsilon_xz", 1,
+ makeExtrapolator(
+ getExtrapolator(), _local_assemblers,
+ &SmallDeformationLocalAssemblerInterface::getIntPtEpsilonXZ));
+ }
+}
+
+template <int DisplacementDim>
+void SmallDeformationProcess<DisplacementDim>::assembleConcreteProcess(
+ const double t, GlobalVector const& x, GlobalMatrix& M, GlobalMatrix& K,
+ GlobalVector& b, StaggeredCouplingTerm const& coupling_term)
+{
+ DBUG("Assemble SmallDeformationProcess.");
+
+ // Call global assembler for each local assembly item.
+ GlobalExecutor::executeMemberDereferenced(
+ _global_assembler, &VectorMatrixAssembler::assemble, _local_assemblers,
+ *_local_to_global_index_map, t, x, M, K, b, coupling_term);
+}
+
+template <int DisplacementDim>
+void SmallDeformationProcess<DisplacementDim>::
+ assembleWithJacobianConcreteProcess(
+ const double t, GlobalVector const& x, GlobalVector const& xdot,
+ const double dxdot_dx, const double dx_dx, GlobalMatrix& M,
+ GlobalMatrix& K, GlobalVector& b, GlobalMatrix& Jac,
+ StaggeredCouplingTerm const& coupling_term)
+{
+ DBUG("AssembleWithJacobian SmallDeformationProcess.");
+
+ // Call global assembler for each local assembly item.
+ GlobalExecutor::executeMemberDereferenced(
+ _global_assembler, &VectorMatrixAssembler::assembleWithJacobian,
+ _local_assemblers, *_local_to_global_index_map, t, x, xdot, dxdot_dx,
+ dx_dx, M, K, b, Jac, coupling_term);
+
+ b.copyValues(*_nodal_forces);
+ std::transform(_nodal_forces->begin(), _nodal_forces->end(),
+ _nodal_forces->begin(), [](double val) { return -val; });
+}
+
+template <int DisplacementDim>
+void SmallDeformationProcess<DisplacementDim>::preTimestepConcreteProcess(
+ GlobalVector const& x, double const t, double const dt)
+{
+ DBUG("PreTimestep SmallDeformationProcess.");
+
+ _process_data.dt = dt;
+ _process_data.t = t;
+
+ GlobalExecutor::executeMemberOnDereferenced(
+ &SmallDeformationLocalAssemblerInterface::preTimestep,
+ _local_assemblers, *_local_to_global_index_map, x, t, dt);
+}
+
+} // namespace SmallDeformation
+} // namespace ProcessLib
diff --git a/ProcessLib/SmallDeformation/SmallDeformationProcess.cpp b/ProcessLib/SmallDeformation/SmallDeformationProcess.cpp
index 8ed4587fb74a1102660ed9bff1ebf7b0742a29f4..6aafdb38ce36af31fddcbf4ac6e0da54ec2f44bd 100644
--- a/ProcessLib/SmallDeformation/SmallDeformationProcess.cpp
+++ b/ProcessLib/SmallDeformation/SmallDeformationProcess.cpp
@@ -8,6 +8,7 @@
*/
#include "SmallDeformationProcess.h"
+#include "SmallDeformationProcess-impl.h"
namespace ProcessLib
{
diff --git a/ProcessLib/SmallDeformation/SmallDeformationProcess.h b/ProcessLib/SmallDeformation/SmallDeformationProcess.h
index b4427aafbb71fdfb17f83b9af01a163022394ca4..4cc68df5e74f760931ca82f0ef23dc4a3d5933ea 100644
--- a/ProcessLib/SmallDeformation/SmallDeformationProcess.h
+++ b/ProcessLib/SmallDeformation/SmallDeformationProcess.h
@@ -10,12 +10,7 @@
#pragma once
#include "LocalAssemblerInterface.h"
-#include <cassert>
-
#include "ProcessLib/Process.h"
-#include "ProcessLib/SmallDeformation/CreateLocalAssemblers.h"
-
-#include "SmallDeformationFEM.h"
#include "SmallDeformationProcessData.h"
namespace ProcessLib
@@ -38,21 +33,11 @@ public:
process_variables,
SmallDeformationProcessData<DisplacementDim>&& process_data,
SecondaryVariableCollection&& secondary_variables,
- NumLib::NamedFunctionCaller&& named_function_caller)
- : Process(mesh, std::move(jacobian_assembler), parameters,
- integration_order, std::move(process_variables),
- std::move(secondary_variables),
- std::move(named_function_caller)),
- _process_data(std::move(process_data))
- {
- _nodal_forces = MeshLib::getOrCreateMeshProperty<double>(
- mesh, "NodalForces", MeshLib::MeshItemType::Node, DisplacementDim);
- }
+ NumLib::NamedFunctionCaller&& named_function_caller);
//! \name ODESystem interface
//! @{
-
- bool isLinear() const override { return false; }
+ bool isLinear() const override;
//! @}
private:
@@ -61,149 +46,20 @@ private:
void initializeConcreteProcess(
NumLib::LocalToGlobalIndexMap const& dof_table,
MeshLib::Mesh const& mesh,
- unsigned const integration_order) override
- {
- ProcessLib::SmallDeformation::createLocalAssemblers<DisplacementDim,
- LocalAssemblerData>(
- mesh.getDimension(), mesh.getElements(), dof_table,
- _local_assemblers, mesh.isAxiallySymmetric(), integration_order,
- _process_data);
-
- // TODO move the two data members somewhere else.
- // for extrapolation of secondary variables
- std::vector<MeshLib::MeshSubsets> all_mesh_subsets_single_component;
- all_mesh_subsets_single_component.emplace_back(
- _mesh_subset_all_nodes.get());
- _local_to_global_index_map_single_component =
- std::make_unique<NumLib::LocalToGlobalIndexMap>(
- std::move(all_mesh_subsets_single_component),
- // by location order is needed for output
- NumLib::ComponentOrder::BY_LOCATION);
- _nodal_forces->resize(DisplacementDim * mesh.getNumberOfNodes());
-
- Base::_secondary_variables.addSecondaryVariable(
- "sigma_xx", 1,
- makeExtrapolator(
- getExtrapolator(), _local_assemblers,
- &SmallDeformationLocalAssemblerInterface::getIntPtSigmaXX));
-
- Base::_secondary_variables.addSecondaryVariable(
- "sigma_yy", 1,
- makeExtrapolator(
- getExtrapolator(), _local_assemblers,
- &SmallDeformationLocalAssemblerInterface::getIntPtSigmaYY));
-
- Base::_secondary_variables.addSecondaryVariable(
- "sigma_zz", 1,
- makeExtrapolator(
- getExtrapolator(), _local_assemblers,
- &SmallDeformationLocalAssemblerInterface::getIntPtSigmaZZ));
-
- Base::_secondary_variables.addSecondaryVariable(
- "sigma_xy", 1,
- makeExtrapolator(
- getExtrapolator(), _local_assemblers,
- &SmallDeformationLocalAssemblerInterface::getIntPtSigmaXY));
-
- if (DisplacementDim == 3) {
- Base::_secondary_variables.addSecondaryVariable(
- "sigma_xz", 1,
- makeExtrapolator(
- getExtrapolator(), _local_assemblers,
- &SmallDeformationLocalAssemblerInterface::getIntPtSigmaXZ));
-
- Base::_secondary_variables.addSecondaryVariable(
- "sigma_yz", 1,
- makeExtrapolator(
- getExtrapolator(), _local_assemblers,
- &SmallDeformationLocalAssemblerInterface::getIntPtSigmaYZ));
- }
-
- Base::_secondary_variables.addSecondaryVariable(
- "epsilon_xx", 1,
- makeExtrapolator(
- getExtrapolator(), _local_assemblers,
- &SmallDeformationLocalAssemblerInterface::getIntPtEpsilonXX));
+ unsigned const integration_order) override;
- Base::_secondary_variables.addSecondaryVariable(
- "epsilon_yy", 1,
- makeExtrapolator(
- getExtrapolator(), _local_assemblers,
- &SmallDeformationLocalAssemblerInterface::getIntPtEpsilonYY));
-
- Base::_secondary_variables.addSecondaryVariable(
- "epsilon_zz", 1,
- makeExtrapolator(
- getExtrapolator(), _local_assemblers,
- &SmallDeformationLocalAssemblerInterface::getIntPtEpsilonZZ));
-
- Base::_secondary_variables.addSecondaryVariable(
- "epsilon_xy", 1,
- makeExtrapolator(
- getExtrapolator(), _local_assemblers,
- &SmallDeformationLocalAssemblerInterface::getIntPtEpsilonXY));
- if (DisplacementDim == 3)
- {
- Base::_secondary_variables.addSecondaryVariable(
- "epsilon_yz", 1,
- makeExtrapolator(getExtrapolator(), _local_assemblers,
- &SmallDeformationLocalAssemblerInterface::
- getIntPtEpsilonYZ));
-
- Base::_secondary_variables.addSecondaryVariable(
- "epsilon_xz", 1,
- makeExtrapolator(getExtrapolator(), _local_assemblers,
- &SmallDeformationLocalAssemblerInterface::
- getIntPtEpsilonXZ));
- }
- }
-
- void assembleConcreteProcess(const double t, GlobalVector const& x,
- GlobalMatrix& M, GlobalMatrix& K,
- GlobalVector& b,
- StaggeredCouplingTerm const&
- coupling_term) override
- {
- DBUG("Assemble SmallDeformationProcess.");
-
- // Call global assembler for each local assembly item.
- GlobalExecutor::executeMemberDereferenced(
- _global_assembler, &VectorMatrixAssembler::assemble,
- _local_assemblers, *_local_to_global_index_map, t, x, M, K, b,
- coupling_term);
- }
+ void assembleConcreteProcess(
+ const double t, GlobalVector const& x, GlobalMatrix& M, GlobalMatrix& K,
+ GlobalVector& b, StaggeredCouplingTerm const& coupling_term) override;
void assembleWithJacobianConcreteProcess(
const double t, GlobalVector const& x, GlobalVector const& xdot,
const double dxdot_dx, const double dx_dx, GlobalMatrix& M,
GlobalMatrix& K, GlobalVector& b, GlobalMatrix& Jac,
- StaggeredCouplingTerm const& coupling_term) override
- {
- DBUG("AssembleWithJacobian SmallDeformationProcess.");
-
- // Call global assembler for each local assembly item.
- GlobalExecutor::executeMemberDereferenced(
- _global_assembler, &VectorMatrixAssembler::assembleWithJacobian,
- _local_assemblers, *_local_to_global_index_map, t, x, xdot,
- dxdot_dx, dx_dx, M, K, b, Jac, coupling_term);
-
- b.copyValues(*_nodal_forces);
- std::transform(_nodal_forces->begin(), _nodal_forces->end(),
- _nodal_forces->begin(), [](double val) { return -val;});
- }
+ StaggeredCouplingTerm const& coupling_term) override;
void preTimestepConcreteProcess(GlobalVector const& x, double const t,
- double const dt) override
- {
- DBUG("PreTimestep SmallDeformationProcess.");
-
- _process_data.dt = dt;
- _process_data.t = t;
-
- GlobalExecutor::executeMemberOnDereferenced(
- &SmallDeformationLocalAssemblerInterface::preTimestep,
- _local_assemblers, *_local_to_global_index_map, x, t, dt);
- }
+ double const dt) override;
private:
SmallDeformationProcessData<DisplacementDim> _process_data;
@@ -215,5 +71,8 @@ private:
MeshLib::PropertyVector<double>* _nodal_forces = nullptr;
};
+extern template class SmallDeformationProcess<2>;
+extern template class SmallDeformationProcess<3>;
+
} // namespace SmallDeformation
} // namespace ProcessLib