Public Git Hosting - freefoam.git/commit

commit	753885ddce69229ed12f883ad7fde84cff515005
author	Michael Wild <themiwi@users.sourceforge.net>
	Sat, 20 Aug 2011 11:40:00 +0000 (20 13:40 +0200)
committer	Michael Wild <themiwi@users.sourceforge.net>
	Sat, 20 Aug 2011 11:40:00 +0000 (20 13:40 +0200)
tree	267180fa15f1e57118f7d3b7a0532d8cda3a13cb	tree \| snapshot (tar.gz zip)
parent	2ad02d2649f6d874f5f0685816850b8a8ff42dad	commit \| diff
parent	8912f80ece8437b61c5e9496d9c4464ffda9dade	commit \| diff

Merge branch 'upstream/OpenFOAM'

Conflicts:
src/finiteVolume/Make/files
src/postProcessing/functionObjects/IO/partialWrite/partialWrite.C
src/sampling/Make/files

Signed-off-by: Michael Wild <themiwi@users.sourceforge.net>

13 files changed:

applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C	diff1 \|	diff2 \|	blob \| history
src/OpenFOAM/meshes/meshTools/matchPoints.C	diff1 \|	diff2 \|	blob \| history
src/finiteVolume/files.cmake	diff1 \|	\|	blob \| history
src/finiteVolume/interpolation/interpolation/interpolationCellPatchConstrained/interpolationCellPatchConstrained.C	\|	diff2 \|	blob \| history
src/finiteVolume/interpolation/interpolation/interpolationCellPatchConstrained/interpolationCellPatchConstrained.H	\|	diff2 \|	blob \| history
src/finiteVolume/interpolation/interpolation/interpolationCellPatchConstrained/makeInterpolationCellPatchConstrained.C	\|	diff2 \|	blob \| history
src/postProcessing/functionObjects/IO/partialWrite/partialWrite.C	diff1 \|	diff2 \|	blob \| history
src/sampling/files.cmake	diff1 \|	\|	blob \| history
src/sampling/sampledSet/patchCloud/patchCloudSet.C	\|	diff2 \|	blob \| history
src/sampling/sampledSet/patchCloud/patchCloudSet.H	\|	diff2 \|	blob \| history
src/sampling/sampledSet/sampledSets/sampledSetsTemplates.C	diff1 \|	diff2 \|	blob \| history
src/transportModels/interfaceProperties/interfaceProperties.C	diff1 \|	diff2 \|	blob \| history
src/turbulenceModels/compressible/RAS/RASModel/RASModel.C	diff1 \|	diff2 \|	blob \| history

a fork of OpenFOAM to use CMake as building system

RSS Atom

applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C	diff1 \|	diff2 \|	blob \| history
src/OpenFOAM/meshes/meshTools/matchPoints.C	diff1 \|	diff2 \|	blob \| history
src/finiteVolume/files.cmake	diff1 \|	\|	blob \| history
src/finiteVolume/interpolation/interpolation/interpolationCellPatchConstrained/interpolationCellPatchConstrained.C	\|	diff2 \|	blob \| history
src/finiteVolume/interpolation/interpolation/interpolationCellPatchConstrained/interpolationCellPatchConstrained.H	\|	diff2 \|	blob \| history
src/finiteVolume/interpolation/interpolation/interpolationCellPatchConstrained/makeInterpolationCellPatchConstrained.C	\|	diff2 \|	blob \| history
src/postProcessing/functionObjects/IO/partialWrite/partialWrite.C	diff1 \|	diff2 \|	blob \| history
src/sampling/files.cmake	diff1 \|	\|	blob \| history
src/sampling/sampledSet/patchCloud/patchCloudSet.C	\|	diff2 \|	blob \| history
src/sampling/sampledSet/patchCloud/patchCloudSet.H	\|	diff2 \|	blob \| history
src/sampling/sampledSet/sampledSets/sampledSetsTemplates.C	diff1 \|	diff2 \|	blob \| history
src/transportModels/interfaceProperties/interfaceProperties.C	diff1 \|	diff2 \|	blob \| history
src/turbulenceModels/compressible/RAS/RASModel/RASModel.C	diff1 \|	diff2 \|	blob \| history