From 6210b6435efe92c7d454b4a36e66fc11d5fa3031 Mon Sep 17 00:00:00 2001
From: Norihiro Watanabe <norihiro.watanabe@ufz.de>
Date: Tue, 31 May 2016 11:23:26 +0200
Subject: [PATCH] fix in TES
---
ProcessLib/TES/TESLocalAssembler-impl.h | 2 +-
ProcessLib/TES/TESLocalAssembler.h | 4 ++--
ProcessLib/TES/TESProcess.cpp | 22 +++++++++++-----------
ProcessLib/TES/TESProcess.h | 14 +++++++-------
4 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/ProcessLib/TES/TESLocalAssembler-impl.h b/ProcessLib/TES/TESLocalAssembler-impl.h
index 3b9ad99e5c2..c5894a8c1e5 100644
--- a/ProcessLib/TES/TESLocalAssembler-impl.h
+++ b/ProcessLib/TES/TESLocalAssembler-impl.h
@@ -190,7 +190,7 @@ template <typename ShapeFunction_, typename IntegrationMethod_,
void TESLocalAssembler<ShapeFunction_, IntegrationMethod_, GlobalMatrix,
GlobalVector, GlobalDim>::
addToGlobal(
- AssemblerLib::LocalToGlobalIndexMap::RowColumnIndices const& indices,
+ NumLib::LocalToGlobalIndexMap::RowColumnIndices const& indices,
GlobalMatrix& M, GlobalMatrix& K, GlobalVector& b) const
{
M.add(indices, _local_M);
diff --git a/ProcessLib/TES/TESLocalAssembler.h b/ProcessLib/TES/TESLocalAssembler.h
index 68da0989069..cc80fc33e7f 100644
--- a/ProcessLib/TES/TESLocalAssembler.h
+++ b/ProcessLib/TES/TESLocalAssembler.h
@@ -33,7 +33,7 @@ public:
std::vector<double> const& local_x) = 0;
virtual void addToGlobal(
- AssemblerLib::LocalToGlobalIndexMap::RowColumnIndices const&,
+ NumLib::LocalToGlobalIndexMap::RowColumnIndices const&,
GlobalMatrix& M, GlobalMatrix& K, GlobalVector& b) const = 0;
virtual bool checkBounds(std::vector<double> const& local_x,
@@ -58,7 +58,7 @@ public:
void assemble(double const t, std::vector<double> const& local_x) override;
void addToGlobal(
- AssemblerLib::LocalToGlobalIndexMap::RowColumnIndices const& indices,
+ NumLib::LocalToGlobalIndexMap::RowColumnIndices const& indices,
GlobalMatrix& M, GlobalMatrix& K, GlobalVector& b) const override;
Eigen::Map<const Eigen::VectorXd> getShapeMatrix(
diff --git a/ProcessLib/TES/TESProcess.cpp b/ProcessLib/TES/TESProcess.cpp
index 930bc4d4c92..48b887a7060 100644
--- a/ProcessLib/TES/TESProcess.cpp
+++ b/ProcessLib/TES/TESProcess.cpp
@@ -10,9 +10,9 @@
#include "TESProcess.h"
// TODO Copied from VectorMatrixAssembler. Could be provided by the DOF table.
-inline AssemblerLib::LocalToGlobalIndexMap::RowColumnIndices
+inline NumLib::LocalToGlobalIndexMap::RowColumnIndices
getRowColumnIndices_(std::size_t const id,
- AssemblerLib::LocalToGlobalIndexMap const& dof_table,
+ NumLib::LocalToGlobalIndexMap const& dof_table,
std::vector<GlobalIndexType>& indices)
{
assert(dof_table.size() > id);
@@ -27,14 +27,14 @@ getRowColumnIndices_(std::size_t const id,
indices.insert(indices.end(), idcs.begin(), idcs.end());
}
- return AssemblerLib::LocalToGlobalIndexMap::RowColumnIndices(indices,
+ return NumLib::LocalToGlobalIndexMap::RowColumnIndices(indices,
indices);
}
template <typename GlobalVector>
void getVectorValues(
GlobalVector const& x,
- AssemblerLib::LocalToGlobalIndexMap::RowColumnIndices const& r_c_indices,
+ NumLib::LocalToGlobalIndexMap::RowColumnIndices const& r_c_indices,
std::vector<double>& local_x)
{
auto const& indices = r_c_indices.rows;
@@ -50,7 +50,7 @@ void getVectorValues(
// TODO that essentially duplicates code which is also present in ProcessOutput.
template <typename GlobalVector>
double getNodalValue(GlobalVector const& x, MeshLib::Mesh const& mesh,
- AssemblerLib::LocalToGlobalIndexMap const& dof_table,
+ NumLib::LocalToGlobalIndexMap const& dof_table,
std::size_t const node_id,
std::size_t const global_component_id)
{
@@ -170,7 +170,7 @@ TESProcess<GlobalSetup>::TESProcess(
template <typename GlobalSetup>
void TESProcess<GlobalSetup>::initializeConcreteProcess(
- AssemblerLib::LocalToGlobalIndexMap const& dof_table,
+ NumLib::LocalToGlobalIndexMap const& dof_table,
MeshLib::Mesh const& mesh, unsigned const integration_order)
{
DBUG("Create global assembler.");
@@ -187,10 +187,10 @@ void TESProcess<GlobalSetup>::initializeConcreteProcess(
all_mesh_subsets_single_component.emplace_back(
new MeshLib::MeshSubsets(this->_mesh_subset_all_nodes.get()));
_local_to_global_index_map_single_component.reset(
- new AssemblerLib::LocalToGlobalIndexMap(
+ new NumLib::LocalToGlobalIndexMap(
std::move(all_mesh_subsets_single_component),
// by location order is needed for output
- AssemblerLib::ComponentOrder::BY_LOCATION));
+ NumLib::ComponentOrder::BY_LOCATION));
_extrapolator.reset(
new ExtrapolatorImplementation(MathLib::MatrixSpecifications(
@@ -338,7 +338,7 @@ template <typename GlobalSetup>
typename TESProcess<GlobalSetup>::GlobalVector const&
TESProcess<GlobalSetup>::computeVapourPartialPressure(
typename TESProcess::GlobalVector const& x,
- AssemblerLib::LocalToGlobalIndexMap const& dof_table,
+ NumLib::LocalToGlobalIndexMap const& dof_table,
std::unique_ptr<GlobalVector>& result_cache)
{
assert(&dof_table == this->_local_to_global_index_map.get());
@@ -370,7 +370,7 @@ template <typename GlobalSetup>
typename TESProcess<GlobalSetup>::GlobalVector const&
TESProcess<GlobalSetup>::computeRelativeHumidity(
typename TESProcess::GlobalVector const& x,
- AssemblerLib::LocalToGlobalIndexMap const& dof_table,
+ NumLib::LocalToGlobalIndexMap const& dof_table,
std::unique_ptr<GlobalVector>& result_cache)
{
assert(&dof_table == this->_local_to_global_index_map.get());
@@ -407,7 +407,7 @@ template <typename GlobalSetup>
typename TESProcess<GlobalSetup>::GlobalVector const&
TESProcess<GlobalSetup>::computeEquilibriumLoading(
typename TESProcess::GlobalVector const& x,
- AssemblerLib::LocalToGlobalIndexMap const& dof_table,
+ NumLib::LocalToGlobalIndexMap const& dof_table,
std::unique_ptr<GlobalVector>& result_cache)
{
assert(&dof_table == this->_local_to_global_index_map.get());
diff --git a/ProcessLib/TES/TESProcess.h b/ProcessLib/TES/TESProcess.h
index 5149b329af5..5034eff13eb 100644
--- a/ProcessLib/TES/TESProcess.h
+++ b/ProcessLib/TES/TESProcess.h
@@ -10,7 +10,7 @@
#ifndef PROCESS_LIB_TESPROCESS_H_
#define PROCESS_LIB_TESPROCESS_H_
-#include "AssemblerLib/LocalToGlobalIndexMap.h"
+#include "NumLib/DOF/LocalToGlobalIndexMap.h"
#include "NumLib/Extrapolation/LocalLinearLeastSquaresExtrapolator.h"
#include "ProcessLib/Process.h"
@@ -59,7 +59,7 @@ private:
using LocalAssembler =
TESLocalAssemblerInterface<GlobalMatrix, GlobalVector>;
- using GlobalAssembler = AssemblerLib::VectorMatrixAssembler<
+ using GlobalAssembler = NumLib::VectorMatrixAssembler<
GlobalMatrix, GlobalVector, LocalAssembler,
NumLib::ODESystemTag::FirstOrderImplicitQuasilinear>;
@@ -70,7 +70,7 @@ private:
GlobalVector, TESIntPtVariables, LocalAssembler>;
void initializeConcreteProcess(
- AssemblerLib::LocalToGlobalIndexMap const& dof_table,
+ NumLib::LocalToGlobalIndexMap const& dof_table,
MeshLib::Mesh const& mesh, unsigned const integration_order) override;
void assembleConcreteProcess(const double t, GlobalVector const& x,
@@ -79,17 +79,17 @@ private:
GlobalVector const& computeVapourPartialPressure(
GlobalVector const& x,
- AssemblerLib::LocalToGlobalIndexMap const& dof_table,
+ NumLib::LocalToGlobalIndexMap const& dof_table,
std::unique_ptr<GlobalVector>& result_cache);
GlobalVector const& computeRelativeHumidity(
GlobalVector const& x,
- AssemblerLib::LocalToGlobalIndexMap const& dof_table,
+ NumLib::LocalToGlobalIndexMap const& dof_table,
std::unique_ptr<GlobalVector>& result_cache);
GlobalVector const& computeEquilibriumLoading(
GlobalVector const& x,
- AssemblerLib::LocalToGlobalIndexMap const& dof_table,
+ NumLib::LocalToGlobalIndexMap const& dof_table,
std::unique_ptr<GlobalVector>& result_cache);
std::unique_ptr<GlobalAssembler> _global_assembler;
@@ -97,7 +97,7 @@ private:
AssemblyParams _assembly_params;
- std::unique_ptr<AssemblerLib::LocalToGlobalIndexMap>
+ std::unique_ptr<NumLib::LocalToGlobalIndexMap>
_local_to_global_index_map_single_component;
std::unique_ptr<ExtrapolatorInterface> _extrapolator;
--
GitLab