zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote branch 'OpenCFD/master' into olesenm

Browse Source 
Conflicts:
	applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
	applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh.C
	applications/utilities/surface/surfaceCheck/surfaceCheck.C
	src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
	src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C
	src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.C

NOTE: also needed to strip trailing space/lines in various files
This commit is contained in:
Mark Olesen
2010-12-21 10:19:53 +01:00
parent 6abfeb88ba 255b9c0262
commit 881b3dafa2
415 changed files with 11347 additions and 5745 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/decomposeParDict
View File

@ -17,7 +17,7 @@ FoamFile
numberOfSubdomains 4;
method metis;
method scotch;
simpleCoeffs
{

16
tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution
View File

@ -36,15 +36,15 @@ solvers
{
solver GAMG;
tolerance 1e-06;
relTol 0.01;
relTol 0.01;
smoother GaussSeidel;
nPreSweeps 0;
nPostSweeps 2;
nBottomSweeps 2;
cacheAgglomeration false;
nCellsInCoarsestLevel 10;
agglomerator faceAreaPair;
mergeLevels 1;
nPreSweeps 0;
nPostSweeps 2;
nFinestSweeps 2;
cacheAgglomeration false;
nCellsInCoarsestLevel 10;
agglomerator faceAreaPair;
mergeLevels 1;
}
pFinal

2
tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/decomposeParDict
View File

@ -17,7 +17,7 @@ FoamFile
numberOfSubdomains 4;
method metis;
method scotch;
preserveFaceZones
(

2
tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/system/decomposeParDict
View File

@ -17,7 +17,7 @@ FoamFile
numberOfSubdomains 8;
method metis;
method scotch;
simpleCoeffs
{

2
tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/system/wallFilmRegion/decomposeParDict
View File

@ -17,7 +17,7 @@ FoamFile
numberOfSubdomains 8;
method metis;
method scotch;
simpleCoeffs
{

2
tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/wallFilmRegion.org/decomposeParDict
View File

@ -17,7 +17,7 @@ FoamFile
numberOfSubdomains 4;
method metis;
method scotch;
simpleCoeffs
{

2
tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/system/decomposeParDict
View File

@ -17,7 +17,7 @@ FoamFile
numberOfSubdomains 4;
method metis;
method scotch;
simpleCoeffs
{

2
tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/system/wallFilmRegion.org/decomposeParDict
View File

@ -17,7 +17,7 @@ FoamFile
numberOfSubdomains 4;
method metis;
method scotch;
simpleCoeffs
{

2
tutorials/lagrangian/reactingParcelFilmFoam/panel/system/decomposeParDict
View File

@ -17,7 +17,7 @@ FoamFile
numberOfSubdomains 4;
method metis;
method scotch;
simpleCoeffs
{

2
tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/decomposeParDict
View File

@ -17,7 +17,7 @@ FoamFile
numberOfSubdomains 4;
method metis;
method scotch;
simpleCoeffs
{

4
tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/options
View File

@ -4,8 +4,8 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/solids/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/solidMixture/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/pointSolids/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/pointSolidMixture/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/liquidMixture/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \

2
tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/decomposeParDict
View File

@ -17,7 +17,7 @@ FoamFile
numberOfSubdomains 4;
method metis;
method scotch;
simpleCoeffs
{