Commit graph

74 commits

Author SHA1 Message Date
Hrvoje Jasak
a854dca4dc Cleaning up merge problems 2011-11-08 12:30:01 +00:00
Hrvoje Jasak
44b1424586 Removed merge conflicts 2011-11-07 10:44:41 +00:00
Hrvoje Jasak
e39aeaf19e Default compiler gcc 2011-11-07 10:42:23 +00:00
Hrvoje Jasak
21c18fbcbc Merge remote-tracking branch 'remotes/origin/hotfix/faMeshDecom' into HrvojeJasak
Conflicts:
	ThirdParty/AllMake.stage4
	etc/settings.csh
	etc/settings.sh
	src/dynamicMesh/topoChangerFvMesh/Make/files
	src/dynamicMesh/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
	tutorials/incompressible/icoDyMFoam/movingConeTopo/Allrun
2011-11-07 10:41:45 +00:00
Hrvoje Jasak
0ed41599c6 etc file sourcing fix 2011-10-18 22:35:40 +01:00
Hrvoje Jasak
245231243d Merge from master 2011-10-13 07:24:18 +01:00
Hrvoje Jasak
a270d8d01e Scripts update: darwin 2011-10-12 20:33:16 +01:00
Hrvoje Jasak
88dcacde95 Fix merge error 2011-09-22 15:07:51 +01:00
Hrvoje Jasak
9b43cfb506 Paraview-3.8.1 2011-08-25 20:15:21 +01:00
Hrvoje Jasak
f7f9afd80b Merge remote-tracking branch 'remotes/origin/hotfix/ThirdParty_scripts' into HrvojeJasak
Conflicts:
	ThirdParty/AllMake.stage1
	ThirdParty/AllMake.stage4
	ThirdParty/rpmBuild/SPECS/qt-everywhere-opensource-src-4.7.0.spec
	etc/settings.csh
	etc/settings.sh
2011-08-25 11:20:40 +01:00
Hrvoje Jasak
90b957a97a Partial master merge 2011-08-25 11:17:35 +01:00
Hrvoje Jasak
60934bd37c Added new switches 2011-08-24 20:38:46 +01:00
Martin Beaudoin
b8b33b691e ThirdParty packages: switch to cmake 2.8.5 2011-08-16 20:42:40 -07:00
Martin Beaudoin
95e65ecfa5 ThirdParty packages: switch to cmake 2.8.5 2011-08-17 19:30:10 -07:00
Hrvoje Jasak
a8bbcf078b Added faMesh switch 2011-08-14 17:41:04 +01:00
Hrvoje Jasak
89a4a7f0d7 Updates for Ubuntu 11.04 and Icc 12 2011-08-12 18:46:37 +01:00
Hrvoje Jasak
e422f5a577 Merge remote-tracking branch 'remotes/origin/hotfix/ThirdParty_scripts' 2011-08-09 15:31:54 +01:00
Hrvoje Jasak
3a9ca0ed43 Clean-up: merge error 2011-07-04 21:03:20 +01:00
Hrvoje Jasak
137014f511 Parallel GGI performance improvements 2011-06-26 22:46:38 +01:00
Martin Beaudoin
a470b0c665 ThirdParty: adjustments for various version of Gcc compiler 2011-05-28 10:09:00 -04:00
Martin Beaudoin
9893a45acd ThirdParty: adjustments for csh 2011-05-28 10:07:46 -04:00
Martin Beaudoin
c828d84e65 ThirdParty: adjustments for csh 2011-05-28 10:04:55 -04:00
Martin Beaudoin
cecae8937e ThirdParty: switch to mpfr-3.0.1 2011-05-16 21:40:12 -04:00
Martin Beaudoin
410de58450 ThirdParty: Darwin platforms: using Mac Ports compilers only when specifying System compiler option 2011-05-14 09:30:52 -04:00
Martin Beaudoin
1d2f5551ac ThirdParty: Adding bison, flex and m4 2011-05-08 22:48:26 -04:00
Hrvoje Jasak
86f0eaae45 Bug fix - lines commented out 2011-01-31 12:21:32 +00:00
Hrvoje Jasak
c4881e2c16 Mixing plane 2011-01-29 02:59:06 +00:00
Hrvoje Jasak
1e7189ba10 Merge branch 'HrvojeJasak' 2011-01-24 21:51:37 +00:00
Hrvoje Jasak
84588f87ca Clean-up 2011-01-24 21:51:26 +00:00
Hrvoje Jasak
f9d3f6c220 Clean-up 2011-01-24 21:49:27 +00:00
Hrvoje Jasak
3959333942 Fixed merge problems: location of executables and libraries 2010-12-27 11:49:41 +00:00
Hrvoje Jasak
0778c0393f Merge remote branch 'remotes/origin/feature/overlapGgi'
Conflicts:
	src/decompositionMethods/metisDecomp/Make/options
	src/decompositionMethods/parMetisDecomp/Make/options
	src/decompositionMethods/scotchDecomp/Make/options
	src/dynamicMesh/meshMotion/mesquiteMotionSolver/Make/options
	src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options
2010-12-20 20:17:13 +00:00
Martin Beaudoin
518a019e98 Add libccmio-2.6.1 as a ThirdParty package 2010-12-19 22:22:59 -05:00
Hrvoje Jasak
13cfb416bb Merge remote branch 'remotes/origin/hotfix/ThirdParty_useSystemInstalledPackages'
Conflicts:
	ThirdParty/rpmBuild/SPECS/ParaView-3.8.1.spec
	ThirdParty/rpmBuild/SPECS/openmpi-1.4.3.spec
2010-12-16 22:56:57 +00:00
Hrvoje Jasak
974b5ed28b Added geometric multigrid contrils 2010-12-16 22:46:58 +00:00
Martin Beaudoin
b9adfe2d6f ThirdParty packages: Fix typos for some .csh files. Add some comments in the etc/prefs.csh-EXAMPLE and etc/prefs.sh-EXAMPLE fles about QT 2010-12-15 17:26:41 -08:00
Hrvoje Jasak
119ccc84ed Fix unknown mpi_version shell error before the build started 2010-12-12 22:16:30 +00: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
Oliver Borm (boroli)
e5a96484f3 Merge branch 'master' into feature/overlapGgi 2010-12-02 18:19:40 +01:00
Martin Beaudoin
8156ee2b1f Updating the ThirdParty packages env. variables before compiling a new package. Applying same recipe before compiling the OpenFOAM source code. 2010-12-01 08:08:07 -05:00
Oliver Borm (boroli)
31a8b096f1 Initial patched files for debian package 2010-11-29 17:14:51 +01:00
Henrik Rusche
24dc3e2967 Final changes to headers 2010-11-25 01:27:21 +01:00
Martin Beaudoin
de0c0ab8ec Corrections to etc/settings.sh. 2010-11-24 01:13:57 -05:00
Martin Beaudoin
63a1e2fac3 New ThirdParty packs suite: compilation from original source tarballs 2010-11-24 00:49:05 -05:00
Hrvoje Jasak
e7a95c8e72 Update to release docs 2010-11-18 19:31:44 +00:00
Hrvoje Jasak
85fca7069a Changed paraview version 2010-11-05 21:49:01 +00:00
Hrvoje Jasak
04a7850093 Fix cshrc error 2010-11-05 10:59:09 +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
Hrvoje Jasak
bd649daa5f Merge remote branch 'remotes/origin/mergeCoupled'
Conflicts:
	tutorials/coupled/conjugateHeatFoam/conjugateCavity/system/fvSolution
2010-10-17 19:12:24 +01:00
Henrik Rusche
052f832078 reduced verbosity of blockLduMatrix 2010-10-16 13:25:27 +02:00