Bernhard F.W. Gschaider
|
dfd971ed20
|
Merge in next release
|
2014-05-15 16:51:41 +02:00 |
|
Hrvoje Jasak
|
f9e0818602
|
Merge remote-tracking branch 'remotes/origin/feature/mvapich2' into nextRelease
Conflicts:
etc/bashrc
etc/cshrc
|
2014-04-30 10:35:07 +01:00 |
|
Alexander Monakov
|
6a6c4903f3
|
Support building Pstream against MVAPICH2
|
2014-03-06 16:04:18 +01:00 |
|
Bernhard F.W. Gschaider
|
198c096905
|
Fixing the scripts to correctly compile with MPI
|
2014-02-21 21:19:07 +01:00 |
|
Bernhard F.W. Gschaider
|
e299d0feab
|
Adapt for the new location of the MPI-implementations in MacPort
--HG--
rename : wmake/rules/darwinIntel64Gcc/ARCHITECTURE_TESTED => wmake/rules/darwinIntel64Dragonegg/ARCHITECTURE_TESTED
rename : wmake/rules/darwinIntel64Gcc/X => wmake/rules/darwinIntel64Dragonegg/X
rename : wmake/rules/darwinIntel64Gcc/c => wmake/rules/darwinIntel64Dragonegg/c
rename : wmake/rules/darwinIntel64Gcc/c++ => wmake/rules/darwinIntel64Dragonegg/c++
rename : wmake/rules/darwinIntel64Gcc/c++Debug => wmake/rules/darwinIntel64Dragonegg/c++Debug
rename : wmake/rules/darwinIntel64Gcc/c++Opt => wmake/rules/darwinIntel64Dragonegg/c++Opt
rename : wmake/rules/darwinIntel64Gcc/c++Prof => wmake/rules/darwinIntel64Dragonegg/c++Prof
rename : wmake/rules/darwinIntel64Gcc/cDebug => wmake/rules/darwinIntel64Dragonegg/cDebug
rename : wmake/rules/darwinIntel64Gcc/cOpt => wmake/rules/darwinIntel64Dragonegg/cOpt
rename : wmake/rules/darwinIntel64Gcc/cProf => wmake/rules/darwinIntel64Dragonegg/cProf
rename : wmake/rules/darwinIntel64Gcc/general => wmake/rules/darwinIntel64Dragonegg/general
rename : wmake/rules/darwinIntel64Gcc/mplib => wmake/rules/darwinIntel64Dragonegg/mplib
rename : wmake/rules/darwinIntel64Gcc/mplibMACPORTOPENMPI => wmake/rules/darwinIntel64Dragonegg/mplibMACPORTOPENMPI
rename : wmake/rules/darwinIntel64Gcc/mplibOPENMPI => wmake/rules/darwinIntel64Dragonegg/mplibOPENMPI
rename : wmake/rules/darwinIntel64Gcc/mplibSYSTEMOPENMPI => wmake/rules/darwinIntel64Dragonegg/mplibSYSTEMOPENMPI
|
2014-02-20 19:23:16 +01:00 |
|
Hrvoje Jasak
|
47c824e967
|
Merge remote-tracking branch 'origin/BUGFIX/adjustedMakeScripts' into nextRelease
|
2014-02-19 12:39:35 +00:00 |
|
Dominik Christ
|
e50d7c4dcc
|
Added #!/bin/bash ; serial compile for swak4Foam
|
2014-02-17 15:19:04 +00:00 |
|
Martin Beaudoin
|
453aa36bc3
|
ThirdParty: bumping Qt to version 4.8.5
|
2014-02-15 22:52:19 -05:00 |
|
Bernhard F.W. Gschaider
|
e452f1429c
|
Forgotten line for MacPort-MPI
--HG--
branch : bgschaid/foam3FixesBranch
|
2013-12-23 11:18:25 +01:00 |
|
Hrvoje Jasak
|
aac5de5e16
|
Renamed and cleaned foam-extend
|
2013-12-11 16:09:41 +00:00 |
|
Dominik Christ
|
3c95ab6a8a
|
Upgrade to Paraview 4.0.1; contributed by Andreas Feymark
|
2013-12-11 09:25:19 +00:00 |
|
Henrik Rusche
|
eafe626e71
|
changes to library and settings
|
2013-11-26 13:00:51 +01:00 |
|
Martin Beaudoin
|
d165d80833
|
ThirdParty: bumping hwloc to version 1.7.2
|
2013-10-23 13:19:42 -04:00 |
|
Martin Beaudoin
|
228d0ae7b8
|
ThirdParty: bumping openmpi to version 1.6.5
|
2013-10-23 11:22:29 -04:00 |
|
Martin Beaudoin
|
5cdeb8ca25
|
ThirdParty: bumping cmake to version 2.8.12
|
2013-10-23 10:56:49 -04:00 |
|
Hrvoje Jasak
|
db4d4cefe7
|
Hand-merged CUDA support
|
2013-10-11 14:12:56 +01:00 |
|
Hrvoje Jasak
|
fb82dfdc4c
|
gcc paths
|
2013-10-10 10:47:38 +01:00 |
|
Hrvoje Jasak
|
4c3ca4097c
|
Merge remote-tracking branch 'remotes/origin/bgschaid/minorAdditions' into nextRelease
Conflicts:
src/OpenFOAM/matrices/blockLduMatrix/BlockLduMatrix/BlockLduMatrixATmul.C
|
2013-08-22 17:15:23 +01: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 |
|