Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev

This commit is contained in:
andy
2010-12-08 17:17:10 +00:00
522 changed files with 11792 additions and 104627 deletions

View File

@ -104,6 +104,8 @@
taking film into account
+ Parallel aware
*** *New* ptscotch decomposition method
*** *Updated* decomposePar maps polyPatches instead of recreating them so
polyPatches holding data can map the data.
*** *Updated* particle tracking algorithm
+ uses non-blocking parallel transfers
+ does 'minimum-tet' decomposition of face to work with warped faces (snappyHexMesh!)
@ -150,7 +152,12 @@
OpenFOAM.
+ *New* wall functions:
+ kappatJayatillekeWallFunction: incompressible RAS thermal wall function
+ directMappedFixedValue:
+ takes interpolationScheme so can interpolate instead of always getting
cell value
+ takes optional fieldName to sample
+ directMapped patch added 'normal' method to calculate sample points
to e.g. sample fields just above wall (e.g. for streaklines)
* Utilities
There have been some utilities added and updated in this release.
*** *New* utilities
@ -172,8 +179,10 @@
*** Updated utilities
+ =setFields=: optionally use faceSets to set patch values (see e.g. hotRoom tutorial).
+ =blockMesh=: specify patches via dictionary instead of type only. This
makes rereading the boundary superfluous. see
makes rereading the boundary file superfluous. see
e.g. pitzDailyDirectMapped tutorial.
+ =setSet=: allows time range (e.g. 0:100) in combination with -batch argument
to execute the commands for multiple times.
* Post-processing
+ =foamToEnsight=: parallel continuous data. new =-nodeValues= option to generate and output nodal
field data.
@ -181,6 +190,10 @@
mesh. Great for postprocessing.
+ =steadyParticleTracks=: Generates VTK tracks from the output of the cloud
=ParticleTracks= post-processing sub-model
+ Sampling:
+ =patchInternalField=: new sampledSurface - like 'patch' but samples
internal field instead of boundary field.
+ =ensight=: new output format for all sampledSurfaces.
+ Function objects:
+ =residualControl=: new function object to allow users to terminate steady
state calculations when the defined residual levels are achieved
@ -190,6 +203,14 @@
specified time has been reached, e.g. to automagically change fvSchemes and
fvSolution during a calculation
+ =streamLine=: generate streamlines; ouputs both trajectory and field data
+ =surfaceInterpolateFields=: constructs face interpolate of registered
volFields for any future functionObjects that need surfaceFields.
+ =readFields=: reads field if not yet registered. Makes functionObjects
useable through standalone execFlowFunctionObjects.
+ =faceSource=: can now calculate on a sampledSurface (e.g. flow through a
triSurfaceMesh).
+ =nearWallFields=: constructs field with on selected patches interpolated
internal field for further postprocessing.
* New tutorials
There is a large number of new tutorials for existing and new solvers in the

View File

@ -27,6 +27,7 @@ PDRModels/XiGModels/basicXiSubG/basicXiSubG.C
laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C
/* PDRFoamAutoRefine.C */
PDRFoam.C
EXE = $(FOAM_APPBIN)/PDRFoam

View File

@ -25,8 +25,8 @@ Application
PDRFoam
Description
Compressible premixed/partially-premixed combustion solver with turbulence
modelling.
Solver for compressible premixed/partially-premixed combustion with
turbulence modelling.
Combusting RANS code using the b-Xi two-equation model.
Xi may be obtained by either the solution of the Xi transport
@ -35,7 +35,7 @@ Description
to be appropriate by comparison with the results from the
spectral model.
Strain effects are encorporated directly into the Xi equation
Strain effects are incorporated directly into the Xi equation
but not in the algebraic approximation. Further work need to be
done on this issue, particularly regarding the enhanced removal rate
caused by flame compression. Analysis using results of the spectral
@ -78,9 +78,9 @@ int main(int argc, char *argv[])
#include "readCombustionProperties.H"
#include "readGravitationalAcceleration.H"
#include "createFields.H"
#include "readPISOControls.H"
#include "initContinuityErrs.H"
#include "readTimeControls.H"
#include "CourantNo.H"
#include "setInitialDeltaT.H"
scalar StCoNum = 0.0;
@ -94,7 +94,6 @@ int main(int argc, char *argv[])
#include "readTimeControls.H"
#include "readPISOControls.H"
#include "CourantNo.H"
#include "setDeltaT.H"
runTime++;

View File

@ -5,6 +5,7 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basicSolidThermo/lnInclude \
-I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel/lnInclude

View File

@ -7,6 +7,7 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basicSolidThermo/lnInclude \
-I$(LIB_SRC)/turbulenceModels \
-I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel/lnInclude \

View File

@ -4,7 +4,7 @@
tmp<volScalarField> trho = thermo.rho();
const volScalarField& rho = trho();
tmp<volScalarField> tcp = thermo.cp();
tmp<volScalarField> tcp = thermo.Cp();
const volScalarField& cp = tcp();
tmp<volScalarField> tK = thermo.K();

View File

@ -4,11 +4,12 @@
tmp<volScalarField> trho = thermo.rho();
const volScalarField& rho = trho();
tmp<volScalarField> tcp = thermo.cp();
tmp<volScalarField> tcp = thermo.Cp();
const volScalarField& cp = tcp();
tmp<volScalarField> tK = thermo.K();
//tmp<volSymmTensorField> tK = thermo.directionalK();
const volScalarField& K = tK();
//const volSymmTensorField& K = tK();
volScalarField& T = thermo.T();

View File

@ -55,4 +55,35 @@ Foam::scalar Foam::solidRegionDiffNo
}
Foam::scalar Foam::solidRegionDiffNo
(
const fvMesh& mesh,
const Time& runTime,
const volScalarField& Cprho,
const volSymmTensorField& Kdirectional
)
{
scalar DiNum = 0.0;
scalar meanDiNum = 0.0;
volScalarField K = mag(Kdirectional);
//- Take care: can have fluid domains with 0 cells so do not test for
// zero internal faces.
surfaceScalarField KrhoCpbyDelta =
mesh.surfaceInterpolation::deltaCoeffs()
* fvc::interpolate(K)
/ fvc::interpolate(Cprho);
DiNum = gMax(KrhoCpbyDelta.internalField())*runTime.deltaT().value();
meanDiNum = (average(KrhoCpbyDelta)).value()*runTime.deltaT().value();
Info<< "Region: " << mesh.name() << " Diffusion Number mean: " << meanDiNum
<< " max: " << DiNum << endl;
return DiNum;
}
// ************************************************************************* //

View File

@ -41,6 +41,15 @@ namespace Foam
const volScalarField& Cprho,
const volScalarField& K
);
scalar solidRegionDiffNo
(
const fvMesh& mesh,
const Time& runTime,
const volScalarField& Cprho,
const volSymmTensorField& K
);
}
#endif

View File

@ -18,6 +18,8 @@ if (finalIter)
Info<< "Min/max T:" << min(T) << ' ' << max(T) << endl;
}
thermo.correct();
if (finalIter)
{
mesh.data::remove("finalIteration");

View File

@ -10,8 +10,8 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/liquidMixture/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/thermophysicalFunctions/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@ -33,8 +33,8 @@ EXE_LIBS = \
-lbasicThermophysicalModels \
-lliquids \
-lliquidMixture \
-lsolids \
-lsolidMixture \
-lpointSolids \
-lpointSolidMixture \
-lthermophysicalFunctions \
-lreactionThermophysicalModels \
-lSLGThermo \

View File

@ -10,8 +10,8 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/liquidMixture/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/thermophysicalFunctions/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@ -32,8 +32,8 @@ EXE_LIBS = \
-lbasicThermophysicalModels \
-lliquids \
-lliquidMixture \
-lsolids \
-lsolidMixture \
-lpointSolids \
-lpointSolidMixture \
-lthermophysicalFunctions \
-lreactionThermophysicalModels \
-lSLGThermo \

View File

@ -5,8 +5,8 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/pdfs/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 \
@ -26,8 +26,8 @@ EXE_LIBS = \
-lcompressibleLESModels \
-lspecie \
-lbasicThermophysicalModels \
-lsolids \
-lsolidMixture \
-lpointSolids \
-lpointSolidMixture \
-lthermophysicalFunctions \
-lreactionThermophysicalModels \
-lSLGThermo \

View File

@ -9,8 +9,8 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/liquidMixture/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/thermophysicalFunctions/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@ -31,8 +31,8 @@ EXE_LIBS = \
-lbasicThermophysicalModels \
-lliquids \
-lliquidMixture \
-lsolids \
-lsolidMixture \
-lpointSolids \
-lpointSolidMixture \
-lthermophysicalFunctions \
-lreactionThermophysicalModels \
-lSLGThermo \

View File

@ -10,8 +10,8 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/liquidMixture/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/thermophysicalFunctions/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@ -32,8 +32,8 @@ EXE_LIBS = \
-lbasicThermophysicalModels \
-lliquids \
-lliquidMixture \
-lsolids \
-lsolidMixture \
-lpointSolids \
-lpointSolidMixture \
-lthermophysicalFunctions \
-lreactionThermophysicalModels \
-lSLGThermo \

View File

@ -1,4 +1,3 @@
Test-CompactIOList.C
testCompactIOList.C
EXE = $(FOAM_APPBIN)/CompactIOList
EXE = $(FOAM_USER_APPBIN)/Test-CompactIOList

View File

@ -1,3 +1,3 @@
CompactListListTest.C
Test-CompactListList.C
EXE = $(FOAM_USER_APPBIN)/CompactListListTest
EXE = $(FOAM_USER_APPBIN)/Test-CompactListList

View File

@ -1,3 +1,3 @@
DLListTest.C
Test-DLList.C
EXE = $(FOAM_USER_APPBIN)/DLListTest
EXE = $(FOAM_USER_APPBIN)/Test-DLList

View File

@ -1,3 +1,3 @@
DictionaryTest.C
Test-Dictionary.C
EXE = $(FOAM_USER_APPBIN)/DictionaryTest
EXE = $(FOAM_USER_APPBIN)/Test-Dictionary

View File

@ -1,3 +1,3 @@
DynamicFieldTest.C
Test-DynamicField.C
EXE = $(FOAM_USER_APPBIN)/DynamicFieldTest
EXE = $(FOAM_USER_APPBIN)/Test-DynamicField

View File

@ -1,4 +1,3 @@
Test-DynamicList.C
DynamicListTest.C
EXE = $(FOAM_USER_APPBIN)/DynamicListTest
EXE = $(FOAM_USER_APPBIN)/Test-DynamicList

View File

@ -1,3 +1,3 @@
FieldTest.C
Test-Field.C
SEXE = $(FOAM_USER_APPBIN)/FieldTest
EXE = $(FOAM_USER_APPBIN)/Test-Field

View File

@ -1,4 +1,4 @@
#include "testField.H"
#include "Test-Field.H"
int main()
{

View File

@ -56,4 +56,3 @@ inline Vector<C> operator+(const Vector<C>& v1, const Vector<C>& v2)
{
return Vector<C>(v1.X+v2.X, v1.Y+v2.Y);
}

View File

@ -1,3 +1,3 @@
FixedListTest.C
Test-FixedList.C
EXE = $(FOAM_USER_APPBIN)/FixedListTest
EXE = $(FOAM_USER_APPBIN)/Test-FixedList

View File

@ -1,3 +1,3 @@
hashPtrTableTest.C
Test-hashPtrTable.C
EXE = $(FOAM_USER_APPBIN)/hashPtrTableTest
EXE = $(FOAM_USER_APPBIN)/Test-hashPtrTable

View File

@ -1,3 +1,3 @@
hashSetTest.C
Test-hashSet.C
EXE = $(FOAM_USER_APPBIN)/hashSetTest
EXE = $(FOAM_USER_APPBIN)/Test-hashSet

View File

@ -1,3 +1,3 @@
hashTableTest.C
Test-hashTable.C
EXE = $(FOAM_USER_APPBIN)/hashTableTest
EXE = $(FOAM_USER_APPBIN)/Test-hashTable

View File

@ -1,3 +1,3 @@
testHashing.C
Test-Hashing.C
EXE = $(FOAM_USER_APPBIN)/testHashing
EXE = $(FOAM_USER_APPBIN)/Test-Hashing

View File

@ -1,3 +1,3 @@
testHashingSpeed.C
Test-HashingSpeed.C
EXE = $(FOAM_USER_APPBIN)/testHashingSpeed
EXE = $(FOAM_USER_APPBIN)/Test-HashingSpeed

View File

@ -1,3 +1,3 @@
ISLListTest.C
Test-ISLList.C
EXE = $(FOAM_USER_APPBIN)/ISLListTest
EXE = $(FOAM_USER_APPBIN)/Test-ISLList

View File

@ -1,3 +1,3 @@
IStringStreamTest.C
Test-IStringStream.C
EXE = $(FOAM_USER_APPBIN)/IStringStreamTest
EXE = $(FOAM_USER_APPBIN)/Test-IStringStream

View File

@ -1,4 +1,3 @@
Test-IndirectList.C
IndirectListTest.C
EXE = $(FOAM_USER_APPBIN)/IndirectListTest
EXE = $(FOAM_USER_APPBIN)/Test-IndirectList

View File

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

View File

@ -1,18 +0,0 @@
#include "List.H"
#include "scalar.H"
using namespace Foam;
void func
(
List<scalar>& l1,
const List<scalar>& l2,
const List<label>& a1,
const List<label>& a2
)
{
forAll(l1, i)
{
l1[a1[i]] -= l2[a2[i]];
}
}

View File

@ -1,4 +1,3 @@
ListTest.C
ListLoop.C
Test-List.C
EXE = $(FOAM_USER_APPBIN)/ListTest
EXE = $(FOAM_USER_APPBIN)/Test-List

View File

@ -1,4 +1,3 @@
Test-Map.C
MapTest.C
EXE = $(FOAM_USER_APPBIN)/MapTest
EXE = $(FOAM_USER_APPBIN)/Test-Map

View File

@ -1,3 +1,3 @@
MatrixTest.C
Test-Matrix.C
EXE = $(FOAM_USER_APPBIN)/MatrixTest
EXE = $(FOAM_USER_APPBIN)/Test-Matrix

View File

@ -1,3 +1,3 @@
namedEnumTest.C
Test-namedEnum.C
EXE = $(FOAM_USER_APPBIN)/NamedEnum

View File

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

View File

@ -1,3 +1,2 @@
EXE_INC = -I$(LIB_SRC)/ODE/lnInclude
EXE_LIBS = -lODE

View File

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

View File

@ -1,3 +1,3 @@
OStringStreamTest.C
Test-OStringStream.C
EXE = $(FOAM_USER_APPBIN)/OStringStreamTest
EXE = $(FOAM_USER_APPBIN)/Test-OStringStream

View File

@ -1,2 +1,2 @@
POSIXTest.C
EXE = $(FOAM_USER_APPBIN)/POSIXTest
Test-POSIX.C
EXE = $(FOAM_USER_APPBIN)/Test-POSIX

View File

@ -1,3 +1,3 @@
PackedListTest.C
Test-PackedList.C
EXE = $(FOAM_USER_APPBIN)/PackedListTest
EXE = $(FOAM_USER_APPBIN)/Test-PackedList

View File

@ -114,21 +114,6 @@ int main(int argc, char *argv[])
reportInfo<14>();
reportInfo<15>();
reportInfo<16>();
reportInfo<17>();
reportInfo<18>();
reportInfo<19>();
reportInfo<20>();
reportInfo<21>();
reportInfo<22>();
reportInfo<23>();
reportInfo<24>();
reportInfo<25>();
reportInfo<26>();
reportInfo<27>();
reportInfo<28>();
reportInfo<29>();
reportInfo<30>();
reportInfo<31>();
return 0;
}

View File

@ -1,3 +1,3 @@
PackedListTest1.C
Test-PackedList1.C
EXE = $(FOAM_USER_APPBIN)/PackedListTest1
EXE = $(FOAM_USER_APPBIN)/Test-PackedList1

View File

@ -1,3 +1,3 @@
PackedListTest2.C
Test-PackedList2.C
EXE = $(FOAM_USER_APPBIN)/PackedListTest2
EXE = $(FOAM_USER_APPBIN)/Test-PackedList2

View File

@ -1,3 +1,3 @@
PackedListTest3.C
Test-PackedList3.C
EXE = $(FOAM_USER_APPBIN)/PackedListTest3
EXE = $(FOAM_USER_APPBIN)/Test-PackedList3

View File

@ -1,3 +1,3 @@
PackedListTest4.C
Test-PackedList4.C
EXE = $(FOAM_USER_APPBIN)/PackedListTest4
EXE = $(FOAM_USER_APPBIN)/Test-PackedList4

View File

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

View File

@ -3,4 +3,3 @@ EXE_INC = \
EXE_LIBS = \
-lmeshTools

View File

@ -1,3 +1,3 @@
PolynomialTest.C
Test-Polynomial.C
EXE = $(FOAM_USER_APPBIN)/PolynomialTest
EXE = $(FOAM_USER_APPBIN)/Test-Polynomial

View File

@ -1,3 +1,3 @@
PtrListTest.C
Test-PtrList.C
EXE = $(FOAM_USER_APPBIN)/PtrListTest
EXE = $(FOAM_USER_APPBIN)/Test-PtrList

View File

@ -1,3 +1,3 @@
SLListTest.C
Test-SLList.C
EXE = $(FOAM_USER_APPBIN)/SLListTest
EXE = $(FOAM_USER_APPBIN)/Test-SLList

View File

@ -1,3 +1,3 @@
staticHashTableTest.C
Test-staticHashTable.C
EXE = $(FOAM_APPBIN)/staticHashTableTest
EXE = $(FOAM_USER_APPBIN)/Test-staticHashTable

View File

@ -1,3 +1,3 @@
Tuple2Test.C
Test-Tuple2.C
EXE = $(FOAM_USER_APPBIN)/Tuple2Test
EXE = $(FOAM_USER_APPBIN)/Test-Tuple2

View File

@ -1,3 +1,3 @@
UDictionaryTest.C
Test-UDictionary.C
EXE = $(FOAM_USER_APPBIN)/UDictionaryTest
EXE = $(FOAM_USER_APPBIN)/Test-UDictionary

View File

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

View File

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

View File

@ -1,8 +1,8 @@
allocTest.C
Test-alloc.C
/*
newTest.C
mallocTest.C
test.C
Test-new.C
Test-malloc.C
Test.C
*/
SEXE = $(FOAM_USER_APPBIN)/allocTest
EXE = $(FOAM_USER_APPBIN)/Test-alloc

Some files were not shown because too many files have changed in this diff Show More