From 3e1c53e1f6e2cabf23d8b134e57048e7b0c9cb2c Mon Sep 17 00:00:00 2001
From: Christoph Lehmann <christoph.lehmann@ufz.de>
Date: Mon, 4 Jul 2016 12:34:19 +0200
Subject: [PATCH] [PL] LocAsmIntf w/o VecMatAsm
---
ProcessLib/LocalAssemblerInterface.h | 29 +++++++++++-----------------
1 file changed, 11 insertions(+), 18 deletions(-)
diff --git a/ProcessLib/LocalAssemblerInterface.h b/ProcessLib/LocalAssemblerInterface.h
index 8c43b50380a..56b46c3fc99 100644
--- a/ProcessLib/LocalAssemblerInterface.h
+++ b/ProcessLib/LocalAssemblerInterface.h
@@ -23,26 +23,19 @@ class LocalAssemblerInterface
public:
virtual ~LocalAssemblerInterface() = default;
- virtual void assemble(double const t, std::vector<double> const& local_x) = 0;
-
- virtual void addToGlobal(
- NumLib::LocalToGlobalIndexMap::RowColumnIndices const&,
- GlobalMatrix& M, GlobalMatrix& K, GlobalVector& b) const = 0;
-
- virtual void assembleJacobian(double const /*t*/,
- std::vector<double> const& /*local_x*/)
- {
- OGS_FATAL(
- "assembleJacobian function is not implemented in the local "
- "assembler.");
- }
-
- virtual void addJacobianToGlobal(NumLib::LocalToGlobalIndexMap::
- RowColumnIndices const& /*indices*/,
- GlobalMatrix& /*Jac*/) const
+ virtual void assemble(std::size_t const id,
+ NumLib::LocalToGlobalIndexMap const& dof_table,
+ double const t, GlobalVector const& x,
+ GlobalMatrix& M, GlobalMatrix& K,
+ GlobalVector& b) = 0;
+
+ virtual void assembleJacobian(
+ std::size_t const /*id*/,
+ NumLib::LocalToGlobalIndexMap const& /*dof_table*/, double const /*t*/,
+ GlobalVector const& /*x*/, GlobalMatrix& /*Jac*/)
{
OGS_FATAL(
- "addJacobianToGlobal function is not implemented in the local "
+ "The assembleJacobian() function is not implemented in the local "
"assembler.");
}
--
GitLab