[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)

tutorials/cfdemSolverRhoPimpleChem/PolydisperseFluidizedBed/R2_FB/CFD/constant/combustionProperties

@@ -15,11 +15,14 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-combustionModel   noCombustion<rhoThermoCombustion>; //PaSR<rhoChemistryCombustion>;  //PaSR<psiChemistryCombustion>;
+// OF5 -> OF6: noCombustion<> -> none (template parameters are no longer required)
+//combustionModel   noCombustion<rhoThermoCombustion>; //PaSR<rhoChemistryCombustion>;  //PaSR<psiChemistryCombustion>;
+combustionModel  none; // OF6
 
 active  false; //true;
 
-noCombustionCoeffs
+//noCombustionCoeffs
+noneCoeffs
 {
 }
 

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;

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;

tutorials/cfdemSolverRhoPimpleChem/PolydisperseFluidizedBed/R2_FB/CFD/system/fvOptions

@@ -22,7 +22,10 @@ limitedTemperature
     {
         active          yes;
         selectionMode   all;
-        Tmin     1020;
+        //Tmin     1020; // OF4
-        Tmax     1500;
+        //Tmax     1500; // OF4
+        min     1020; // OF5,OF6
+        max     1500; // OF5,OF6
     }
 }
+

tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/30CO6H2_Hematite/CFD/constant/combustionProperties

@@ -15,11 +15,14 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-combustionModel  noCombustion<rhoThermoCombustion>;
+// OF5 -> OF6: noCombustion<> -> none (template parameters are no longer required)
+//combustionModel  noCombustion<rhoThermoCombustion>; // OF4,OF5
+combustionModel  none; // OF6
 
 active  false; //true;
 
-noCombustionCoeffs
+//noCombustionCoeffs
+noneCoeffs
 {
 }
 

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;

tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/30CO6H2_Hematite/CFD/system/fvOptions

@@ -22,8 +22,10 @@ limitedTemperature
     {
         active          yes;
         selectionMode   all;
-        Tmin     1200;
+        //Tmin     1200; // OF4
-        Tmax     2500;
+        //Tmax     2500; // OF4
+        min     1200; // OF5,OF6
+        max     2500; // OF5,OF6
     }
 }
 

tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/33CO3H2_Hematite/CFD/constant/combustionProperties

@@ -15,11 +15,14 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-combustionModel   noCombustion<rhoThermoCombustion>; //PaSR<rhoChemistryCombustion>;  //PaSR<psiChemistryCombustion>;
+// OF5 -> OF6: noCombustion<> -> none (template parameters are no longer required)
+//combustionModel   noCombustion<rhoThermoCombustion>; //PaSR<rhoChemistryCombustion>;  //PaSR<psiChemistryCombustion>;
+combustionModel  none; // OF6
 
 active  false; //true;
 
-noCombustionCoeffs
+//noCombustionCoeffs
+noneCoeffs
 {
 }
 

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;

tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/33CO3H2_Hematite/CFD/system/fvOptions

@@ -22,8 +22,10 @@ limitedTemperature
     {
         active          yes;
         selectionMode   all;
-        Tmin     1200;
+        //Tmin     1200; // OF4
-        Tmax     2500;
+        //Tmax     2500; // OF4
+        min     1200; // OF5,OF6
+        max     2500; // OF5,OF6
     }
 }
 

tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/GOD0k1_Hematite/CFD/constant/combustionProperties

@@ -15,11 +15,14 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-combustionModel   noCombustion<rhoThermoCombustion>; //PaSR<rhoChemistryCombustion>;  //PaSR<psiChemistryCombustion>;
+// OF5 -> OF6: noCombustion<> -> none (template parameters are no longer required)
+//combustionModel   noCombustion<rhoThermoCombustion>; //PaSR<rhoChemistryCombustion>;  //PaSR<psiChemistryCombustion>;
+combustionModel  none; // OF6
 
 active  false; //true;
 
-noCombustionCoeffs
+//noCombustionCoeffs
+noneCoeffs
 {
 }
 

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;

tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/GOD0k1_Hematite/CFD/system/fvOptions

@@ -22,9 +22,10 @@ limitedTemperature
     {
         active          yes;
         selectionMode   all;
-        Tmin     1200;
+        //Tmin     1200; // OF4
-        Tmax     2500;
+        //Tmax     2500; // OF4
+        min     1200; // OF5,OF6
+        max     2500; // OF5,OF6
     }
 }
 
-

tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/ISO4695/CFD/constant/combustionProperties

@@ -15,11 +15,14 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-combustionModel   noCombustion<rhoThermoCombustion>; //PaSR<rhoChemistryCombustion>;  //PaSR<psiChemistryCombustion>;
+// OF5 -> OF6: noCombustion<> -> none (template parameters are no longer required)
+//combustionModel   noCombustion<rhoThermoCombustion>; //PaSR<rhoChemistryCombustion>;  //PaSR<psiChemistryCombustion>;
+combustionModel  none; // OF6
 
 active  false; //true;
 
-noCombustionCoeffs
+//noCombustionCoeffs
+noneCoeffs
 {
 }
 

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;

tutorials/cfdemSolverRhoPimpleChem/SingleParticleCases/ISO4695/CFD/system/fvOptions

@@ -22,8 +22,10 @@ limitedTemperature
     {
         active          yes;
         selectionMode   all;
-        Tmin     1200;
+        //Tmin     1200; // OF4
-        Tmax     2500;
+        //Tmax     2500; // OF4
+        min     1200; // OF5,OF6
+        max     2500; // OF5,OF6
     }
 }