[PL] change function names, move cross section areas' calculation.

ProcessLib/HeatTransportBHE/BHE/BHECommonCoaxial.cpp

@@ -83,13 +83,6 @@ BHECommonCoaxial::pipeAdvectionVectors() const
              {0, 0, 0}}};
 }
 
-std::array<double, BHECommonCoaxial::number_of_unknowns>
-BHECommonCoaxial::crossSectionAreas() const
-{
-    auto S = cross_section_areas_coaxial();
-    return {S[0], S[1], S[2]};
-}
-
 std::array<double, BHECommonCoaxial::number_of_unknowns>
 BHECommonCoaxial::calcThermalResistances(double const Nu_inner_pipe,
                                          double const Nu_annulus_pipe)

ProcessLib/HeatTransportBHE/BHE/BHECommonCoaxial.h

@@ -34,6 +34,11 @@ public:
         : BHECommon{borehole, refrigerant, grout, flowAndTemperatureControl},
           _pipes(pipes)
     {
+        cross_section_area_inner_pipe = _pipes.inner_pipe.area();
+        cross_section_area_annulus =
+            _pipes.outer_pipe.area() - _pipes.inner_pipe.outsideArea();
+        cross_section_area_grout =
+            borehole_geometry.area() - _pipes.outer_pipe.outsideArea();
     }
 
     static constexpr int number_of_unknowns = 3;
@@ -58,14 +63,10 @@ public:
 
     std::array<Eigen::Vector3d, number_of_unknowns> pipeAdvectionVectors()
         const;
+
     double cross_section_area_inner_pipe, cross_section_area_annulus,
         cross_section_area_grout;
 
-    std::array<double, number_of_unknowns> crossSectionAreas() const;
-
-    virtual std::array<double, number_of_unknowns> cross_section_areas_coaxial()
-        const = 0;
-
 protected:
     void updateHeatTransferCoefficients(double const flow_rate)
     {
@@ -91,13 +92,6 @@ protected:
         _thermal_resistances =
             calcThermalResistances(tm_flow_properties.nusselt_number,
                                    tm_flow_properties_annulus.nusselt_number);
-
-        auto const cross_section_area = calculateCrossSectionAreasCoaxial(
-            _pipes.inner_pipe, _pipes.outer_pipe, borehole_geometry.area());
-
-        cross_section_area_inner_pipe = cross_section_area.inner;
-        cross_section_area_annulus = cross_section_area.annulus;
-        cross_section_area_grout = cross_section_area.grout;
     }
 
     PipeConfigurationCoaxial const _pipes;

ProcessLib/HeatTransportBHE/BHE/BHE_CXA.h

@@ -107,9 +107,7 @@ public:
         }
     }
 
-public:
-    std::array<double, number_of_unknowns> cross_section_areas_coaxial()
-        const override
+    std::array<double, number_of_unknowns> crossSectionAreas() const
     {
         return {cross_section_area_annulus, cross_section_area_inner_pipe,
                 cross_section_area_grout};

ProcessLib/HeatTransportBHE/BHE/BHE_CXC.h

@@ -107,9 +107,7 @@ public:
         }
     }
 
-public:
-    std::array<double, number_of_unknowns> cross_section_areas_coaxial()
-        const override
+    std::array<double, number_of_unknowns> crossSectionAreas() const
     {
         return {cross_section_area_inner_pipe, cross_section_area_annulus,
                 cross_section_area_grout};

ProcessLib/HeatTransportBHE/BHE/Physics.h

@@ -98,22 +98,6 @@ inline double nusseltNumberAnnulus(double const reynolds_number,
              0.14 * std::pow(diameter_ratio, 0.6)) /
             (1.0 + diameter_ratio));
 }
-
-struct CrossSectionAreasCoaxial
-{
-    double const inner;
-    double const annulus;
-    double const grout;
-};
-
-inline CrossSectionAreasCoaxial calculateCrossSectionAreasCoaxial(
-    Pipe const& inner_pipe, Pipe const& outer_pipe, double const borehole_area)
-{
-    double const inner = inner_pipe.area();
-    double const annulus = outer_pipe.area() - inner_pipe.outsideArea();
-    double const grout = borehole_area - outer_pipe.outsideArea();
-    return {inner, annulus, grout};
-}
 }  // end of namespace BHE
 }  // end of namespace HeatTransportBHE
 }  // end of namespace ProcessLib