From e5232a2e23432bb34dc2237cf918be83c2973654 Mon Sep 17 00:00:00 2001
From: Shuang Chen <gechenshuang88@gmail.com>
Date: Wed, 3 Feb 2021 11:39:57 +0100
Subject: [PATCH] [BHE] replace the tuple type to array type for thermal
resistance
---
ProcessLib/HeatTransportBHE/BHE/BHE_1U.cpp | 5 +++--
ProcessLib/HeatTransportBHE/BHE/BHE_2U.cpp | 9 ++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ProcessLib/HeatTransportBHE/BHE/BHE_1U.cpp b/ProcessLib/HeatTransportBHE/BHE/BHE_1U.cpp
index 4a6272803f6..2ef82cbe6b6 100644
--- a/ProcessLib/HeatTransportBHE/BHE/BHE_1U.cpp
+++ b/ProcessLib/HeatTransportBHE/BHE/BHE_1U.cpp
@@ -124,8 +124,9 @@ double compute_R_gg(double const chi, double const R_gs, double const R_ar,
/// Check if constraints regarding negative thermal resistances are violated
/// apply correction procedure.
/// Section (1.5.5) in FEFLOW White Papers Vol V.
-std::tuple<double, double, double> thermalResistancesGroutSoil(
- double const chi, double const R_ar, double const R_g)
+std::array<double, 3> thermalResistancesGroutSoil(double const chi,
+ double const R_ar,
+ double const R_g)
{
double R_gs = compute_R_gs(chi, R_g);
double R_gg =
diff --git a/ProcessLib/HeatTransportBHE/BHE/BHE_2U.cpp b/ProcessLib/HeatTransportBHE/BHE/BHE_2U.cpp
index 0fbc897fb0e..99555a2ea54 100644
--- a/ProcessLib/HeatTransportBHE/BHE/BHE_2U.cpp
+++ b/ProcessLib/HeatTransportBHE/BHE/BHE_2U.cpp
@@ -142,11 +142,10 @@ double compute_R_gg_2U(double const chi, double const R_gs, double const R_ar,
/// Check if constraints regarding negative thermal resistances are violated
/// apply correction procedure.
/// Section (1.5.5) in FEFLOW White Papers Vol V.
-std::tuple<double, double, double, double> thermalResistancesGroutSoil2U(
- double const chi,
- double const R_ar_1,
- double const R_ar_2,
- double const R_g)
+std::array<double, 4> thermalResistancesGroutSoil2U(double const chi,
+ double const R_ar_1,
+ double const R_ar_2,
+ double const R_g)
{
double R_gs = compute_R_gs_2U(chi, R_g);
double R_gg_1 = compute_R_gg_2U(chi, R_gs, R_ar_1, R_g);
--
GitLab