From 4e5c3329b06a061ae2528999ddb64244f01d948d Mon Sep 17 00:00:00 2001
From: renchao_lu <renchao.lu@gmail.com>
Date: Sun, 31 May 2020 17:40:22 +0200
Subject: [PATCH] [PL/CT] Remove mapping process id to component name.
---
.../ComponentTransportProcess.cpp | 7 ++-----
.../ComponentTransport/ComponentTransportProcess.h | 13 +------------
.../CreateComponentTransportProcess.cpp | 12 +-----------
3 files changed, 4 insertions(+), 28 deletions(-)
diff --git a/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp b/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp
index d1f4734ce81..ff56013ff93 100644
--- a/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp
+++ b/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp
@@ -31,15 +31,12 @@ ComponentTransportProcess::ComponentTransportProcess(
ComponentTransportProcessData&& process_data,
SecondaryVariableCollection&& secondary_variables,
bool const use_monolithic_scheme,
- std::unique_ptr<ProcessLib::SurfaceFluxData>&& surfaceflux,
- std::vector<std::pair<int, std::string>>&& process_id_to_component_name_map)
+ std::unique_ptr<ProcessLib::SurfaceFluxData>&& surfaceflux)
: Process(std::move(name), mesh, std::move(jacobian_assembler), parameters,
integration_order, std::move(process_variables),
std::move(secondary_variables), use_monolithic_scheme),
_process_data(std::move(process_data)),
- _surfaceflux(std::move(surfaceflux)),
- _process_id_to_component_name_map(
- std::move(process_id_to_component_name_map))
+ _surfaceflux(std::move(surfaceflux))
{
}
diff --git a/ProcessLib/ComponentTransport/ComponentTransportProcess.h b/ProcessLib/ComponentTransport/ComponentTransportProcess.h
index f6ea2388c45..8b5f300935f 100644
--- a/ProcessLib/ComponentTransport/ComponentTransportProcess.h
+++ b/ProcessLib/ComponentTransport/ComponentTransportProcess.h
@@ -102,9 +102,7 @@ public:
ComponentTransportProcessData&& process_data,
SecondaryVariableCollection&& secondary_variables,
bool const use_monolithic_scheme,
- std::unique_ptr<ProcessLib::SurfaceFluxData>&& surfaceflux,
- std::vector<std::pair<int, std::string>>&&
- process_id_to_component_name_map);
+ std::unique_ptr<ProcessLib::SurfaceFluxData>&& surfaceflux);
//! \name ODESystem interface
//! @{
@@ -116,12 +114,6 @@ public:
MathLib::Point3d const& p, double const t,
std::vector<GlobalVector*> const& x) const override;
- std::vector<std::pair<int, std::string>> const&
- getProcessIDToComponentNameMap() const
- {
- return _process_id_to_component_name_map;
- }
-
void setCoupledTermForTheStaggeredSchemeToLocalAssemblers(
int const process_id) override;
@@ -164,9 +156,6 @@ private:
std::vector<std::unique_ptr<GlobalVector>> _xs_previous_timestep;
std::unique_ptr<ProcessLib::SurfaceFluxData> _surfaceflux;
-
- std::vector<std::pair<int, std::string>> const
- _process_id_to_component_name_map;
};
} // namespace ComponentTransport
diff --git a/ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp b/ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp
index f1ffdaae5dc..46a862793bf 100644
--- a/ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp
+++ b/ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp
@@ -130,7 +130,6 @@ std::unique_ptr<Process> createComponentTransportProcess(
it->get().getNumberOfComponents());
}
- std::vector<std::pair<int, std::string>> process_id_to_component_name_map;
// Allocate the collected process variables into a two-dimensional vector,
// depending on what scheme is adopted
if (use_monolithic_scheme) // monolithic scheme.
@@ -147,15 +146,7 @@ std::unique_ptr<Process> createComponentTransportProcess(
per_process_variable.emplace_back(pv);
process_variables.push_back(std::move(per_process_variable));
}
-
- auto variable_id = 0;
- for (unsigned process_id = 1; process_id < process_variables.size();
- process_id++)
{
- auto const& transport_process_variable =
- process_variables[process_id][variable_id].get().getName();
- process_id_to_component_name_map.emplace_back(
- process_id, transport_process_variable);
}
}
@@ -214,8 +205,7 @@ std::unique_ptr<Process> createComponentTransportProcess(
std::move(name), mesh, std::move(jacobian_assembler), parameters,
integration_order, std::move(process_variables),
std::move(process_data), std::move(secondary_variables),
- use_monolithic_scheme, std::move(surfaceflux),
- std::move(process_id_to_component_name_map));
+ use_monolithic_scheme, std::move(surfaceflux));
}
} // namespace ComponentTransport
--
GitLab