Merge branch 'master' into cvm (de64877b) · Commits · Development / openfoam

Commit de64877b authored 14 years ago by

graham

Merge branch 'master' into cvm

Conflicts:
	applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
	src/edgeMesh/Make/files
	src/edgeMesh/featureEdgeMesh/featureEdgeMesh.C
	src/edgeMesh/featureEdgeMesh/featureEdgeMesh.H

parents 0090ec65 ecf13f23

Hide whitespace changes

Inline Side-by-side

Showing

ReleaseNotes-dev 8 additions, 0 deletions

ReleaseNotes-dev
applications/test/Polynomial/Test-Polynomial.C 47 additions, 18 deletions

applications/test/Polynomial/Test-Polynomial.C
applications/test/syncTools/Test-syncTools.C 8 additions, 8 deletions

applications/test/syncTools/Test-syncTools.C
applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C 1 addition, 1 deletion

...utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C
applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C 161 additions, 19 deletions

...ilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
applications/utilities/mesh/manipulation/insideCells/insideCells.C 18 additions, 12 deletions

...ons/utilities/mesh/manipulation/insideCells/insideCells.C
applications/utilities/miscellaneous/foamDebugSwitches/Make/options 15 additions, 1 deletion

...ns/utilities/miscellaneous/foamDebugSwitches/Make/options
applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C 26 additions, 25 deletions

...allelProcessing/redistributeMeshPar/redistributeMeshPar.C
applications/utilities/postProcessing/dataConversion/foamToTecplot360/Allwmake 14 additions, 0 deletions

...s/postProcessing/dataConversion/foamToTecplot360/Allwmake
applications/utilities/postProcessing/dataConversion/foamToTecplot360/Make/options 2 additions, 2 deletions

...stProcessing/dataConversion/foamToTecplot360/Make/options
applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecio/Runmake 277 additions, 0 deletions

...tProcessing/dataConversion/foamToTecplot360/tecio/Runmake
applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecio/examples/arrow/Arrow.plt 0 additions, 0 deletions

...onversion/foamToTecplot360/tecio/examples/arrow/Arrow.plt
applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecio/examples/arrow/Makefile 11 additions, 0 deletions

...Conversion/foamToTecplot360/tecio/examples/arrow/Makefile
applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecio/examples/arrow/arrow.cpp 530 additions, 0 deletions

...onversion/foamToTecplot360/tecio/examples/arrow/arrow.cpp
applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecio/examples/arrow/arrow.vcproj 172 additions, 0 deletions

...ersion/foamToTecplot360/tecio/examples/arrow/arrow.vcproj
applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecio/examples/comtest/Makefile 11 additions, 0 deletions

...nversion/foamToTecplot360/tecio/examples/comtest/Makefile
applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecio/examples/comtest/comtest.c 492 additions, 0 deletions

...version/foamToTecplot360/tecio/examples/comtest/comtest.c
applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecio/examples/comtest/comtest.f 467 additions, 0 deletions

...version/foamToTecplot360/tecio/examples/comtest/comtest.f
applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecio/examples/comtest/comtest.f90 467 additions, 0 deletions

...rsion/foamToTecplot360/tecio/examples/comtest/comtest.f90
applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecio/examples/comtest/comtestc.vcproj 346 additions, 0 deletions

...n/foamToTecplot360/tecio/examples/comtest/comtestc.vcproj

with 3073 additions and 86 deletions

Please register or to comment

Admin message

Admin message

Merge branch 'master' into cvm