Commit graph

272 commits

Author SHA1 Message Date
Dominik Christ
83b9a7161f Reverted to OpenMPI 1.6.5 2015-08-06 12:32:26 +01:00
Hrvoje Jasak
2a0b888ff9 openmpi-1.8.8 2015-08-06 10:02:34 +01:00
Hrvoje Jasak
fbf26c0de3 OpenMPI-1.8.7: bug fixes 2015-08-06 10:02:33 +01:00
Dominik Christ
ef26ee1688 FEATURE: Re-enabled paraview compilation by default. Moved 3rd party sources to SourceForge. Dominik Christ. 2015-06-12 13:17:22 +01:00
Martin Beaudoin
a8a87dcade ThirdParty: fixing the compilation of scotch 6.0.4. Disabling the compilation of Zoltan by default 2015-06-12 09:55:54 +01:00
Henrik Rusche
a23acb0388 VERSION: version, headers, whitespace & tabs for 3.2. Author: Henrik Rusche. Merge: Henrik Rusche 2015-06-02 11:52:46 +02:00
Henrik Rusche
f83a771395 FEATURE: testHarness: improvements. Author: Martin Beaudoin. Merge: Henrik Rusche.
testHarness: adding the source code git revision number to the Build Name.

See here for an example:
http://openfoam-extend.sourceforge.net/CDash/index.php?project=foam-extend-3.1&date=2015-05-28
2015-06-02 10:57:25 +02:00
Henrik Rusche
46f509ad79 FEATURE: Simpler ThirdParty packages selection mechanism. Author: Martin Beaudoin. Merge: Henrik Rusche.
I am proposing an improved ThirdParty packages selection mechanism based on a set of package-specific, pre-defined environment variables.

Using those environment variables, one can control the selection of the full list of ThirdParty packages he/she want to compile/use by simply editing the etc/prefs.sh or etc/prefs.csh file.

Using this new approach, you will no longer have to edit the ThirdParty/AllMake.stageXXX files or the etc/settings.[sh,csh] to suit your needs; every supported package is selectable from a single environment variable specified in your prefs.[sh,csh] file, or in one of your script file.

Another benefit from this improvement will also come from supplying a set of predefined prefs.[sh,csh]-EXAMPLE files for both generic or specialized configurations and/or for specific Operating Systems. For example:

prefs.sh-EXAMPLE-Centos-7
prefs.sh-EXAMPLE-Ubuntu-14.02
prefs.sh-EXAMPLE-MacOSX_Yosemite_without_MacPorts
prefs.sh-EXAMPLE-RaspberryPi2

I also took the liberty of bumping many ThirdParty packages to the latest version available.
2015-06-01 18:03:56 +02:00
Martin Beaudoin
0631e66ab6 ThirdParty: Various adjustments to the selection mechanism 2015-05-26 00:59:43 -04:00
Henrik Rusche
82a0e1e7df Replace tabs by 4 spaces in bin, tutorials, src, ... & clean-up by hand 2015-05-18 09:54:40 +02:00
Henrik Rusche
f5c5fe700b Upgrade case file headers 2015-05-18 09:54:33 +02:00
Martin Beaudoin
246eb0eda1 ThirdParty: setting ParaView 4.3.1 as the default version 2015-05-17 23:55:32 -04:00
Henrik Rusche
0a02a92e53 Upgrade copyright notices & banner in source code 2015-05-17 15:58:16 +02:00
Martin Beaudoin
ce2b0894c5 ThirdParty: bumping Scotch to version 6.0.4
bumping hwloc to version 1.10.1
            Adjusting libccmio for Mac OSX Yosemite
            Adjustments for cmake 3.2.2
            Adding spec file for openmpi version 1.8.4
2015-05-17 07:46:05 -04:00
Martin Beaudoin
e2b9bd5b80 ThirdParty: cmake 3.2.2 2015-05-16 23:19:40 -04:00
Martin Beaudoin
109bc7ae80 ThirdParty:: new compilation recipe for gcc 4.9.2 and 4.8.4 2015-05-16 20:39:14 -04:00
Martin Beaudoin
78d0ccc78d ThirdParty: initial commit of the packages selection mechanism using environment variables 2015-05-15 08:48:09 -04:00
Hrvoje Jasak
6661bc2412 Merge commit 'bd947865f2881af1c52b458aa6b6b1b1844ce254' into nextRelease
Conflicts:
	ListOfContributors
	applications/solvers/compressible/sonicDyMFoam/eEqn.H
	applications/utilities/immersedBoundary/refineImmersedBoundaryMesh/Make/options
	src/coupledMatrix/coupledLduMatrix/coupledLduMatrix.C
	src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/coupledMesh/dynamicTopoFvMeshCoupled.C
	src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchScalarField.C
	src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C
	src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.H
	src/foam/fields/PointPatchFields/constraint/processor/ProcessorPointPatchField.C
	src/foam/interpolations/GGIInterpolation/GGIInterpolationQuickRejectTests.C
	src/foam/matrices/blockLduMatrix/BlockAmg/coarseBlockAmgLevel.C
	src/foam/meshes/polyMesh/globalMeshData/globalMeshData.H
	src/lduSolvers/amg/coarseAmgLevel.C
	src/mesh/cfMesh/meshLibrary/utilities/octrees/meshOctree/refinementControls/objectRefinement/objectRefinement.C
2015-05-13 18:27:51 +01:00
Bernhard F.W. Gschaider
48eabff312 Now etc/tcshrc also works if sourced from .tcshrc. But an environment variable has to be set to make it work correctly as in this case diff does not work correctly 2015-05-12 16:28:29 +01:00
Bernhard F.W. Gschaider
edc6952f57 Make sure that the aliases that source the tcshrc still work 2015-05-12 16:28:29 +01:00
Bernhard Gschaider
76d193a557 For some reason quotes are needed on Linux 2015-05-12 16:28:29 +01:00
Bernhard F.W. Gschaider
170d1bb369 Catch the exception in Python2 or Python 3 2015-05-12 16:28:28 +01:00
Bernhard F.W. Gschaider
93ca2b71ee Make the script more stable (exception catching etc) 2015-05-12 16:28:28 +01:00
Bernhard F.W. Gschaider
c05eac90c8 Now there is also a script for tcsh
--HG--
rename : etc/zshrc => etc/tcshrc
2015-05-12 16:28:28 +01:00
Bernhard F.W. Gschaider
e4d16f78eb Added fish-shell to demonstrate that this approach allows completely different shells
--HG--
rename : etc/zshrc => etc/fishrc
2015-05-12 16:28:28 +01:00
Bernhard F.W. Gschaider
53b7c23edc Make sure that the real bash is used 2015-05-12 16:28:27 +01:00
Bernhard F.W. Gschaider
7c3f127120 First proof-of-concept of a 'one script for all' 2015-05-12 16:28:27 +01:00
Hrvoje Jasak
7f32cf4357 Added LDP option 2015-05-12 15:01:28 +01:00
Hrvoje Jasak
6b022758d1 Feature: Single precision and long double precision port 2015-05-12 15:01:27 +01:00
Martin Beaudoin
473f85c949 controlSwitches: - We are now completely free from the global controlDict file.
This file is no longer necessary.
                 - If necessary, one can still use a global controlDict file
                   using the environment variable FOAM_GLOBAL_CONTROLDICT
                 - Case specific global control switches values can now be
                   supplied in the case's system/controlDict file.
                 - Renaming $WM_PROJECT_DIR/etc/controlDict to
                   $WM_PROJECT_DIR/etc/controlDict-EXAMPLE
                 - Some code cleanup.
2015-05-05 08:57:06 -04:00
Martin Beaudoin
4706995f5f controlSwitches: updating after code merge. Minor correction for DimensionedConstants sigmaSB. Adapting foamDebugSwitches 2015-05-02 09:57:47 -04:00
Bernhard F.W. Gschaider
7cd32a2da3 Support pyFoam version 0.6.4 2015-04-27 10:56:23 +01:00
Bernhard F.W. Gschaider
f450b35fd4 Add a separate directory for scripts and libraries not part of the PyFoam-distribution. This will only work with Pyfoam 0.6.4 or later 2015-04-27 10:56:23 +01:00
Hrvoje Jasak
1255b6a886 Script clean-up: FOAM 2015-04-23 13:51:07 +01:00
Hrvoje Jasak
ba56c65739 Versions update 2015-04-07 16:59:45 +01:00
Martin Beaudoin
e64704203c Merge branch 'nextRelease' into nr/feature/changeGlobalControlDictParamsFromCmdLine 2014-12-24 11:59:55 -05:00
Dominik Christ
d71951fb59 Commented out ulimit in etc/bashrc 2014-06-17 11:35:58 +02:00
Hrvoje Jasak
8b9c3d4764 ulimit on Mac OS X - temporary fix 2014-06-14 22:05:26 +01:00
Hrvoje Jasak
9bdca86e5e Disable ulimit from Mac 2014-06-13 15:35:38 +01:00
Hrvoje Jasak
1c2432f41a Update bashrc file for native Mac OSX build 2014-06-12 10:04:18 +01:00
Henrik Rusche
3c5ba8da44 bump version number 2014-06-01 18:23:43 +02:00
Martin Beaudoin
d3b269b7c6 ThirdParty apckages: Various adjustments.
- Add spec file for bison-2.7. Switch to this version
   - Modify patch file for ParMGridGen-1.0 so we no longer need to bother with gmake
   - Updated Ubuntu 14.04 build instructions
   - Added missing ThirdParty packages configuration for settings.csh
   - Replaced occurences of string 'OpenFOAM' for 'foam-extend' in various files
2014-05-31 20:26:57 -07:00
Bernhard F.W. Gschaider
d1d0f4d233 Upgrade PyFoam to the release candidate of 0.6.3
--HG--
rename : ThirdParty/rpmBuild/SPECS/PyFoam-0.6.2.spec => ThirdParty/rpmBuild/SPECS/PyFoam-0.6.3.spec
2014-05-30 00:05:40 +02:00
Bernhard F.W. Gschaider
1cb3e1f77a Allow specification of different mpirun to be used by the RunFunctions - Used on Mac but may be beneficial for other systems too 2014-05-29 18:09:23 +02:00
Bernhard F.W. Gschaider
d868141816 Use latest released PyFoam-version 0.6.2
--HG--
rename : ThirdParty/rpmBuild/SPECS/PyFoam-0.6.1.spec => ThirdParty/rpmBuild/SPECS/PyFoam-0.6.2.spec
2014-05-29 16:58:02 +02:00
Bernhard F.W. Gschaider
c8d4a68123 Adding proper Fortran-compilers for MacPorts-installations. This makes sure Mesquite gets compiled 2014-05-29 16:02:17 +02:00
Martin Beaudoin
705a5bc7c9 Merge remote-tracking branch 'origin/nextRelease' into nr/feature/changeGlobalControlDictParamsFromCmdLine 2014-05-28 01:21:37 -04:00
Martin Beaudoin
6f1102cb5d Add options for modifying the global controlDict values/switches from the command-line
The following command-line options are available:
 -DebugSwitches        key=value
 -DimensionedConstants key=value
 -InfoSwitches         key=value
 -OptimisationSwitches key=value
 -Tolerances           key=value

In order to modify more than one key/value pair for a given category, you will
need to specify a given option more than once.

If an invalid/unknown key is specified, a complete list of valid keys for the
application will be written at the console.

Martin Beaudoin 05/2014
2014-05-28 01:11:17 -04:00
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
b360468492 Add csh bits for MVAPICH2 build support 2014-03-06 16:04:18 +01:00
Alexander Monakov
6a6c4903f3 Support building Pstream against MVAPICH2 2014-03-06 16:04:18 +01:00
Dominik Christ
adc2bbb081 Updated documentation in comments to include 'SYSTEMOPENMPI' again 2014-02-25 09:36:02 +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
Dominik Christ
b3bc82bb44 Merge remote-tracking branch 'origin/BUGFIX/adjustedMakeScripts' 2014-02-17 16:34:24 +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
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