Commit graph

25 commits

Author SHA1 Message Date
Henrik Rusche
a09b971def Merge remote-tracking branch 'origin/feature/gcc4.6port' into nextRelease
Conflicts:
	src/decompositionMethods/scotchDecomp/Make/options
	src/thermophysicalModels/basic/Make/options
	src/thermophysicalModels/reactionThermo/Make/options
2013-07-03 21:20:15 +02:00
Henrik Rusche
e394390d8f Merge branch 'HJ/AdjointImmersedBoundary' into masterSF
Conflicts:
	ThirdParty/AllMake.stage1
	ThirdParty/AllMake.stage4
	ThirdParty/rpmBuild/SOURCES/libccmio-2.6.1.patch_0
	ThirdParty/rpmBuild/SPECS/ParaView-3.12.0.spec
	ThirdParty/rpmBuild/SPECS/libccmio-2.6.1.spec
	ThirdParty/rpmBuild/SPECS/mesquite-2.1.2.spec
	ThirdParty/rpmBuild/SPECS/qt-everywhere-opensource-src-4.7.4.spec
	etc/prefs.csh-EXAMPLE
	etc/prefs.sh-EXAMPLE
	etc/settings.csh
	etc/settings.sh
	src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
	src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwind.C
	src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwindV.C
	src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/reconCentral/reconCentral.C
	testHarness/OSIG/Turbomachinery/README.txt
	testHarness/OpenFOAM/1.6-ext/CMakeFiles/CMakeLists.txt
2013-07-03 15:11:21 +02:00
Martin Beaudoin
0e0052604b libscotchDecomp : no library librt for Mac OS X 2012-06-20 00:27:44 -04:00
Hrvoje Jasak
ba42b5f4a7 Merge branch 'HrvojeJasak'
Conflicts:
	applications/utilities/mesh/conversion/ideasUnvToFoam/Make/options
	applications/utilities/surface/surfaceSmooth/Make/options
	applications/utilities/surface/surfaceSplitByPatch/Make/options
	src/decompositionMethods/decompositionMethods/patchConstrainedDecomp/patchConstrainedDecomp.C
	src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.C
	src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
	wmake/rules/linuxGcc/c++
2012-04-25 10:27:21 +01:00
Hrvoje Jasak
64d1162661 Build clean-up and coupled patch robustness 2012-03-12 15:49:37 +00:00
Hrvoje Jasak
17ddcaf6e9 Patch constrained decomposition 2012-01-29 12:05:14 +00:00
Hrvoje Jasak
76e9b4c70d Patch constrained decomposition 2012-01-29 12:05:14 +00:00
David L. F. Gaden
2a801c8b76 Adding -lrt to scotch decomp 2011-11-25 20:37:21 -06:00
Martin Beaudoin
36ca67ef7c ThirdParty packages: enable using system installed packages instead of the packages fetched through external source tarballs 2010-12-08 21:28:32 -05:00
Martin Beaudoin
63a1e2fac3 New ThirdParty packs suite: compilation from original source tarballs 2010-11-24 00:49:05 -05:00
Hrvoje Jasak
f440a5d5b7 Updated paths 2010-11-17 12:13:12 +00:00
Bernhard F.W. Gschaider
051cb20e5b Merge with master. Only conflicts in etc/bashrc. Resolved I hope
--HG--
branch : macMerge
2010-10-19 17:20:34 +02:00
Martin Beaudoin
cf802d88a8 Moving the update commands to GIT; Fix problems with foamToTecplot360 2010-10-09 14:58:08 -04:00
Bernhard F.W. Gschaider
3aace48568 Merge in default branch
--HG--
branch : macMerge
2010-10-06 21:23:52 +02:00
Bernhard F.W. Gschaider
6c7281dad7 Use the System-MPI (switch on via prefs.sh)
--HG--
branch : macMerge
2010-10-05 21:56:55 +02:00
Bernhard F.W. Gschaider
c50ad6d1fd Merge bgschaid stuff into the rest. Should make it compile with the Standard-Apple-Compiler
--HG--
branch : macMerge
2010-10-05 17:47:03 +02:00
Hrvoje Jasak
a95f381e1d Formatting 2010-10-04 22:26:56 +01:00
Hrvoje Jasak
4300aeb73e Removing Mac OS X hack 2010-10-04 20:37:56 +01:00
Hrvoje Jasak
2859319549 Removing Mac OS X hack - scotch 2010-10-04 18:48:51 +01:00
Hrvoje Jasak
b2f5b43bcc Mac OS X Port 2010-10-04 15:56:23 +01:00
Bernhard F.W. Gschaider
f224ce1984 Everything except the TecPlot-Converter compiles now. PV3ReaderPlugin untested
--HG--
branch : bgschaidMac
2010-10-03 12:31:44 +02:00
Hrvoje Jasak
c382fe369c Porting, compilation 2010-09-22 19:13:13 +01:00
Hrvoje Jasak
bea25f5960 Compilation fixes 2010-09-21 15:32:04 +01:00
Hrvoje Jasak
3ed10cf177 Compilation updates 2010-08-30 18:57:22 +01:00
Hrvoje Jasak
54c7d7fb19 Merge update 2010-08-24 16:19:39 +01:00