diff options
| -rw-r--r-- | sci-libs/openfoam-src/ChangeLog | 5 | ||||
| -rw-r--r-- | sci-libs/openfoam-src/Manifest | 8 | ||||
| -rw-r--r-- | sci-libs/openfoam-src/files/OpenFOAM-1.5-ggi.patch | 233 | ||||
| -rw-r--r-- | sci-libs/openfoam-src/openfoam-src-1.5_p20090311.ebuild (renamed from sci-libs/openfoam-src/openfoam-src-1.5_p20090204.ebuild) | 11 |
4 files changed, 252 insertions, 5 deletions
diff --git a/sci-libs/openfoam-src/ChangeLog b/sci-libs/openfoam-src/ChangeLog index 0da7bb84a..570a04d32 100644 --- a/sci-libs/openfoam-src/ChangeLog +++ b/sci-libs/openfoam-src/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 13 Mar 2009; Oliver Borm (boroli) <oli.borm@web.de> + -openfoam-src-1.5_p20090204.ebuild, +openfoam-src-1.5_p20090311.ebuild, + +files/OpenFOAM-1.5-ggi.patch: + Version bump + 13 Feb 2009; Oliver Borm (boroli) <oli.borm@web.de> -openfoam-src-1.4.1_p20080827.ebuild, -files/openfoam-src-compile-1.4.1_p20080827.patch: diff --git a/sci-libs/openfoam-src/Manifest b/sci-libs/openfoam-src/Manifest index c8087f433..a50f65ef0 100644 --- a/sci-libs/openfoam-src/Manifest +++ b/sci-libs/openfoam-src/Manifest @@ -1,6 +1,8 @@ AUX OpenFOAM-1.5-compile.patch 15006 RMD160 ba8423526b5244e3c30d9d38830a2fe79e3c2a1a SHA1 7d275039cea1fe8a3c28fafeda1fef3665360f83 SHA256 6cb940b6c559a846ec65184db8f7c7966d1bef105d5bdad6ca4afd3f1b4d5b89 +AUX OpenFOAM-1.5-ggi.patch 5907 RMD160 9a678e2fd7d36e862ffa1ed7e18aa4a073b77ea3 SHA1 2053a2e4e0c96500330b8ec233673391cb7487cf SHA256 e592d47ffee2fe9495378860932630936d5d838cf7290fb10d1e298986729b6c +DIST OpenFOAM-1.5-git-1.5_p20090311.patch 711366 RMD160 ac9f6710aa9c92473068c18cf97ca2b25dc904e8 SHA1 068ade9111558adf4b2330e6acb5aabfe55f58fe SHA256 393ad127f9bd2cf6eb8826d65e2528d83ad8b6cceeab3de5ed04fb01746e3201 +DIST OpenFOAM-1.5-svn.patch 4002548 RMD160 75b28c0c9c03b3e3886d0d90e8c631233d0734a2 SHA1 349e50a91095e0ff0e75b41f8eb8453623d5e4a8 SHA256 2a5872a4dbb8f58cb55b1ec64bcdc6f8e462ce2a541d21f1a8fc5faeb345d7d4 DIST OpenFOAM-1.5.General.tgz 117334661 RMD160 bccaa9f8f99d31aa6c791d40b30dd9ad4f534041 SHA1 3577f562dc1f54bb32e1e0ef43f979418212c2f7 SHA256 d4cba2d9475523a53cea80b8d39da70d12bfffb9f46e2d1442946ba4a23efd31 -DIST openfoam-src-1.5_p20090204.patch 1431520 RMD160 74c249208d4586553b5d1a02e657b3909a05afc0 SHA1 09c7662149752d7c7fe7ad1e3290140476c3fc80 SHA256 d60978d4e15a97be49ece13c612bb317edeef0934a0654b0f1d234c9e65a246b -EBUILD openfoam-src-1.5_p20090204.ebuild 921 RMD160 8d3f1cda625ad6c26fffd7e1eee27000c26efeb2 SHA1 ed737e72d34b918a057e0d973d908ed2e05a9675 SHA256 7cbe2b929d5c70757cdcedc4418fad1cfbb9cceb85beeab9b76a2a471327c6fc -MISC ChangeLog 2882 RMD160 8a7cb7d8f0e3f848080a6c6723bdbae6dbfe51ab SHA1 1a2d29fc7784363b5152762b3f2c85b53113173e SHA256 ae8ac4ee6ebda70c2dd3180f6be2a84148457c4dfee66c909b1b8b7579e41edc +EBUILD openfoam-src-1.5_p20090311.ebuild 1184 RMD160 558aff896ad889056a214222c1f43d65be86033a SHA1 77577c65fc913613b2730993c210ee22ce57f82d SHA256 03d609cae012557080a3d78817162e514a7b33179be75f7af5aa021a3868438f +MISC ChangeLog 3059 RMD160 d0af6211efbb55c25fb16a1d0b700a6656bb60be SHA1 87cbb1d1089f6efc7803f6862a5bc4ebe74fa7d7 SHA256 40ccc04243ac7de45492abdc73242f6223901a82d33d152c7ce6c34d91cbc0bc MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/sci-libs/openfoam-src/files/OpenFOAM-1.5-ggi.patch b/sci-libs/openfoam-src/files/OpenFOAM-1.5-ggi.patch new file mode 100644 index 000000000..155905018 --- /dev/null +++ b/sci-libs/openfoam-src/files/OpenFOAM-1.5-ggi.patch @@ -0,0 +1,233 @@ +--- OpenFOAM-1.5/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H 2009-03-12 16:57:20.000000000 +0100 ++++ OpenFOAM-1.5-dev/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H 2009-01-21 13:25:35.000000000 +0100 +@@ -54,9 +54,14 @@ + : + public polyPatch + { +- // Private data ++protected: ++ ++ // Protected data ++ ++ // Alowing derived classes to create their own transformation ++ // HJ, 24/Oct/2008 + +- //- offset (distance) vector from one side of the couple to the other ++ //- Offset (distance) vector from one side of the couple to the other + mutable vectorField separation_; + + //- Face transformation tensor +--- OpenFOAM-1.5/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H 2009-03-12 16:57:20.000000000 +0100 ++++ OpenFOAM-1.5-dev/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H 2009-01-21 13:25:37.000000000 +0100 +@@ -173,6 +173,11 @@ + mutable Field<PointType>* pointNormalsPtr_; + + ++ // Static Private Data ++ ++ static const bool nSquaredProjection_; ++ ++ + // Private Member Functions + + //- Calculate edges of the patch +@@ -412,6 +417,22 @@ + labelHashSet* setPtr = NULL + ) const; + ++ //- Write VTK patch, HJ, 14/Jan/2009 ++ static void writeVTK ++ ( ++ const fileName& name, ++ const FaceListType& faces, ++ const Field<PointType>& points ++ ); ++ ++ //- Write VTK patch normals, HJ, 14/Jan/2009 ++ static void writeVTKNormals ++ ( ++ const fileName& name, ++ const FaceListType& faces, ++ const Field<PointType>& points ++ ); ++ + + // Edit + +--- OpenFOAM-1.5/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchCheck.C 2009-03-12 16:57:20.000000000 +0100 ++++ OpenFOAM-1.5-dev/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchCheck.C 2009-01-21 13:25:37.000000000 +0100 +@@ -30,6 +30,7 @@ + #include "PrimitivePatch.H" + #include "Map.H" + #include "ListOps.H" ++#include "OFstream.H" + + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +@@ -331,6 +332,166 @@ + } + + ++template ++< ++ class Face, ++ template<class> class FaceList, ++ class PointField, ++ class PointType ++> ++void PrimitivePatch<Face, FaceList, PointField, PointType>::writeVTK ++( ++ const fileName& name, ++ const FaceListType& faces, ++ const Field<PointType>& points ++) ++{ ++ // Write patch and points into VTK ++ OFstream mps(name + ".vtk"); ++ ++ mps << "# vtk DataFile Version 2.0" << nl ++ << name << ".vtk" << nl ++ << "ASCII" << nl ++ << "DATASET POLYDATA" << nl ++ << "POINTS " << points.size() << " float" << nl; ++ ++ // Write points ++ List<float> mlpBuffer(3*points.size()); ++ ++ label counter = 0; ++ forAll (points, i) ++ { ++ mlpBuffer[counter++] = float(points[i].x()); ++ mlpBuffer[counter++] = float(points[i].y()); ++ mlpBuffer[counter++] = float(points[i].z()); ++ } ++ ++ forAll (mlpBuffer, i) ++ { ++ mps << mlpBuffer[i] << ' '; ++ ++ if (i > 0 && (i % 10) == 0) ++ { ++ mps << nl; ++ } ++ } ++ ++ // Write faces ++ label nFaceVerts = 0; ++ ++ forAll (faces, faceI) ++ { ++ nFaceVerts += faces[faceI].size() + 1; ++ } ++ labelList mlfBuffer(nFaceVerts); ++ ++ counter = 0; ++ forAll (faces, faceI) ++ { ++ const Face& f = faces[faceI]; ++ ++ mlfBuffer[counter++] = f.size(); ++ ++ forAll (f, fpI) ++ { ++ mlfBuffer[counter++] = f[fpI]; ++ } ++ } ++ mps << nl; ++ ++ mps << "POLYGONS " << faces.size() << ' ' << nFaceVerts << endl; ++ ++ forAll (mlfBuffer, i) ++ { ++ mps << mlfBuffer[i] << ' '; ++ ++ if (i > 0 && (i % 10) == 0) ++ { ++ mps << nl; ++ } ++ } ++ mps << nl; ++} ++ ++ ++template ++< ++ class Face, ++ template<class> class FaceList, ++ class PointField, ++ class PointType ++> ++void PrimitivePatch<Face, FaceList, PointField, PointType>::writeVTKNormals ++( ++ const fileName& name, ++ const FaceListType& faces, ++ const Field<PointType>& points ++) ++{ ++ // Write patch and points into VTK ++ OFstream mps(name + ".vtk"); ++ ++ mps << "# vtk DataFile Version 2.0" << nl ++ << name << ".vtk" << nl ++ << "ASCII" << nl ++ << "DATASET POLYDATA" << nl ++ << "POINTS " << faces.size() << " float" << nl; ++ ++ // Write points ++ List<float> mlPointBuffer(3*faces.size()); ++ ++ label counter = 0; ++ forAll (faces, i) ++ { ++ const vector c = faces[i].centre(points); ++ ++ mlPointBuffer[counter++] = float(c.x()); ++ mlPointBuffer[counter++] = float(c.y()); ++ mlPointBuffer[counter++] = float(c.z()); ++ } ++ ++ forAll (mlPointBuffer, i) ++ { ++ mps << mlPointBuffer[i] << ' '; ++ ++ if (i > 0 && (i % 10) == 0) ++ { ++ mps << nl; ++ } ++ } ++ mps << nl; ++ ++ // Write normals ++ mps << "POINT_DATA " << faces.size() << nl ++ << "FIELD attributes " << 1 << nl ++ << "normals" << " 3 " ++ << faces.size() << " float" << nl; ++ ++ List<float> mlNormalBuffer(3*faces.size()); ++ ++ counter = 0; ++ forAll (faces, i) ++ { ++ const vector n = faces[i].normal(points); ++ ++ mlNormalBuffer[counter++] = float(n.x()); ++ mlNormalBuffer[counter++] = float(n.y()); ++ mlNormalBuffer[counter++] = float(n.z()); ++ } ++ ++ forAll (mlNormalBuffer, i) ++ { ++ mps << mlNormalBuffer[i] << ' '; ++ ++ if (i > 0 && (i % 10) == 0) ++ { ++ mps << nl; ++ } ++ } ++ mps << nl; ++} ++ ++ + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + + } // End namespace Foam diff --git a/sci-libs/openfoam-src/openfoam-src-1.5_p20090204.ebuild b/sci-libs/openfoam-src/openfoam-src-1.5_p20090311.ebuild index 5840b38ce..becc6e603 100644 --- a/sci-libs/openfoam-src/openfoam-src-1.5_p20090204.ebuild +++ b/sci-libs/openfoam-src/openfoam-src-1.5_p20090311.ebuild @@ -13,7 +13,8 @@ MY_P="${MY_PN}-${MY_PV}" DESCRIPTION="OpenFOAM - sources" HOMEPAGE="http://www.opencfd.co.uk/openfoam/" SRC_URI="mirror://sourceforge/foam/${MY_P}.General.gtgz -> ${MY_P}.General.tgz - http://omploader.org/vMTdsOA/${P}.patch" + http://omploader.org/vMWRlMQ/${MY_P}-git-${PVR}.patch + http://omploader.org/vMWRlMA/${MY_P}-svn.patch" LICENSE="GPL-2" SLOT="1.5" @@ -28,9 +29,15 @@ INSDIR="/usr/$(get_libdir)/${MY_PN}/${MY_P}" src_prepare() { epatch "${FILESDIR}"/${MY_P}-compile.patch - epatch "${DISTDIR}"/${P}.patch + epatch "${DISTDIR}"/${MY_P}-svn.patch + epatch "${DISTDIR}"/${MY_PN}-git-${PVR}.patch + epatch "${FILESDIR}"/${MY_P}-ggi.patch } +src_compile() { + source ${INSDIR}/etc/bashrc + wcleanLnIncludeAll || die "could not clean lnInclude dirs" +} src_install() { insinto ${INSDIR}/src doins -r src/* |