Fix identification of marker boundaries at mixing plane interface

Author: joshkellyjak

Common/include/CConfig.hpp

@@ -10040,7 +10040,7 @@ class CConfig {
    * \param[in] nMarker - Number of the marker in a zone being tested, starting at 0.
    * \return value > 1 if (on this mpi rank) the zone defined by config is part of the mixing plane.
    */
-  short FindMixingPlaneInterfaceMarker(unsigned short nMarker) const;
+  short FindMixingPlaneInterfaceMarker(unsigned short nMarker, unsigned short iMarkerInt) const;
 
   /*!
    * \brief Get whether or not to save solution data to libROM.

Common/src/CConfig.cpp

@@ -9964,11 +9964,11 @@ short CConfig::FindInterfaceMarker(unsigned short iInterface) const {
   return -1;
 }
 
-short CConfig::FindMixingPlaneInterfaceMarker(unsigned short nMarker) const {
+short CConfig::FindMixingPlaneInterfaceMarker(unsigned short nMarker, unsigned short iMarkerInt) const {
   short mark;
   for (auto iMarker = 0; iMarker < nMarker; iMarker++){
       /*--- If the tag GetMarker_All_MixingPlaneInterface equals the index we are looping at ---*/
-      if (GetMarker_All_MixingPlaneInterface(iMarker)){
+      if (GetMarker_All_MixingPlaneInterface(iMarker) == iMarkerInt){
           /*--- We have identified the local index of the marker ---*/
           /*--- Store the identifier for the marker ---*/
           mark = iMarker;

Common/src/interface_interpolation/CMixingPlane.cpp

@@ -236,7 +236,7 @@ void CMixingPlane::WriteInterpolationDetails(const std::string& filename, const
     outFile << "===============================================================" << endl;
 
     // Loop through each marker interface
-    for (auto iMarkerInt = 0; iMarkerInt < nMarkerInt; iMarkerInt++) {
+    for (auto iMarkerInt = 0; iMarkerInt < nMarkerInt + 1; iMarkerInt++) {
         if (targetSpans[iMarkerInt].empty()) continue;
 
         outFile << "Marker Interface " << iMarkerInt << "\n";
@@ -256,7 +256,7 @@ void CMixingPlane::WriteInterpolationDetails(const std::string& filename, const
     outFile << "\n\nGrouped by Donor Span\n";
     outFile << "=====================\n\n";
 
-    for (auto iMarkerInt = 0; iMarkerInt < nMarkerInt; iMarkerInt++) {
+    for (auto iMarkerInt = 0; iMarkerInt < nMarkerInt + 1; iMarkerInt++) {
         if (targetSpans[iMarkerInt].empty()) continue;
 
         outFile << "Marker Interface " << iMarkerInt << "\n";

SU2_CFD/src/drivers/CDriver.cpp

@@ -2963,7 +2963,7 @@ void CFluidDriver::Run() {
     for (iZone = 0; iZone < nZone; iZone++) {
       for (jZone = 0; jZone < nZone; jZone++)
         if(jZone != iZone && interpolator_container[iZone][jZone] != nullptr)
-        interpolator_container[iZone][jZone]->SetTransferCoeff(config_container);
+        interpolator_container[iZone][jZone]->SetTransferCoeff(geometry_container, config_container);
     }
   }
 

SU2_CFD/src/interfaces/cfd/CMixingPlaneInterface.cpp

@@ -78,7 +78,7 @@ void CMixingPlaneInterface::BroadcastData_MixingPlane(const CInterpolator& inter
 
     /*--- Fill send buffers. ---*/
 
-    vector<short> sendDonorMarker(nSpanDonor + 1);
+    vector<short> sendDonorMarker(nSpanDonor + 1, -1);
     vector<su2double> sendDonorVar(static_cast<size_t>(nSpanDonor + 1) * nMixingVars);
 
     if (markDonor != -1) {
@@ -124,23 +124,19 @@ void CMixingPlaneInterface::BroadcastData_MixingPlane(const CInterpolator& inter
 
       auto& targetSpan = interpolator.targetSpans[iMarkerInt][iTargetSpan];
 
+      /*--- Get the global index of the donor span. ---*/
+      const auto donorSpan = targetSpan.donorSpan;
+
       InitializeTarget_Variable(target_solution, markTarget, iTargetSpan, nSpanDonor);
 
       if ((iTargetSpan == 0) || (iTargetSpan == nTargetSpan) || (iTargetSpan == nTargetSpan - 1)) {
         /*--- Transfer values at hub, shroud and 1D values ---*/
-        unsigned long donorSpan;
-        if (iTargetSpan == 0) donorSpan = 0;
-        else if (iTargetSpan == nTargetSpan - 1) donorSpan = nSpanDonor - 1;
-        else if (iTargetSpan == nTargetSpan) donorSpan = nSpanDonor;
-
         RecoverTarget_Span_Endwall(sendDonorVar, donorSpan);
 
         SetTarget_Variable(target_solution, target_geometry, target_config, markTarget, iTargetSpan, 0);
       }
       else {
-        /*--- Get the global index of the donor and the interpolation coefficient. ---*/
-
-        const auto donorSpan = targetSpan.donorSpan;
+        /*--- Get the global index of interpolation coefficient. ---*/
         const auto donorCoeff = targetSpan.coefficient;
 
         /*--- Recover the Target_Variable from the buffer of variables. ---*/