Merge pull request #1571 from lkusch/fix_axisymmetric_adjoint

lkusch · web-flow · commit 3a5b668665eb · 2022-03-23T15:49:21.000+01:00
Fix for discrete adjoint: axisymmetry + SST turbulence model
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -91,6 +91,7 @@ JonathanSmith1936
 Kedar Naik
 LaSerpe
 Lennaert Tol
+Lisa Kusch
 Matteo Pini
 Max Aehle
 Max Le
diff --git a/Common/src/CConfig.cpp b/Common/src/CConfig.cpp
@@ -3375,6 +3375,11 @@ void CConfig::SetPostprocessing(SU2_COMPONENT val_software, unsigned short val_i
     SU2_MPI::Error("A turbulence model must be specified with KIND_TURB_MODEL if SOLVER= INC_RANS", CURRENT_FUNCTION);
   }
 
+  /*--- Check if turbulence model can be used for AXISYMMETRIC case---*/
+  if (Axisymmetric && Kind_Turb_Model != TURB_MODEL::NONE && Kind_Turb_Model != TURB_MODEL::SST && Kind_Turb_Model != TURB_MODEL::SST_SUST){
+    SU2_MPI::Error("Axisymmetry is currently only supported for KIND_TURB_MODEL chosen as SST or SST_SUST", CURRENT_FUNCTION);
+  }
+
   /*--- Set the boolean Wall_Functions equal to true if there is a
    definition for the wall founctions ---*/
 
diff --git a/SU2_CFD/include/numerics/turbulent/turb_sources.hpp b/SU2_CFD/include/numerics/turbulent/turb_sources.hpp
@@ -599,9 +599,10 @@ class CSourcePieceWise_TurbSST final : public CNumerics {
     if (Coord_i[1] < EPS) return;
 
     AD::SetPreaccIn(Coord_i[1]);
+    AD::SetPreaccIn(V_i[idx.Velocity() + 1]);
 
     const su2double yinv = 1.0 / Coord_i[1];
-    const su2double rhov = Density_i * V_i[2];
+    const su2double rhov = Density_i * V_i[idx.Velocity() + 1];
     const su2double& k = ScalarVar_i[0];
     const su2double& w = ScalarVar_i[1];
 
@@ -611,7 +612,7 @@ class CSourcePieceWise_TurbSST final : public CNumerics {
 
     /*--- Production ---*/
     const su2double pk_axi = max(
-        0.0, 2.0 / 3.0 * rhov * k * ((2.0 * yinv * V_i[2] - PrimVar_Grad_i[2][1] - PrimVar_Grad_i[1][0]) / zeta - 1.0));
+        0.0, 2.0 / 3.0 * rhov * k * ((2.0 * yinv * V_i[idx.Velocity() + 1] - PrimVar_Grad_i[idx.Velocity()+1][1] - PrimVar_Grad_i[idx.Velocity()][0]) / zeta - 1.0));
     const su2double pw_axi = alfa_blended * zeta / k * pk_axi;
 
     /*--- Convection-Diffusion ---*/
diff --git a/TestCases/axisymmetric_rans/air_nozzle/air_nozzle.cfg b/TestCases/axisymmetric_rans/air_nozzle/air_nozzle.cfg
@@ -19,9 +19,6 @@ SOLVER= RANS
 % Specify turbulence model (NONE, SA, SA_NEG, SST, SA_E, SA_COMP, SA_E_COMP)
 KIND_TURB_MODEL= SST
 %
-% Mathematical problem (DIRECT, CONTINUOUS_ADJOINT, DISCRETE_ADJOINT)
-MATH_PROBLEM= DIRECT
-%
 % Restart solution (NO, YES)
 RESTART_SOL= YES
 %
@@ -208,4 +205,4 @@ SOLUTION_FILENAME= solution_flow.dat
 OUTPUT_WRT_FREQ= 1000
 %
 % Screen output
-SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, RMS_TKE, RMS_DISSIPATION)
+SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, RMS_TKE, RMS_DISSIPATION, RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, RMS_ADJ_TKE, RMS_ADJ_DISSIPATION)
diff --git a/TestCases/parallel_regression_AD.py b/TestCases/parallel_regression_AD.py
@@ -168,6 +168,22 @@ def main():
     discadj_incomp_turb_NACA0012_sst.tol       = 0.00001
     test_list.append(discadj_incomp_turb_NACA0012_sst)
 
+    ####################################################################
+    ###  Disc. Adj. Axisymmetric RANS                                ###
+    ####################################################################
+
+    # Adjoint Axisymmetric RANS
+    discadj_axisymmetric_rans_nozzle            = TestCase('discadj_axisymmetric_rans')
+    discadj_axisymmetric_rans_nozzle.cfg_dir    = "axisymmetric_rans/air_nozzle"
+    discadj_axisymmetric_rans_nozzle.cfg_file   = "air_nozzle.cfg"
+    discadj_axisymmetric_rans_nozzle.test_iter  = 10
+    discadj_axisymmetric_rans_nozzle.test_vals  = [-10.391857, -15.524696, -7.715907, -17.350541]        
+    discadj_axisymmetric_rans_nozzle.su2_exec   = "mpirun -n 2 SU2_CFD_AD"
+    discadj_axisymmetric_rans_nozzle.timeout    = 1600
+    discadj_axisymmetric_rans_nozzle.tol        = 0.00001
+    discadj_axisymmetric_rans_nozzle.no_restart = True
+    test_list.append(discadj_axisymmetric_rans_nozzle)
+
     #######################################################
     ### Unsteady Disc. adj. compressible RANS           ###
     #######################################################

Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,6 @@ SOLVER= RANS`
`19`	`19`	`% Specify turbulence model (NONE, SA, SA_NEG, SST, SA_E, SA_COMP, SA_E_COMP)`
`20`	`20`	`KIND_TURB_MODEL= SST`
`21`	`21`	`%`
`22`		`-% Mathematical problem (DIRECT, CONTINUOUS_ADJOINT, DISCRETE_ADJOINT)`
`23`		`-MATH_PROBLEM= DIRECT`
`24`		`-%`
`25`	`22`	`% Restart solution (NO, YES)`
`26`	`23`	`RESTART_SOL= YES`
`27`	`24`	`%`
`@@ -208,4 +205,4 @@ SOLUTION_FILENAME= solution_flow.dat`
`208`	`205`	`OUTPUT_WRT_FREQ= 1000`
`209`	`206`	`%`
`210`	`207`	`% Screen output`
`211`		`-SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, RMS_TKE, RMS_DISSIPATION)`
	`208`	`+SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, RMS_TKE, RMS_DISSIPATION, RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, RMS_ADJ_TKE, RMS_ADJ_DISSIPATION)`