Bernhard F.W. Gschaider
|
91ae72c445
|
Merge in
--HG--
branch : bgschaid/minorAdditionsBranch
|
2013-08-22 12:01:19 +02:00 |
|
Hrvoje Jasak
|
1a0318c0ca
|
Tet fem reorganisation
|
2013-08-13 16:01:45 +01:00 |
|
Bernhard F.W. Gschaider
|
72c243a96f
|
Merge
--HG--
branch : bgschaid/minorAdditionsBranch
|
2013-07-19 00:36:27 +02:00 |
|
Henrik Rusche
|
8141282b1d
|
Convert tabs to fours spaces systematically
|
2013-07-18 10:50:29 +02:00 |
|
Bernhard F.W. Gschaider
|
a4c378a31f
|
On Mac: asume that we want to use the OpenMPI from MacPorts if it is present and the user doesn't say otherwise
--HG--
branch : bgschaid/minorAdditionsBranch
|
2013-07-12 01:12:50 +02:00 |
|
Bernhard F.W. Gschaider
|
1713e3dcf9
|
On Mac use different compilers with the same settings if no separate configuration directory is set
--HG--
branch : bgschaid/minorAdditionsBranch
|
2013-07-12 00:58:42 +02:00 |
|
Bernhard F.W. Gschaider
|
823c6c0c18
|
Make sure that MacPorts never gets to the DYLD_LIBRARY_PATH
--HG--
branch : bgschaid/minorAdditionsBranch
|
2013-07-11 14:45:27 -04:00 |
|
Bernhard F.W. Gschaider
|
bb0d8e90a6
|
Make sure that MacPorts never gets to the DYLD_LIBRARY_PATH
--HG--
branch : bgschaid/minorAdditionsBranch
|
2013-07-11 19:20:30 +02:00 |
|
Martin Beaudoin
|
7c521ed7e6
|
ThirdParty: adding the hwloc package
|
2013-07-07 12:59:07 -04:00 |
|
Martin Beaudoin
|
6cd429d931
|
Switch to PyFoam version 0.6.1
|
2013-07-06 13:52:14 -04:00 |
|
Martin Beaudoin
|
dacea7a6fb
|
ThirdParty packages: switching to ParaView-3.14.1
|
2013-07-04 20:22:32 -04:00 |
|
Martin Beaudoin
|
7a06f7c21a
|
ThirdParty packages: switching to openmpi-1.6.3
|
2013-07-04 10:43:58 -04:00 |
|
Martin Beaudoin
|
a32d534f77
|
ThirdParty packages: switching to cmake 2.8.11
|
2013-07-04 10:04:40 -04:00 |
|
Henrik Rusche
|
09fbf2ef28
|
Fixes to previous merge commits
|
2013-07-03 19:43:31 +02:00 |
|
Henrik Rusche
|
eaf054002e
|
Merge branch 'HJ/master' into nextRelease
Conflicts:
ThirdParty/rpmBuild/SOURCES/libccmio-2.6.1.patch_0
ThirdParty/rpmBuild/SPECS/ParaView-3.12.0.spec
etc/prefs.csh-EXAMPLE
etc/prefs.sh-EXAMPLE
etc/settings.sh
src/OpenFOAM/interpolations/MixingPlaneInterpolation/MixingPlaneInterpolate.C
src/OpenFOAM/interpolations/RBFInterpolation/RBFInterpolation.H
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/mixingPlane/mixingPlanePolyPatch.C
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/mixingPlane/mixingPlanePolyPatch.H
src/lduSolvers/lduSolver/bicgStabSolver/bicgStabSolver.C
testHarness/OSIG/Turbomachinery/README.txt
testHarness/OpenFOAM/1.6-ext/CMakeFiles/CMakeLists.txt
|
2013-07-03 15:51:19 +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 |
|
Hrvoje Jasak
|
02b41462e1
|
Merge branch 'master' of ssh://openfoam-extend.git.sourceforge.net/gitroot/openfoam-extend/OpenFOAM-1.6-ext
Conflicts:
ThirdParty/AllMake.stage1
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/qt-everywhere-opensource-src-4.7.4.spec
etc/prefs.csh-EXAMPLE
etc/prefs.sh-EXAMPLE
etc/settings.sh
testHarness/OSIG/Turbomachinery/README.txt
testHarness/OpenFOAM/1.6-ext/CMakeFiles/CMakeLists.txt
|
2012-09-03 12:39:35 +01: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 |
|
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
|
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
|
4bf399fa58
|
Switch to PyFoam version 0.5.7
|
2012-04-17 22:51:22 -04:00 |
|
Martin Beaudoin
|
03c59a643c
|
Addition of PyFoam as a ThirdParty package
|
2012-04-11 00:03:09 -04:00 |
|
Hrvoje Jasak
|
b818775ac7
|
Paraview compilation issues
|
2012-03-13 17:18:55 +00:00 |
|
Martin Beaudoin
|
2953d87c89
|
Updating version of CMake and Qt
|
2012-01-28 16:23:50 -05:00 |
|
Martin Beaudoin
|
8bdf59751c
|
Modification pour Zoltan
|
2011-10-19 10:35:02 -04:00 |
|
Hrvoje Jasak
|
9998f0c1ed
|
Added missing WM_OPTIONS
|
2011-10-13 07:16:39 +01:00 |
|
Hrvoje Jasak
|
bcff68668d
|
Incompatibilities with Bourne Shell
Conflicts:
etc/settings.sh
|
2011-10-03 09:28:22 +01:00 |
|
Hrvoje Jasak
|
86b1af3367
|
Hot fixes
|
2011-09-22 15:16:44 +01:00 |
|
Hrvoje Jasak
|
89a4a7f0d7
|
Updates for Ubuntu 11.04 and Icc 12
|
2011-08-12 18:46:37 +01:00 |
|
Martin Beaudoin
|
1c715bbc96
|
Adjustments for cmake
|
2011-06-04 18:55:09 -04:00 |
|
Martin Beaudoin
|
500b61e503
|
merge branch feature/globalCtrlDictFromEnvVariable hotfix/ThirdParty_scripts hotfix/testHarness
|
2011-06-04 12:38:23 -04:00 |
|
Martin Beaudoin
|
a470b0c665
|
ThirdParty: adjustments for various version of Gcc compiler
|
2011-05-28 10:09:00 -04:00 |
|
Martin Beaudoin
|
4dba7ce12b
|
Test harness: adjustments to compiler related environment variables
|
2011-05-22 16:43:46 -04:00 |
|
Martin Beaudoin
|
cecae8937e
|
ThirdParty: switch to mpfr-3.0.1
|
2011-05-16 21:40:12 -04:00 |
|
Martin Beaudoin
|
1d2f5551ac
|
ThirdParty: Adding bison, flex and m4
|
2011-05-08 22:48:26 -04: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
|
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 |
|
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 |
|
Bernhard F.W. Gschaider
|
82f584adbc
|
Merge with default. On the Mac the Apple-OpenMPI is chosen if the type is set to SYSTEMOPENMPI. Otherwise the thirdParty-stuff
--HG--
branch : macMerge
|
2010-10-12 13:36:54 +02:00 |
|
Hrvoje Jasak
|
db148bed71
|
Mac OS X updates
|
2010-10-12 08:53:05 +01:00 |
|