not all interpolators need their transpose

pcarruscag · pcarruscag · commit efa20ba02c2a · 2020-08-06T11:15:03.000+01:00
diff --git a/Common/include/interface_interpolation/CInterpolator.hpp b/Common/include/interface_interpolation/CInterpolator.hpp
@@ -29,7 +29,6 @@
 #include "../../include/basic_types/datatype_structure.hpp"
 #include "../../include/toolboxes/C2DContainer.hpp"
 #include <vector>
-#include <memory>
 
 class CConfig;
 class CGeometry;
@@ -77,7 +76,6 @@ class CInterpolator {
   CGeometry**** const Geometry;      /*! \brief Vector which stores n zones of geometry. */
   CGeometry* const donor_geometry;   /*! \brief Donor geometry. */
   CGeometry* const target_geometry;  /*! \brief Target geometry. */
-  const vector<vector<unique_ptr<CInterpolator> > >& interpolators; /*! \brief All the interpolators. */
 
 public:
   struct CDonorInfo {
@@ -99,12 +97,10 @@ class CInterpolator {
    * \brief Constructor of the class.
    * \param[in] geometry_container - Geometrical definition of the problem.
    * \param[in] config - Definition of the particular problem.
-   * \param[in] interpolator - Container of all interpolators.
    * \param[in] iZone - index of the donor zone.
    * \param[in] jZone - index of the target zone.
    */
   CInterpolator(CGeometry ****geometry_container, const CConfig* const* config,
-                const vector<vector<unique_ptr<CInterpolator> > >& interpolator,
                 unsigned int iZone, unsigned int jZone);
 
   /*!
diff --git a/Common/include/interface_interpolation/CInterpolatorFactory.hpp b/Common/include/interface_interpolation/CInterpolatorFactory.hpp
@@ -41,15 +41,15 @@ namespace CInterpolatorFactory {
  * \brief The factory method.
  * \param[in] geometry_container - Geometrical definition of the problem.
  * \param[in] config - Definition of the particular problem.
- * \param[in] interp_container - Container of all interpolators.
+ * \param[in] transpInterpolator - Transpose interpolator.
  * \param[in] iZone - Index of the donor zone.
  * \param[in] jZone - Index of the target zone.
  * \param[in] verbose - If true, print information to screen.
  * \return Pointer to interpolator on the heap, caller is responsible for deletion.
  */
 CInterpolator* CreateInterpolator(CGeometry ****geometry_container,
                                   const CConfig* const* config,
-                                  const vector<vector<std::unique_ptr<CInterpolator> > >& interp_container,
+                                  const CInterpolator* transpInterpolator,
                                   unsigned iZone, unsigned jZone,
                                   bool verbose = true);
 
diff --git a/Common/include/interface_interpolation/CIsoparametric.hpp b/Common/include/interface_interpolation/CIsoparametric.hpp
@@ -42,12 +42,10 @@ class CIsoparametric final : public CInterpolator {
    * \brief Constructor of the class.
    * \param[in] geometry - Geometrical definition of the problem.
    * \param[in] config - Definition of the particular problem.
-   * \param[in] interpolator - Container of all interpolators.
    * \param[in] iZone - index of the donor zone.
    * \param[in] jZone - index of the target zone.
    */
   CIsoparametric(CGeometry ****geometry_container, const CConfig* const* config,
-                 const vector<vector<unique_ptr<CInterpolator> > >& interpolator,
                  unsigned int iZone, unsigned int jZone);
 
   /*!
diff --git a/Common/include/interface_interpolation/CMirror.hpp b/Common/include/interface_interpolation/CMirror.hpp
@@ -33,19 +33,21 @@
  * \note Requires that the opposing mesh has already run interpolation (jZone > iZone), otherwise throws.
  */
 class CMirror final : public CInterpolator {
+private:
+  const CInterpolator* const transpInterpolator; /*! \brief The transpose interpolator (from j to i). */
+
 public:
   /*!
    * \brief Constructor of the class.
    * \note Data is set in geometry[targetZone].
    * \param[in] geometry_container
    * \param[in] config - config container
-   * \param[in] interpolator - Container of all interpolators
+   * \param[in] interpolator - Transpose interpolator
    * \param[in] iZone - First zone
    * \param[in] jZone - Second zone
    */
   CMirror(CGeometry ****geometry_container, const CConfig* const* config,
-          const vector<vector<unique_ptr<CInterpolator> > >& interpolator,
-          unsigned int iZone, unsigned int jZone);
+          const CInterpolator* interpolator, unsigned int iZone, unsigned int jZone);
 
   /*!
    * \brief Set up transfer matrix defining relation between two meshes
diff --git a/Common/include/interface_interpolation/CNearestNeighbor.hpp b/Common/include/interface_interpolation/CNearestNeighbor.hpp
@@ -43,12 +43,10 @@ class CNearestNeighbor final : public CInterpolator {
    * \brief Constructor of the class.
    * \param[in] geometry - Geometrical definition of the problem.
    * \param[in] config - Definition of the particular problem.
-   * \param[in] interpolator - Container of all interpolators.
    * \param[in] iZone - index of the donor zone.
    * \param[in] jZone - index of the target zone.
    */
   CNearestNeighbor(CGeometry ****geometry_container, const CConfig* const* config,
-                   const vector<vector<unique_ptr<CInterpolator> > >& interpolator,
                    unsigned int iZone, unsigned int jZone);
 
   /*!
diff --git a/Common/include/interface_interpolation/CRadialBasisFunction.hpp b/Common/include/interface_interpolation/CRadialBasisFunction.hpp
@@ -45,12 +45,10 @@ class CRadialBasisFunction final : public CInterpolator {
    * \brief Constructor of the class.
    * \param[in] geometry - Geometrical definition of the problem.
    * \param[in] config - Definition of the particular problem.
-   * \param[in] interpolator - Container of all interpolators.
    * \param[in] iZone - index of the donor zone.
    * \param[in] jZone - index of the target zone.
    */
   CRadialBasisFunction(CGeometry ****geometry_container, const CConfig* const* config,
-                       const vector<vector<unique_ptr<CInterpolator> > >& interpolator,
                        unsigned int iZone, unsigned int jZone);
 
   /*!
diff --git a/Common/include/interface_interpolation/CSlidingMesh.hpp b/Common/include/interface_interpolation/CSlidingMesh.hpp
@@ -39,12 +39,10 @@ class CSlidingMesh final : public CInterpolator {
    * \brief Constructor of the class.
    * \param[in] geometry - Geometrical definition of the problem.
    * \param[in] config - Definition of the particular problem.
-   * \param[in] interpolator - Container of all interpolators.
    * \param[in] iZone - index of the donor zone.
    * \param[in] jZone - index of the target zone.
    */
   CSlidingMesh(CGeometry ****geometry_container, const CConfig* const* config,
-               const vector<vector<unique_ptr<CInterpolator> > >& interpolator,
                unsigned int iZone, unsigned int jZone);
 
   /*!
diff --git a/Common/src/interface_interpolation/CInterpolator.cpp b/Common/src/interface_interpolation/CInterpolator.cpp
@@ -31,16 +31,14 @@
 
 
 CInterpolator::CInterpolator(CGeometry ****geometry_container, const CConfig* const* config,
-                             const vector<vector<unique_ptr<CInterpolator> > >& interpolator,
                              unsigned int iZone, unsigned int jZone) :
   rank(SU2_MPI::GetRank()),
   size(SU2_MPI::GetSize()),
   donorZone(iZone),
   targetZone(jZone),
   Geometry(geometry_container),
   donor_geometry(geometry_container[iZone][INST_0][MESH_0]),
-  target_geometry(geometry_container[jZone][INST_0][MESH_0]),
-  interpolators(interpolator) {
+  target_geometry(geometry_container[jZone][INST_0][MESH_0]) {
 }
 
 bool CInterpolator::CheckInterfaceBoundary(int markDonor, int markTarget) {
diff --git a/Common/src/interface_interpolation/CInterpolatorFactory.cpp b/Common/src/interface_interpolation/CInterpolatorFactory.cpp
@@ -36,7 +36,7 @@
 namespace CInterpolatorFactory {
 CInterpolator* CreateInterpolator(CGeometry ****geometry_container,
                                   const CConfig* const* config,
-                                  const vector<vector<unique_ptr<CInterpolator> > >& interp_container,
+                                  const CInterpolator* transpInterpolator,
                                   unsigned iZone, unsigned jZone, bool verbose) {
 
   CInterpolator* interpolator = nullptr;
@@ -56,27 +56,27 @@ CInterpolator* CreateInterpolator(CGeometry ****geometry_container,
 
   if (type == WEIGHTED_AVERAGE) {
     if (verbose) cout << "using a sliding mesh approach." << endl;
-    interpolator = new CSlidingMesh(geometry_container, config, interp_container, iZone, jZone);
+    interpolator = new CSlidingMesh(geometry_container, config, iZone, jZone);
   }
   else if (config[jZone]->GetConservativeInterpolation()) {
     if (verbose) cout << "using the mirror approach, \"transposing\" coefficients from opposite mesh." << endl;
-    interpolator = new CMirror(geometry_container, config, interp_container, iZone, jZone);
+    interpolator = new CMirror(geometry_container, config, transpInterpolator, iZone, jZone);
   }
   else {
     switch(type) {
     case ISOPARAMETRIC:
       if (verbose) cout << "using the isoparametric approach." << endl;
-      interpolator = new CIsoparametric(geometry_container, config, interp_container, iZone, jZone);
+      interpolator = new CIsoparametric(geometry_container, config, iZone, jZone);
       break;
 
     case NEAREST_NEIGHBOR:
       if (verbose) cout << "using a nearest neighbor approach." << endl;
-      interpolator = new CNearestNeighbor(geometry_container, config, interp_container, iZone, jZone);
+      interpolator = new CNearestNeighbor(geometry_container, config, iZone, jZone);
       break;
 
     case RADIAL_BASIS_FUNCTION:
       if (verbose) cout << "using a radial basis function approach." << endl;
-      interpolator = new CRadialBasisFunction(geometry_container, config, interp_container, iZone, jZone);
+      interpolator = new CRadialBasisFunction(geometry_container, config, iZone, jZone);
       break;
 
     default:
diff --git a/Common/src/interface_interpolation/CIsoparametric.cpp b/Common/src/interface_interpolation/CIsoparametric.cpp
@@ -47,9 +47,8 @@ struct DonorInfo {
 };
 
 CIsoparametric::CIsoparametric(CGeometry ****geometry_container, const CConfig* const* config,
-                               const vector<vector<unique_ptr<CInterpolator> > >& interpolator,
                                unsigned int iZone, unsigned int jZone) :
-  CInterpolator(geometry_container, config, interpolator, iZone, jZone) {
+  CInterpolator(geometry_container, config, iZone, jZone) {
   SetTransferCoeff(config);
 }
 
diff --git a/Common/src/interface_interpolation/CMirror.cpp b/Common/src/interface_interpolation/CMirror.cpp
@@ -32,9 +32,9 @@
 
 
 CMirror::CMirror(CGeometry ****geometry_container, const CConfig* const* config,
-                 const vector<vector<unique_ptr<CInterpolator> > >& interpolator,
-                 unsigned int iZone, unsigned int jZone) :
-  CInterpolator(geometry_container, config, interpolator, iZone, jZone) {
+                 const CInterpolator* interpolator, unsigned int iZone, unsigned int jZone) :
+  CInterpolator(geometry_container, config, iZone, jZone),
+  transpInterpolator(interpolator) {
   using PrintingToolbox::to_string;
   if (jZone < iZone) {
     SU2_MPI::Error(string("The order of the zones does not allow conservative interpolation to be setup.\n"
@@ -52,7 +52,7 @@ void CMirror::SetTransferCoeff(const CConfig* const* config) {
   vector<unsigned long> allNumNodeDonor(nProcessor);
 
   /*--- The target vertex information of the transpose interpolator. ---*/
-  const auto& donorVertices = interpolators[targetZone][donorZone]->targetVertices;
+  const auto& donorVertices = transpInterpolator->targetVertices;
 
   targetVertices.resize(config[targetZone]->GetnMarker_All());
 
diff --git a/Common/src/interface_interpolation/CNearestNeighbor.cpp b/Common/src/interface_interpolation/CNearestNeighbor.cpp
@@ -41,9 +41,8 @@ struct DonorInfo {
 };
 
 CNearestNeighbor::CNearestNeighbor(CGeometry ****geometry_container, const CConfig* const* config,
-                                   const vector<vector<unique_ptr<CInterpolator> > >& interpolator,
                                    unsigned int iZone, unsigned int jZone) :
-  CInterpolator(geometry_container, config, interpolator, iZone, jZone) {
+  CInterpolator(geometry_container, config, iZone, jZone) {
   SetTransferCoeff(config);
 }
 
diff --git a/Common/src/interface_interpolation/CRadialBasisFunction.cpp b/Common/src/interface_interpolation/CRadialBasisFunction.cpp
@@ -46,9 +46,8 @@ extern "C" void dgemm_(const char*, const char*, const int*, const int*, const i
 
 
 CRadialBasisFunction::CRadialBasisFunction(CGeometry ****geometry_container, const CConfig* const* config,
-                                           const vector<vector<unique_ptr<CInterpolator> > >& interpolator,
                                            unsigned int iZone, unsigned int jZone) :
-  CInterpolator(geometry_container, config, interpolator, iZone, jZone) {
+  CInterpolator(geometry_container, config, iZone, jZone) {
   SetTransferCoeff(config);
 }
 
diff --git a/Common/src/interface_interpolation/CSlidingMesh.cpp b/Common/src/interface_interpolation/CSlidingMesh.cpp
@@ -32,9 +32,8 @@
 
 
 CSlidingMesh::CSlidingMesh(CGeometry ****geometry_container, const CConfig* const* config,
-                           const vector<vector<unique_ptr<CInterpolator> > >& interpolator,
                            unsigned int iZone, unsigned int jZone) :
-  CInterpolator(geometry_container, config, interpolator, iZone, jZone) {
+  CInterpolator(geometry_container, config, iZone, jZone) {
   SetTransferCoeff(config);
 }
 
diff --git a/SU2_CFD/src/drivers/CDriver.cpp b/SU2_CFD/src/drivers/CDriver.cpp
@@ -2405,8 +2405,8 @@ void CDriver::Interface_Preprocessing(CConfig **config, CSolver***** solver, CGe
 
         /*--- Setup the interpolation. ---*/
 
-        interpolation[donor][target] = unique_ptr<CInterpolator>(
-          CInterpolatorFactory::CreateInterpolator(geometry, config, interpolation, donor, target));
+        interpolation[donor][target] = unique_ptr<CInterpolator>(CInterpolatorFactory::CreateInterpolator(
+                                       geometry, config, interpolation[target][donor].get(), donor, target));
 
         /*--- The type of variables transferred depends on the donor/target physics. ---*/
 
diff --git a/SU2_CFD/src/interfaces/CInterface.cpp b/SU2_CFD/src/interfaces/CInterface.cpp
@@ -63,6 +63,7 @@ void CInterface::BroadcastData(const CInterpolator& interpolator,
                                CSolver *donor_solution, CSolver *target_solution,
                                CGeometry *donor_geometry, CGeometry *target_geometry,
                                const CConfig *donor_config, const CConfig *target_config) {
+  static_assert(su2activematrix::Storage == StorageType::RowMajor,"");
 
   GetPhysical_Constants(donor_solution, target_solution, donor_geometry, target_geometry,
                         donor_config, target_config);

Original file line number	Diff line number	Diff line change
`@@ -47,9 +47,8 @@ struct DonorInfo {`
`47`	`47`	`};`
`48`	`48`
`49`	`49`	`CIsoparametric::CIsoparametric(CGeometry ***geometry_container, const CConfig const* config,`
`50`		`- const vector<vector<unique_ptr<CInterpolator> > >& interpolator,`
`51`	`50`	`unsigned int iZone, unsigned int jZone) :`
`52`		`- CInterpolator(geometry_container, config, interpolator, iZone, jZone) {`
	`51`	`+ CInterpolator(geometry_container, config, iZone, jZone) {`
`53`	`52`	`SetTransferCoeff(config);`
`54`	`53`	`}`
`55`	`54`