Merge pull request #1427 from su2code/fix_inletfiles

Fixes to inlet files

Author: TobiKattmann

SU2_CFD/src/CMarkerProfileReaderFVM.cpp

@@ -357,9 +357,8 @@ void CMarkerProfileReaderFVM::MergeProfileMarkers() {
       }
     }
 
-    /*--- Sort and remove the duplicate profile marker strings. ---*/
+    /*--- Remove the duplicate profile marker strings. From 1 per point to 1 per marker. ---*/
 
-    sort(profileTags.begin(), profileTags.end());
     profileTags.erase(unique(profileTags.begin(),
                              profileTags.end()),
                       profileTags.end());
@@ -450,37 +449,41 @@ void CMarkerProfileReaderFVM::WriteMarkerProfileTemplate() {
 
     node_file << "NMARK= " << numberOfProfiles << endl;
 
-    for (unsigned short iMarker = 0; iMarker < numberOfProfiles; iMarker++) {
+    unsigned short iMarkerCounter = 0;
+    for (unsigned short iMarker = 0; iMarker < config->GetnMarker_All(); iMarker++) {
+      if (config->GetMarker_All_KindBC(iMarker) == markerType) {
 
-      /*--- Access the default data for this marker. ---*/
+        /*--- Access the default data for this marker. ---*/
 
-      string Marker_Tag = profileTags[iMarker];
+        string Marker_Tag = profileTags[iMarkerCounter];
 
-      /*--- Header information for this marker. ---*/
+        /*--- Header information for this marker. ---*/
 
-      node_file << "MARKER_TAG= " << Marker_Tag              << endl;
-      node_file << "NROW="        << numberOfRowsInProfile[iMarker] << endl;
-      node_file << "NCOL="        << nColumns          << endl;
+        node_file << "MARKER_TAG= " << Marker_Tag              << endl;
+        node_file << "NROW="        << numberOfRowsInProfile[iMarkerCounter] << endl;
+        node_file << "NCOL="        << nColumns          << endl;
 
-      /*--- header line (names of the columns) --- */
-      node_file << columnNames[iMarker] << endl;
+        /*--- header line (names of the columns) --- */
+        node_file << columnNames[iMarkerCounter] << endl;
 
-      node_file << setprecision(15);
-      node_file << std::scientific;
+        node_file << setprecision(15);
+        node_file << std::scientific;
 
-      /*--- Loop over the data structure and write the coords and vars. ---*/
+        /*--- Loop over the data structure and write the coords and vars. ---*/
 
-      for (unsigned long iPoint = 0; iPoint < numberOfRowsInProfile[iMarker]; iPoint++) {
+        for (unsigned long iPoint = 0; iPoint < numberOfRowsInProfile[iMarkerCounter]; iPoint++) {
 
-        for (unsigned short iDim = 0; iDim < dimension; iDim++) {
-          node_file << profileCoords[iMarker][iDim][iPoint] << "\t";
-        }
+          for (unsigned short iDim = 0; iDim < dimension; iDim++) {
+            node_file << profileCoords[iMarkerCounter][iDim][iPoint] << "\t";
+          }
 
-        node_file << columnValues[iMarker] << endl;
+          node_file << columnValues[iMarkerCounter] << endl;
 
-      }
+        }
 
-    }
+        iMarkerCounter++;
+      }
+    } // iMarker
     node_file.close();
 
     /*--- Print a message to inform the user about the template file. ---*/

SU2_CFD/src/solvers/CSolver.cpp

@@ -3617,7 +3617,7 @@ void CSolver::LoadInletProfile(CGeometry **geometry,
       case TURB_MODEL::SA: case TURB_MODEL::SA_NEG: case TURB_MODEL::SA_E: case TURB_MODEL::SA_COMP: case TURB_MODEL::SA_E_COMP:
         /*--- 1-equation turbulence model: SA ---*/
         columnName << "NU_TILDE   " << setw(24);
-        columnValue << config->GetNuFactor_FreeStream()*config->GetViscosity_FreeStreamND()/config->GetDensity_FreeStreamND() <<"\t";
+        columnValue << config->GetNuFactor_FreeStream() * config->GetViscosity_FreeStream() / config->GetDensity_FreeStream() <<"\t";
         break;
       case TURB_MODEL::SST: case TURB_MODEL::SST_SUST:
         /*--- 2-equation turbulence model (SST) ---*/

SU2_CFD/src/solvers/CTurbSASolver.cpp

@@ -598,9 +598,16 @@ void CTurbSASolver::BC_Inlet(CGeometry *geometry, CSolver **solver_container, CN
 
       conv_numerics->SetPrimitive(V_domain, V_inlet);
 
+      /*--- Non-dimensionalize Inlet_TurbVars if Inlet-Files are used. ---*/
+      su2double Inlet_Vars[MAXNVAR];
+      Inlet_Vars[0] = Inlet_TurbVars[val_marker][iVertex][0];
+      if (config->GetInlet_Profile_From_File()) {
+        Inlet_Vars[0] *= config->GetDensity_Ref() / config->GetViscosity_Ref();
+      }
+
       /*--- Load the inlet turbulence variable (uniform by default). ---*/
 
-      conv_numerics->SetScalarVar(nodes->GetSolution(iPoint), Inlet_TurbVars[val_marker][iVertex]);
+      conv_numerics->SetScalarVar(nodes->GetSolution(iPoint), Inlet_Vars);
 
       /*--- Set various other quantities in the conv_numerics class ---*/
 

SU2_CFD/src/solvers/CTurbSSTSolver.cpp

@@ -628,12 +628,20 @@ void CTurbSSTSolver::BC_Inlet(CGeometry *geometry, CSolver **solver_container, C
 
       conv_numerics->SetPrimitive(V_domain, V_inlet);
 
+      /*--- Non-dimensionalize Inlet_TurbVars if Inlet-Files are used. ---*/
+      su2double Inlet_Vars[MAXNVAR];
+      Inlet_Vars[0] = Inlet_TurbVars[val_marker][iVertex][0];
+      Inlet_Vars[1] = Inlet_TurbVars[val_marker][iVertex][1];
+      if (config->GetInlet_Profile_From_File()) {
+        Inlet_Vars[0] /= pow(config->GetVelocity_Ref(), 2);
+        Inlet_Vars[1] *= config->GetViscosity_Ref() / (config->GetDensity_Ref() * pow(config->GetVelocity_Ref(), 2));
+      }
+
       /*--- Set the turbulent variable states. Use free-stream SST
        values for the turbulent state at the inflow. ---*/
       /*--- Load the inlet turbulence variables (uniform by default). ---*/
 
-      conv_numerics->SetScalarVar(nodes->GetSolution(iPoint),
-                                Inlet_TurbVars[val_marker][iVertex]);
+      conv_numerics->SetScalarVar(nodes->GetSolution(iPoint), Inlet_Vars);
 
       /*--- Set various other quantities in the solver class ---*/