songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,589 Commits 104 Branches 33 Tags 325 MiB
b18f6cc1ce
Commit Graph

4 Commits

Author SHA1 Message Date
graham
b18f6cc1ce STYLE: 2011 copyright date. 2011-01-05 11:14:26 +00:00
Mark Olesen
881b3dafa2 Merge remote branch 'OpenCFD/master' into olesenm 
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
 2010-12-21 10:19:53 +01:00
andy
228456ca5c COMP: resolve conflict 2010-12-17 18:19:04 +00:00
mattijs
46ec7d65d5 ENH: extrudeMesh : reorganisation. Added layers. 2010-12-16 18:46:26 +00:00