Merge pull request #1664 from su2code/fix_misc_issues

Small misc fixes

Author: pcarruscag

SU2_CFD/src/output/COutput.cpp

@@ -926,7 +926,7 @@ bool COutput::GetCauchyCorrectedTimeConvergence(const CConfig *config){
 bool COutput::SetResult_Files(CGeometry *geometry, CConfig *config, CSolver** solver_container,
                               unsigned long iter, bool force_writing) {
 
-  bool isFileWrite = false;
+  bool isFileWrite = false, dataIsLoaded = false;
   const auto nVolumeFiles = config->GetnVolumeOutputFiles();
   const auto* VolumeFiles = config->GetVolumeOutputFiles();
 
@@ -938,10 +938,13 @@ bool COutput::SetResult_Files(CGeometry *geometry, CConfig *config, CSolver** so
     /*--- Collect the volume data from the solvers.
      *  If time-domain is enabled, we also load the data although we don't output it,
      *  since we might want to do time-averaging. ---*/
-    if (WriteVolume_Output(config, iter, force_writing || cauchyTimeConverged, iFile) || config->GetTime_Domain())
-      LoadDataIntoSorter(config, geometry, solver_container);
+    const bool write_file = WriteVolume_Output(config, iter, force_writing || cauchyTimeConverged, iFile);
 
-    if (!(WriteVolume_Output(config, iter, force_writing || cauchyTimeConverged, iFile))) continue;
+    if ((write_file || config->GetTime_Domain()) && !dataIsLoaded) {
+      LoadDataIntoSorter(config, geometry, solver_container);
+      dataIsLoaded = true;
+    }
+    if (!write_file) continue;
 
     /*--- Partition and sort the data --- */
 
@@ -1039,10 +1042,10 @@ bool COutput::Convergence_Monitoring(CConfig *config, unsigned long Iteration) {
 
         oldFunc[iField_Conv] = newFunc[iField_Conv];
         newFunc[iField_Conv] = monitor;
-        /*--- Automatically modify the scaling factor of relative Cauchy convergence for 
-        * coefficients that are close to zero. Example: For the clean aircraft, the rolling 
-        * moment coefficient MOMENT_X is close to zero and thus will never reach a relative 
-        * cauchy convergence ->> dividing tiny numbers is not a good idea. Using absolute 
+        /*--- Automatically modify the scaling factor of relative Cauchy convergence for
+        * coefficients that are close to zero. Example: For the clean aircraft, the rolling
+        * moment coefficient MOMENT_X is close to zero and thus will never reach a relative
+        * cauchy convergence ->> dividing tiny numbers is not a good idea. Using absolute
         * cauchy convergence is more robust in this case. ---*/
         cauchyFunc = fabs(newFunc[iField_Conv] - oldFunc[iField_Conv]) / fmax(fabs(monitor), 0.1);
 

SU2_CFD/src/solvers/CEulerSolver.cpp

@@ -6456,8 +6456,8 @@ void CEulerSolver::BC_Inlet(CGeometry *geometry, CSolver **solver_container,
   unsigned short iDim;
   unsigned long iVertex, iPoint;
   su2double P_Total, T_Total, Velocity[MAXNDIM], Velocity2, H_Total, Temperature, Riemann,
-  Pressure, Density, Energy, *Flow_Dir, Mach2, SoundSpeed2, SoundSpeed_Total2, Vel_Mag,
-  alpha, aa, bb, cc, dd, Area, UnitNormal[MAXNDIM], Normal[MAXNDIM] = {0.0};
+  Pressure, Density, Energy, Flow_Dir[MAXNDIM], Mach2, SoundSpeed2, SoundSpeed_Total2, Vel_Mag,
+  alpha, aa, bb, cc, dd, Area, UnitNormal[MAXNDIM], Normal[MAXNDIM];
   su2double *V_inlet, *V_domain;
 
   const bool implicit = (config->GetKind_TimeIntScheme() == EULER_IMPLICIT);
@@ -6510,13 +6510,17 @@ void CEulerSolver::BC_Inlet(CGeometry *geometry, CSolver **solver_container,
 
         /*--- Total properties have been specified at the inlet. ---*/
 
-        case INLET_TYPE::TOTAL_CONDITIONS:
+        case INLET_TYPE::TOTAL_CONDITIONS: {
 
           /*--- Retrieve the specified total conditions for this inlet. ---*/
 
           P_Total  = Inlet_Ptotal[val_marker][iVertex];
           T_Total  = Inlet_Ttotal[val_marker][iVertex];
-          Flow_Dir = Inlet_FlowDir[val_marker][iVertex];
+          const su2double* dir = Inlet_FlowDir[val_marker][iVertex];
+          const su2double mag = GeometryToolbox::Norm(nDim, dir);
+          for (iDim = 0; iDim < nDim; iDim++) {
+            Flow_Dir[iDim] = dir[iDim] / mag;
+          }
 
           /*--- Non-dim. the inputs if necessary. ---*/
 
@@ -6614,16 +6618,20 @@ void CEulerSolver::BC_Inlet(CGeometry *geometry, CSolver **solver_container,
           V_inlet[nDim+3] = Energy + Pressure/Density;
 
           break;
+        }
+        /*--- Mass flow has been specified at the inlet. ---*/
 
-          /*--- Mass flow has been specified at the inlet. ---*/
-
-        case INLET_TYPE::MASS_FLOW:
+        case INLET_TYPE::MASS_FLOW: {
 
           /*--- Retrieve the specified mass flow for the inlet. ---*/
 
           Density  = Inlet_Ttotal[val_marker][iVertex];
           Vel_Mag  = Inlet_Ptotal[val_marker][iVertex];
-          Flow_Dir = Inlet_FlowDir[val_marker][iVertex];
+          const su2double* dir = Inlet_FlowDir[val_marker][iVertex];
+          const su2double mag = GeometryToolbox::Norm(nDim, dir);
+          for (iDim = 0; iDim < nDim; iDim++) {
+            Flow_Dir[iDim] = dir[iDim] / mag;
+          }
 
           /*--- Non-dim. the inputs if necessary. ---*/
 
@@ -6672,7 +6680,7 @@ void CEulerSolver::BC_Inlet(CGeometry *geometry, CSolver **solver_container,
           V_inlet[nDim+3] = Energy + Pressure/Density;
 
           break;
-
+        }
         default:
           SU2_MPI::Error("Unsupported INLET_TYPE.", CURRENT_FUNCTION);
           break;

TestCases/hybrid_regression.py

@@ -132,7 +132,7 @@ def main():
     poiseuille_profile.cfg_dir   = "navierstokes/poiseuille"
     poiseuille_profile.cfg_file  = "profile_poiseuille.cfg"
     poiseuille_profile.test_iter = 10
-    poiseuille_profile.test_vals = [-12.494752, -7.712204, -0.000000, 2.085796]
+    poiseuille_profile.test_vals = [-12.494712, -7.710813, -0.000000, 2.085796]
     test_list.append(poiseuille_profile)
 
     # 2D Rotational Periodic

TestCases/serial_regression.py

@@ -250,7 +250,7 @@ def main():
     poiseuille_profile.cfg_dir   = "navierstokes/poiseuille"
     poiseuille_profile.cfg_file  = "profile_poiseuille.cfg"
     poiseuille_profile.test_iter = 10
-    poiseuille_profile.test_vals = [-12.494720, -7.711373, -0.000000, 2.085796] #last 4 columns
+    poiseuille_profile.test_vals = [-12.494715, -7.711824, -0.000000, 2.085796] #last 4 columns
     poiseuille_profile.su2_exec  = "SU2_CFD"
     poiseuille_profile.new_output = True
     poiseuille_profile.timeout   = 1600