sci-libs/openfoam-solvers: New patch sets

svn path=/sunrise/; revision=7018

4 files changed, 268 insertions, 2 deletions

diff --git a/sci-libs/openfoam-solvers/ChangeLog b/sci-libs/openfoam-solvers/ChangeLog
index 1ce687504..36ad0304d 100644
--- a/sci-libs/openfoam-solvers/ChangeLog
+++ b/sci-libs/openfoam-solvers/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  08 Sep 2008; Oliver Borm (boroli) <oli.borm@web.de>
+  -openfoam-solvers-1.5.ebuild, +openfoam-solvers-1.5_p20080905.ebuild,
+  +files/openfoam-solvers-1.5_p20080905.patch:
+  New patch sets
+
   31 Aug 2008; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   -openfoam-solvers-1.4.1_p20080328.ebuild,
   -files/openfoam-solvers-1.4.1_p20080328.patch,
diff --git a/sci-libs/openfoam-solvers/Manifest b/sci-libs/openfoam-solvers/Manifest
index 02ae6e1c9..ed9184c15 100644
--- a/sci-libs/openfoam-solvers/Manifest
+++ b/sci-libs/openfoam-solvers/Manifest
@@ -1,9 +1,10 @@
 AUX OpenFOAM-1.5-compile.patch 15006 RMD160 ba8423526b5244e3c30d9d38830a2fe79e3c2a1a SHA1 7d275039cea1fe8a3c28fafeda1fef3665360f83 SHA256 6cb940b6c559a846ec65184db8f7c7966d1bef105d5bdad6ca4afd3f1b4d5b89
 AUX openfoam-solvers-1.4.1_p20080827.patch 15090 RMD160 7d3f6b97e2f7ddb9d4a96d26894e3f3f0af75616 SHA1 50d45192e46c4cce6458091e0e1e715c32745001 SHA256 4555e1345df0e241b3536115118e4833fe0ae3bde0b7600446832725f43e3bdd
+AUX openfoam-solvers-1.5_p20080905.patch 9009 RMD160 5113997d5f0a9aad94bc66578b632c09e6d1ca31 SHA1 251eab17e96a0426e020d811a72d24c82f4df95d SHA256 18ea1f715e0dae1ed7baf9252d14d738b2a8c6bd0573d46ae849baa1f7075233
 AUX openfoam-solvers-compile-1.4.1_p20080827.patch 996 RMD160 0debfeb112bed547317d8d61a3fbdae1490050ba SHA1 87c9b4ace94e4eb7b0c16a39e041ec72fca7877e SHA256 1e6062ff63e4367067c229cc8348f5bbd5e6e96f2b9f109bbacb73f3f16310d5
 DIST OpenFOAM-1.4.1.General.gtgz 148526808 RMD160 e25d8bdfa63f15eeeb7b9f1cef09cc26fb7bef74 SHA1 56bbbf5b33c49d08cda35088a65b24d7dc59014f SHA256 c765b36639b42c737bc9ba1ac13c0f66efe20ee4a9f71a6ef987e86ebd50da28
 DIST OpenFOAM-1.5.General.gtgz 117334661 RMD160 bccaa9f8f99d31aa6c791d40b30dd9ad4f534041 SHA1 3577f562dc1f54bb32e1e0ef43f979418212c2f7 SHA256 d4cba2d9475523a53cea80b8d39da70d12bfffb9f46e2d1442946ba4a23efd31
 EBUILD openfoam-solvers-1.4.1_p20080827.ebuild 2624 RMD160 f61aec1dcf80aa4295ad894ede2af3ba1bab136c SHA1 6a7b3701e3d39744484afe69de684e7d9075ead7 SHA256 567fb499cd396e9058a56e60b5b0ab4a4f03c64bdd0fe3bd9c1de41b5ecddbd4
-EBUILD openfoam-solvers-1.5.ebuild 1820 RMD160 166913ae0572bfb57c327eff0d84f4be932cf658 SHA1 276ec3d920d1564cef01861daf86971cbbfda41f SHA256 f3f4506810142d9f7a7a59d8626ddcb11fd1a6e9f67a531a77033c1a5cb5dcf8
-MISC ChangeLog 2005 RMD160 fb2a65f9a00c742096514b3ec4907fc9c9a78f92 SHA1 1cfbed43a4b028adbf0aae564e65a677f1189eed SHA256 571b1eaff1c559d049ef709f0687ccea7b36f5ee58a50167a3ac8d0dd270df54
+EBUILD openfoam-solvers-1.5_p20080905.ebuild 1853 RMD160 e4db5f031efb3323b435de60c03a8f9c6d17c038 SHA1 9b3065cc7558170b6e6c97151262f4e45de3d40b SHA256 b940305f6f8577640e0c3184383e0889161ed0c4415d1f34190333d235a0a977
+MISC ChangeLog 2196 RMD160 3550c000389efb2a0116366089151f580c16c6a1 SHA1 fa429c02c1d89a013696506fe4a17f7cd8380d66 SHA256 2ae60cee9071fbaf72344da136ed45750029b18a13222392a957fe4859663757
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
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
new file mode 100644
index 000000000..b2dff8d80
--- /dev/null
+++ b/sci-libs/openfoam-solvers/files/openfoam-solvers-1.5_p20080905.patch
@@ -0,0 +1,259 @@
+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.ebuild b/sci-libs/openfoam-solvers/openfoam-solvers-1.5_p20080905.ebuild
index 0d44191c0..f32541c67 100644
--- a/sci-libs/openfoam-solvers/openfoam-solvers-1.5.ebuild
+++ b/sci-libs/openfoam-solvers/openfoam-solvers-1.5_p20080905.ebuild
@@ -35,6 +35,7 @@ src_unpack() {
 
 	cd "${S}"
 	epatch "${FILESDIR}"/${MY_P}-compile.patch
+	epatch "${FILESDIR}"/${P}.patch
 }
 
 src_compile() {