From 4c25d64af672f8fd8497a9bf1b746c33e769cad3 Mon Sep 17 00:00:00 2001 From: danielque Date: Tue, 24 Sep 2019 17:50:44 +0200 Subject: [PATCH] define probes directly in controlDict test harness is not yet prepared to handle '#include' properly or read probes from probesDict --- .../R2_FB/CFD/system/controlDict | 41 ++++++++++++++++++- .../30CO6H2_Hematite/CFD/system/controlDict | 39 +++++++++++++++++- .../33CO3H2_Hematite/CFD/system/controlDict | 39 +++++++++++++++++- .../GOD0k1_Hematite/CFD/system/controlDict | 32 ++++++++++++++- .../ISO4695/CFD/system/controlDict | 32 ++++++++++++++- 5 files changed, 173 insertions(+), 10 deletions(-) diff --git a/tutorials/cfdemSolverRhoPimpleChem/PolydisperseFluidizedBed/R2_FB/CFD/system/controlDict b/tutorials/cfdemSolverRhoPimpleChem/PolydisperseFluidizedBed/R2_FB/CFD/system/controlDict index 9b110527..c76dbe67 100644 --- a/tutorials/cfdemSolverRhoPimpleChem/PolydisperseFluidizedBed/R2_FB/CFD/system/controlDict +++ b/tutorials/cfdemSolverRhoPimpleChem/PolydisperseFluidizedBed/R2_FB/CFD/system/controlDict @@ -65,13 +65,50 @@ functions type rhoReactionThermoMoleFractions; } - probes1 + probes { type probes; functionObjectLibs ("libsampling.so"); - #include "probesDict"; + // Name of the directory for probe data + name probes; + + // 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) + ); + + fields + ( + rho + p + T + Cpv + 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 10000; } diff --git a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/30CO6H2_Hematite/CFD/system/controlDict b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/30CO6H2_Hematite/CFD/system/controlDict index 746a7dee..da324be3 100644 --- a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/30CO6H2_Hematite/CFD/system/controlDict +++ b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/30CO6H2_Hematite/CFD/system/controlDict @@ -65,13 +65,48 @@ functions type rhoReactionThermoMoleFractions; } - probes1 + probes { type probes; functionObjectLibs ("libsampling.so"); - #include "probesDict"; + // Name of the directory for probe data + name probes; + + // Locations to be probed. + probeLocations + ( + (7.0 2.5 2.5) + (8.0 2.5 2.5) + (1.0 2.5 2.5) + ); + + fields + ( + rho + p + T + Cpv + 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 50; } diff --git a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/33CO3H2_Hematite/CFD/system/controlDict b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/33CO3H2_Hematite/CFD/system/controlDict index df901edf..4b61fbc5 100644 --- a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/33CO3H2_Hematite/CFD/system/controlDict +++ b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/33CO3H2_Hematite/CFD/system/controlDict @@ -64,13 +64,48 @@ functions type rhoReactionThermoMoleFractions; } - probes1 + probes { type probes; functionObjectLibs ("libsampling.so"); - #include "probesDict"; + // Name of the directory for probe data + name probes; + + // Locations to be probed. + probeLocations + ( + (7.0 2.5 2.5) + (8.0 2.5 2.5) + (1.0 2.5 2.5) + ); + + fields + ( + rho + p + T + Cpv + 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 50; } diff --git a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/GOD0k1_Hematite/CFD/system/controlDict b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/GOD0k1_Hematite/CFD/system/controlDict index ed6639af..3235c342 100644 --- a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/GOD0k1_Hematite/CFD/system/controlDict +++ b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/GOD0k1_Hematite/CFD/system/controlDict @@ -65,13 +65,41 @@ functions type rhoReactionThermoMoleFractions; } - probes1 + probes { type probes; functionObjectLibs ("libsampling.so"); - #include "probesDict"; + // Name of the directory for probe data + name probes; + + // Locations to be probed. + probeLocations + ( + (7.0 2.5 2.5) + (8.0 2.5 2.5) + (1.0 2.5 2.5) + ); + + fields + ( + rho + p + T + Cpv + N2 + CO2 + CO + ModSpeciesMassField_N2 + ModSpeciesMassField_CO2 + ModSpeciesMassField_CO + X_CO + X_CO2 + ); + + writeControl timeStep; + writeInterval 50; } diff --git a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/ISO4695/CFD/system/controlDict b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/ISO4695/CFD/system/controlDict index d2261a1e..841b387d 100644 --- a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/ISO4695/CFD/system/controlDict +++ b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/ISO4695/CFD/system/controlDict @@ -65,13 +65,41 @@ functions type rhoReactionThermoMoleFractions; } - probes1 + probes { type probes; functionObjectLibs ("libsampling.so"); - #include "probesDict"; + // Name of the directory for probe data + name probes; + + // Locations to be probed. + probeLocations + ( + (7.0 2.5 2.5) + (8.0 2.5 2.5) + (1.0 2.5 2.5) + ); + + fields + ( + rho + p + T + Cpv + N2 + CO2 + CO + ModSpeciesMassField_N2 + ModSpeciesMassField_CO2 + ModSpeciesMassField_CO + X_CO + X_CO2 + ); + + writeControl timeStep; + writeInterval 50; }