From 4ce38960e2319235921c962031a96f7569461a9b Mon Sep 17 00:00:00 2001 From: Boyan Meng <meng.boyan@ufz.de> Date: Tue, 12 Nov 2019 15:59:08 +0100 Subject: [PATCH] drop the ctor in IntegrationPointDataSoil.h and replace emplace_back with push_back in the IP data initializaiton --- .../HeatTransportBHELocalAssemblerSoil-impl.h | 2 +- .../LocalAssemblers/IntegrationPointDataSoil.h | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/ProcessLib/HeatTransportBHE/LocalAssemblers/HeatTransportBHELocalAssemblerSoil-impl.h b/ProcessLib/HeatTransportBHE/LocalAssemblers/HeatTransportBHELocalAssemblerSoil-impl.h index 43de03698ce..fdce2003e63 100644 --- a/ProcessLib/HeatTransportBHE/LocalAssemblers/HeatTransportBHELocalAssemblerSoil-impl.h +++ b/ProcessLib/HeatTransportBHE/LocalAssemblers/HeatTransportBHELocalAssemblerSoil-impl.h @@ -61,7 +61,7 @@ HeatTransportBHELocalAssemblerSoil<ShapeFunction, IntegrationMethod>:: auto const& sm = _shape_matrices[ip]; double const w = _integration_method.getWeightedPoint(ip).getWeight() * sm.integralMeasure * sm.detJ; - _ip_data.emplace_back(sm.N, sm.dNdx, w); + _ip_data.push_back({sm.N, sm.dNdx, w}); _secondary_data.N[ip] = sm.N; } diff --git a/ProcessLib/HeatTransportBHE/LocalAssemblers/IntegrationPointDataSoil.h b/ProcessLib/HeatTransportBHE/LocalAssemblers/IntegrationPointDataSoil.h index 1bc722b3fa7..3ef76df7b09 100644 --- a/ProcessLib/HeatTransportBHE/LocalAssemblers/IntegrationPointDataSoil.h +++ b/ProcessLib/HeatTransportBHE/LocalAssemblers/IntegrationPointDataSoil.h @@ -17,15 +17,6 @@ namespace HeatTransportBHE template <typename NodalRowVectorType, typename GlobalDimNodalMatrixType> struct IntegrationPointDataSoil final { - IntegrationPointDataSoil(NodalRowVectorType N_, - GlobalDimNodalMatrixType dNdx_, - double const& integration_weight_) - : N(std::move(N_)), - dNdx(std::move(dNdx_)), - integration_weight(integration_weight_) - { - } - NodalRowVectorType const N; GlobalDimNodalMatrixType const dNdx; double const integration_weight; -- GitLab