deprecate CONV_CRITERIA

Author: pcarruscag

Common/src/CConfig.cpp

@@ -1785,8 +1785,6 @@ void CConfig::SetConfig_Options() {
   /*!\par CONFIG_CATEGORY: Convergence\ingroup Config*/
   /*--- Options related to convergence ---*/
 
-  // This option is deprecated. After a grace period until 7.2.0 the usage warning should become an error.
-  addStringOption("CONV_CRITERIA", ConvCriteria, "this option is deprecated");
   /*!\brief CONV_RESIDUAL_MINVAL\n DESCRIPTION: Min value of the residual (log10 of the residual)\n DEFAULT: -14.0 \ingroup Config*/
   addDoubleOption("CONV_RESIDUAL_MINVAL", MinLogResidual, -14.0);
   /*!\brief CONV_STARTITER\n DESCRIPTION: Iteration number to begin convergence monitoring\n DEFAULT: 5 \ingroup Config*/
@@ -2966,19 +2964,18 @@ void CConfig::SetConfig_Parsing(istream& config_buffer){
             newString.append("UNST_RESTART_ITER is deprecated. Use RESTART_ITER instead.\n\n");
           else if (!option_name.compare("DYN_RESTART_ITER"))
             newString.append("DYN_RESTART_ITER is deprecated. Use RESTART_ITER instead.\n\n");
-          // This option is deprecated. After a grace period until 7.2.0 the usage warning should become an error.
-          /*else if (!option_name.compare("CONV_CRITERIA"))
-            newString.append(string("CONV_CRITERIA is deprecated. SU2 will choose the criteria automatically based on the CONV_FIELD.\n") +
-                             string("RESIDUAL for any RMS_* BGS_* value. CAUCHY for coefficients like DRAG etc.\n\n"));*/
-          if (!option_name.compare("THERMAL_DIFFUSIVITY"))
+          else if (!option_name.compare("CONV_CRITERIA"))
+            newString.append("CONV_CRITERIA is deprecated. SU2 will choose the criteria automatically based on the CONV_FIELD.\n"
+                             "RESIDUAL for any RMS_* BGS_* value. CAUCHY for coefficients like DRAG etc.\n\n");
+          else if (!option_name.compare("THERMAL_DIFFUSIVITY"))
             newString.append("THERMAL_DIFFUSIVITY is deprecated. See the INC_ENERGY_EQUATION options instead.\n\n");
-          if (!option_name.compare("THERMAL_DIFFUSIVITY_SOLID"))
+          else if (!option_name.compare("THERMAL_DIFFUSIVITY_SOLID"))
             newString.append("THERMAL_DIFFUSIVITY_SOLID is deprecated. Set THERMAL_CONDUCTIVITY_CONSTANT, MATERIAL_DENSITY and SPECIFIC_HEAT_CP instead.\n\n");
-          if (!option_name.compare("SOLID_THERMAL_CONDUCTIVITY"))
+          else if (!option_name.compare("SOLID_THERMAL_CONDUCTIVITY"))
             newString.append("SOLID_THERMAL_CONDUCTIVITY is deprecated. Use THERMAL_CONDUCTIVITY_CONSTANT instead.\n\n");
-          if (!option_name.compare("SOLID_DENSITY"))
+          else if (!option_name.compare("SOLID_DENSITY"))
             newString.append("SOLID_DENSITY is deprecated. Use MATERIAL_DENSITY instead.\n\n");
-          if (!option_name.compare("SOLID_TEMPERATURE_INIT"))
+          else if (!option_name.compare("SOLID_TEMPERATURE_INIT"))
             newString.append("SOLID_TEMPERATURE_INIT is deprecated. Use FREESTREAM_TEMPERATURE instead.\n\n");
           else {
             /*--- Find the most likely candidate for the unrecognized option, based on the length
@@ -5233,11 +5230,6 @@ void CConfig::SetPostprocessing(SU2_COMPONENT val_software, unsigned short val_i
 
   } // species transport checks
 
-  // This option is deprecated. After a grace period until 7.2.0 the usage warning should become an error.
-  if(OptionIsSet("CONV_CRITERIA") && rank == MASTER_NODE) {
-    cout << "\n\nWARNING: CONV_CRITERIA is deprecated. SU2 will choose the criteria automatically based on the CONV_FIELD.\n"
-            "That is, RESIDUAL for any RMS_* BGS_* value, and CAUCHY for coefficients such as DRAG etc.\n" << endl;
-  }
 }
 
 void CConfig::SetMarkers(SU2_COMPONENT val_software) {

Common/src/geometry/CPhysicalGeometry.cpp

@@ -4752,20 +4752,30 @@ void CPhysicalGeometry::SetPoint_Connectivity() {
 
 void CPhysicalGeometry::SetRCM_Ordering(CConfig *config) {
 
-  queue<unsigned long> Queue;
-  vector<char> inQueue(nPoint, false);
+  /*--- The result is the RCM ordering, during the process it is also used as
+   * the queue of new points considered by the algorithm. This is possible
+   * because points move from the front of the queue to the back of the result,
+   * which is equivalent to incrementing an integer marking the end of the
+   * result and the start of the queue. ---*/
+  vector<char> InQueue(nPoint, false);
   vector<unsigned long> AuxQueue, Result;
   Result.reserve(nPoint);
+  unsigned long QueueStart = 0;
 
+  /*--- Exclude halo nodes from the ordering process. ---*/
+  for (auto iPoint = nPointDomain; iPoint < nPoint; iPoint++) {
+    InQueue[iPoint] = true;
+  }
+
+  /*--- Repeat as many times as necessary to handle disconnected graphs. ---*/
   while (Result.size() < nPointDomain) {
 
     /*--- Select the node with the lowest degree in the grid. ---*/
-
     auto AddPoint = nPoint;
     auto MinDegree = std::numeric_limits<unsigned short>::max();
     for (auto iPoint = 0ul; iPoint < nPointDomain; iPoint++) {
       auto Degree = nodes->GetnPoint(iPoint);
-      if (!inQueue[iPoint] && Degree < MinDegree) {
+      if (!InQueue[iPoint] && Degree < MinDegree) {
         MinDegree = Degree;
         AddPoint = iPoint;
       }
@@ -4775,59 +4785,47 @@ void CPhysicalGeometry::SetRCM_Ordering(CConfig *config) {
     }
 
     /*--- Seed the queue with the minimum degree node. ---*/
+    Result.push_back(AddPoint);
+    InQueue[AddPoint] = true;
 
-    Queue.push(AddPoint);
-    inQueue[AddPoint] = true;
-
-    /*--- Loop until reorganizing all the nodes. ---*/
+    /*--- Loop until reorganizing all nodes connected to AddPoint. This will
+     * also terminate early once the ordering + queue include all points. ---*/
+    while (QueueStart < Result.size() && Result.size() < nPointDomain) {
 
-    while (!Queue.empty()) {
-
-      /*--- Extract the first node from the queue and add it to the order. ---*/
-
-      AddPoint = Queue.front();
-      Result.push_back(AddPoint);
-      Queue.pop();
+      /*--- Move the start of the queue, equivalent to taking from the front of
+       * the queue and inserting at the end of the result. ---*/
+      AddPoint = Result[QueueStart];
+      ++QueueStart;
 
       /*--- Add all adjacent nodes to the queue in increasing order of their
        degree, checking if the element is already in the queue. ---*/
-
       AuxQueue.clear();
       for (auto iNode = 0u; iNode < nodes->GetnPoint(AddPoint); iNode++) {
-        auto AdjPoint = nodes->GetPoint(AddPoint, iNode);
-        if (!inQueue[AdjPoint] && (AdjPoint < nPointDomain)) {
+        const auto AdjPoint = nodes->GetPoint(AddPoint, iNode);
+        if (!InQueue[AdjPoint]) {
           AuxQueue.push_back(AdjPoint);
+          InQueue[AdjPoint] = true;
         }
       }
       if (AuxQueue.empty()) continue;
 
       /*--- Sort the auxiliar queue based on the number of neighbors (degree). ---*/
-
       stable_sort(AuxQueue.begin(), AuxQueue.end(),
         [&](unsigned long iPoint, unsigned long jPoint) {
           return nodes->GetnPoint(iPoint) < nodes->GetnPoint(jPoint);
         }
       );
-
-      for (auto iPoint : AuxQueue) {
-        Queue.push(iPoint);
-        inQueue[iPoint] = true;
-      }
+      Result.insert(Result.end(), AuxQueue.begin(), AuxQueue.end());
     }
   }
+  reverse(Result.begin(), Result.end());
 
   /*--- Check that all the points have been added ---*/
-
-  for (auto iPoint = 0ul; iPoint < nPointDomain; iPoint++) {
-    if (!inQueue[iPoint]) {
-      SU2_MPI::Error("RCM ordering failed", CURRENT_FUNCTION);
-    }
+  for (const auto status : InQueue) {
+    if (!status) SU2_MPI::Error("RCM ordering failed", CURRENT_FUNCTION);
   }
 
-  reverse(Result.begin(), Result.end());
-
   /*--- Add the MPI points ---*/
-
   for (auto iPoint = nPointDomain; iPoint < nPoint; iPoint++) {
     Result.push_back(iPoint);
   }