From a971650a9c2ef8b2008ab0eb51e110afe32107ae Mon Sep 17 00:00:00 2001
From: Wenqing Wang <wenqing.wang@ufz.de>
Date: Thu, 25 Nov 2021 14:17:08 +0100
Subject: [PATCH] Revert "[BHE] Rotate the velocity instead of rotating dNdx in
the advection term"
This reverts commit dc2127395c21acf0db4a20f53e2650f2c46dffb8.
---
.../HeatTransportBHELocalAssemblerBHE-impl.h | 27 ++-----------------
.../HeatTransportBHELocalAssemblerBHE.h | 1 -
2 files changed, 2 insertions(+), 26 deletions(-)
diff --git a/ProcessLib/HeatTransportBHE/LocalAssemblers/HeatTransportBHELocalAssemblerBHE-impl.h b/ProcessLib/HeatTransportBHE/LocalAssemblers/HeatTransportBHELocalAssemblerBHE-impl.h
index 6342f4f7a78..4a3fca94981 100644
--- a/ProcessLib/HeatTransportBHE/LocalAssemblers/HeatTransportBHELocalAssemblerBHE-impl.h
+++ b/ProcessLib/HeatTransportBHE/LocalAssemblers/HeatTransportBHELocalAssemblerBHE-impl.h
@@ -12,25 +12,12 @@
#include "HeatTransportBHELocalAssemblerBHE.h"
#include "MathLib/LinAlg/Eigen/EigenMapTools.h"
-#include "MeshLib/ElementCoordinatesMappingLocal.h"
#include "NumLib/Fem/InitShapeMatrices.h"
namespace ProcessLib
{
namespace HeatTransportBHE
{
-Eigen::Vector3d compute1Dto3DRotationMatrix(MeshLib::Element const& e)
-{
- constexpr int global_dim = 3;
- constexpr int element_dim = 1;
-
- assert(e.getDimension() == element_dim);
- const MeshLib::ElementCoordinatesMappingLocal ele_local_coord(e,
- global_dim);
- return ele_local_coord.getRotationMatrixToGlobal()
- .template topLeftCorner<global_dim, element_dim>();
-}
-
template <typename ShapeFunction, typename IntegrationMethod, typename BHEType>
HeatTransportBHELocalAssemblerBHE<ShapeFunction, IntegrationMethod, BHEType>::
HeatTransportBHELocalAssemblerBHE(MeshLib::Element const& e,
@@ -41,8 +28,7 @@ HeatTransportBHELocalAssemblerBHE<ShapeFunction, IntegrationMethod, BHEType>::
: _process_data(process_data),
_integration_method(integration_order),
_bhe(bhe),
- _element_id(e.getID()),
- _rotation_matrix_1D_to_3D(compute1Dto3DRotationMatrix(e))
+ _element_id(e.getID())
{
// need to make sure that the BHE elements are one-dimensional
assert(e.getDimension() == 1);
@@ -175,11 +161,6 @@ void HeatTransportBHELocalAssemblerBHE<ShapeFunction, IntegrationMethod,
auto const& lambda = pipe_heat_conductions[idx_bhe_unknowns];
auto const& advection_vector =
pipe_advection_vectors[idx_bhe_unknowns];
-
- // R^T * v, 3D to 1D:
- double const advection_coefficient =
- _rotation_matrix_1D_to_3D.dot(advection_vector);
-
auto const& A = cross_section_areas[idx_bhe_unknowns];
int const single_bhe_unknowns_index =
@@ -200,16 +181,12 @@ void HeatTransportBHELocalAssemblerBHE<ShapeFunction, IntegrationMethod,
single_bhe_unknowns_index, single_bhe_unknowns_index)
.noalias() += dNdx.transpose() * dNdx * lambda * A * w;
// advection part
- int constexpr element_dim = 1;
local_K
.template block<single_bhe_unknowns_size,
single_bhe_unknowns_size>(
single_bhe_unknowns_index, single_bhe_unknowns_index)
.noalias() +=
- advection_coefficient * N.transpose() *
- dNdx.template topLeftCorner<element_dim,
- ShapeFunction::NPOINTS>() *
- A * w;
+ N.transpose() * advection_vector.transpose() * dNdx * A * w;
}
}
diff --git a/ProcessLib/HeatTransportBHE/LocalAssemblers/HeatTransportBHELocalAssemblerBHE.h b/ProcessLib/HeatTransportBHE/LocalAssemblers/HeatTransportBHELocalAssemblerBHE.h
index c90e9656f0c..a8de82b04a7 100644
--- a/ProcessLib/HeatTransportBHE/LocalAssemblers/HeatTransportBHELocalAssemblerBHE.h
+++ b/ProcessLib/HeatTransportBHE/LocalAssemblers/HeatTransportBHELocalAssemblerBHE.h
@@ -92,7 +92,6 @@ private:
SecondaryData<typename ShapeMatrices::ShapeType> _secondary_data;
Eigen::Vector3d _element_direction;
- Eigen::Vector3d const _rotation_matrix_1D_to_3D;
typename ShapeMatricesType::template MatrixType<bhe_unknowns_size,
bhe_unknowns_size>
--
GitLab