Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add further parallel regions #2208

Merged
merged 9 commits into from
Feb 16, 2024
Merged

Add further parallel regions #2208

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8bb0435
Add parallel regions.
jblueh Nov 23, 2023
9339f0b
Move code inside parallel region.
jblueh Nov 28, 2023
beeda76
Merge branch 'develop' into add_parallel_regions
jblueh Feb 13, 2024
ad13643
OpDiLib update.
jblueh Feb 13, 2024
1f8a640
OpDiLib update.
jblueh Feb 14, 2024
d0d0c41
Include OpDiLib's postEvaluate() in the AD workflow.
jblueh Feb 14, 2024
a6b058b
Make CHeatSolver::Set_Heatflux_Areas safe for OpenMP.
jblueh Feb 15, 2024
94f17b8
MeDiPack update.
jblueh Feb 15, 2024
bc2207e
Merge branch 'develop' into add_parallel_regions
jblueh Feb 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions SU2_CFD/src/drivers/CDiscAdjSinglezoneDriver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
pcarruscag marked this conversation as resolved.
Show resolved Hide resolved
END_SU2_OMP_PARALLEL
}
}
}
Expand Down
10 changes: 6 additions & 4 deletions SU2_CFD/src/iteration/CDiscAdjFluidIteration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -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]);
pcarruscag marked this conversation as resolved.
Show resolved Hide resolved
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);
Expand Down
2 changes: 1 addition & 1 deletion externals/opdi
Open in desktop
Submodule opdi updated 11 files
+41 −0 .gitlab-ci.yml
+6 −3 include/opdi/backend/macro/macros.hpp
+3 −7 include/opdi/backend/macro/reductionTools.hpp
+14 −2 include/opdi/logic/omp/implicitTaskOmpLogic.cpp
+24 −7 include/opdi/logic/omp/parallelOmpLogic.cpp
+4 −0 include/opdi/logic/omp/parallelOmpLogic.hpp
+1 −0 include/opdi/misc/tapePool.hpp
+9 −4 tests/Makefile
+15 −6 tests/run.sh
+7 −0 tests/tests/TestExternalFunctionGlobal.hpp
+3 −0 tests/tests/TestExternalFunctionLocal.hpp
2 changes: 1 addition & 1 deletion meson_scripts/init.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def init_submodules(
github_repo_codi = "https://github.com/scicompkl/CoDiPack"
sha_version_medi = "85711944f8d5d03dd75c635f8a18e220b216040d"
github_repo_medi = "https://github.com/SciCompKL/MeDiPack"
sha_version_opdi = "93d05a762f1b614a84767ea5ba75fd7e2c27f317"
sha_version_opdi = "2cc84e79309ab8077f08d95bd7668fd9dd18d1c8"
github_repo_opdi = "https://github.com/SciCompKL/OpDiLib"
sha_version_meson = "41c650a040d50e0912d268af7a903a9ce1456dfa"
github_repo_meson = "https://github.com/mesonbuild/meson"
Expand Down
Loading