Merge remote-tracking branch 'upstream/develop' into remove_old_scripts

Author: pcarruscag

.github/workflows/regression.yml

@@ -128,7 +128,7 @@ jobs:
         uses: docker://ghcr.io/su2code/su2/test-su2:230225-2136
         with:
           # -t <Tutorials-branch> -c <Testcases-branch>
-          args: -b ${{github.ref}} -t develop -c py_wrapper_example -s ${{matrix.testscript}}
+          args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}}
       - name: Cleanup
         uses: docker://ghcr.io/su2code/su2/test-su2:230225-2136
         with:

AUTHORS.md

@@ -92,6 +92,7 @@ Jessie Lauzon
 João Loureiro
 Johannes Blühdorn
 JonathanSmith1936
+Joseph Signorelli
 Josy P. Pullockara
 Kedar Naik
 Kürşat Yurt

SU2_CFD/src/output/CFlowOutput.cpp

@@ -1451,6 +1451,15 @@ void CFlowOutput::SetVolumeOutputFieldsScalarMisc(const CConfig* config) {
     }
     AddVolumeOutput("Q_CRITERION", "Q_Criterion", "VORTEX_IDENTIFICATION", "Value of the Q-Criterion");
   }
+
+  // Timestep info
+  AddVolumeOutput("DELTA_TIME", "Delta_Time", "TIMESTEP", "Value of the local timestep for the flow variables");
+  AddVolumeOutput("CFL", "CFL", "TIMESTEP", "Value of the local CFL for the flow variables");
+  if (config->GetKind_Turb_Model() != TURB_MODEL::NONE)
+  {
+    AddVolumeOutput("TURB_DELTA_TIME", "Turb_Delta_Time", "TIMESTEP", "Value of the local timestep for the turbulence variables");
+    AddVolumeOutput("TURB_CFL", "Turb_CFL", "TIMESTEP", "Value of the local CFL for the turbulence variables");
+  }
 }
 
 void CFlowOutput::LoadVolumeDataScalar(const CConfig* config, const CSolver* const* solver, const CGeometry* geometry,
@@ -1462,6 +1471,9 @@ void CFlowOutput::LoadVolumeDataScalar(const CConfig* config, const CSolver* con
   const auto* Node_Trans = (config->GetKind_Trans_Model() != TURB_TRANS_MODEL::NONE) ? trans_solver->GetNodes() : nullptr;
   const auto* Node_Geo = geometry->nodes;
 
+  SetVolumeOutputValue("DELTA_TIME", iPoint, Node_Flow->GetDelta_Time(iPoint));
+  SetVolumeOutputValue("CFL", iPoint, Node_Flow->GetLocalCFL(iPoint));
+
   if (config->GetViscous()) {
     if (nDim == 3){
       SetVolumeOutputValue("VORTICITY_X", iPoint, Node_Flow->GetVorticity(iPoint)[0]);
@@ -1501,6 +1513,8 @@ void CFlowOutput::LoadVolumeDataScalar(const CConfig* config, const CSolver* con
   /*--- If we got here a turbulence model is being used, therefore there is eddy viscosity. ---*/
   if (config->GetKind_Turb_Model() != TURB_MODEL::NONE) {
     SetVolumeOutputValue("EDDY_VISCOSITY", iPoint, Node_Flow->GetEddyViscosity(iPoint));
+    SetVolumeOutputValue("TURB_DELTA_TIME", iPoint, Node_Turb->GetDelta_Time(iPoint));
+    SetVolumeOutputValue("TURB_CFL", iPoint, Node_Turb->GetLocalCFL(iPoint));
   }
 
   if (config->GetSAParsedOptions().bc) {

TestCases/parallel_regression_AD.py

@@ -520,7 +520,7 @@ def main():
 
     # Flow AD Mesh Displacement and Initial Coordinates Sensitivity
     pywrapper_wavy_wall_steady = TestCase('pywrapper_wavy_wall_steady')
-    pywrapper_wavy_wall_steady.cfg_dir = "py_wrapper/disc_adj_flow/mesh_disp_sens"
+    pywrapper_wavy_wall_steady.cfg_dir = "py_wrapper/wavy_wall"
     pywrapper_wavy_wall_steady.cfg_file = "run_steady.py"
     pywrapper_wavy_wall_steady.test_iter = 100
     pywrapper_wavy_wall_steady.test_vals = [-1.360044, 2.580709, -2.892473]

TestCases/py_wrapper/wavy_wall/run_steady.py

@@ -143,7 +143,6 @@ def RunPrimal(channel_width, deform_amplitude):
     Returns the objective function.
     """
     comm = MPI.COMM_WORLD
-    rank = comm.Get_rank()
 
     with open('config.cfg', 'w') as f:
         f.write(common_settings.replace('__WIDTH__', str(channel_width)) + primal_settings)
@@ -175,7 +174,6 @@ def RunAdjoint(channel_width, deform_amplitude):
     Returns the sensitivity of the objective function to the amplitude and width.
     """
     comm = MPI.COMM_WORLD
-    rank = comm.Get_rank()
 
     with open('config_ad.cfg', 'w') as f:
         f.write(common_settings.replace('__WIDTH__', str(channel_width)) + adjoint_settings)
@@ -278,7 +276,7 @@ def Deformation(t, amplitude, marker_id, driver, check = False):
 def SumSensitivity(t, marker_id, driver):
     """Integrates the sensitivity with respect to the amplitude of the deformation."""
     if marker_id < 0:
-        return
+        return 0.0
     ini_coords = driver.MarkerInitialCoordinates(marker_id)
     phase = Phase(t)
     sens = 0