Commit graph

80 commits

Author SHA1 Message Date
Henrik Rusche
09fbf2ef28 Fixes to previous merge commits 2013-07-03 19:43:31 +02:00
Henrik Rusche
031d180f63 Merge branch 'hotfix/gcc47_HR' into nextRelease
Conflicts:
	src/OpenFOAM/fields/PointPatchFields/constraint/processor/ProcessorPointPatchField.C
	src/OpenFOAM/fields/PointPatchFields/derived/global/GlobalPointPatchField.C
2013-07-03 17:19:52 +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
bd38c3b482 ThirdParty packages: changing download URL for qt-everywhere-opensource-src-4.7.4. Bug fix from Daniel Combest 2013-06-29 21:57:05 -04:00
Martin Beaudoin
1fac933c61 ThirdParty: fix compilation of libccmio-2.6.1 on Mac OS X 2013-06-05 09:41:46 -04:00
Martin Beaudoin
da272842e4 AllMake.stage3: new URL for libccmio-2.6.1. Bug fix from Hakan Nilsson and Niels Jacobsen 2013-06-05 09:40:33 -04:00
Hrvoje Jasak
e9470225d4 Attempted Third party build bug fix - reconsider 2013-04-15 12:59:44 +01:00
Hrvoje Jasak
799ba456fd Patch source code 2013-04-15 12:59:11 +01:00
Henrik Rusche
2ac4e0a4d7 Changes for gcc 4.7 on Ubuntu 12.10 2013-01-08 18:03:41 +01:00
Hrvoje Jasak
d280b12a93 Project update 2012-08-30 17:35:14 +01:00
Martin Beaudoin
4ebf8c586f ThirdParty: adjustments for Ubuntu 12.04 32 bit 2012-07-06 14:14:28 -04:00
Martin Beaudoin
d706e1a521 ThirdParty: mesquite 2.1.2: forcing the installation of the libraries under lib. Under some OSes, lib64 will be chosen by default 2012-06-12 11:45:12 -04:00
Martin Beaudoin
85daa4a8cc Fixes for gcc-4.5.1 2012-06-10 21:27:30 -04:00
Martin Beaudoin
1455422a0a ThirdParty: add missing files for ParaView-3.12.0. Move QT to version 4.7.4 2012-05-10 11:56:29 -04:00
Martin Beaudoin
7dc84e1e62 ThirdParty: cmake version 2.8.8 2012-05-10 02:12:34 -04:00
Martin Beaudoin
c4a76be138 ThirdParty: fix compilation of mesquite-2.1.2 with gcc 4.6.x. Contribution from Philippose Rajan 2012-05-10 01:48:59 -04:00
Martin Beaudoin
91073b20d4 ThirdParty: fix compilation of libccmio-2.6.1 on Mac OS X 2012-05-10 01:09:42 -04:00
Martin Beaudoin
a09f865c8b ThirdParty: fix compilation of ParMGridGen-1.0 on Mac OS X 2012-05-10 00:24:54 -04:00
Martin Beaudoin
bb4cc6905f ThirdParty: fix compilation of ParMetis 3.1.1 on Mac OS X 2012-05-10 00:15:37 -04:00
Hrvoje Jasak
da4fa8dcef Updated settings 2012-04-25 10:55:12 +01:00
Hrvoje Jasak
ad5af13ef9 Merge remote-tracking branch 'remotes/origin/mixingPlane_RC1'
Conflicts:
	ThirdParty/AllMake.stage1
	ThirdParty/AllMake.stage4
	applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/Make/options
	etc/settings.csh
	etc/settings.sh
	src/OpenFOAM/Make/files
	src/finiteVolume/Make/files
2012-04-25 10:49:05 +01:00
Martin Beaudoin
5f2900413d New PyFoam scripts for modifying GGI and mixingPlane interfaces definitions in the 'boundary' dictionary. Adjustement to the mixingPlane tutorials 2012-04-23 11:18:22 -04:00
Martin Beaudoin
4fc17d394f Add ParaView 3.14.1. Modify vtkPV3Foam/Make/options for easy switching between ParaView versions 2012-04-22 16:25:38 -04:00
Martin Beaudoin
6f69e55399 PyFoam installation: make the shebang line portable for the PyFoam application scripts 2012-04-21 15:49:09 -04:00
Martin Beaudoin
6829e5f63e ThirdParty: missing spec file for PyFoam-0.5.7 2012-04-18 18:06:52 -04:00
Martin Beaudoin
0cbff77759 ThirdParty: Fix the version number for swak4Foam 2012-04-17 23:11:57 -04:00
Martin Beaudoin
4bf399fa58 Switch to PyFoam version 0.5.7 2012-04-17 22:51:22 -04:00
Martin Beaudoin
8b621679f4 Addition of swak4Foam as a ThirdParty package 2012-04-12 16:56:44 -04:00
Martin Beaudoin
d33b9255e9 ThirdParty: stop building script when spec file is missing 2012-04-12 16:38:40 -04:00
Martin Beaudoin
fc35742b3c Fix download URL for ParMetis-3.1.1 2012-04-11 08:58:54 -04:00
Martin Beaudoin
03c59a643c Addition of PyFoam as a ThirdParty package 2012-04-11 00:03:09 -04:00
Hrvoje Jasak
9685b52873 Paraview-3.12 2012-01-29 12:06:18 +00:00
Hrvoje Jasak
3e21dbc090 Paraview-3.12 2012-01-29 12:06:18 +00:00
Hrvoje Jasak
adc5ea3d20 Paraview-3.8.1 2012-01-29 12:05:11 +00:00
Hrvoje Jasak
30c2cd2c50 Partial master merge 2012-01-29 12:05:10 +00:00
Martin Beaudoin
2e62417a29 ThirdParty packages: switch to cmake 2.8.5 2012-01-29 12:02:10 +00:00
Martin Beaudoin
d415ea89ed ThirdParty packages: switch to cmake 2.8.5 2012-01-29 12:01:08 +00:00
Martin Beaudoin
1d0a3a9859 ThirdParty scripts: Qt: disable generation of .debug files 2012-01-29 12:01:08 +00:00
Martin Beaudoin
2953d87c89 Updating version of CMake and Qt 2012-01-28 16:23:50 -05:00
Martin Beaudoin
19e5ed0771 Modifications for Mac OS X Lion 2012-01-28 16:11:16 -05:00
Hrvoje Jasak
6b0aedf2f6 Updates for Ubuntu 11.04 and Icc 12 2011-08-12 18:47:00 +01:00
Hrvoje Jasak
89a4a7f0d7 Updates for Ubuntu 11.04 and Icc 12 2011-08-12 18:46:37 +01:00
beaudoin
67f8b4e56b ThirdParty packages: changing ParMetis-3.1.1 download URL 2011-07-14 20:15:00 -04:00
Martin Beaudoin
c260c492fe Merge branch 'hotfix/ThirdParty_scripts' into mixingPlane 2011-07-11 09:28:21 -04:00
Martin Beaudoin
cb8972be19 ThirdParty packages: Add comment in README file. Contributed by Darrin Stephens 2011-07-11 09:13:13 -04:00
Martin Beaudoin
01127a76e3 ThirdParty packages: libccmio-2.6.1: fix for Mac OSX 10.6.8. Contributed by Darrin Stephens 2011-07-11 09:06:09 -04:00
Martin Beaudoin
f37bcfa3c2 Merge branch 'hotfix/ThirdParty_scripts' into mixingPlane 2011-07-11 08:44:23 -04:00
beaudoin
dbbaacc5ed ThirdParty packages: changing metis-5.0pre2 download URL 2011-06-18 08:40:36 -04:00
Martin Beaudoin
ac09bdf670 ThirdParty packages: fix compilation of libccmio-2.6.1 on Mac OS X 2011-06-09 17:04:01 -04:00
Martin Beaudoin
1c715bbc96 Adjustments for cmake 2011-06-04 18:55:09 -04:00