Commit graph

1578 commits

Author SHA1 Message Date
Henrik Rusche
09fbf2ef28 Fixes to previous merge commits 2013-07-03 19:43:31 +02:00
Henrik Rusche
031d180f63 Merge branch 'hotfix/gcc47_HR' into nextRelease
Conflicts:
	src/OpenFOAM/fields/PointPatchFields/constraint/processor/ProcessorPointPatchField.C
	src/OpenFOAM/fields/PointPatchFields/derived/global/GlobalPointPatchField.C
2013-07-03 17:19:52 +02:00
Henrik Rusche
3a90759972 Merge branch 'HJ/parallelTopoEngine' into nextRelease
Conflicts:
	applications/utilities/mesh/manipulation/moveDyMEngineMesh/Make/options
	applications/utilities/mesh/manipulation/moveDyMEngineMesh/moveDyMEngineMesh.C
2013-07-03 16:45:44 +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
ec811c3586 Mixing plane update, intermediate 2013-07-02 14:17:12 +01:00
Hrvoje Jasak
12d4084b24 Separation offset bug fix 2013-06-30 18:37:14 +01:00
Hrvoje Jasak
e42b41bea9 Comments 2013-06-30 18:36:45 +01:00
Martin Beaudoin
bd38c3b482 ThirdParty packages: changing download URL for qt-everywhere-opensource-src-4.7.4. Bug fix from Daniel Combest 2013-06-29 21:57:05 -04:00
Hrvoje Jasak
f6b896db76 Cut-off top-level solution if the number of equations is small 2013-06-28 17:11:41 +01:00
Hrvoje Jasak
75be6fb23e AMG solver robustness improvements 2013-06-27 17:50:02 +01:00
Hrvoje Jasak
aef17bc3d0 Reset U option 2013-06-27 13:05:12 +01:00
Hrvoje Jasak
d2c7a11028 Compiler warning: direction 2013-06-27 13:05:03 +01:00
Hrvoje Jasak
52c914b353 Access to dictionaries 2013-06-27 13:03:07 +01:00
Hrvoje Jasak
f6487618db Clean-up 2013-06-27 13:02:42 +01:00
Hrvoje Jasak
6736d30bd7 Initialisation of uninitialised variable: compiler warning 2013-06-27 13:02:17 +01:00
Hrvoje Jasak
82491a5f79 Non-const access to controls 2013-06-26 13:57:32 +01:00
Hrvoje Jasak
fa313560d0 Moved correct patch grads into base class 2013-06-14 22:37:11 +01:00
Hrvoje Jasak
002040be85 Mixing plane update 2013-06-13 16:50:19 +01:00
Hrvoje Jasak
75ff3d51f3 Update of flux bc 2013-06-13 09:59:59 +01:00
Hrvoje Jasak
4fa88b1419 Compiler requires cast 2013-06-13 09:59:32 +01:00
Hrvoje Jasak
7e1989f184 Non-const access to fv controls 2013-06-13 09:59:04 +01:00
Martin Beaudoin
1fac933c61 ThirdParty: fix compilation of libccmio-2.6.1 on Mac OS X 2013-06-05 09:41:46 -04:00
Martin Beaudoin
da272842e4 AllMake.stage3: new URL for libccmio-2.6.1. Bug fix from Hakan Nilsson and Niels Jacobsen 2013-06-05 09:40:33 -04:00
Martin Beaudoin
3d957c67ab Fixing compilation of lduSolvers following removal of files 2013-06-02 09:41:46 -04:00
Martin Beaudoin
7a8b5100f0 Fixing compilation of lduSolvers following removal of files 2013-06-02 09:41:37 -04:00
Martin Beaudoin
b7dc01d10f Fixing compilation of lduSolvers following removal of files 2013-06-02 09:41:36 -04:00
Martin Beaudoin
a70a1e3b39 Fixing compilation of lduSolvers following removal of files 2013-06-02 09:41:36 -04:00
Martin Beaudoin
3d4501e538 Fixing compilation of lduSolvers following removal of files 2013-06-02 09:41:34 -04:00
Martin Beaudoin
72908cb3d3 Fixing compilation of lduSolvers following removal of files 2013-06-02 09:41:33 -04:00
Martin Beaudoin
829072b14e Fixing compilation of lduSolvers following removal of files 2013-06-02 09:41:31 -04:00
Martin Beaudoin
4e42aa7689 Fixing compilation of lduSolvers following removal of files 2013-06-02 09:41:29 -04:00
Martin Beaudoin
3f80186a4a Fixing compilation of lduSolvers following removal of files 2013-06-02 09:41:25 -04:00
Martin Beaudoin
890e77eb2e Fixing compilation of lduSolvers following removal of files 2013-06-02 09:41:23 -04:00
Martin Beaudoin
0f76aaed76 Fixing compilation of lduSolvers following removal of files 2013-06-02 09:41:22 -04:00
Martin Beaudoin
80d1a8392b Fixing compilation of lduSolvers following removal of files 2013-06-02 09:41:12 -04:00
Martin Beaudoin
21a1003e80 Fixing compilation of lduSolvers following removal of files 2013-06-02 09:41:10 -04:00
Martin Beaudoin
ebd4ccb989 Fixing compilation of lduSolvers following removal of files 2013-06-02 09:41:08 -04:00
Martin Beaudoin
d7bdb0d7b0 Fixing compilation of lduSolvers following removal of files 2013-06-02 09:41:04 -04:00
Martin Beaudoin
812374774a Fixing compilation of lduSolvers following removal of files 2013-06-02 09:40:53 -04:00
Martin Beaudoin
f42972b7ee Fixing compilation of lduSolvers following removal of files 2013-06-02 09:40:50 -04:00
Martin Beaudoin
3a7b0de428 Fixing compilation of lduSolvers following removal of files 2013-06-02 09:11:26 -04:00
Hrvoje Jasak
afdf469c1d Changed handling of non-parallel cyclic implicit interfaces 2013-05-31 13:39:44 +01:00
Hrvoje Jasak
ce26313610 Removed unnecessary header 2013-05-31 11:13:00 +01:00
Hrvoje Jasak
ba3d1e6dd1 Added handling for solo cells 2013-05-31 11:12:48 +01:00
Hrvoje Jasak
f4b8e41a89 Changed handling of coupled interfaces for ldu 2013-05-31 11:12:37 +01:00
Hrvoje Jasak
1777433765 Changed handling of coupled interfaces for ldu - compilation update 2013-05-31 11:11:55 +01:00
Hrvoje Jasak
b23535ae7a Changed handling of coupled interfaces for ldu - compilation update 2013-05-31 11:11:14 +01:00
Hrvoje Jasak
542c19da79 Changed handling of coupled interfaces for ldu 2013-05-31 11:10:15 +01:00
Hrvoje Jasak
c6a7e7b70b Fixed error in return type 2013-05-31 11:06:23 +01:00