Merge branch 'develop' into dependabot/github_actions/actions/setup-python-6

Author: bigfooted

SU2_CFD/src/solvers/CSpeciesSolver.cpp

@@ -427,7 +427,7 @@ su2double CSpeciesSolver::GetInletAtVertex(unsigned short iMarker, unsigned long
 
 void CSpeciesSolver::SetUniformInlet(const CConfig* config, unsigned short iMarker) {
   /*--- Find BC string to the numeric-identifier. ---*/
-  if (config->GetMarker_All_KindBC(iMarker) == INLET_FLOW) {
+  if (config->GetMarker_All_KindBC(iMarker) == INLET_FLOW || config->GetMarker_All_KindBC(iMarker) == SUPERSONIC_INLET) {
     const string Marker_Tag = config->GetMarker_All_TagBound(iMarker);
     for (unsigned long iVertex = 0; iVertex < nVertex[iMarker]; iVertex++) {
       for (unsigned short iVar = 0; iVar < nVar; iVar++) {

SU2_PY/set_ffd_design_var.py

@@ -214,7 +214,7 @@
     iVariable = 0
     dvList = "DEFINITION_DV= "
     for kIndex in range(options.kOrder):
-        for jIndex in range(1 + options.jOrder / 2):
+        for jIndex in range(1 + options.jOrder // 2):
             for iIndex in range(options.iOrder):
                 iVariable = iVariable + 1
                 dvList = (
@@ -237,7 +237,7 @@
                     + ", 1.0, 0.0 )"
                 )
                 if iVariable < (
-                    options.iOrder * (1 + options.jOrder / 2) * options.kOrder
+                    options.iOrder * (1 + options.jOrder // 2) * options.kOrder
                 ):
                     dvList = dvList + "; "
 
@@ -249,7 +249,7 @@
     iVariable = 0
     dvList = "DEFINITION_DV= "
     for kIndex in range(options.kOrder):
-        for jIndex in range(1 + options.jOrder / 2):
+        for jIndex in range(1 + options.jOrder // 2):
             for iIndex in range(options.iOrder):
                 iVariable = iVariable + 1
                 dvList = (
@@ -272,7 +272,7 @@
                     + ", 0.0, 1.0 )"
                 )
                 if iVariable < (
-                    options.iOrder * (1 + options.jOrder / 2) * options.kOrder
+                    options.iOrder * (1 + options.jOrder // 2) * options.kOrder
                 ):
                     dvList = dvList + "; "