From b85cd351a368c675ad94fa9cdfdc10c11d546eda Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 7 Aug 2019 16:50:47 +0200 Subject: [PATCH] SUBMODULE: added adios submodule (ADIOS2) and control files --- .gitmodules | 3 ++ bin/tools/CleanFunctions | 10 +++++++ etc/caseDicts/annotated/adiosWriteDict | 34 +++++++++++++++++++++++ etc/caseDicts/insitu/adios/adiosWrite.cfg | 19 +++++++++++++ modules/adios | 1 + 5 files changed, 67 insertions(+) create mode 100644 etc/caseDicts/annotated/adiosWriteDict create mode 100644 etc/caseDicts/insitu/adios/adiosWrite.cfg create mode 160000 modules/adios diff --git a/.gitmodules b/.gitmodules index 866de836a4..85bf8e7146 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "catalyst"] path = modules/catalyst url = https://develop.openfoam.com/Community/catalyst.git +[submodule "adios"] + path = modules/adios + url = https://develop.openfoam.com/Community/adiosfoam.git diff --git a/bin/tools/CleanFunctions b/bin/tools/CleanFunctions index c667bb7e4e..33c901e254 100644 --- a/bin/tools/CleanFunctions +++ b/bin/tools/CleanFunctions @@ -37,6 +37,15 @@ cleanTimeDirectories() } +cleanAdiosOutput() +{ + if [ -d adiosData ] && [ -d system ] + then + rm -rf adiosData > /dev/null 2>&1 + fi +} + + cleanDynamicCode() { if [ -d dynamicCode ] && [ -d system ] @@ -93,6 +102,7 @@ cleanCase() { cleanTimeDirectories cleanPostProcessing + cleanAdiosOutput cleanDynamicCode cleanOptimisation diff --git a/etc/caseDicts/annotated/adiosWriteDict b/etc/caseDicts/annotated/adiosWriteDict new file mode 100644 index 0000000000..b0f6b38ee6 --- /dev/null +++ b/etc/caseDicts/annotated/adiosWriteDict @@ -0,0 +1,34 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: v1906 | +| \\ / A nd | Web: www.OpenFOAM.com | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +// Embed output with ADIOS2 + +type adiosWrite; +libs ("libadiosFunctionObjects.so"); + +// Additional items to write, or items to write (when explicit) +write +{ + // Only use explicitly named fields/clouds. + // Otherwise select all fields/clouds that have AUTO_WRITE on. + explicit false; + + // Volume fields + fields (); + + // Parcel clouds + clouds (); +} + +// Items to suppress from writing +ignore +{ + fields (); + clouds (); +} + +// ************************************************************************* // diff --git a/etc/caseDicts/insitu/adios/adiosWrite.cfg b/etc/caseDicts/insitu/adios/adiosWrite.cfg new file mode 100644 index 0000000000..c402e9abdd --- /dev/null +++ b/etc/caseDicts/insitu/adios/adiosWrite.cfg @@ -0,0 +1,19 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: v1906 | +| \\ / A nd | Web: www.OpenFOAM.com | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +// Embed output with ADIOS2 + +type adiosWrite; +libs ("libadiosFunctionObjects.so"); + +executeControl none; + +writeControl writeTime; + +writeInterval 1; + +// ************************************************************************* // diff --git a/modules/adios b/modules/adios new file mode 160000 index 0000000000..64b82ebbe1 --- /dev/null +++ b/modules/adios @@ -0,0 +1 @@ +Subproject commit 64b82ebbe119287434b2d52d042d598d2899ad6b