Merge branch 'develop' into feature_MUSCL_ramp

joshkellyjak · web-flow · commit 2599029ce329 · 2025-12-08T20:51:00.000Z
diff --git a/Common/include/geometry/CGeometry.hpp b/Common/include/geometry/CGeometry.hpp
@@ -1,4 +1,4 @@
-﻿/*!
+/*!
  * \file CGeometry.hpp
  * \brief Headers of the main subroutines for creating the geometrical structure.
  *        The subroutines and functions are in the <i>CGeometry.cpp</i> file.
@@ -51,6 +51,7 @@ extern "C" {
 #include <climits>
 #include <memory>
 #include <unordered_map>
+#include <cstdint>
 
 #include "primal_grid/CPrimalGrid.hpp"
 #include "dual_grid/CDualGrid.hpp"
diff --git a/Common/include/geometry/primal_grid/CPrimalGrid.hpp b/Common/include/geometry/primal_grid/CPrimalGrid.hpp
@@ -28,11 +28,11 @@
 
 #pragma once
 
+#include <cstdint>
 #include <iostream>
 #include <vector>
 #include <limits>
 #include <cstdlib>
-#include <limits>
 #include <memory>
 
 #include "../../option_structure.hpp"
diff --git a/Common/src/CConfig.cpp b/Common/src/CConfig.cpp
@@ -6215,8 +6215,8 @@ void CConfig::SetMarkers(SU2_COMPONENT val_software) {
     }
   }
 
-  /*--- Idenftification fo Giles Markers ---*/
-  // This is seperate from MP and Turbomachinery Markers as all mixing plane markers are Giles,
+  /*--- Identification of Giles Markers ---*/
+  // This is separate from MP and Turbomachinery Markers as all mixing plane markers are Giles,
   // but not all Giles markers are mixing plane
   for (iMarker_CfgFile = 0; iMarker_CfgFile < nMarker_CfgFile; iMarker_CfgFile++) {
     Marker_CfgFile_Giles[iMarker_CfgFile] = NO;
@@ -10040,8 +10040,8 @@ void CConfig::SetProfilingCSV() {
 
   /*--- Allocate and initialize memory ---*/
 
-  double *l_min_red = NULL, *l_max_red = NULL, *l_tot_red = NULL, *l_avg_red = NULL;
-  int *n_calls_red = NULL;
+  double *l_min_red = nullptr, *l_max_red = nullptr, *l_tot_red = nullptr, *l_avg_red = nullptr;
+  int *n_calls_red = nullptr;
   double* l_min = new double[map_size];
   double* l_max = new double[map_size];
   double* l_tot = new double[map_size];
diff --git a/Common/src/geometry/CPhysicalGeometry.cpp b/Common/src/geometry/CPhysicalGeometry.cpp
@@ -4642,7 +4642,7 @@ void CPhysicalGeometry::SetElement_Connectivity() {
 
           if ((elem[iElem]->GetNeighbor_Elements(iFace) == -1) && (iElem < Test_Elem) &&
               FindFace(iElem, Test_Elem, first_elem_face, second_elem_face)) {
-            /*--- Localice which faces are sharing both elements ---*/
+            /*--- Localize which faces are sharing both elements ---*/
 
             elem[iElem]->SetNeighbor_Elements(Test_Elem, first_elem_face);
 
@@ -4666,7 +4666,7 @@ void CPhysicalGeometry::SetBoundVolume() {
       CheckVol = false;
 
       for (iElem = 0; iElem < nodes->GetnElem(Point); iElem++) {
-        /*--- Look for elements surronding that point --*/
+        /*--- Look for elements surrounding that point --*/
         cont = 0;
         iElem_Domain = nodes->GetElem(Point, iElem);
         for (iNode_Domain = 0; iNode_Domain < elem[iElem_Domain]->GetnNodes(); iNode_Domain++) {
@@ -4775,10 +4775,10 @@ void CPhysicalGeometry::ComputeNSpan(CConfig* config, unsigned short val_iZone,
   nSpan_loc = 0;
   if (nDim == 2) {
     nSpanWiseSections[marker_flag - 1] = 1;
-    // TODO (turbo) make it more genral
+    // TODO (turbo) make it more general
     if (marker_flag == OUTFLOW) config->SetnSpanWiseSections(1);
 
-    /*---Initilize the vector of span-wise values that will be ordered ---*/
+    /*---Initialize the vector of span-wise values that will be ordered ---*/
     SpanWiseValue[marker_flag - 1] = new su2double[1];
     for (iSpan = 0; iSpan < 1; iSpan++) {
       SpanWiseValue[marker_flag - 1][iSpan] = 0;
@@ -4792,7 +4792,7 @@ void CPhysicalGeometry::ComputeNSpan(CConfig* config, unsigned short val_iZone,
           if (config->GetMarker_All_TurbomachineryFlag(iMarker) != marker_flag) continue;
 
           /*--- loop to find the vertex that ar both of inflow or outflow marker and on the periodic
-           * in order to caount the number of Span ---*/
+           * in order to count the number of Span ---*/
           for (jMarker = 0; jMarker < nMarker; jMarker++) {
             if (config->GetMarker_All_KindBC(jMarker) != PERIODIC_BOUNDARY) continue;
 
diff --git a/SU2_CFD/include/numerics_simd/flow/convection/common.hpp b/SU2_CFD/include/numerics_simd/flow/convection/common.hpp
@@ -51,9 +51,7 @@ FORCEINLINE Double umusclProjection(Double grad_proj,
   /*--- To maintain proper scaling for edge limiters, the result of ---*/
   /*--- this function is 0.5 * dV_ij^kap.                           ---*/
   /*-------------------------------------------------------------------*/
-  const Double cent = 0.5 * delta;
-  const Double upw = grad_proj - cent;
-  return (1.0 - kappa) * upw + (1.0 + kappa) * cent;
+  return (1.0 - kappa) * grad_proj + kappa * delta;
 }
 
 /*!
@@ -221,7 +219,7 @@ FORCEINLINE CPair<ReconVarType> reconstructPrimitives(Int iEdge, Int iPoint, Int
   }
 
   if (muscl) {
-    /*--- Recompute density and enthalpy instead of reconstructing. ---*/
+    /*--- Reconstruct density and enthalpy without using their gradients. ---*/
     constexpr auto nVarGrad = ReconVarType::nVar - 2;
     switch (limiterType) {
     case LIMITER::NONE:
@@ -234,12 +232,23 @@ FORCEINLINE CPair<ReconVarType> reconstructPrimitives(Int iEdge, Int iPoint, Int
       musclPointLimited<nVarGrad>(iPoint, jPoint, vector_ij, limiters, gradients, V, kappa, relax, ramp_val);
       break;
     }
+    /*--- Recompute density using the reconstructed pressure and temperature. ---*/
     V.i.density() = V.i.pressure() / (gasConst * V.i.temperature());
     V.j.density() = V.j.pressure() / (gasConst * V.j.temperature());
 
+    /*--- Reconstruct enthalpy using dH/dT = Cp and dH/dv = v. Recomputing enthalpy would cause
+     * stability issues because we use rho E = rho H - P, which loses its relation to temperature
+     * if both rho and H are recomputed. This only seems to be an issue for wall-function meshes.
+     * NOTE: This "one-sided" reconstruction does not lose much of the U-MUSCL benefit, because
+     * the static enthalpy is linear, and for the KE term we do the equivalent of using the
+     * average dH/dv, which is exact for quadratic functions. ---*/
     const su2double cp = gasConst * gamma / (gamma - 1);
-    V.i.enthalpy() = cp * V.i.temperature() + 0.5 * squaredNorm<nDim>(V.i.velocity());
-    V.j.enthalpy() = cp * V.j.temperature() + 0.5 * squaredNorm<nDim>(V.j.velocity());
+    V.i.enthalpy() += cp * (V.i.temperature() - V1st.i.temperature());
+    V.j.enthalpy() += cp * (V.j.temperature() - V1st.j.temperature());
+    for (size_t iDim = 0; iDim < nDim; ++iDim) {
+      V.i.enthalpy() += 0.5 * (pow(V.i.velocity(iDim), 2) - pow(V1st.i.velocity(iDim), 2));
+      V.j.enthalpy() += 0.5 * (pow(V.j.velocity(iDim), 2) - pow(V1st.j.velocity(iDim), 2));
+    }
 
     /*--- Detect a non-physical reconstruction based on negative pressure or density. ---*/
     const Double neg_p_or_rho = fmax(fmin(V.i.pressure(), V.j.pressure()) < 0.0,
diff --git a/SU2_CFD/include/solvers/CGradientSmoothingSolver.hpp b/SU2_CFD/include/solvers/CGradientSmoothingSolver.hpp
@@ -275,7 +275,7 @@ class CGradientSmoothingSolver final : public CFEASolverBase {
   }
 
   /*!
-   * \brief Set the current working dimension, if the seperate dimension option is set.
+   * \brief Set the current working dimension, if the separate dimension option is set.
    * \param[in] iDim - the dimension we are currently working in.
    */
   inline void SetCurrentDim(unsigned int iDim) {
diff --git a/SU2_CFD/include/variables/CFlowVariable.hpp b/SU2_CFD/include/variables/CFlowVariable.hpp
@@ -26,6 +26,9 @@
 
 #pragma once
 
+#include <algorithm>
+#include <cstdint>
+
 #include "CVariable.hpp"
 
 /*!
diff --git a/SU2_CFD/src/solvers/CGradientSmoothingSolver.cpp b/SU2_CFD/src/solvers/CGradientSmoothingSolver.cpp
@@ -93,7 +93,7 @@ CGradientSmoothingSolver::CGradientSmoothingSolver(CGeometry *geometry, CConfig
     element_container[GRAD_TERM][EL_PYRAM2] = new CPYRAM6();
   }
 
-  /*--- For operations on surfaces we initalize the structures for nDim-1 ---*/
+  /*--- For operations on surfaces we initialize the structures for nDim-1 ---*/
   if (config->GetSmoothOnSurface()) {
     if (nDim == 2) {
       element_container[GRAD_TERM][EL_LINE] = new CLINE();
diff --git a/SU2_CFD/src/variables/CMeshVariable.cpp b/SU2_CFD/src/variables/CMeshVariable.cpp
@@ -34,7 +34,7 @@ CMeshVariable::CMeshVariable(unsigned long npoint, unsigned long ndim, CConfig *
   /*--- Store the dimensionality of the problem ---*/
   nDim = ndim;
 
-  /*--- Initalize the variables that will always be there in a problem with moving mesh ---*/
+  /*--- Initialize the variables that will always be there in a problem with moving mesh ---*/
   Mesh_Coord.resize(nPoint,nDim) = su2double(0.0);
   WallDistance.resize(nPoint) = su2double(1e-9);
 
diff --git a/SU2_PY/SU2/__init__.py b/SU2_PY/SU2/__init__.py
@@ -28,5 +28,5 @@ class DivergenceFailure(EvaluationFailure):
         readline.parse_and_bind("bind ^I rl_complete")
     else:
         readline.parse_and_bind("tab: complete")
-except:
-    pass
+except Exception:
+    pass  # readline is optional, continue without it
diff --git a/SU2_PY/SU2/io/config.py b/SU2_PY/SU2/io/config.py
@@ -94,7 +94,7 @@ def __init__(self, *args, **kwarg):
                 self.read(filename)
             except IOError:
                 print("Could not find config file: %s" % filename)
-            except:
+            except Exception:
                 print("Unexpected error: ", sys.exc_info()[0])
                 raise
         self._filename = filename
diff --git a/SU2_PY/SU2/io/data.py b/SU2_PY/SU2/io/data.py
@@ -115,7 +115,7 @@ def load_data(file_name, var_names=None, file_format="infer", core_name="python_
     #: with filelock
 
     # load specified varname into dictionary
-    if var_names != None:
+    if var_names is not None:
         # check for one item name array
         if isinstance(var_names, str):
             var_names = [
@@ -365,7 +365,7 @@ def rec2dict(array_in):
         # convert array
         elif isinstance(value, numpy.ndarray):
             # check for another struct level
-            if value.dtype.names == None:
+            if value.dtype.names is None:
                 value = value.tolist()
             # telescoping
             else:
diff --git a/SU2_PY/SU2/util/bunch.py b/SU2_PY/SU2/util/bunch.py
@@ -82,7 +82,7 @@ def __contains__(self, k):
         """
         try:
             return hasattr(self, k) or dict.__contains__(self, k)
-        except:
+        except Exception:
             return False
 
     # only called if k not found in normal places
@@ -140,7 +140,7 @@ def __setattr__(self, k, v):
         except AttributeError:
             try:
                 self[k] = v
-            except:
+            except (KeyError, TypeError):
                 raise AttributeError(k)
         else:
             object.__setattr__(self, k, v)
diff --git a/SU2_PY/SU2/util/ordered_bunch.py b/SU2_PY/SU2/util/ordered_bunch.py
@@ -97,7 +97,7 @@ def __contains__(self, k):
         """
         try:
             return hasattr(self, k) or dict.__contains__(self, k)
-        except:
+        except Exception:
             return False
 
     # only called if k not found in normal places
@@ -160,7 +160,7 @@ def __setattr__(self, k, v):
         except AttributeError:
             try:
                 self[k] = v
-            except:
+            except (KeyError, TypeError):
                 raise AttributeError(k)
         else:
             object.__setattr__(self, k, v)
diff --git a/SU2_PY/SU2_CFD.py b/SU2_PY/SU2_CFD.py
@@ -120,7 +120,7 @@ def main():
     options.wave_equation = options.wave_equation.upper() == "TRUE"
     options.heat_equation = options.heat_equation.upper() == "TRUE"
 
-    if options.filename == None:
+    if options.filename is None:
         raise Exception("No config file provided. Use -f flag")
 
     if options.with_MPI == True:
@@ -163,7 +163,7 @@ def main():
     # Finalize the solver and exit cleanly
     SU2Driver.Finalize()
 
-    if SU2Driver != None:
+    if SU2Driver is not None:
         del SU2Driver
 
 
diff --git a/SU2_PY/parallel_computation.py b/SU2_PY/parallel_computation.py
@@ -64,7 +64,7 @@ def main():
     options.partitions = int(options.partitions)
     options.compute = options.compute.upper() == "TRUE"
 
-    if options.filename == None:
+    if options.filename is None:
         raise Exception("No config file provided. Use -f flag")
 
     parallel_computation(options.filename, options.partitions, options.compute)
diff --git a/SU2_PY/parallel_computation_fsi.py b/SU2_PY/parallel_computation_fsi.py
@@ -64,7 +64,7 @@ def main():
     options.partitions = int(options.partitions)
     options.compute = options.compute.upper() == "TRUE"
 
-    if options.filename == None:
+    if options.filename is None:
         raise Exception("No config file provided. Use -f flag")
 
     parallel_computation(options.filename, options.partitions, options.compute)
diff --git a/SU2_PY/topology_optimization.py b/SU2_PY/topology_optimization.py
@@ -123,8 +123,8 @@ def obj_val(self, x):
         # clear previous output and run direct solver
         try:
             os.remove(self._objValFile)
-        except:
-            pass
+        except OSError:
+            pass  # Ignore error if file does not exist
 
         try:
             sp.call(self._objValCommand, shell=True)
@@ -136,7 +136,7 @@ def obj_val(self, x):
                     break
             # the return code of mpirun is useless, we test the value of the function
             self._assert_isfinite(val)
-        except:
+        except Exception:
             raise RuntimeError("Objective function evaluation failed")
         # end
 
@@ -150,8 +150,8 @@ def obj_der(self, x):
         # clear previous output and run direct solver
         try:
             os.remove(self._objDerFile)
-        except:
-            pass
+        except OSError:
+            pass  # Ignore error if file does not exist
         N = x.shape[0]
         y = np.ndarray((N,))
 
@@ -167,7 +167,7 @@ def obj_der(self, x):
                 self._assert_isfinite(val)
                 y[i] = val * obj_scale / var_scale
             # end
-        except:
+        except Exception:
             raise RuntimeError("Objective gradient evaluation failed")
         # end
 
@@ -186,7 +186,7 @@ def con_val(self, x):
                     val = float(lines[1].split(",")[col])
                     break
             self._assert_isfinite(val)
-        except:
+        except Exception:
             raise RuntimeError("Constraint function evaluation failed")
         # end
 
@@ -200,8 +200,8 @@ def con_der(self, x):
         # clear previous output and run solver
         try:
             os.remove(self._conDerFile)
-        except:
-            pass
+        except OSError:
+            pass  # Ignore error if file does not exist
         N = x.shape[0]
         y = np.ndarray((N,))
 
@@ -217,7 +217,7 @@ def con_der(self, x):
                 self._assert_isfinite(val)
                 y[i] = val * con_scale / var_scale
             # end
-        except:
+        except Exception:
             raise RuntimeError("Constraint function evaluation failed")
         # end
 
@@ -295,7 +295,7 @@ def finished(self):
         return self._value == self._maxi
 
     def value(self):
-        if self._func == None:
+        if self._func is None:
             return self._value
         else:
             return self._func(self._value)
diff --git a/TestCases/disc_adj_fsi/dyn_fsi/grad_dv.opt.ref b/TestCases/disc_adj_fsi/dyn_fsi/grad_dv.opt.ref
@@ -1,9 +1,9 @@
 INDEX	GRAD
-0	-4.570869180445024e-04
-1	-2.401466726069483e-04
-2	-9.134698219534478e-05
-3	-1.628086953114332e-05
-4	-1.741052432426715e-05
-5	-9.462489852612668e-05
-6	-2.452466275723706e-04
-7	-4.635483655821636e-04
+0	-4.570869126273463e-04
+1	-2.401466681907557e-04
+2	-9.134697929286435e-05
+3	-1.628086861828660e-05
+4	-1.741052581631559e-05
+5	-9.462490278520256e-05
+6	-2.452466349703724e-04
+7	-4.635483765277457e-04
diff --git a/TestCases/hybrid_regression.py b/TestCases/hybrid_regression.py
diff --git a/TestCases/hybrid_regression_AD.py b/TestCases/hybrid_regression_AD.py
diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py
diff --git a/TestCases/parallel_regression_AD.py b/TestCases/parallel_regression_AD.py
diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py
diff --git a/TestCases/serial_regression_AD.py b/TestCases/serial_regression_AD.py
diff --git a/TestCases/vandv.py b/TestCases/vandv.py
diff --git a/TestCases/vandv/rans/bump_in_channel/turb_bump_sst.cfg b/TestCases/vandv/rans/bump_in_channel/turb_bump_sst.cfg
diff --git a/TestCases/vandv/rans/swbli/config_sst.cfg b/TestCases/vandv/rans/swbli/config_sst.cfg

Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ class CGradientSmoothingSolver final : public CFEASolverBase {`
`275`	`275`	`}`
`276`	`276`
`277`	`277`	`/*!`
`278`		`- * \brief Set the current working dimension, if the seperate dimension option is set.`
	`278`	`+ * \brief Set the current working dimension, if the separate dimension option is set.`
`279`	`279`	`* \param[in] iDim - the dimension we are currently working in.`
`280`	`280`	`*/`
`281`	`281`	`inline void SetCurrentDim(unsigned int iDim) {`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ CGradientSmoothingSolver::CGradientSmoothingSolver(CGeometry *geometry, CConfig`
`93`	`93`	`element_container[GRAD_TERM][EL_PYRAM2] = new CPYRAM6();`
`94`	`94`	`}`
`95`	`95`
`96`		`- /--- For operations on surfaces we initalize the structures for nDim-1 ---/`
	`96`	`+ /--- For operations on surfaces we initialize the structures for nDim-1 ---/`
`97`	`97`	`if (config->GetSmoothOnSurface()) {`
`98`	`98`	`if (nDim == 2) {`
`99`	`99`	`element_container[GRAD_TERM][EL_LINE] = new CLINE();`