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 |
|
Bernhard F.W. Gschaider
|
51a28461e9
|
Work around a problem when the absolute path is specified
--HG--
branch : bgschaid/minorAdditionsBranch
|
2013-08-21 00:58:36 +02:00 |
|
Hrvoje Jasak
|
1a0318c0ca
|
Tet fem reorganisation
|
2013-08-13 16:01:45 +01:00 |
|
Bernhard F.W. Gschaider
|
93e80e2c87
|
Automatically determine the additional version specification from the directory name of the installation
--HG--
branch : bgschaid/minorAdditionsBranch
|
2013-07-22 13:43:34 +02:00 |
|
Bernhard F.W. Gschaider
|
a10196a180
|
Make sure that WM_PROJECT_VERSION_ADDITION is unset at the start of the script
--HG--
branch : bgschaid/minorAdditionsBranch
|
2013-07-21 19:31:41 +02:00 |
|
Bernhard F.W. Gschaider
|
194418bc0c
|
Add possibility of preset to cshrc
--HG--
branch : bgschaid/minorAdditionsBranch
|
2013-07-19 01:44:58 +02: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 |
|
Henrik Rusche
|
3241862b6c
|
Remove trailing whitespace systematically
|
2013-07-18 10:15:54 +02:00 |
|
Bernhard F.W. Gschaider
|
aa7910714e
|
WM_DIR is not set at that time
--HG--
branch : bgschaid/minorAdditionsBranch
|
2013-07-15 20:47:27 +02:00 |
|
Bernhard F.W. Gschaider
|
2a75032491
|
MacPorts-specific. Set WM_FC (needed by two ThirdParty-packages)
--HG--
branch : bgschaid/minorAdditionsBranch
|
2013-07-15 17:49:24 +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
|
93f583fd97
|
Remove extra lines introduced by last merge
--HG--
branch : bgschaid/minorAdditionsBranch
|
2013-07-12 01:04:45 +02:00 |
|
Bernhard F.W. Gschaider
|
164b6639fe
|
Automated merge with git+ssh://git.code.sf.net/p/openfoam-extend/OpenFOAM-1.6-ext
--HG--
branch : bgschaid/minorAdditionsBranch
|
2013-07-12 01:01:57 +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
|
2f0ecfd98f
|
Allow having a second installation of the same version without touching the sources
--HG--
branch : bgschaid/minorAdditionsBranch
|
2013-07-11 16:48:40 -04:00 |
|
Bernhard F.W. Gschaider
|
6732db815e
|
Move the site configuration up so that WM_THIRD_PARTY_DIR can be unset
before it is set
--HG--
branch : bgschaid/minorAdditionsBranch
|
2013-07-11 16:47:30 -04:00 |
|
Bernhard F.W. Gschaider
|
6036337395
|
Add the possibility to inject variables BEFORE WM_PROJECT_DIR is set
--HG--
branch : bgschaid/minorAdditionsBranch
|
2013-07-11 16:41:08 -04:00 |
|
Martin Beaudoin
|
6aebefdeae
|
Remove comments
|
2013-07-11 15:31:01 -04:00 |
|
Bernhard F.W. Gschaider
|
751568a632
|
Fix strange results when using a zsh
--HG--
branch : bgschaid/minorAdditionsBranch
|
2013-07-11 15:28:56 -04: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 |
|
Martin Beaudoin
|
912e758cc7
|
Using complete path for foamGetSystemInfo. Bug reported by Bernhard Gschaider
|
2013-07-11 10:47:31 -07: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 |
|
Bernhard F.W. Gschaider
|
7ac8e597de
|
Fix strange results when using a zsh
--HG--
branch : bgschaid/minorAdditionsBranch
|
2013-07-11 19:19:57 +02:00 |
|
Bernhard F.W. Gschaider
|
e17e20289a
|
Add the possibility to inject variables BEFORE WM_PROJECT_DIR is set
--HG--
branch : bgschaid/minorAdditionsBranch
|
2013-07-11 18:22:11 +02:00 |
|
Bernhard F.W. Gschaider
|
9bfd822a9b
|
Move the site configuration up so that WM_THIRD_PARTY_DIR can be unset
before it is set
--HG--
branch : bgschaid/minorAdditionsBranch
|
2013-07-11 18:21:35 +02:00 |
|
Bernhard F.W. Gschaider
|
bcaaa26a75
|
Allow having a second installation of the same version without touching the sources
--HG--
branch : bgschaid/minorAdditionsBranch
|
2013-07-11 17:46:01 +02:00 |
|
Martin Beaudoin
|
0cd1ffc04d
|
Fixing initialization of environment variable MACOSX_DEPLOYMENT_TARGET
|
2013-07-10 09:14:21 -04:00 |
|
Martin Beaudoin
|
f3234e58f7
|
Initialization of WM_NCOMPPROCS using foamGetSystemInfo
|
2013-07-07 13:02:10 -04: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 |
|
Henrik Rusche
|
5891662bc3
|
for Max: hw.ncpu --> hw.physicalcpu
|
2013-07-05 19:34:09 +02:00 |
|
Henrik Rusche
|
ac008a3ca0
|
Compatibility: auto NCOMPPROCS for Mac
|
2013-07-05 18:15:23 +02:00 |
|
Henrik Rusche
|
c262140556
|
Determine NCOMPPROCS automatically
|
2013-07-05 17:15:35 +02:00 |
|
Martin Beaudoin
|
d4ce052e6f
|
Settings adjustments for csh
|
2013-07-05 07:30:22 -07:00 |
|
Martin Beaudoin
|
779fcf8a8f
|
Mac OS X: removing the revision number from 10.7
|
2013-07-04 22:08:36 -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
|
08b09c5246
|
Fixed tcsh bugs
|
2012-09-03 13:31:18 +01: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 |
|
Hrvoje Jasak
|
d280b12a93
|
Project update
|
2012-08-30 17:35:14 +01:00 |
|
Martin Beaudoin
|
85daa4a8cc
|
Fixes for gcc-4.5.1
|
2012-06-10 21:27:30 -04:00 |
|
Martin Beaudoin
|
068bc78dbb
|
Fixing testHarness
|
2012-05-11 08:47:43 -07: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 |
|