sci-libs/openfoam-solvers: Fixed typos

svn path=/sunrise/; revision=8084

5 files changed, 10 insertions, 304 deletions

diff --git a/sci-libs/openfoam-solvers/ChangeLog b/sci-libs/openfoam-solvers/ChangeLog
index 5abd5dddc..8fa50183c 100644
--- a/sci-libs/openfoam-solvers/ChangeLog
+++ b/sci-libs/openfoam-solvers/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Mar 2009; Oliver Borm (boroli) <oli.borm@web.de>
+  openfoam-solvers-1.5_p20090311.ebuild, files/OpenFOAM-1.5-compile.patch,
+  -files/openfoam-solvers-1.5_p20080905.patch:
+  Fixed typos
+
   13 Mar 2009; Oliver Borm (boroli) <oli.borm@web.de>
   -openfoam-solvers-1.5_p20080905.ebuild,
   +openfoam-solvers-1.5_p20090311.ebuild, +files/OpenFOAM-1.5-ggi.patch:
diff --git a/sci-libs/openfoam-solvers/Manifest b/sci-libs/openfoam-solvers/Manifest
index 5a58722e0..317bbc1b3 100644
--- a/sci-libs/openfoam-solvers/Manifest
+++ b/sci-libs/openfoam-solvers/Manifest
@@ -1,9 +1,8 @@
-AUX OpenFOAM-1.5-compile.patch 15006 RMD160 ba8423526b5244e3c30d9d38830a2fe79e3c2a1a SHA1 7d275039cea1fe8a3c28fafeda1fef3665360f83 SHA256 6cb940b6c559a846ec65184db8f7c7966d1bef105d5bdad6ca4afd3f1b4d5b89
+AUX OpenFOAM-1.5-compile.patch 13417 RMD160 1c074f559011c5135ab8069f0ebc9325d9094fba SHA1 bbeb3d53f75eb7dfee475766a78c509b6a7c4a1c SHA256 8dd34d4690f694f22d33b9ba4fb5391eeadad5104676b63de7fe5ccf72e0ff6a
 AUX OpenFOAM-1.5-ggi.patch 5907 RMD160 9a678e2fd7d36e862ffa1ed7e18aa4a073b77ea3 SHA1 2053a2e4e0c96500330b8ec233673391cb7487cf SHA256 e592d47ffee2fe9495378860932630936d5d838cf7290fb10d1e298986729b6c
-AUX openfoam-solvers-1.5_p20080905.patch 9009 RMD160 5113997d5f0a9aad94bc66578b632c09e6d1ca31 SHA1 251eab17e96a0426e020d811a72d24c82f4df95d SHA256 18ea1f715e0dae1ed7baf9252d14d738b2a8c6bd0573d46ae849baa1f7075233
-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
-EBUILD openfoam-solvers-1.5_p20090311.ebuild 2041 RMD160 7a98388748ca5f30190be81d5674a42fdc2d3bbc SHA1 7f020c9916ad14e3e0b0f103fc76cd7f11db89c4 SHA256 90920ef67492e33dd9ba4b2a6f6da9f271202af142c5927d8ba1b5a1c257d393
-MISC ChangeLog 2820 RMD160 161a8983d2bfc993002de264d6a1c05b54b7cc70 SHA1 51609fd7073dd713c493511896cfb4474733de59 SHA256 aeac179ab3b8f825040401f43a9b2b905575917ab8361cd2d72091cdc011fecc
+DIST OpenFOAM-git-1.5_p20090311.patch 711366 RMD160 ac9f6710aa9c92473068c18cf97ca2b25dc904e8 SHA1 068ade9111558adf4b2330e6acb5aabfe55f58fe SHA256 393ad127f9bd2cf6eb8826d65e2528d83ad8b6cceeab3de5ed04fb01746e3201
+EBUILD openfoam-solvers-1.5_p20090311.ebuild 2042 RMD160 f6fbc99d74dd8ec0a150be466a6c4d2b9c46b5c7 SHA1 fbd7c492f71b2c3fdd72fb06bb85c3dcaef0ba6e SHA256 d3b32245331707f9a714a08755a70ebdf0a78e2235cf1723800f2550fa4a357e
+MISC ChangeLog 3011 RMD160 01faac14656e88aaae7873dde3ece90c579573ac SHA1 a6ad51a8fd3242df47f808b51acd296ec89552b2 SHA256 e95e93fd6e39b2c85ef0e7e94f8a40ecf09e8f4f01d88eaf08a1c469decdc05c
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/sci-libs/openfoam-solvers/files/OpenFOAM-1.5-compile.patch b/sci-libs/openfoam-solvers/files/OpenFOAM-1.5-compile.patch
index 4479cb384..f95bf462f 100644
--- a/sci-libs/openfoam-solvers/files/OpenFOAM-1.5-compile.patch
+++ b/sci-libs/openfoam-solvers/files/OpenFOAM-1.5-compile.patch
@@ -395,42 +395,3 @@
  LIB_LIBS = \
 +    -lIMlib \
      -lMGridGen
---- OpenFOAM-1.5-src/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C	2008-07-09 10:43:41.000000000 +0200
-+++ OpenFOAM-1.5/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C	2008-07-21 22:02:55.000000000 +0200
-@@ -240,6 +240,7 @@
-         // ~~~~~~~~~~~~~~~~~~~~~~~~~
-         // Only look at surface intersections (minLevel and surface curvature),
-         // do not do internal refinement (refinementShells)
-+PtrList<featureEdgeMesh> dummy(0);
- 
-         labelList candidateCells
-         (
-@@ -248,7 +249,8 @@
-                 refineParams.keepPoints()[0],
-                 refineParams.curvature(),
- 
--                PtrList<featureEdgeMesh>(0),    // dummy featureMeshes;
-+//                PtrList<featureEdgeMesh>(0),    // dummy featureMeshes;
-+dummy, //dummy featureMeshes;
-                 labelList(0),                   // dummy featureLevels;
- 
-                 false,              // featureRefinement
-@@ -382,6 +384,8 @@
-             << "----------------------------" << nl
-             << endl;
- 
-+PtrList<featureEdgeMesh> dummy(0);
-+
-         labelList candidateCells
-         (
-             meshRefiner_.refineCandidates
-@@ -389,7 +393,8 @@
-                 refineParams.keepPoints()[0],
-                 refineParams.curvature(),
- 
--                PtrList<featureEdgeMesh>(0),    // dummy featureMeshes;
-+//                PtrList<featureEdgeMesh>(0),    // dummy featureMeshes;
-+dummy, // dummy featureMeshes;
-                 labelList(0),                   // dummy featureLevels;
- 
-                 false,              // featureRefinement
diff --git a/sci-libs/openfoam-solvers/files/openfoam-solvers-1.5_p20080905.patch b/sci-libs/openfoam-solvers/files/openfoam-solvers-1.5_p20080905.patch
deleted file mode 100644
index b2dff8d80..000000000
--- a/sci-libs/openfoam-solvers/files/openfoam-solvers-1.5_p20080905.patch
+++ /dev/null
@@ -1,259 +0,0 @@
-Index: heatTransfer/chtMultiRegionFoam/fluid/pEqn.H
-===================================================================
---- applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H	(Revision 723)
-+++ applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H	(Revision 801)
-@@ -47,14 +47,14 @@
-                 (
-                     "massIni",
-                     dimMass,
-                     initialMassf[i]
-                 )
-               - fvc::domainIntegrate(thermof[i].psi()*thermof[i].p())
-             )/fvc::domainIntegrate(thermof[i].psi());
--
-+        pdf[i] == thermof[i].p() - (rhof[i]*ghf[i] + pRef);
-         rhof[i] = thermof[i].rho();
-     }
- 
-     // Update thermal conductivity
-     Kf[i] = rhof[i]*thermof[i].Cp()*turb[i].alphaEff();
- }
-Index: heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
-===================================================================
---- applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H	(Revision 723)
-+++ applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H	(Revision 801)
-@@ -43,18 +43,15 @@
-         );
- 
-         Info<< "    Adding to thermof\n" << endl;
- 
-         thermof.set
-         (
-             i,
--            autoPtr<basicThermo>
--            (
--                basicThermo::New(fluidRegions[i])
--            ).ptr()
-+            basicThermo::New(fluidRegions[i]).ptr()
-         );
- 
-         Info<< "    Adding to rhof\n" << endl;
-         rhof.set
-         (
-             i,
-             new volScalarField
-Index: heatTransfer/buoyantFoam/pEqn.H
-===================================================================
---- applications/solvers/heatTransfer/buoyantFoam/pEqn.H	(Revision 723)
-+++ applications/solvers/heatTransfer/buoyantFoam/pEqn.H	(Revision 801)
-@@ -51,9 +51,10 @@
- 
- // For closed-volume cases adjust the pressure and density levels
- // to obey overall mass continuity
- if (closedVolume)
- {
-     p += (initialMass - fvc::domainIntegrate(thermo->psi()*p))
-         /fvc::domainIntegrate(thermo->psi());
-+    pd == p - (rho*gh + pRef);
-     rho = thermo->rho();
- }
-Index: heatTransfer/buoyantSimpleRadiationFoam/pEqn.H
-===================================================================
---- applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/pEqn.H	(Revision 723)
-+++ applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/pEqn.H	(Revision 801)
-@@ -42,12 +42,13 @@
- 
- // For closed-volume cases adjust the pressure and density levels
- // to obey overall mass continuity
- if (closedVolume)
- {
-     p += (initialMass - fvc::domainIntegrate(thermo->psi()*p))
-         /fvc::domainIntegrate(thermo->psi());
-+    pd == p - (rho*gh + pRef);
- }
- 
- rho = thermo->rho();
- rho.relax();
- Info<< "rho max/min : " << max(rho).value() << " " << min(rho).value() << endl;
-Index: heatTransfer/buoyantSimpleFoam/pEqn.H
-===================================================================
---- applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H	(Revision 723)
-+++ applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H	(Revision 801)
-@@ -1,10 +1,11 @@
- volScalarField rUA = 1.0/UEqn().A();
- U = rUA*UEqn().H();
- UEqn.clear();
-+
- phi = fvc::interpolate(rho)*(fvc::interpolate(U) & mesh.Sf());
- bool closedVolume = adjustPhi(phi, U, p);
- phi -= fvc::interpolate(rho*gh*rUA)*fvc::snGrad(rho)*mesh.magSf();
- 
- for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
- {
-     fvScalarMatrix pdEqn
-@@ -42,12 +43,13 @@
- 
- // For closed-volume cases adjust the pressure and density levels
- // to obey overall mass continuity
- if (closedVolume)
- {
-     p += (initialMass - fvc::domainIntegrate(thermo->psi()*p))
-         /fvc::domainIntegrate(thermo->psi());
-+    pd == p - (rho*gh + pRef);
- }
- 
- rho = thermo->rho();
- rho.relax();
- Info<< "rho max/min : " << max(rho).value() << " " << min(rho).value() << endl;
-Index: multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
-===================================================================
---- applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C	(Revision 723)
-+++ applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C	(Revision 801)
-@@ -234,16 +234,15 @@
-         1.0e-6
-     );
- 
-     dimensionedScalar TsmallSqrt = sqrt(Tsmall);
-     volScalarField ThetaSqrt = sqrt(Theta_);
- 
-     // 'thermal' conductivity (Table 3.3, p. 49)
--    volScalarField kappa_ =
--        conductivityModel_->kappa(alpha, Theta_, gs0_, rhoa_, da_, e_);
-+    kappa_ = conductivityModel_->kappa(alpha, Theta_, gs0_, rhoa_, da_, e_);
- 
-     // particle viscosity (Table 3.2, p.47)
-     mua_ = viscosityModel_->mua(alpha, Theta_, gs0_, rhoa_, da_, e_);
- 
-     // dissipation (Eq. 3.24, p.50)
-     volScalarField gammaCoeff =
-         12.0*(1.0 - e_*e_)*sqr(alpha)*rhoa_*gs0_*(1.0/da_)
-@@ -252,16 +251,15 @@
-     // Eq. 3.25, p. 50 Js = J1 - J2
-     volScalarField J1 = 3.0*betaPrim;
-     volScalarField J2 =
-         0.25*sqr(betaPrim)*da_*sqr(Ur)
-        /(alpha*rhoa_*sqrtPi*(ThetaSqrt + TsmallSqrt));
- 
-     // bulk viscosity  p. 45 (Lun et al. 1984).
--    volScalarField lambda_ =
--        (4.0/3.0)*sqr(alpha_)*rhoa_*da_*gs0_*(1.0+e_)*ThetaSqrt/sqrtPi;
-+    lambda_ = (4.0/3.0)*sqr(alpha_)*rhoa_*da_*gs0_*(1.0+e_)*ThetaSqrt/sqrtPi;
- 
- 
-     // stress tensor, Definitions, Table 3.1, p. 43
-     volTensorField tau = 2.0*mua_*D + (lambda_ - (2.0/3.0)*mua_)*tr(D)*I;
- 
-     if (!equilibrium_)
-     {
-@@ -348,16 +346,15 @@
-     );
- 
-     // add frictional stress for alpha > alphaMinFriction
-     mua_ = viscosityModel_->mua(alpha, Theta_, gs0_, rhoa_, da_, e_) + muf;
-     mua_.min(1.0e+2);
-     mua_.max(0.0);
- 
--    lambda_ = (4.0/3.0)*sqr(alpha_)*rhoa_*da_*gs0_*(1.0 + e_)
--        *ThetaSqrt/sqrtPi;
-+    lambda_ = (4.0/3.0)*sqr(alpha_)*rhoa_*da_*gs0_*(1.0 + e_)*ThetaSqrt/sqrtPi;
- 
-     Info<< "kinTheory: max(Theta) = " << max(Theta_).value() << endl;
- 
-     volScalarField ktn = mua_/rhoa_;
- 
-     Info<< "kinTheory: min(nua) = " << min(ktn).value()
-         << ", max(nua) = " << max(ktn).value() << endl;
-Index: multiphase/interDyMFoam/UEqn.H
-===================================================================
---- applications/solvers/multiphase/interDyMFoam/UEqn.H	(Revision 723)
-+++ applications/solvers/multiphase/interDyMFoam/UEqn.H	(Revision 801)
-@@ -1,29 +1,34 @@
--    surfaceScalarField muf = twoPhaseProperties.muf();
-+surfaceScalarField muEff
-+(
-+    "muEff",
-+    twoPhaseProperties.muf()
-+  + fvc::interpolate(rho*turbulence->nut())
-+);
- 
--    fvVectorMatrix UEqn
--    (
--        fvm::ddt(rho, U)
--      + fvm::div(rhoPhi, U)
--      - fvm::laplacian(muf, U)
--      - (fvc::grad(U) & fvc::grad(muf))
--    //- fvc::div(muf*(fvc::interpolate(dev(fvc::grad(U))) & mesh.Sf()))
--    );
-+fvVectorMatrix UEqn
-+(
-+    fvm::ddt(rho, U)
-+  + fvm::div(rhoPhi, U)
-+  - fvm::laplacian(muEff, U)
-+  - (fvc::grad(U) & fvc::grad(muEff))
-+//- fvc::div(muEff*(fvc::interpolate(dev(fvc::grad(U))) & mesh.Sf()))
-+);
- 
--    UEqn.relax();
-+UEqn.relax();
- 
--    if (momentumPredictor)
--    {
--        solve
-+if (momentumPredictor)
-+{
-+    solve
-+    (
-+        UEqn
-+      ==
-+        fvc::reconstruct
-         (
--            UEqn
--         ==
--            fvc::reconstruct
-             (
--                (
--                    fvc::interpolate(interface.sigmaK())*fvc::snGrad(gamma)
--                  - ghf*fvc::snGrad(rho)
--                  - fvc::snGrad(pd)
--                ) * mesh.magSf()
--            )
--        );
--    }
-+                fvc::interpolate(interface.sigmaK())*fvc::snGrad(gamma)
-+              - ghf*fvc::snGrad(rho)
-+              - fvc::snGrad(pd)
-+            )*mesh.magSf()
-+        )
-+    );
-+}
-Index: incompressible/icoFoam/icoFoam.C
-===================================================================
---- applications/solvers/incompressible/icoFoam/icoFoam.C	(Revision 723)
-+++ applications/solvers/incompressible/icoFoam/icoFoam.C	(Revision 801)
-@@ -1,8 +1,8 @@
--/*---------------------------------------------------------------------------* \
-+/*---------------------------------------------------------------------------*\
-   =========                 |
-   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-    \\    /   O peration     |
-     \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
-      \\/     M anipulation  |
- -------------------------------------------------------------------------------
- License
-@@ -67,15 +67,15 @@
-         // --- PISO loop
- 
-         for (int corr=0; corr<nCorr; corr++)
-         {
-             volScalarField rUA = 1.0/UEqn.A();
- 
-             U = rUA*UEqn.H();
--            phi = (fvc::interpolate(U) & mesh.Sf()) 
-+            phi = (fvc::interpolate(U) & mesh.Sf())
-                 + fvc::ddtPhiCorr(rUA, U, phi);
- 
-             adjustPhi(phi, U, p);
- 
-             for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
-             {
-                 fvScalarMatrix pEqn
diff --git a/sci-libs/openfoam-solvers/openfoam-solvers-1.5_p20090311.ebuild b/sci-libs/openfoam-solvers/openfoam-solvers-1.5_p20090311.ebuild
index 6487d49aa..5bf6dfbde 100644
--- a/sci-libs/openfoam-solvers/openfoam-solvers-1.5_p20090311.ebuild
+++ b/sci-libs/openfoam-solvers/openfoam-solvers-1.5_p20090311.ebuild
@@ -13,7 +13,7 @@ MY_P="${MY_PN}-${MY_PV}"
 DESCRIPTION="OpenFOAM - solvers"
 HOMEPAGE="http://www.opencfd.co.uk/openfoam/"
 SRC_URI="mirror://sourceforge/foam/${MY_P}.General.gtgz -> ${MY_P}.General.tgz
-	http://omploader.org/vMWRlMQ/${MY_P}-git-${PVR}.patch
+	http://omploader.org/vMWRlMQ/${MY_PN}-git-${PVR}.patch
 	http://omploader.org/vMWRlMA/${MY_P}-svn.patch"
 
 LICENSE="GPL-2"