?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: e72ecd6 3d4501e)
Merge remote-tracking branch 'origin/hotfix/ggiSeparation+blockCoupledGgi' into nextR...
commit8a70870771705584529ba37933d70113bb35aeac
authorDominik Christ <d.christ@wikki.co.uk>
Mon, 8 Jul 2013 11:05:49 +0000 (8 12:05 +0100)
committerDominik Christ <d.christ@wikki.co.uk>
Mon, 8 Jul 2013 11:05:49 +0000 (8 12:05 +0100)
tree638dca9d1d83c9aa6f2829e431423f20db28fa4atree | snapshot (tar.gz zip)
parente72ecd6fcf0a86fc1940d85a2eeb350894cd148fcommit | diff
parent3d4501e5383d226bd9c3f5aa243ef00cfd359ca9commit | diff
Merge remote-tracking branch 'origin/hotfix/ggiSeparation+blockCoupledGgi' into nextRelease

Conflicts:
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatch.H
.gitignore diff1 |  diff2 |  blob | history
src/OpenFOAM/interpolations/GGIInterpolation/GGIInterpolation.H diff1 |  diff2 |  blob | history
src/OpenFOAM/matrices/blockLduMatrix/BlockLduMatrix/scalarBlockLduMatrix.C diff1 |  diff2 |  blob | history
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclicGgi/cyclicGgiPolyPatch.C diff1 |  diff2 |  blob | history
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatch.C diff1 |  diff2 |  blob | history
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatch.H diff1 |  diff2 |  blob | history
src/finiteVolume/fields/fvPatchFields/constraint/cyclicGgi/cyclicGgiFvPatchField.C diff1 |  diff2 |  blob | history
src/finiteVolume/fields/fvPatchFields/constraint/cyclicGgi/cyclicGgiFvPatchField.H diff1 |  diff2 |  blob | history
The foam-extend project is a fork of the OpenFOAM® open source library for Computational Fluid Dynamics (CFD). It is an open project welcoming and integrating contributions from all users and developers.