Commit graph

65 commits

Author SHA1 Message Date
Bernhard F.W. Gschaider
dfd971ed20 Merge in next release 2014-05-15 16:51:41 +02: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
e0eb6b91a1 More template depth in instantiation 2014-02-17 10:53:42 +00:00
Hrvoje Jasak
7b07622f0b PORT: Update darwin rules 2013-12-17 09:02:58 +00:00
Hrvoje Jasak
aac5de5e16 Renamed and cleaned foam-extend 2013-12-11 16:09:41 +00:00
Hrvoje Jasak
bd40dc3d91 Merge remote-tracking branch 'origin/bgschaid/minorAdditions' into nextRelease 2013-11-08 16:44:54 +00:00
Bernhard F.W. Gschaider
caf9efd208 Adding a FPE-handler for Darwin
--HG--
branch : bgschaid/minorAdditionsBranch
2013-11-08 00:42:49 +01:00
Henrik Rusche
9b3628ad43 Minor Clean-Up 2013-11-08 00:14:24 +01: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
Hrvoje Jasak
b476189438 Mac Maverick re-port 2013-11-04 14:10:04 +00:00
Hrvoje Jasak
f3441a1a31 Merge branch 'macMaverickPort' into nextRelease
Conflicts:
	applications/solvers/solidMechanics/solidModels/Make/files
	applications/solvers/solidMechanics/solidModels/contactModel/contactPatchPair.C
	applications/solvers/solidMechanics/solidModels/contactModel/contactPatchPairCorrect.C
	applications/solvers/solidMechanics/solidModels/contactModel/contactProblem.C
	applications/solvers/solidMechanics/solidModels/fvPatchFields/fixedDisplacementZeroShear/fixedDisplacementZeroShearFvPatchVectorField.C
	src/Allwmake
	src/solidModels/fvPatchFields/fixedDisplacementZeroShear/fixedDisplacementZeroShearFvPatchVectorField.H
	src/solidModels/fvPatchFields/solidTraction/solidTractionFvPatchVectorField.C
	src/solidModels/fvPatchFields/solidTraction/solidTractionFvPatchVectorField.H
	src/solidModels/fvPatchFields/solidTractionFree/solidTractionFreeFvPatchVectorField.C
	src/solidModels/fvPatchFields/solidTractionFree/solidTractionFreeFvPatchVectorField.H
	src/solidModels/fvPatchFields/timeVaryingSolidTraction/timeVaryingSolidTractionFvPatchVectorField.C
2013-11-04 09:57:50 +00:00
Hrvoje Jasak
d2a5f2f1a3 Mac OS X Maverick port 2013-11-03 20:28:05 +00:00
Hrvoje Jasak
f7ad627f7f Merge remote-tracking branch 'origin/nextRelease_philipc' into nextRelease
Conflicts:
	src/Allwmake
2013-10-29 10:20:25 +00:00
Hrvoje Jasak
abd7127005 Linux 64 CUDA compilation 2013-10-22 15:53:21 +01:00
Philip Cardiff
ab6cd72839 Rearranging solidMechanics solvers and src, and added wmake darwin rules 2013-10-11 14:31:14 +01:00
Hrvoje Jasak
db4d4cefe7 Hand-merged CUDA support 2013-10-11 14:12:56 +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
Henrik Rusche
3241862b6c Remove trailing whitespace systematically 2013-07-18 10:15:54 +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
Henrik Rusche
a09b971def Merge remote-tracking branch 'origin/feature/gcc4.6port' into nextRelease
Conflicts:
	src/decompositionMethods/scotchDecomp/Make/options
	src/thermophysicalModels/basic/Make/options
	src/thermophysicalModels/reactionThermo/Make/options
2013-07-03 21:20:15 +02:00
Henrik Rusche
09fbf2ef28 Fixes to previous merge commits 2013-07-03 19:43:31 +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
938999f299 Increased template depth: block solver 2013-04-15 13:12:06 +01:00
Hrvoje Jasak
d280b12a93 Project update 2012-08-30 17:35:14 +01:00
Martin Beaudoin
4ebf8c586f ThirdParty: adjustments for Ubuntu 12.04 32 bit 2012-07-06 14:14:28 -04:00
Martin Beaudoin
b622e1269f Adding missing wmake files gor gcc 4.6.x 2012-06-11 21:01:25 -04:00
Martin Beaudoin
85daa4a8cc Fixes for gcc-4.5.1 2012-06-10 21:27:30 -04:00
Hrvoje Jasak
9d08b299d3 Build clean-up and coupled patch robustness 2012-03-12 15:49:50 +00:00
Hrvoje Jasak
4ce097de54 Merge remote-tracking branch 'remotes/origin/hotfix/gcc46' into HrvojeJasak 2012-03-05 14:57:57 +00:00
Henrik Rusche
93978be8f3 compiler switches for gcc 4.6
These changes probably break older gcc compilers, but I am not sure!
2012-03-02 16:41:05 +01:00
Hrvoje Jasak
fa6c5b8888 Merge remote-tracking branch 'remotes/origin/feature/postfixedSubRegistry' into HrvojeJasak 2012-01-29 12:27:23 +00:00
Hrvoje Jasak
b288e6da65 gcc-4.6 changes, stage 1 2012-01-29 12:05:45 +00:00
Hrvoje Jasak
2db50e24ec gcc-4.6 changes, stage 1 2012-01-29 12:05:15 +00:00
David L. F. Gaden
13347d0dde wmake rules changes 2011-11-25 20:22:42 -06:00
Henrik Rusche
7f259a3ded changes to turbulence models 2011-11-13 20:28:18 +01:00
Hrvoje Jasak
86b1af3367 Hot fixes 2011-09-22 15:16:44 +01:00
Hrvoje Jasak
e19d3aee58 Removed old option 2011-08-24 18:48:54 +01:00
Hrvoje Jasak
89a4a7f0d7 Updates for Ubuntu 11.04 and Icc 12 2011-08-12 18:46:37 +01:00
Hrvoje Jasak
ab7d6dcf47 Changed comment - too long 2011-01-13 17:22:00 +00:00
Hrvoje Jasak
56663df4e6 Fixed merge problems: location of executables and libraries 2010-12-27 11:50:58 +00:00
Oliver Borm (boroli)
e5a96484f3 Merge branch 'master' into feature/overlapGgi 2010-12-02 18:19:40 +01:00
Sandeep Menon
1cce903338 Allow strict-aliasing and remove reinterpret_cast. Compliance for gcc-4.5.x 2010-12-01 20:01:52 -05:00
Hrvoje Jasak
190132af07 Cpp switch 2010-11-30 09:41:15 +00:00
Oliver Borm (boroli)
31a8b096f1 Initial patched files for debian package 2010-11-29 17:14:51 +01:00
Bernhard F.W. Gschaider
051cb20e5b Merge with master. Only conflicts in etc/bashrc. Resolved I hope
--HG--
branch : macMerge
2010-10-19 17:20:34 +02:00
Hrvoje Jasak
60a73feaec Added -P option. Martin Beaudoin 2010-10-18 22:57:41 +01:00