From 2a541caa5aa40173a7659230190471b4ec7b51b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kan=20Nilsson?= Date: Tue, 13 Aug 2013 15:27:36 +0200 Subject: [PATCH 1/4] Not allowed to reach mgnet for ParMGridGen-1.0, perhaps temporarily --- ThirdParty/AllMake.stage3 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ThirdParty/AllMake.stage3 b/ThirdParty/AllMake.stage3 index d1884e354..f6ec51bd2 100755 --- a/ThirdParty/AllMake.stage3 +++ b/ThirdParty/AllMake.stage3 @@ -68,7 +68,8 @@ fi # ParMGridGen if [ -z "$PARMGRIDGEN_SYSTEM" ] then - ( rpm_make -p ParMGridGen-1.0 -s ParMGridGen-1.0.spec -u http://www.mgnet.org/mgnet/Codes/parmgridgen/ParMGridGen-1.0.tar.gz ) + #( rpm_make -p ParMGridGen-1.0 -s ParMGridGen-1.0.spec -u http://www.mgnet.org/mgnet/Codes/parmgridgen/ParMGridGen-1.0.tar.gz ) + ( rpm_make -p ParMGridGen-1.0 -s ParMGridGen-1.0.spec -u ftp://ftp.proxad.net/.mirrors1/ftp.freebsd.org/ports/distfiles/ParMGridGen-1.0.tar.gz ) else echo "Using system installed ParMGridGen" echo "" From 666d57bebb48576fb60bb07defb85232e37fe5e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kan=20Nilsson?= Date: Wed, 14 Aug 2013 09:01:53 +0200 Subject: [PATCH 2/4] Moved compilation of multiSolver since it needs lfiniteVolume.so --- src/Allwmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Allwmake b/src/Allwmake index e2e483751..0e45bc0d0 100755 --- a/src/Allwmake +++ b/src/Allwmake @@ -22,8 +22,6 @@ Pstream/Allwmake wmake libo OSspecific/$WM_OSTYPE wmake libso OpenFOAM -wmake libso multiSolver - # Decomposition methods needed by meshTools decompositionMethods/AllwmakeLnInclude decompositionMethods/Allwmake @@ -41,6 +39,8 @@ wmake libso finiteArea wmake libso lduSolvers wmake libso VectorN +wmake libso multiSolver + (cd tetDecompositionFiniteElement ; ./Allwmake) # Make dynamicMesh tools From 55857bf6ab1deedb18d42e776fb941c3a991af59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kan=20Nilsson?= Date: Wed, 14 Aug 2013 09:15:44 +0200 Subject: [PATCH 3/4] Removed first compilation of solidBodyMotion, since it will produce an error, and since it is compiled later anyway --- src/dynamicMesh/meshMotion/Allwmake | 1 - 1 file changed, 1 deletion(-) diff --git a/src/dynamicMesh/meshMotion/Allwmake b/src/dynamicMesh/meshMotion/Allwmake index 2c32daba6..e1f9d0c52 100755 --- a/src/dynamicMesh/meshMotion/Allwmake +++ b/src/dynamicMesh/meshMotion/Allwmake @@ -3,7 +3,6 @@ cd ${0%/*} || exit 1 # run from this directory set -x # Make meshMotion solvers -wmake libso solidBodyMotion wmake libso fvMotionSolver wmake libso RBFMotionSolver wmake libso mesquiteMotionSolver From 5da1f509bc2027deac42c5ec3feaa26dff1e1ddc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kan=20Nilsson?= Date: Wed, 14 Aug 2013 09:23:07 +0200 Subject: [PATCH 4/4] Added semicolon at end of line --- .../dynamicTopoFvMesh/eMesh/eMeshDemandDrivenData.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/eMesh/eMeshDemandDrivenData.C b/src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/eMesh/eMeshDemandDrivenData.C index 939239b4e..7341cf9da 100644 --- a/src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/eMesh/eMeshDemandDrivenData.C +++ b/src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/eMesh/eMeshDemandDrivenData.C @@ -180,7 +180,7 @@ void eMesh::calcEdgePoints() const // NOTE: Will work only on tetrahedral meshes! bool found; - label faceIndex = -1 + label faceIndex = -1; label cellIndex = -1; const labelList& owner = mesh_.faceOwner(); const labelList& neighbour = mesh_.faceNeighbour();