Commit graph

212 commits

Author SHA1 Message Date
Dominik Christ
3c95ab6a8a Upgrade to Paraview 4.0.1; contributed by Andreas Feymark 2013-12-11 09:25:19 +00:00
Hrvoje Jasak
77983dc2ee Add Intel CC compilation 2013-11-29 17:21:10 +00:00
Henrik Rusche
eafe626e71 changes to library and settings 2013-11-26 13:00:51 +01:00
Hrvoje Jasak
28418f4b05 Version script breaks transfers. Sorry. 2013-11-08 17:27:40 +00:00
Bernhard F.W. Gschaider
2c4e17cdbf Modify Mac-stuff to use CLang from MacPort (still got issues: seems that CLang can't handle the output from flex)
--HG--
branch : bgschaid/minorAdditionsBranch
rename : wmake/rules/darwinIntel64Gcc/ARCHITECTURE_TESTED => wmake/rules/darwinIntel64Clang/ARCHITECTURE_TESTED
rename : wmake/rules/darwinIntel64Gcc/X => wmake/rules/darwinIntel64Clang/X
rename : wmake/rules/darwinIntel64Gcc/c => wmake/rules/darwinIntel64Clang/c
rename : wmake/rules/darwinIntel64Gcc/c++ => wmake/rules/darwinIntel64Clang/c++
rename : wmake/rules/darwinIntel64Gcc/c++Debug => wmake/rules/darwinIntel64Clang/c++Debug
rename : wmake/rules/darwinIntel64Gcc/c++Opt => wmake/rules/darwinIntel64Clang/c++Opt
rename : wmake/rules/darwinIntel64Gcc/c++Prof => wmake/rules/darwinIntel64Clang/c++Prof
rename : wmake/rules/darwinIntel64Gcc/cDebug => wmake/rules/darwinIntel64Clang/cDebug
rename : wmake/rules/darwinIntel64Gcc/cOpt => wmake/rules/darwinIntel64Clang/cOpt
rename : wmake/rules/darwinIntel64Gcc/cProf => wmake/rules/darwinIntel64Clang/cProf
rename : wmake/rules/darwinIntel64Gcc/general => wmake/rules/darwinIntel64Clang/general
rename : wmake/rules/darwinIntel64Gcc/mplib => wmake/rules/darwinIntel64Clang/mplib
rename : wmake/rules/darwinIntel64Gcc/mplibMACPORTOPENMPI => wmake/rules/darwinIntel64Clang/mplibMACPORTOPENMPI
rename : wmake/rules/darwinIntel64Gcc/mplibOPENMPI => wmake/rules/darwinIntel64Clang/mplibOPENMPI
rename : wmake/rules/darwinIntel64Gcc/mplibSYSTEMOPENMPI => wmake/rules/darwinIntel64Clang/mplibSYSTEMOPENMPI
2013-11-07 10:38:49 +01:00
Bernhard F.W. Gschaider
002822076a Merge in fixes
--HG--
branch : bgschaid/minorAdditionsBranch
2013-11-06 17:28:06 +01:00
Hrvoje Jasak
b476189438 Mac Maverick re-port 2013-11-04 14:10:04 +00: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
Bernhard F.W. Gschaider
40f9c7af23 Merge latest nextRelease
--HG--
branch : bgschaid/minorAdditionsBranch
2013-10-10 16:14:21 +02:00
Hrvoje Jasak
529271393f Revert cshrc 2013-10-10 10:49:46 +01:00
Hrvoje Jasak
fb82dfdc4c gcc paths 2013-10-10 10:47:38 +01:00
Dominik Christ
755a78d0ce Changed bashrc 2013-09-19 09:33:55 +01:00
Bernhard F.W. Gschaider
13b86450c8 Now the script doesn't fail if sourced from cshrc but it can't detect its name and location (only tcsh)
--HG--
branch : bgschaid/minorAdditionsBranch
2013-09-09 23:18:55 +02:00
Bernhard F.W. Gschaider
7def1e6da1 What works in tcsh doesn't work in csh (although most systems nowadays use tcsh as csh)
--HG--
branch : bgschaid/minorAdditionsBranch
2013-09-05 01:31:14 +02:00
Bernhard F.W. Gschaider
fdcfb61f0b Distinguish different bash-versions and how they find out about the source file
--HG--
branch : bgschaid/minorAdditionsBranch
2013-09-05 01:29:18 +02:00
Bernhard F.W. Gschaider
af4c60ef56 Replace shell-based auto-detection with a singe Python-oneliner that should be more stable (at least it doesn't choke on symbolic links anymore)
--HG--
branch : bgschaid/minorAdditionsBranch
2013-09-04 23:47:55 +02:00
Henrik Rusche
e83ac65b74 Backporting prefs treatment 2013-08-30 11:21:40 +02: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
Bernhard F.W. Gschaider
91ae72c445 Merge in
--HG--
branch : bgschaid/minorAdditionsBranch
2013-08-22 12:01:19 +02: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
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
Hrvoje Jasak
b2cd738861 Merge branch 'parallelTopo'
Conflicts:
	applications/utilities/mesh/manipulation/moveDyMEngineMesh/Make/options
	applications/utilities/mesh/manipulation/moveDyMEngineMesh/moveDyMEngineMesh.C
	applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
	applications/utilities/parallelProcessing/decomposePar/decomposePar.C
	src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
	src/decompositionMethods/decompositionMethods/patchConstrainedDecomp/patchConstrainedDecomp.C
	src/decompositionMethods/metisDecomp/metisDecomp.C
	src/dynamicMesh/topoChangerFvMesh/Make/files
	src/dynamicMesh/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
	src/finiteArea/faMesh/faMesh.C
	src/finiteVolume/cfdTools/general/include/checkVolContinuity.H
	src/tetDecompositionFiniteElement/tetPolyMeshCellDecomp/tetPolyPatches/constraint/processor/calcProcessorTetPolyPatchCellDecompPointAddr.C
	src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
	src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
	src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
	src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
	tutorials/incompressible/icoDyMFoam/movingConeTopo/system/decomposeParDict
2012-04-25 10:38:12 +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
8b621679f4 Addition of swak4Foam as a ThirdParty package 2012-04-12 16:56:44 -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
Hrvoje Jasak
fa6c5b8888 Merge remote-tracking branch 'remotes/origin/feature/postfixedSubRegistry' into HrvojeJasak 2012-01-29 12:27:23 +00:00
Hrvoje Jasak
3e21dbc090 Paraview-3.12 2012-01-29 12:06:18 +00:00
Hrvoje Jasak
db96bb9a21 Cleaning up merge problems 2012-01-29 12:05:15 +00:00
Hrvoje Jasak
72ab66aa0b Default compiler gcc 2012-01-29 12:05:14 +00:00
Hrvoje Jasak
fc072f48d6 etc file sourcing fix 2012-01-29 12:05:14 +00:00
Hrvoje Jasak
adc5ea3d20 Paraview-3.8.1 2012-01-29 12:05:11 +00:00
Hrvoje Jasak
12d78544f3 Partial master merge 2012-01-29 12:04:11 +00:00
Martin Beaudoin
2f4c452110 ThirdParty packages: switch to cmake 2.8.5 2012-01-29 12:02:10 +00:00
Martin Beaudoin
2953d87c89 Updating version of CMake and Qt 2012-01-28 16:23:50 -05:00
Henrik Rusche
7f259a3ded changes to turbulence models 2011-11-13 20:28:18 +01:00
Henrik Rusche
9cf1ef5f18 added postFixedSubRegistry 2011-11-13 20:26:45 +01: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
60934bd37c Added new switches 2011-08-24 20:38:46 +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
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