Merge pull request #2208 from su2code/add_parallel_regions

Further parallel regions and hybrid AD memory improvements

Author: jblueh

Common/include/basic_types/ad_structure.hpp

@@ -357,6 +357,9 @@ FORCEINLINE void ComputeAdjoint() {
   opdi::logic->prepareEvaluate();
 #endif
   AD::getTape().evaluate();
+#if defined(HAVE_OPDI)
+  opdi::logic->postEvaluate();
+#endif
 }
 
 FORCEINLINE void ComputeAdjoint(unsigned short enter, unsigned short leave) {

SU2_CFD/src/drivers/CDiscAdjSinglezoneDriver.cpp

@@ -255,7 +255,9 @@ void CDiscAdjSinglezoneDriver::SetRecording(RECORDING kind_recording){
     for (unsigned short iMesh = 0; iMesh <= config_container[ZONE_0]->GetnMGLevels(); iMesh++) {
       auto solver = solver_container[ZONE_0][INST_0][iMesh][iSol];
       if (solver && solver->GetAdjoint()) {
+        SU2_OMP_PARALLEL_(if (solver->GetHasHybridParallel()))
         solver->SetRecording(geometry_container[ZONE_0][INST_0][iMesh], config_container[ZONE_0]);
+        END_SU2_OMP_PARALLEL
       }
     }
   }

SU2_CFD/src/iteration/CDiscAdjFluidIteration.cpp

@@ -457,7 +457,9 @@ void CDiscAdjFluidIteration::SetDependencies(CSolver***** solver, CGeometry****
       (kind_recording == RECORDING::SOLUTION_AND_MESH)) {
     /*--- Update geometry to get the influence on other geometry variables (normals, volume etc) ---*/
 
+    SU2_OMP_PARALLEL
     CGeometry::UpdateGeometry(geometry[iZone][iInst], config[iZone]);
+    END_SU2_OMP_PARALLEL
 
     CGeometry::ComputeWallDistance(config, geometry);
   }
@@ -480,17 +482,17 @@ void CDiscAdjFluidIteration::SetDependencies(CSolver***** solver, CGeometry****
     solvers0[SPECIES_SOL]->InitiateComms(geometry0, config[iZone], SOLUTION);
     solvers0[SPECIES_SOL]->CompleteComms(geometry0, config[iZone], SOLUTION);
   }
-
-  }
-  END_SU2_OMP_PARALLEL
-
   if (config[iZone]->GetWeakly_Coupled_Heat()) {
     solvers0[HEAT_SOL]->Set_Heatflux_Areas(geometry0, config[iZone]);
     solvers0[HEAT_SOL]->Preprocessing(geometry0, solvers0, config[iZone], MESH_0, NO_RK_ITER, RUNTIME_HEAT_SYS, true);
     solvers0[HEAT_SOL]->Postprocessing(geometry0, solvers0, config[iZone], MESH_0);
     solvers0[HEAT_SOL]->InitiateComms(geometry0, config[iZone], SOLUTION);
     solvers0[HEAT_SOL]->CompleteComms(geometry0, config[iZone], SOLUTION);
   }
+
+  }
+  END_SU2_OMP_PARALLEL
+
   if (config[iZone]->AddRadiation()) {
     solvers0[RAD_SOL]->Postprocessing(geometry0, solvers0, config[iZone], MESH_0);
     solvers0[RAD_SOL]->InitiateComms(geometry0, config[iZone], SOLUTION);

SU2_CFD/src/solvers/CHeatSolver.cpp

@@ -314,6 +314,8 @@ void CHeatSolver::Viscous_Residual(CGeometry *geometry, CSolver **solver_contain
 
 void CHeatSolver::Set_Heatflux_Areas(CGeometry *geometry, CConfig *config) {
 
+  BEGIN_SU2_OMP_SAFE_GLOBAL_ACCESS {
+
   string HeatFlux_Tag, Marker_Tag;
 
   su2double *Local_Surface_Areas, Local_HeatFlux_Areas_Monitor, Area, *Normal;
@@ -365,6 +367,8 @@ void CHeatSolver::Set_Heatflux_Areas(CGeometry *geometry, CConfig *config) {
   }
 
   delete[] Local_Surface_Areas;
+
+  } END_SU2_OMP_SAFE_GLOBAL_ACCESS
 }
 
 void CHeatSolver::BC_Isothermal_Wall(CGeometry *geometry, CSolver **solver_container, CNumerics *conv_numerics,

externals/medi

@@ -57,9 +57,9 @@ def init_submodules(
     # The sha tag must be maintained manually to point to the correct commit
     sha_version_codi = "9ca6c38280610b3ea5337ca3e5b5085ee1c66b59"
     github_repo_codi = "https://github.com/scicompkl/CoDiPack"
-    sha_version_medi = "85711944f8d5d03dd75c635f8a18e220b216040d"
+    sha_version_medi = "ab3a7688f6d518f8d940eb61a341d89f51922ba4"
     github_repo_medi = "https://github.com/SciCompKL/MeDiPack"
-    sha_version_opdi = "93d05a762f1b614a84767ea5ba75fd7e2c27f317"
+    sha_version_opdi = "8c89798817253abb017d857a0ae7f0520187645c"
     github_repo_opdi = "https://github.com/SciCompKL/OpDiLib"
     sha_version_meson = "41c650a040d50e0912d268af7a903a9ce1456dfa"
     github_repo_meson = "https://github.com/mesonbuild/meson"