From 47b3007df127cea5de30e2ebbe85ee4955aeffd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20Bl=C3=BChdorn?=
 <johannes.bluehdorn@scicomp.uni-kl.de>
Date: Thu, 2 Nov 2023 16:10:53 +0100
Subject: [PATCH] Add explicit locks for AD::GetDerivative() call trees.

---
 SU2_CFD/src/solvers/CDiscAdjFEASolver.cpp | 8 ++++++++
 SU2_CFD/src/solvers/CDiscAdjSolver.cpp    | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/SU2_CFD/src/solvers/CDiscAdjFEASolver.cpp b/SU2_CFD/src/solvers/CDiscAdjFEASolver.cpp
index a297039ea3a..7abd17805fa 100644
--- a/SU2_CFD/src/solvers/CDiscAdjFEASolver.cpp
+++ b/SU2_CFD/src/solvers/CDiscAdjFEASolver.cpp
@@ -232,12 +232,16 @@ void CDiscAdjFEASolver::ExtractAdjoint_Solution(CGeometry *geometry, CConfig *co
 
   /*--- Extract and store the adjoint solution ---*/
 
+  AD::BeginUseAdjoints();
+
   for (auto iPoint = 0ul; iPoint < nPoint; iPoint++) {
     su2double Solution[MAXNVAR] = {0.0};
     direct_solver->GetNodes()->GetAdjointSolution(iPoint,Solution);
     nodes->SetSolution(iPoint,Solution);
   }
 
+  AD::EndUseAdjoints();
+
   if (CrossTerm) return;
 
   /*--- Extract and store the adjoint solution at time n (including accel. and velocity) ---*/
@@ -358,6 +362,8 @@ void CDiscAdjFEASolver::SetSensitivity(CGeometry *geometry, CConfig *config, CSo
 
   /*--- Extract the geometric sensitivities ---*/
 
+  AD::BeginUseAdjoints();
+
   for (unsigned long iPoint = 0; iPoint < nPoint; iPoint++) {
 
     auto Coord = geometry->nodes->GetCoord(iPoint);
@@ -375,6 +381,8 @@ void CDiscAdjFEASolver::SetSensitivity(CGeometry *geometry, CConfig *config, CSo
     }
   }
 
+  AD::EndUseAdjoints();
+
 }
 
 void CDiscAdjFEASolver::ReadDV(const CConfig *config) {
diff --git a/SU2_CFD/src/solvers/CDiscAdjSolver.cpp b/SU2_CFD/src/solvers/CDiscAdjSolver.cpp
index c42e2b4925f..ac9c6043097 100644
--- a/SU2_CFD/src/solvers/CDiscAdjSolver.cpp
+++ b/SU2_CFD/src/solvers/CDiscAdjSolver.cpp
@@ -317,6 +317,8 @@ void CDiscAdjSolver::ExtractAdjoint_Solution(CGeometry *geometry, CConfig *confi
 
   if (!config->GetMultizone_Problem()) nodes->Set_OldSolution();
 
+  AD::BeginUseAdjoints();
+
   SU2_OMP_FOR_STAT(omp_chunk_size)
   for (auto iPoint = 0ul; iPoint < nPoint; iPoint++) {
 
@@ -339,6 +341,8 @@ void CDiscAdjSolver::ExtractAdjoint_Solution(CGeometry *geometry, CConfig *confi
   }
   END_SU2_OMP_FOR
 
+  AD::EndUseAdjoints();
+
   direct_solver->ExtractAdjoint_SolutionExtra(nodes->GetSolutionExtra(), config);
 
   /*--- Residuals and time_n terms are not needed when evaluating multizone cross terms. ---*/
@@ -477,6 +481,8 @@ void CDiscAdjSolver::SetAdjoint_Output(CGeometry *geometry, CConfig *config) {
 
 void CDiscAdjSolver::SetSensitivity(CGeometry *geometry, CConfig *config, CSolver*) {
 
+  AD::BeginUseAdjoints();
+
   SU2_OMP_PARALLEL {
 
   const bool time_stepping = (config->GetTime_Marching() != TIME_MARCHING::STEADY);
@@ -510,6 +516,8 @@ void CDiscAdjSolver::SetSensitivity(CGeometry *geometry, CConfig *config, CSolve
 
   }
   END_SU2_OMP_PARALLEL
+
+  AD::EndUseAdjoints();
 }
 
 void CDiscAdjSolver::SetSurface_Sensitivity(CGeometry *geometry, CConfig *config) {