From d5f331c83176f5bcd70f83c9d30ed6528ad5cd00 Mon Sep 17 00:00:00 2001 From: danielque Date: Fri, 9 Aug 2019 15:37:07 +0200 Subject: [PATCH] testharnes does not yet support #include directives in OF dictionaries --- .../30CO6H2_Hematite/CFD/system/controlDict | 7 +- .../CFD/system/controlDict_test | 151 ++++++++++++++++++ .../30CO6H2_Hematite/prerun.sh | 6 +- .../Spreitzer_R2/CFD/system/controlDict_test | 44 ++++- 4 files changed, 200 insertions(+), 8 deletions(-) create mode 100644 tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/30CO6H2_Hematite/CFD/system/controlDict_test diff --git a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/30CO6H2_Hematite/CFD/system/controlDict b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/30CO6H2_Hematite/CFD/system/controlDict index ed95c9f6..746c0af4 100644 --- a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/30CO6H2_Hematite/CFD/system/controlDict +++ b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/30CO6H2_Hematite/CFD/system/controlDict @@ -53,9 +53,10 @@ maxDeltaT 0.1; // ************************************************************************* // - libs ( - "libfieldFunctionObjects.so" - ); +libs +( + "libfieldFunctionObjects.so" +); functions { diff --git a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/30CO6H2_Hematite/CFD/system/controlDict_test b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/30CO6H2_Hematite/CFD/system/controlDict_test new file mode 100644 index 00000000..2d6de853 --- /dev/null +++ b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/30CO6H2_Hematite/CFD/system/controlDict_test @@ -0,0 +1,151 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 2.3.0 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object controlDict; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +application cfdemSolverRhoPimpleChem; + +startFrom startTime; + +startTime 0; + +stopAt endTime; + +endTime 11000.0; + +deltaT 1; + +writeControl runTime; + +writeInterval 1000; + +purgeWrite 0; + +writeFormat ascii; + +writePrecision 10; + +writeCompression off; + +timeFormat general; + +timePrecision 6; + +runTimeModifiable false; + +adjustTimeStep no; + +maxCo 0.5; + +maxDeltaT 0.1; + + +// ************************************************************************* // +libs +( + "libfieldFunctionObjects.so" +); + +functions +{ + moleFrac + { + type rhoReactionThermoMoleFractions; + } + + probes1 + { + type probes; + + functionObjectLibs ("libsampling.so"); + + fields + ( + rho + p + T + molC + N2 + CO2 + CO + H2 + H2O + ModSpeciesMassField_N2 + ModSpeciesMassField_CO2 + ModSpeciesMassField_CO + ModSpeciesMassField_H2 + ModSpeciesMassField_H2O + X_CO + X_CO2 + X_H2 + X_N2 + X_H2O + ); + + writeControl timeStep; + writeInterval 10; + + // Locations to be probed + probeLocations + ( + (7.0 2.5 2.5) + (8.0 2.5 2.5) + (1.0 2.5 2.5) + ); + + } + + globalMassFrac + { + type volRegion; + libs ("libfieldFunctionObjects.so"); + writeControl timeStep;//outputTime; + writeInterval 1; + log true; + writeFields false; + regionType all; + name c0; + operation weightedVolAverage; + weightField rhoeps; + fields + ( + H2 + CO2 + CO + N2 + H2O + ); + } + + globalMass + { + type volRegion; + libs ("libfieldFunctionObjects.so"); + writeControl timeStep;//outputTime; + writeInterval 1; + log true; + writeFields false; + regionType all; + name c1; + operation volIntegrate; + fields + ( + rhoeps + rho + ); + } +} + +// ************************************************************************* // diff --git a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/30CO6H2_Hematite/prerun.sh b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/30CO6H2_Hematite/prerun.sh index 7b370ae7..bee37f2d 100755 --- a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/30CO6H2_Hematite/prerun.sh +++ b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/30CO6H2_Hematite/prerun.sh @@ -10,4 +10,8 @@ else echo "mesh needs to be built" cd $casePath/CFD blockMesh -fi \ No newline at end of file +fi + +# adapt settings for test harness run +cp $casePath/CFD/system/controlDict_test $casePath/CFD/system/controlDict + diff --git a/tutorials/cfdemSolverRhoPimpleChem/Spreitzer_FluidBedCases/Spreitzer_R2/CFD/system/controlDict_test b/tutorials/cfdemSolverRhoPimpleChem/Spreitzer_FluidBedCases/Spreitzer_R2/CFD/system/controlDict_test index 999e1f14..1773f218 100644 --- a/tutorials/cfdemSolverRhoPimpleChem/Spreitzer_FluidBedCases/Spreitzer_R2/CFD/system/controlDict_test +++ b/tutorials/cfdemSolverRhoPimpleChem/Spreitzer_FluidBedCases/Spreitzer_R2/CFD/system/controlDict_test @@ -53,9 +53,10 @@ maxDeltaT 0.1; // ************************************************************************* // - libs ( - "libfieldFunctionObjects.so" - ); +libs +( + "libfieldFunctionObjects.so" +); functions { @@ -103,7 +104,42 @@ functions functionObjectLibs ("libsampling.so"); - #include "probesDict"; + fields + ( + rho + p + T + molC + N2 + CO2 + CO + H2 + H2O + ModSpeciesMassField_N2 + ModSpeciesMassField_CO2 + ModSpeciesMassField_CO + ModSpeciesMassField_H2 + ModSpeciesMassField_H2O + X_CO + X_CO2 + X_H2 + X_H2O + X_N2 + ); + + writeControl timeStep; + writeInterval 10000; + + // Locations to be probed + probeLocations + ( + (0.03 0.025 0.03) + (0.03 0.05 0.03) + (0.03 0.075 0.03) + (0.03 0.09 0.03) + (0.03 0.12 0.03) + ); + }