Merge branch 'develop' into pr/2209

joshkellyjak · joshkellyjak · commit fd6d5cb5ef52 · 2024-07-18T14:29:13.000+02:00
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -69,6 +69,7 @@ Daumantas Kavolis
 Dave Taflin
 Eduardo Molina
 Edwin van der Weide
+Eitan Aberman
 Ethan Alan Hereth
 Florian Dittmann
 Filip Hahs
@@ -108,6 +109,7 @@ Max Sagebaum
 Michele Gaffuri
 Mickael Philit
 Mladen Banovic
+Mor
 Nat-1
 Nicola Fonzi
 Nijso Beishuizen
@@ -137,6 +139,7 @@ Trent Lukaczyk
 Vinzenz Götz
 VivaanKhatri
 Wally Maier
+Yair Mor-Yossef
 Y. Chandukrishna
 Zan Xu
 Zcaic
diff --git a/SU2_CFD/src/iteration/CFluidIteration.cpp b/SU2_CFD/src/iteration/CFluidIteration.cpp
@@ -261,7 +261,7 @@ void CFluidIteration::TurboMonitor(CGeometry**** geometry_container, CConfig** c
     const unsigned long rampFreq = SU2_TYPE::Int(config->GetRampRotatingFrame_Coeff(1));
     const unsigned long finalRamp_Iter = SU2_TYPE::Int(config->GetRampRotatingFrame_Coeff(2));
     const su2double rot_z_ini = config->GetRampRotatingFrame_Coeff(0);
-    const bool print = true;
+    const bool print = (config->GetComm_Level() == COMM_FULL);
 
     if(iter % rampFreq == 0 && iter <= finalRamp_Iter){
 
@@ -270,7 +270,7 @@ void CFluidIteration::TurboMonitor(CGeometry**** geometry_container, CConfig** c
       if (fabs(rot_z_final) > 0.0) {
         const su2double rot_z = rot_z_ini + iter * ( rot_z_final - rot_z_ini) / finalRamp_Iter;
         config->SetRotation_Rate(2, rot_z);
-        if (rank == MASTER_NODE && print && iter > 0) {
+        if (rank == MASTER_NODE && iter > 0) {
           cout << "\nUpdated rotating frame grid velocities for zone " << iZone << ".\n";
         }
         geometry_container[iZone][INST_0][MESH_0]->SetRotationalVelocity(config, print);
diff --git a/SU2_CFD/src/solvers/CSolver.cpp b/SU2_CFD/src/solvers/CSolver.cpp
@@ -1821,6 +1821,7 @@ void CSolver::AdaptCFLNumber(CGeometry **geometry,
     /* Loop over all points on this grid and apply CFL adaption. */
 
     su2double myCFLMin = 1e30, myCFLMax = 0.0, myCFLSum = 0.0;
+    const su2double CFLTurbReduction = config->GetCFLRedCoeff_Turb();
 
     SU2_OMP_MASTER
     if ((iMesh == MESH_0) && fullComms) {
@@ -1885,7 +1886,7 @@ void CSolver::AdaptCFLNumber(CGeometry **geometry,
       CFL *= CFLFactor;
       solverFlow->GetNodes()->SetLocalCFL(iPoint, CFL);
       if ((iMesh == MESH_0) && solverTurb) {
-        solverTurb->GetNodes()->SetLocalCFL(iPoint, CFL);
+        solverTurb->GetNodes()->SetLocalCFL(iPoint, CFL * CFLTurbReduction);
       }
 
       /* Store min and max CFL for reporting on the fine grid. */
diff --git a/TestCases/hybrid_regression.py b/TestCases/hybrid_regression.py
@@ -561,7 +561,7 @@ def main():
     Jones_tc_restart.cfg_dir   = "turbomachinery/APU_turbocharger"
     Jones_tc_restart.cfg_file  = "Jones_restart.cfg"
     Jones_tc_restart.test_iter = 5
-    Jones_tc_restart.test_vals = [-6.594590, -2.792279, -14.336129, -8.776066, -11.371439, -5.845633, 73273, 73273, 0.019884, 82.491]
+    Jones_tc_restart.test_vals = [-6.614623, -3.001323, -14.336147, -8.776081, -11.382919, -5.852327, 73273, 73273, 0.019884, 82.491]
     test_list.append(Jones_tc_restart)
 
     # 2D axial stage
diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py
@@ -1067,7 +1067,7 @@ def main():
     Jones_tc_restart.cfg_dir   = "turbomachinery/APU_turbocharger"
     Jones_tc_restart.cfg_file  = "Jones_restart.cfg"
     Jones_tc_restart.test_iter = 5
-    Jones_tc_restart.test_vals = [-6.594590, -2.792281, -14.336129, -8.776067, -11.371439, -5.845633, 73273, 73273, 0.019884, 82.491]
+    Jones_tc_restart.test_vals = [-6.614623, -3.001323, -14.336147, -8.776081, -11.382919, -5.852327, 73273, 73273, 0.019884, 82.491]
     test_list.append(Jones_tc_restart)
 
     # 2D axial stage
diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py
@@ -868,7 +868,7 @@ def main():
     Jones_tc_restart.cfg_dir   = "turbomachinery/APU_turbocharger"
     Jones_tc_restart.cfg_file  = "Jones_restart.cfg"
     Jones_tc_restart.test_iter = 5
-    Jones_tc_restart.test_vals = [-6.594586, -2.792279, -14.336132, -8.776068, -11.371439, -5.845632, 73273, 73273, 0.019884, 82.491]
+    Jones_tc_restart.test_vals = [-6.614623, -3.001323, -14.336147, -8.776081, -11.382919, -5.852327, 73273, 73273, 0.019884, 82.491]
     test_list.append(Jones_tc_restart)
 
     # 2D axial stage
