Merge pull request #472 from DongWangChina/master

PatchFuncInjection & flareFGM model: checkout before running & flareFGM model: load omega_YiNames from combustionProperties
deepmodeling · Apr 21, 2024 · 233d6f3 · 233d6f3
2 parents 7594b8d + d39ccb0
commit 233d6f3
Show file tree

Hide file tree

Showing 51 changed files with 1,321 additions and 158 deletions.
diff --git a/applications/solvers/dfHighSpeedFoam/createFields.H b/applications/solvers/dfHighSpeedFoam/createFields.H
@@ -190,7 +190,7 @@ const word combModelName(mesh.objectRegistry::lookupObject<IOdictionary>("combus
 Info << "Combustion Model Name is confirmed as "<< combModelName << endl;
 
 
-if (combModelName != "flareFGM")
+if(combModelName!="ESF" && combModelName!="flareFGM"  && combModelName!="DeePFGM" && combModelName!="FSD")
 {
     chemistry->correctThermo();
     Info<< "At initial time, min/max(T) = " << min(T).value() << ", " << max(T).value() << endl;

diff --git a/applications/solvers/dfLowMachFoam/createFields.H b/applications/solvers/dfLowMachFoam/createFields.H
@@ -101,7 +101,7 @@ chemistry->setEnergyName("ha");
 chemistry->updateEnergy();
 
 
-if (combModelName != "flareFGM")
+if(combModelName!="ESF" && combModelName!="flareFGM"  && combModelName!="DeePFGM" && combModelName!="FSD")
 {
     chemistry->correctThermo();
     Info<< "At initial time, min/max(T) = " << min(T).value() << ", " << max(T).value() << endl;
@@ -115,7 +115,7 @@ volScalarField K("K", 0.5*magSqr(U));
 
 multivariateSurfaceInterpolationScheme<scalar>::fieldTable fields;
 
-if(combModelName!="flareFGM")
+if(combModelName!="ESF" && combModelName!="flareFGM"  && combModelName!="DeePFGM" && combModelName!="FSD")
 {
 forAll(Y, i)
 {

diff --git a/applications/solvers/dfLowMachFoam/dfLowMachFoam.C b/applications/solvers/dfLowMachFoam/dfLowMachFoam.C
@@ -308,7 +308,7 @@ int main(int argc, char *argv[])
             end = std::clock();
             time_monitor_U += double(end - start) / double(CLOCKS_PER_SEC);
 
-            if(combModelName!="ESF" && combModelName!="flareFGM" && combModelName!="DeePFGM")
+            if(combModelName!="ESF" && combModelName!="flareFGM"  && combModelName!="DeePFGM" && combModelName!="FSD")
             {
                 start = std::clock();
                 #ifdef GPUSolver_

diff --git a/applications/solvers/dfSprayFoam/createFields.H b/applications/solvers/dfSprayFoam/createFields.H
@@ -110,7 +110,7 @@ const label inertIndex(chemistry->species()[inertSpecie]);
 chemistry->setEnergyName("ha");
 chemistry->updateEnergy();
 
-if (combModelName != "flareFGM" && combModelName != "DeePFGM")
+if(combModelName!="ESF" && combModelName!="flareFGM"  && combModelName!="DeePFGM" && combModelName!="FSD")
 {
     chemistry->correctThermo();
     Info<< "At initial time, min/max(T) = " << min(T).value() << ", " << max(T).value() << endl;

diff --git a/applications/solvers/dfSprayFoam/dfSprayFoam.C b/applications/solvers/dfSprayFoam/dfSprayFoam.C
@@ -154,7 +154,7 @@ int main(int argc, char *argv[])
         {
             #include "UEqn.H"
 
-            if(combModelName!="ESF" && combModelName!="flareFGM"  && combModelName!="DeePFGM" )
+            if(combModelName!="ESF" && combModelName!="flareFGM"  && combModelName!="DeePFGM" && combModelName!="FSD")
             {
                 #include "YEqn.H"
                 #include "EEqn.H"

diff --git a/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/CO.gz b/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/CO.gz
diff --git a/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/CO2.gz b/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/CO2.gz
diff --git a/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/Cp.gz b/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/Cp.gz
diff --git a/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/H2O.gz b/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/H2O.gz
diff --git a/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/Ha.gz b/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/Ha.gz
diff --git a/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/Hf.gz b/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/Hf.gz
diff --git a/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/T.gz b/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/T.gz
diff --git a/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/U.gz b/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/U.gz
diff --git a/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/Wt.gz b/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/Wt.gz
diff --git a/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/Z.gz b/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/Z.gz
diff --git a/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/Zcvar.gz b/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/Zcvar.gz
diff --git a/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/Zcvar_s.gz b/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/Zcvar_s.gz
diff --git a/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/Zvar.gz b/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/Zvar.gz
diff --git a/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/Zvar_s.gz b/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/Zvar_s.gz
diff --git a/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/alphat.gz b/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/alphat.gz
diff --git a/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/c.gz b/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/c.gz
diff --git a/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/c_s.gz b/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/c_s.gz
diff --git a/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/chi_Z.gz b/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/chi_Z.gz
diff --git a/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/chi_Zc.gz b/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/chi_Zc.gz
diff --git a/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/chi_c.gz b/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/chi_c.gz
diff --git a/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/cvar.gz b/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/cvar.gz
diff --git a/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/cvar_s.gz b/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/cvar_s.gz
diff --git a/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/epsilon.gz b/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/epsilon.gz
diff --git a/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/k.gz b/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/k.gz
diff --git a/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/mixfrac.gz b/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/mixfrac.gz
diff --git a/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/nut.gz b/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/nut.gz
diff --git a/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/omega_CH4.gz b/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/omega_CH4.gz
diff --git a/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/omega_c.gz b/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/omega_c.gz
diff --git a/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/p.gz b/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/p.gz
diff --git a/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/phi.gz b/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/phi.gz
diff --git a/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/rho.gz b/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/rho.gz
diff --git a/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/uniform/time b/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/1/uniform/time
@@ -19,11 +19,11 @@ value           1;
 
 name            "1";
 
-index           17469;
+index           17498;
 
-deltaT          5.7162129e-05;
+deltaT          5.7362135e-05;
 
-deltaT0         5.7162129e-05;
+deltaT0         5.7362135e-05;
 
 
 // ************************************************************************* //
diff --git a/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/constant/combustionProperties b/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/constant/combustionProperties
@@ -65,7 +65,9 @@ PaSRCoeffs
 }
 
 flareFGMCoeffs
-{
+{  
+  nOmega_Yis        1;
+  omega_YiNames (CH4);
   scaledPV         true;
   combustion       true;
   solveEnthalpy    true;