Merge branch 'AllwmakeScript'

Misc

See merge request !3

Allwmake

@@ -0,0 +1,11 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
+
+libs/Allwmake $targetType $*
+
+solvers_post/Allwmake $targetType $*
+
+#------------------------------------------------------------------------------

examples/FlameD_Equilibrium/constant/SLFMdict

@@ -23,6 +23,9 @@ upperN 30; //number of eta-space over stoichiometric value
 Equilibrium true;
 NVar 40; //20;
 
+Sc 0.68; //Schmidt number
+outletName outlet; // outletName
+
 detailedEta
 (
 1e-6 1e-5 1e-4 1e-3 1e-2 

examples/FlameD_SLFM/constant/SLFMdict

@@ -24,6 +24,9 @@ upperN 30; //number of eta-space over stoichiometric value
 Equilibrium false;
 NVar 40; //20;
 
+Sc 0.68; //Schmidt number
+outletName outlet; // outletName
+
 detailedEta
 (
 1e-6 1e-5 1e-4 1e-3 1e-2 

libs/Allwmake

@@ -0,0 +1,10 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
+
+wmake $targetType chemistryModel_POSTECH
+wmake $targetType combustionModels_POSTECH
+
+#------------------------------------------------------------------------------

solvers_post/Allwmake

@@ -0,0 +1,12 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
+
+wmake SLFMFoam
+wmake LagrangianCMCFoam
+wmake LagrangianCMCSprayFoam
+wmake LagrangianCMCdieselEngineFoam4x
+
+#------------------------------------------------------------------------------

solvers_post/LagrangianCMCSprayFoam/LagrangianCMCSprayFoam.C

@@ -105,7 +105,7 @@ int main(int argc, char *argv[])
 
 		if(runTime.value() >= parcels.injectors()[0].timeStart())
 		{
-			CMC_on = true;	
+			CMC_on = true;
 			if(init_start_CMC == true)
 			{
 				#include "QiCMC_init.H"

solvers_post/LagrangianCMCSprayFoam/Make/files

@@ -0,0 +1,3 @@
+LagrangianCMCSprayFoam.C
+
+EXE = $(FOAM_USER_APPBIN)/LagrangianCMCSprayFoam

solvers_post/LagrangiansCMCSprayFoam/Make/files

@@ -1,3 +0,0 @@
-LagrangiansCMCSprayFoam.C
-
-EXE = $(FOAM_USER_APPBIN)/LagrangiansCMCSprayFoam

solvers_post/SLFMFoam/Mixturefraction.H

@@ -3,7 +3,7 @@ fvScalarMatrix mfEqn
 (
 
       fvm::div(phi, mf)
-    - fvm::laplacian(1.47*turbulence->mut(), mf) //let 1/Sc = 1.47
+    - fvm::laplacian((1/Sc)*turbulence->mut(), mf) //let 1/Sc = 1.47
 );
 
 

solvers_post/SLFMFoam/MixturefractionVar.H

@@ -7,9 +7,9 @@ fvScalarMatrix mfVarEqn
 (
 
      fvm::div(phi, mfVar)
-    - fvm::laplacian(1.47*turbulence->mut(), mfVar) //let 1/Sc = 1.47
+    - fvm::laplacian((1/Sc)*turbulence->mut(), mfVar) 
     ==
-    2 * ( 1.47 * turbulence->mut() ) * (Gradmf & Gradmf)
+    2 * ( (1/Sc) * turbulence->mut() ) * (Gradmf & Gradmf)
     - 2 * rho * SDR
 );
 

solvers_post/SLFMFoam/SLFMFoam.C

@@ -25,10 +25,14 @@ Application
     SLFMFoam
 
 Description
-    Steady state solver for turbulent combustion.
+    Steady Laminar Flamelet Model(SLFM) solver for turbulent combustion. SLFM 
+    assumes a turbulent flame composed of thin stretched laminar flamelets.
+    Each flamelet library is generated by external program and imported by 
+    the solver.
     
 References
-    N. Peters, Turbulent Combustion, Cambridge University Press; 2000.
+    A.Y. Klimenko, R.W. Bilger, Progress in Energy and Combustion Science 25 (1999) 595-687
+    N. Peters, Turbulent Combustion, Cambridge University Press (2000)
 
 Contact
     POSTECH combustion lab.
@@ -55,7 +59,7 @@ int main(int argc, char *argv[])
     #include "createControl.H"
     #include "createFields.H"
     #include "createFieldRefs.H"
-    #include "BetaPDF.H" //make detailed integration space and evaluate beta-pdf integration
+    #include "BetaPDF.H" //make detailed integration space and perform beta-pdf integration
 
     #include "createFvOptions.H"
     #include "initContinuityErrs.H"
@@ -81,8 +85,8 @@ int main(int argc, char *argv[])
         // --- Pressure-velocity SIMPLE corrector loop
         {
             #include "UEqn.H"
-            #include "Mixturefraction.H" //mixture fraction
-            #include "MixturefractionVar.H" //mixture fraction variance 
+            #include "Mixturefraction.H" //mean mixture fraction
+            #include "MixturefractionVar.H" //mean mixture fraction variance 
             #include "setSDR.H" //calculate scalar dissipation rate
             #include "updateT_RHO.H" //update temperature and density
             #include "pEqn.H"