From 8f94dba403b4b7f130058d42deec964612533e0f Mon Sep 17 00:00:00 2001 From: danielque Date: Wed, 13 Nov 2019 13:42:38 +0100 Subject: [PATCH] [OF6] adjust chemistry cases to OF6 syntax OF4 -> OF5: functionObjects volRegion/surfaceRegion -> volFieldValue/surfaceFieldValue fvOptions limitTemperatureCoeffs: Tmin/Tmax -> min/max OF5 -> OF6: combustionProperties: noCombustion<> -> none (template parameters are no longer required) --- .../R2_FB/CFD/constant/combustionProperties | 7 +++++-- .../R2_FB/CFD/system/controlDict | 15 ++++++++++----- .../R2_FB/CFD/system/controlDict_test | 15 ++++++++++----- .../R2_FB/CFD/system/fvOptions | 9 ++++++--- .../CFD/constant/combustionProperties | 7 +++++-- .../30CO6H2_Hematite/CFD/system/controlDict | 6 ++++-- .../30CO6H2_Hematite/CFD/system/fvOptions | 6 ++++-- .../CFD/constant/combustionProperties | 7 +++++-- .../33CO3H2_Hematite/CFD/system/controlDict | 6 ++++-- .../33CO3H2_Hematite/CFD/system/fvOptions | 6 ++++-- .../CFD/constant/combustionProperties | 7 +++++-- .../GOD0k1_Hematite/CFD/system/controlDict | 6 ++++-- .../GOD0k1_Hematite/CFD/system/fvOptions | 7 ++++--- .../ISO4695/CFD/constant/combustionProperties | 7 +++++-- .../ISO4695/CFD/system/controlDict | 6 ++++-- .../ISO4695/CFD/system/fvOptions | 6 ++++-- 16 files changed, 83 insertions(+), 40 deletions(-) diff --git a/tutorials/cfdemSolverRhoPimpleChem/PolydisperseFluidizedBed/R2_FB/CFD/constant/combustionProperties b/tutorials/cfdemSolverRhoPimpleChem/PolydisperseFluidizedBed/R2_FB/CFD/constant/combustionProperties index c5b934a4..ecec7ca7 100644 --- a/tutorials/cfdemSolverRhoPimpleChem/PolydisperseFluidizedBed/R2_FB/CFD/constant/combustionProperties +++ b/tutorials/cfdemSolverRhoPimpleChem/PolydisperseFluidizedBed/R2_FB/CFD/constant/combustionProperties @@ -15,11 +15,14 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -combustionModel noCombustion; //PaSR; //PaSR; +// OF5 -> OF6: noCombustion<> -> none (template parameters are no longer required) +//combustionModel noCombustion; //PaSR; //PaSR; +combustionModel none; // OF6 active false; //true; -noCombustionCoeffs +//noCombustionCoeffs +noneCoeffs { } diff --git a/tutorials/cfdemSolverRhoPimpleChem/PolydisperseFluidizedBed/R2_FB/CFD/system/controlDict b/tutorials/cfdemSolverRhoPimpleChem/PolydisperseFluidizedBed/R2_FB/CFD/system/controlDict index 35d4d6d1..99dd8ef8 100644 --- a/tutorials/cfdemSolverRhoPimpleChem/PolydisperseFluidizedBed/R2_FB/CFD/system/controlDict +++ b/tutorials/cfdemSolverRhoPimpleChem/PolydisperseFluidizedBed/R2_FB/CFD/system/controlDict @@ -145,7 +145,8 @@ functions globalMassFrac { - type volRegion; + //type volRegion; // OF4 + type volFieldValue; // OF5,OF6 libs ("libfieldFunctionObjects.so"); writeControl timeStep;//outputTime; writeInterval 1; @@ -167,7 +168,8 @@ functions globalMass { - type volRegion; + //type volRegion; // OF4 + type volFieldValue; // OF5,OF6 libs ("libfieldFunctionObjects.so"); writeControl timeStep;//outputTime; writeInterval 1; @@ -185,7 +187,8 @@ functions inflow_GasSpecies { - type surfaceRegion; + //type surfaceRegion; // OF4 + type surfaceFieldValue; // OF5,OF6 libs ("libfieldFunctionObjects.so"); writeControl timeStep; writeInterval 100; @@ -208,7 +211,8 @@ functions inflow_phi { - type surfaceRegion; + //type surfaceRegion; // OF4 + type surfaceFieldValue; // OF5,OF6 libs ("libfieldFunctionObjects.so"); writeControl timeStep; writeInterval 100; @@ -227,7 +231,8 @@ functions inflow_U { - type surfaceRegion; + //type surfaceRegion; // OF4 + type surfaceFieldValue; // OF5,OF6 libs ("libfieldFunctionObjects.so"); writeControl timeStep; writeInterval 100; diff --git a/tutorials/cfdemSolverRhoPimpleChem/PolydisperseFluidizedBed/R2_FB/CFD/system/controlDict_test b/tutorials/cfdemSolverRhoPimpleChem/PolydisperseFluidizedBed/R2_FB/CFD/system/controlDict_test index 973a2b63..0dce0127 100644 --- a/tutorials/cfdemSolverRhoPimpleChem/PolydisperseFluidizedBed/R2_FB/CFD/system/controlDict_test +++ b/tutorials/cfdemSolverRhoPimpleChem/PolydisperseFluidizedBed/R2_FB/CFD/system/controlDict_test @@ -145,7 +145,8 @@ functions globalMassFrac { - type volRegion; + //type volRegion; // OF4 + type volFieldValue; // OF5,OF6 libs ("libfieldFunctionObjects.so"); writeControl timeStep;//outputTime; writeInterval 1; @@ -167,7 +168,8 @@ functions globalMass { - type volRegion; + //type volRegion; // OF4 + type volFieldValue; // OF5,OF6 libs ("libfieldFunctionObjects.so"); writeControl timeStep;//outputTime; writeInterval 1; @@ -185,7 +187,8 @@ functions inflow_GasSpecies { - type surfaceRegion; + //type surfaceRegion; // OF4 + type surfaceFieldValue; // OF5,OF6 libs ("libfieldFunctionObjects.so"); writeControl timeStep; writeInterval 100; @@ -208,7 +211,8 @@ functions inflow_phi { - type surfaceRegion; + //type surfaceRegion; // OF4 + type surfaceFieldValue; // OF5,OF6 libs ("libfieldFunctionObjects.so"); writeControl timeStep; writeInterval 100; @@ -227,7 +231,8 @@ functions inflow_U { - type surfaceRegion; + //type surfaceRegion; // OF4 + type surfaceFieldValue; // OF5,OF6 libs ("libfieldFunctionObjects.so"); writeControl timeStep; writeInterval 100; diff --git a/tutorials/cfdemSolverRhoPimpleChem/PolydisperseFluidizedBed/R2_FB/CFD/system/fvOptions b/tutorials/cfdemSolverRhoPimpleChem/PolydisperseFluidizedBed/R2_FB/CFD/system/fvOptions index 5cec3738..50a3b102 100644 --- a/tutorials/cfdemSolverRhoPimpleChem/PolydisperseFluidizedBed/R2_FB/CFD/system/fvOptions +++ b/tutorials/cfdemSolverRhoPimpleChem/PolydisperseFluidizedBed/R2_FB/CFD/system/fvOptions @@ -22,7 +22,10 @@ limitedTemperature { active yes; selectionMode all; - Tmin 1020; - Tmax 1500; + //Tmin 1020; // OF4 + //Tmax 1500; // OF4 + min 1020; // OF5,OF6 + max 1500; // OF5,OF6 } -} \ No newline at end of file +} + diff --git a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/30CO6H2_Hematite/CFD/constant/combustionProperties b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/30CO6H2_Hematite/CFD/constant/combustionProperties index 2f51801a..8835a294 100644 --- a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/30CO6H2_Hematite/CFD/constant/combustionProperties +++ b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/30CO6H2_Hematite/CFD/constant/combustionProperties @@ -15,11 +15,14 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -combustionModel noCombustion; +// OF5 -> OF6: noCombustion<> -> none (template parameters are no longer required) +//combustionModel noCombustion; // OF4,OF5 +combustionModel none; // OF6 active false; //true; -noCombustionCoeffs +//noCombustionCoeffs +noneCoeffs { } diff --git a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/30CO6H2_Hematite/CFD/system/controlDict b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/30CO6H2_Hematite/CFD/system/controlDict index 8d5d1b8b..310f6a32 100644 --- a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/30CO6H2_Hematite/CFD/system/controlDict +++ b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/30CO6H2_Hematite/CFD/system/controlDict @@ -143,7 +143,8 @@ functions globalMassFrac { - type volRegion; + //type volRegion; // OF4 + type volFieldValue; // OF5,OF6 libs ("libfieldFunctionObjects.so"); writeControl timeStep;//outputTime; writeInterval 1; @@ -165,7 +166,8 @@ functions globalMass { - type volRegion; + //type volRegion; // OF4 + type volFieldValue; // OF5,OF6 libs ("libfieldFunctionObjects.so"); writeControl timeStep;//outputTime; writeInterval 1; diff --git a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/30CO6H2_Hematite/CFD/system/fvOptions b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/30CO6H2_Hematite/CFD/system/fvOptions index d021b03e..0063174e 100644 --- a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/30CO6H2_Hematite/CFD/system/fvOptions +++ b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/30CO6H2_Hematite/CFD/system/fvOptions @@ -22,8 +22,10 @@ limitedTemperature { active yes; selectionMode all; - Tmin 1200; - Tmax 2500; + //Tmin 1200; // OF4 + //Tmax 2500; // OF4 + min 1200; // OF5,OF6 + max 2500; // OF5,OF6 } } diff --git a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/33CO3H2_Hematite/CFD/constant/combustionProperties b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/33CO3H2_Hematite/CFD/constant/combustionProperties index c5b934a4..ecec7ca7 100644 --- a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/33CO3H2_Hematite/CFD/constant/combustionProperties +++ b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/33CO3H2_Hematite/CFD/constant/combustionProperties @@ -15,11 +15,14 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -combustionModel noCombustion; //PaSR; //PaSR; +// OF5 -> OF6: noCombustion<> -> none (template parameters are no longer required) +//combustionModel noCombustion; //PaSR; //PaSR; +combustionModel none; // OF6 active false; //true; -noCombustionCoeffs +//noCombustionCoeffs +noneCoeffs { } diff --git a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/33CO3H2_Hematite/CFD/system/controlDict b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/33CO3H2_Hematite/CFD/system/controlDict index 69f672ef..aa5b7869 100644 --- a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/33CO3H2_Hematite/CFD/system/controlDict +++ b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/33CO3H2_Hematite/CFD/system/controlDict @@ -142,7 +142,8 @@ functions globalMassFrac { - type volRegion; + //type volRegion; // OF4 + type volFieldValue; // OF5,OF6 libs ("libfieldFunctionObjects.so"); writeControl timeStep;//outputTime; writeInterval 1; @@ -164,7 +165,8 @@ functions globalMass { - type volRegion; + //type volRegion; // OF4 + type volFieldValue; // OF5,OF6 libs ("libfieldFunctionObjects.so"); writeControl timeStep;//outputTime; writeInterval 1; diff --git a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/33CO3H2_Hematite/CFD/system/fvOptions b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/33CO3H2_Hematite/CFD/system/fvOptions index fd3e0929..8291e573 100644 --- a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/33CO3H2_Hematite/CFD/system/fvOptions +++ b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/33CO3H2_Hematite/CFD/system/fvOptions @@ -22,8 +22,10 @@ limitedTemperature { active yes; selectionMode all; - Tmin 1200; - Tmax 2500; + //Tmin 1200; // OF4 + //Tmax 2500; // OF4 + min 1200; // OF5,OF6 + max 2500; // OF5,OF6 } } diff --git a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/GOD0k1_Hematite/CFD/constant/combustionProperties b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/GOD0k1_Hematite/CFD/constant/combustionProperties index c5b934a4..ecec7ca7 100644 --- a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/GOD0k1_Hematite/CFD/constant/combustionProperties +++ b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/GOD0k1_Hematite/CFD/constant/combustionProperties @@ -15,11 +15,14 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -combustionModel noCombustion; //PaSR; //PaSR; +// OF5 -> OF6: noCombustion<> -> none (template parameters are no longer required) +//combustionModel noCombustion; //PaSR; //PaSR; +combustionModel none; // OF6 active false; //true; -noCombustionCoeffs +//noCombustionCoeffs +noneCoeffs { } diff --git a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/GOD0k1_Hematite/CFD/system/controlDict b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/GOD0k1_Hematite/CFD/system/controlDict index 0a1c1aec..9e547f0f 100644 --- a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/GOD0k1_Hematite/CFD/system/controlDict +++ b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/GOD0k1_Hematite/CFD/system/controlDict @@ -136,7 +136,8 @@ functions globalMassFrac { - type volRegion; + //type volRegion; // OF4 + type volFieldValue; // OF5,OF6 libs ("libfieldFunctionObjects.so"); writeControl timeStep;//outputTime; writeInterval 1; @@ -156,7 +157,8 @@ functions globalMass { - type volRegion; + //type volRegion; // OF4 + type volFieldValue; // OF5,OF6 libs ("libfieldFunctionObjects.so"); writeControl timeStep;//outputTime; writeInterval 1; diff --git a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/GOD0k1_Hematite/CFD/system/fvOptions b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/GOD0k1_Hematite/CFD/system/fvOptions index fd3e0929..0063174e 100644 --- a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/GOD0k1_Hematite/CFD/system/fvOptions +++ b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/GOD0k1_Hematite/CFD/system/fvOptions @@ -22,9 +22,10 @@ limitedTemperature { active yes; selectionMode all; - Tmin 1200; - Tmax 2500; + //Tmin 1200; // OF4 + //Tmax 2500; // OF4 + min 1200; // OF5,OF6 + max 2500; // OF5,OF6 } } - diff --git a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/ISO4695/CFD/constant/combustionProperties b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/ISO4695/CFD/constant/combustionProperties index c5b934a4..ecec7ca7 100644 --- a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/ISO4695/CFD/constant/combustionProperties +++ b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/ISO4695/CFD/constant/combustionProperties @@ -15,11 +15,14 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -combustionModel noCombustion; //PaSR; //PaSR; +// OF5 -> OF6: noCombustion<> -> none (template parameters are no longer required) +//combustionModel noCombustion; //PaSR; //PaSR; +combustionModel none; // OF6 active false; //true; -noCombustionCoeffs +//noCombustionCoeffs +noneCoeffs { } diff --git a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/ISO4695/CFD/system/controlDict b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/ISO4695/CFD/system/controlDict index 7bc0f62b..1d845eb4 100644 --- a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/ISO4695/CFD/system/controlDict +++ b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/ISO4695/CFD/system/controlDict @@ -136,7 +136,8 @@ functions globalMassFrac { - type volRegion; + //type volRegion; // OF4 + type volFieldValue; // OF5,OF6 libs ("libfieldFunctionObjects.so"); writeControl timeStep;//outputTime; writeInterval 1; @@ -156,7 +157,8 @@ functions globalMass { - type volRegion; + //type volRegion; // OF4 + type volFieldValue; // OF5,OF6 libs ("libfieldFunctionObjects.so"); writeControl timeStep;//outputTime; writeInterval 1; diff --git a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/ISO4695/CFD/system/fvOptions b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/ISO4695/CFD/system/fvOptions index fd3e0929..8291e573 100644 --- a/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/ISO4695/CFD/system/fvOptions +++ b/tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/ISO4695/CFD/system/fvOptions @@ -22,8 +22,10 @@ limitedTemperature { active yes; selectionMode all; - Tmin 1200; - Tmax 2500; + //Tmin 1200; // OF4 + //Tmax 2500; // OF4 + min 1200; // OF5,OF6 + max 2500; // OF5,OF6 } }