diff --git a/ProcessLib/SmallDeformation/SmallDeformationProcess-impl.h b/ProcessLib/SmallDeformation/SmallDeformationProcess-impl.h
deleted file mode 100644
index a9d82f965f1d77689da568e240ff44d9d1b354eb..0000000000000000000000000000000000000000
--- a/ProcessLib/SmallDeformation/SmallDeformationProcess-impl.h
+++ /dev/null
@@ -1,289 +0,0 @@
-/**
- * \copyright
- * Copyright (c) 2012-2018, 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 <nlohmann/json.hpp>
-
-#include "BaseLib/Functional.h"
-#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::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);
-
- _material_forces = MeshLib::getOrCreateMeshProperty<double>(
- mesh, "MaterialForces", MeshLib::MeshItemType::Node, DisplacementDim);
-
- _integration_point_writer.emplace_back(
- std::make_unique<SigmaIntegrationPointWriter>(
- static_cast<int>(mesh.getDimension() == 2 ? 4 : 6) /*n components*/,
- 2 /*integration order*/, [this]() {
- // Result containing integration point data for each local
- // assembler.
- std::vector<std::vector<double>> result;
- result.resize(_local_assemblers.size());
-
- for (std::size_t i = 0; i < _local_assemblers.size(); ++i)
- {
- auto const& local_asm = *_local_assemblers[i];
-
- result[i] = local_asm.getSigma();
- }
-
- return result;
- }));
-}
-
-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)
-{
- using nlohmann::json;
-
- ProcessLib::SmallDeformation::createLocalAssemblers<
- DisplacementDim, SmallDeformationLocalAssembler>(
- 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());
- _material_forces->resize(DisplacementDim * mesh.getNumberOfNodes());
-
- Base::_secondary_variables.addSecondaryVariable(
- "free_energy_density",
- makeExtrapolator(1, getExtrapolator(), _local_assemblers,
- &LocalAssemblerInterface::getIntPtFreeEnergyDensity));
-
- Base::_secondary_variables.addSecondaryVariable(
- "sigma",
- makeExtrapolator(MathLib::KelvinVector::KelvinVectorType<
- DisplacementDim>::RowsAtCompileTime,
- getExtrapolator(), _local_assemblers,
- &LocalAssemblerInterface::getIntPtSigma));
-
- Base::_secondary_variables.addSecondaryVariable(
- "epsilon",
- makeExtrapolator(MathLib::KelvinVector::KelvinVectorType<
- DisplacementDim>::RowsAtCompileTime,
- getExtrapolator(), _local_assemblers,
- &LocalAssemblerInterface::getIntPtEpsilon));
-
- // enable output of internal variables defined by material models
- auto const internal_variables =
- _process_data.material->getInternalVariables();
- for (auto const& internal_variable : internal_variables)
- {
- auto const& name = internal_variable.name;
- auto const& fct = internal_variable.getter;
- auto const num_components = internal_variable.num_components;
- DBUG("Registering internal variable %s.", name.c_str());
-
- auto getIntPtValues = BaseLib::easyBind(
- [fct, num_components](
- LocalAssemblerInterface const& loc_asm,
- const double /*t*/,
- GlobalVector const& /*current_solution*/,
- NumLib::LocalToGlobalIndexMap const& /*dof_table*/,
- std::vector<double>& cache) -> std::vector<double> const& {
-
- const unsigned num_int_pts =
- loc_asm.getNumberOfIntegrationPoints();
-
- cache.clear();
- auto cache_mat = MathLib::createZeroedMatrix<Eigen::Matrix<
- double, Eigen::Dynamic, Eigen::Dynamic, Eigen::RowMajor>>(
- cache, num_components, num_int_pts);
-
- // TODO avoid the heap allocation (one per finite element)
- std::vector<double> cache_column(num_int_pts);
-
- for (unsigned i = 0; i < num_int_pts; ++i)
- {
- auto const& state = loc_asm.getMaterialStateVariablesAt(i);
-
- auto const& int_pt_values = fct(state, cache_column);
- assert(int_pt_values.size() == num_components);
- auto const int_pt_values_vec =
- MathLib::toVector(int_pt_values);
-
- cache_mat.col(i).noalias() = int_pt_values_vec;
- }
-
- return cache;
- });
-
- Base::_secondary_variables.addSecondaryVariable(
- name,
- makeExtrapolator(num_components, getExtrapolator(),
- _local_assemblers, std::move(getIntPtValues)));
- }
-
- // Set initial conditions for integration point data.
- for (auto const& ip_writer : _integration_point_writer)
- {
- // Find the mesh property with integration point writer's name.
- auto const& name = ip_writer->name();
- if (!mesh.getProperties().existsPropertyVector<double>(name))
- {
- continue;
- }
- auto const& mesh_property =
- *mesh.getProperties().template getPropertyVector<double>(name);
-
- // The mesh property must be defined on integration points.
- if (mesh_property.getMeshItemType() !=
- MeshLib::MeshItemType::IntegrationPoint)
- {
- continue;
- }
-
- auto const ip_meta_data = getIntegrationPointMetaData(mesh, name);
-
- // Check the number of components.
- if (ip_meta_data.n_components != mesh_property.getNumberOfComponents())
- {
- OGS_FATAL(
- "Different number of components in meta data (%d) than in "
- "the integration point field data for \"%s\": %d.",
- ip_meta_data.n_components, name.c_str(),
- mesh_property.getNumberOfComponents());
- }
-
- // Now we have a properly named vtk's field data array and the
- // corresponding meta data.
- std::size_t position = 0;
- for (auto& local_asm : _local_assemblers)
- {
- std::size_t const integration_points_read =
- local_asm->setIPDataInitialConditions(
- name, &mesh_property[position],
- ip_meta_data.integration_order);
- if (integration_points_read == 0)
- {
- OGS_FATAL(
- "No integration points read in the integration point "
- "initial conditions set function.");
- }
- position += integration_points_read * ip_meta_data.n_components;
- }
- }
-}
-
-template <int DisplacementDim>
-void SmallDeformationProcess<DisplacementDim>::assembleConcreteProcess(
- const double t, GlobalVector const& x, GlobalMatrix& M, GlobalMatrix& K,
- GlobalVector& b)
-{
- DBUG("Assemble SmallDeformationProcess.");
-
- std::vector<std::reference_wrapper<NumLib::LocalToGlobalIndexMap>>
- dof_table = {std::ref(*_local_to_global_index_map)};
- // Call global assembler for each local assembly item.
- GlobalExecutor::executeMemberDereferenced(
- _global_assembler, &VectorMatrixAssembler::assemble, _local_assemblers,
- dof_table, t, x, M, K, b, _coupled_solutions);
-}
-
-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)
-{
- DBUG("AssembleWithJacobian SmallDeformationProcess.");
-
- std::vector<std::reference_wrapper<NumLib::LocalToGlobalIndexMap>>
- dof_table = {std::ref(*_local_to_global_index_map)};
- // Call global assembler for each local assembly item.
- GlobalExecutor::executeMemberDereferenced(
- _global_assembler, &VectorMatrixAssembler::assembleWithJacobian,
- _local_assemblers, dof_table, t, x, xdot, dxdot_dx,
- dx_dx, M, K, b, Jac, _coupled_solutions);
-
- 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,
- const int /*process_id*/)
-{
- DBUG("PreTimestep SmallDeformationProcess.");
-
- _process_data.dt = dt;
- _process_data.t = t;
-
- GlobalExecutor::executeMemberOnDereferenced(
- &LocalAssemblerInterface::preTimestep, _local_assemblers,
- *_local_to_global_index_map, x, t, dt);
-}
-
-template <int DisplacementDim>
-void SmallDeformationProcess<DisplacementDim>::postTimestepConcreteProcess(
- GlobalVector const& x, int const /*process_id*/)
-{
- DBUG("PostTimestep SmallDeformationProcess.");
-
- GlobalExecutor::executeMemberOnDereferenced(
- &LocalAssemblerInterface::postTimestep, _local_assemblers,
- *_local_to_global_index_map, x);
-
- std::unique_ptr<GlobalVector> material_forces;
- ProcessLib::SmallDeformation::writeMaterialForces(
- material_forces, _local_assemblers, *_local_to_global_index_map, x);
-
- material_forces->copyValues(*_material_forces);
-}
-
-} // namespace SmallDeformation
-} // namespace ProcessLib
diff --git a/ProcessLib/SmallDeformation/SmallDeformationProcess.cpp b/ProcessLib/SmallDeformation/SmallDeformationProcess.cpp
index 89d0e40d2283bcdd82d3d79d91937b1df3e90ba2..e23adf00d6c75487c14867db2eebd99986b584e0 100644
--- a/ProcessLib/SmallDeformation/SmallDeformationProcess.cpp
+++ b/ProcessLib/SmallDeformation/SmallDeformationProcess.cpp
@@ -8,15 +8,286 @@
*/
#include "SmallDeformationProcess.h"
-#include "SmallDeformationProcess-impl.h"
+
+#include <cassert>
+#include <nlohmann/json.hpp>
+
+#include "BaseLib/Functional.h"
+#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::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);
+
+ _material_forces = MeshLib::getOrCreateMeshProperty<double>(
+ mesh, "MaterialForces", MeshLib::MeshItemType::Node, DisplacementDim);
+
+ _integration_point_writer.emplace_back(
+ std::make_unique<SigmaIntegrationPointWriter>(
+ static_cast<int>(mesh.getDimension() == 2 ? 4 : 6) /*n components*/,
+ 2 /*integration order*/, [this]() {
+ // Result containing integration point data for each local
+ // assembler.
+ std::vector<std::vector<double>> result;
+ result.resize(_local_assemblers.size());
+
+ for (std::size_t i = 0; i < _local_assemblers.size(); ++i)
+ {
+ auto const& local_asm = *_local_assemblers[i];
+
+ result[i] = local_asm.getSigma();
+ }
+
+ return result;
+ }));
+}
+
+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)
+{
+ using nlohmann::json;
+
+ ProcessLib::SmallDeformation::createLocalAssemblers<
+ DisplacementDim, SmallDeformationLocalAssembler>(
+ 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());
+ _material_forces->resize(DisplacementDim * mesh.getNumberOfNodes());
+
+ Base::_secondary_variables.addSecondaryVariable(
+ "free_energy_density",
+ makeExtrapolator(1, getExtrapolator(), _local_assemblers,
+ &LocalAssemblerInterface::getIntPtFreeEnergyDensity));
+
+ Base::_secondary_variables.addSecondaryVariable(
+ "sigma",
+ makeExtrapolator(MathLib::KelvinVector::KelvinVectorType<
+ DisplacementDim>::RowsAtCompileTime,
+ getExtrapolator(), _local_assemblers,
+ &LocalAssemblerInterface::getIntPtSigma));
+
+ Base::_secondary_variables.addSecondaryVariable(
+ "epsilon",
+ makeExtrapolator(MathLib::KelvinVector::KelvinVectorType<
+ DisplacementDim>::RowsAtCompileTime,
+ getExtrapolator(), _local_assemblers,
+ &LocalAssemblerInterface::getIntPtEpsilon));
+
+ // enable output of internal variables defined by material models
+ auto const internal_variables =
+ _process_data.material->getInternalVariables();
+ for (auto const& internal_variable : internal_variables)
+ {
+ auto const& name = internal_variable.name;
+ auto const& fct = internal_variable.getter;
+ auto const num_components = internal_variable.num_components;
+ DBUG("Registering internal variable %s.", name.c_str());
+
+ auto getIntPtValues = BaseLib::easyBind(
+ [fct, num_components](
+ LocalAssemblerInterface const& loc_asm,
+ const double /*t*/,
+ GlobalVector const& /*current_solution*/,
+ NumLib::LocalToGlobalIndexMap const& /*dof_table*/,
+ std::vector<double>& cache) -> std::vector<double> const& {
+ const unsigned num_int_pts =
+ loc_asm.getNumberOfIntegrationPoints();
+
+ cache.clear();
+ auto cache_mat = MathLib::createZeroedMatrix<Eigen::Matrix<
+ double, Eigen::Dynamic, Eigen::Dynamic, Eigen::RowMajor>>(
+ cache, num_components, num_int_pts);
+
+ // TODO avoid the heap allocation (one per finite element)
+ std::vector<double> cache_column(num_int_pts);
+
+ for (unsigned i = 0; i < num_int_pts; ++i)
+ {
+ auto const& state = loc_asm.getMaterialStateVariablesAt(i);
+
+ auto const& int_pt_values = fct(state, cache_column);
+ assert(int_pt_values.size() == num_components);
+ auto const int_pt_values_vec =
+ MathLib::toVector(int_pt_values);
+
+ cache_mat.col(i).noalias() = int_pt_values_vec;
+ }
+
+ return cache;
+ });
+
+ Base::_secondary_variables.addSecondaryVariable(
+ name,
+ makeExtrapolator(num_components, getExtrapolator(),
+ _local_assemblers, std::move(getIntPtValues)));
+ }
+
+ // Set initial conditions for integration point data.
+ for (auto const& ip_writer : _integration_point_writer)
+ {
+ // Find the mesh property with integration point writer's name.
+ auto const& name = ip_writer->name();
+ if (!mesh.getProperties().existsPropertyVector<double>(name))
+ {
+ continue;
+ }
+ auto const& mesh_property =
+ *mesh.getProperties().template getPropertyVector<double>(name);
+
+ // The mesh property must be defined on integration points.
+ if (mesh_property.getMeshItemType() !=
+ MeshLib::MeshItemType::IntegrationPoint)
+ {
+ continue;
+ }
+
+ auto const ip_meta_data = getIntegrationPointMetaData(mesh, name);
+
+ // Check the number of components.
+ if (ip_meta_data.n_components != mesh_property.getNumberOfComponents())
+ {
+ OGS_FATAL(
+ "Different number of components in meta data (%d) than in "
+ "the integration point field data for \"%s\": %d.",
+ ip_meta_data.n_components, name.c_str(),
+ mesh_property.getNumberOfComponents());
+ }
+
+ // Now we have a properly named vtk's field data array and the
+ // corresponding meta data.
+ std::size_t position = 0;
+ for (auto& local_asm : _local_assemblers)
+ {
+ std::size_t const integration_points_read =
+ local_asm->setIPDataInitialConditions(
+ name, &mesh_property[position],
+ ip_meta_data.integration_order);
+ if (integration_points_read == 0)
+ {
+ OGS_FATAL(
+ "No integration points read in the integration point "
+ "initial conditions set function.");
+ }
+ position += integration_points_read * ip_meta_data.n_components;
+ }
+ }
+}
+
+template <int DisplacementDim>
+void SmallDeformationProcess<DisplacementDim>::assembleConcreteProcess(
+ const double t, GlobalVector const& x, GlobalMatrix& M, GlobalMatrix& K,
+ GlobalVector& b)
+{
+ DBUG("Assemble SmallDeformationProcess.");
+
+ std::vector<std::reference_wrapper<NumLib::LocalToGlobalIndexMap>>
+ dof_table = {std::ref(*_local_to_global_index_map)};
+ // Call global assembler for each local assembly item.
+ GlobalExecutor::executeMemberDereferenced(
+ _global_assembler, &VectorMatrixAssembler::assemble, _local_assemblers,
+ dof_table, t, x, M, K, b, _coupled_solutions);
+}
+
+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)
+{
+ DBUG("AssembleWithJacobian SmallDeformationProcess.");
+
+ std::vector<std::reference_wrapper<NumLib::LocalToGlobalIndexMap>>
+ dof_table = {std::ref(*_local_to_global_index_map)};
+ // Call global assembler for each local assembly item.
+ GlobalExecutor::executeMemberDereferenced(
+ _global_assembler, &VectorMatrixAssembler::assembleWithJacobian,
+ _local_assemblers, dof_table, t, x, xdot, dxdot_dx, dx_dx, M, K, b, Jac,
+ _coupled_solutions);
+
+ 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,
+ const int /*process_id*/)
+{
+ DBUG("PreTimestep SmallDeformationProcess.");
+
+ _process_data.dt = dt;
+ _process_data.t = t;
+
+ GlobalExecutor::executeMemberOnDereferenced(
+ &LocalAssemblerInterface::preTimestep, _local_assemblers,
+ *_local_to_global_index_map, x, t, dt);
+}
+
+template <int DisplacementDim>
+void SmallDeformationProcess<DisplacementDim>::postTimestepConcreteProcess(
+ GlobalVector const& x, int const /*process_id*/)
+{
+ DBUG("PostTimestep SmallDeformationProcess.");
+
+ GlobalExecutor::executeMemberOnDereferenced(
+ &LocalAssemblerInterface::postTimestep, _local_assemblers,
+ *_local_to_global_index_map, x);
+
+ std::unique_ptr<GlobalVector> material_forces;
+ ProcessLib::SmallDeformation::writeMaterialForces(
+ material_forces, _local_assemblers, *_local_to_global_index_map, x);
+
+ material_forces->copyValues(*_material_forces);
+}
template class SmallDeformationProcess<2>;
template class SmallDeformationProcess<3>;
-} // namespace SmallDeformation
-} // namespace ProcessLib
+} // namespace SmallDeformation
+} // namespace ProcessLib