Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev

src/finiteVolume/cfdTools/general/bound/bound.C

@@ -30,7 +30,8 @@ License
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
-void Foam::bound(volScalarField& vsf, const dimensionedScalar& lowerBound)
+Foam::volScalarField&
+Foam::bound(volScalarField& vsf, const dimensionedScalar& lowerBound)
 {
     const scalar minVsf = min(vsf).value();
 
@@ -55,6 +56,8 @@ void Foam::bound(volScalarField& vsf, const dimensionedScalar& lowerBound)
 
         vsf.boundaryField() = max(vsf.boundaryField(), lowerBound.value());
     }
+
+    return vsf;
 }
 
 

src/finiteVolume/cfdTools/general/bound/bound.H

@@ -50,8 +50,9 @@ namespace Foam
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
 //- Bound the given scalar field if it has gone unbounded.
+//  Return the bounded field.
 //  Used extensively in RAS and LES turbulence models.
-void bound(volScalarField&, const dimensionedScalar& lowerBound);
+volScalarField& bound(volScalarField&, const dimensionedScalar& lowerBound);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/turbulenceModels/compressible/LES/LESModel/LESModel.C

@@ -83,7 +83,7 @@ LESModel::LESModel
 
     delta_(LESdelta::New("delta", U.mesh(), *this))
 {
-    readIfPresent("kMin", kMin_);
+    kMin_.readIfPresent(*this);
 
     // Force the construction of the mesh deltaCoeffs which may be needed
     // for the construction of the derived models and BCs

src/turbulenceModels/compressible/RAS/RASModel/RASModel.C

@@ -87,6 +87,10 @@ RASModel::RASModel
 
     y_(mesh_)
 {
+    kMin_.readIfPresent(*this);
+    epsilonMin_.readIfPresent(*this);
+    omegaMin_.readIfPresent(*this);
+
     // Force the construction of the mesh deltaCoeffs which may be needed
     // for the construction of the derived models and BCs
     mesh_.deltaCoeffs();

src/turbulenceModels/incompressible/LES/LESModel/LESModel.C

@@ -81,7 +81,7 @@ LESModel::LESModel
     kMin_("kMin", sqr(dimVelocity), SMALL),
     delta_(LESdelta::New("delta", U.mesh(), *this))
 {
-    readIfPresent("kMin", kMin_);
+    kMin_.readIfPresent(*this);
 
     // Force the construction of the mesh deltaCoeffs which may be needed
     // for the construction of the derived models and BCs

src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C

@@ -323,6 +323,8 @@ kOmegaSSTSAS::kOmegaSSTSAS
         mesh_
     )
 {
+    omegaMin_.readIfPresent(*this);
+
     bound(k_, kMin_);
     bound(omega_, omegaMin_);
 
@@ -458,6 +460,8 @@ bool kOmegaSSTSAS::read()
         zetaTilda2_.readIfPresent(coeffDict());
         FSAS_.readIfPresent(coeffDict());
 
+        omegaMin_.readIfPresent(*this);
+
         return true;
     }
     else

src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C

@@ -119,7 +119,7 @@ LamBremhorstKE::LamBremhorstKE
 
     y_(mesh_),
 
-    Rt_(sqr(k_)/(nu()*epsilon_)),
+    Rt_(sqr(k_)/(nu()*bound(epsilon_, epsilonMin_))),
 
     fMu_
     (
@@ -141,7 +141,7 @@ LamBremhorstKE::LamBremhorstKE
     )
 {
     bound(k_, kMin_);
-    bound(epsilon_, epsilonMin_);
+    // already bounded: bound(epsilon_, epsilonMin_);
 
     nut_ = Cmu_*fMu_*sqr(k_)/epsilon_;
     nut_.correctBoundaryConditions();

src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C

@@ -173,12 +173,12 @@ LienCubicKE::LienCubicKE
     gradU_(fvc::grad(U)),
     eta_
     (
-        k_/(epsilon_ + epsilonMin_)
+        k_/bound(epsilon_, epsilonMin_)
        *sqrt(2.0*magSqr(0.5*(gradU_ + gradU_.T())))
     ),
     ksi_
     (
-        k_/(epsilon_ + epsilonMin_)
+        k_/epsilon_
        *sqrt(2.0*magSqr(0.5*(gradU_ - gradU_.T())))
     ),
     Cmu_(2.0/(3.0*(A1_ + eta_ + alphaKsi_*ksi_))),
@@ -235,7 +235,7 @@ LienCubicKE::LienCubicKE
     )
 {
     bound(k_, kMin_);
-    bound(epsilon_, epsilonMin_);
+    // already bounded: bound(epsilon_, epsilonMin_);
 
     nut_ = Cmu_*sqr(k_)/epsilon_ + C5viscosity_;
     nut_.correctBoundaryConditions();

src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C

@@ -222,12 +222,12 @@ LienCubicKELowRe::LienCubicKELowRe
     gradU_(fvc::grad(U)),
     eta_
     (
-        k_/(epsilon_ + epsilonMin_)
+        k_/bound(epsilon_, epsilonMin_)
        *sqrt(2.0*magSqr(0.5*(gradU_ + gradU_.T())))
     ),
     ksi_
     (
-        k_/(epsilon_ + epsilonMin_)
+        k_/epsilon_
        *sqrt(2.0*magSqr(0.5*(gradU_ - gradU_.T())))
     ),
     Cmu_(2.0/(3.0*(A1_ + eta_ + alphaKsi_*ksi_))),
@@ -235,7 +235,7 @@ LienCubicKELowRe::LienCubicKELowRe
 
     C5viscosity_
     (
-        -2.0*pow3(Cmu_)*pow4(k_)/pow3(epsilon_ + epsilonMin_)
+        -2.0*pow3(Cmu_)*pow4(k_)/pow3(epsilon_)
        *(magSqr(gradU_ + gradU_.T()) - magSqr(gradU_ - gradU_.T()))
     ),
 
@@ -260,7 +260,7 @@ LienCubicKELowRe::LienCubicKELowRe
         symm
         (
             // quadratic terms
-            pow3(k_)/sqr(epsilon_ + epsilonMin_)
+            pow3(k_)/sqr(epsilon_)
            *(
                 Ctau1_/fEta_
                *(
@@ -271,7 +271,7 @@ LienCubicKELowRe::LienCubicKELowRe
               + Ctau3_/fEta_*(gradU_.T() & gradU_)
             )
             // cubic term C4
-          - 20.0*pow4(k_)/pow3(epsilon_ + epsilonMin_)
+          - 20.0*pow4(k_)/pow3(epsilon_)
            *pow3(Cmu_)
            *(
                 ((gradU_ & gradU_) & gradU_.T())
@@ -289,7 +289,7 @@ LienCubicKELowRe::LienCubicKELowRe
     )
 {
     bound(k_, kMin_);
-    bound(epsilon_, epsilonMin_);
+    // already bounded: bound(epsilon_, epsilonMin_);
 
     nut_ = Cmu_
       * (scalar(1) - exp(-Am_*yStar_))

src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C

@@ -192,25 +192,25 @@ NonlinearKEShih::NonlinearKEShih
     gradU_(fvc::grad(U)),
     eta_
     (
-        k_/(epsilon_ + epsilonMin_)
+        k_/bound(epsilon_, epsilonMin_)
        *sqrt(2.0*magSqr(0.5*(gradU_ + gradU_.T())))
     ),
     ksi_
     (
-        k_/(epsilon_+ epsilonMin_)
+        k_/epsilon_
        *sqrt(2.0*magSqr(0.5*(gradU_ - gradU_.T())))
     ),
     Cmu_(2.0/(3.0*(A1_ + eta_ + alphaKsi_*ksi_))),
     fEta_(A2_ + pow(eta_, 3.0)),
 
-    nut_("nut", Cmu_*sqr(k_)/(epsilon_ + epsilonMin_)),
+    nut_("nut", Cmu_*sqr(k_)/epsilon_),
 
     nonlinearStress_
     (
         "nonlinearStress",
         symm
         (
-            pow3(k_)/sqr(epsilon_ + epsilonMin_)
+            pow3(k_)/sqr(epsilon_)
            *(
                 Ctau1_/fEta_
                *(
@@ -224,7 +224,7 @@ NonlinearKEShih::NonlinearKEShih
     )
 {
     bound(k_, kMin_);
-    bound(epsilon_, epsilonMin_);
+    // already bounded: bound(epsilon_, epsilonMin_);
 
     #include "wallNonlinearViscosityI.H"
 

src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C

@@ -86,6 +86,10 @@ RASModel::RASModel
 
     y_(mesh_)
 {
+    kMin_.readIfPresent(*this);
+    epsilonMin_.readIfPresent(*this);
+    omegaMin_.readIfPresent(*this);
+
     // Force the construction of the mesh deltaCoeffs which may be needed
     // for the construction of the derived models and BCs
     mesh_.deltaCoeffs();

src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C

@@ -179,7 +179,7 @@ qZeta::qZeta
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        epsilon_/(2.0*q_),
+        epsilon_/(2.0*bound(q_, qMin_)),
         epsilon_.boundaryField().types()
     ),
 
@@ -198,7 +198,7 @@ qZeta::qZeta
 {
     bound(k_, kMin_);
     bound(epsilon_, epsilonMin_);
-    bound(q_, qMin_);
+    // already bounded: bound(q_, qMin_);
     bound(zeta_, zetaMin_);
 
     nut_ = Cmu_*fMu()*sqr(k_)/epsilon_;

wmake/rules/General/X

@@ -0,0 +1,5 @@
+# X11 includes and libraries in the standard location
+#
+XFLAGS     =
+XINC       = $(XFLAGS) -I/usr/include/X11
+XLIBS      = -lXext -lX11

wmake/rules/General/flex

@@ -1,6 +1,6 @@
 .SUFFIXES: .l
 
-ltoo = flex $$SOURCE ; mv lex.yy.c $*.c ; $(cc) $(cFLAGS) -c $*.c -o $@ 
+ltoo = flex -o $*.c $$SOURCE ; $(cc) $(cFLAGS) -c $*.c -o $@
 
 .l.dep:
 	$(MAKE_DEP)

wmake/rules/General/flex++

@@ -1,6 +1,6 @@
 .SUFFIXES: .L
 
-Ltoo = flex -+ -f $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@
+Ltoo = flex -+ -o $*.C -f $$SOURCE ; $(CC) $(c++FLAGS) -c $*.C -o $@
 
 .L.dep:
 	$(MAKE_DEP)

wmake/rules/General/flex++.test

@@ -1,6 +0,0 @@
-.SUFFIXES: .L
-
-Ltoo = flex++ $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@ 
-
-.L.dep:
-	$(MAKE_DEP)

wmake/rules/General/general

@@ -1,6 +1,7 @@
 AR         = ar
 ARFLAGS    = cr
 RANLIB     = ranlib
+CPP        = cpp
 LD         = ld
 
 GFLAGS     = -D$(WM_ARCH) -DWM_$(WM_PRECISION_OPTION)

wmake/rules/General/mplibMPICH

@@ -1,3 +1,3 @@
-PFLAGS     = 
+PFLAGS     = -DMPICH_SKIP_MPICXX
 PINC       = -I$(MPI_ARCH_PATH)/include
 PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt

wmake/rules/General/mplibQSMPI

@@ -1,3 +1,4 @@
-PFLAGS     = -DOMPI_SKIP_MPICXX
+PFLAGS     =
 PINC       = -I$(MPI_ARCH_PATH)/include
 PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
+

wmake/rules/SiCortex64Gcc/flex++

@@ -1,6 +0,0 @@
-.SUFFIXES: .L
-
-Ltoo = flex --c++ -f $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@ 
-
-.L.dep:
-	$(MAKE_DEP)

wmake/rules/SiCortex64Gcc/general

@@ -1,4 +1,3 @@
-CPP        = /lib/cpp $(GFLAGS)
 LD         = ld -A64
 
 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl

wmake/rules/SiCortex64Gcc/mplib

@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       =
-PLIBS      =

wmake/rules/SiCortex64Gcc/mplib

@@ -0,0 +1 @@
+../General/mplib

wmake/rules/SunOS64Gcc/general

@@ -1,4 +1,4 @@
-CPP        = /lib/cpp $(GFLAGS)
+CPP        = /lib/cpp
 LD         = ld -64
 
 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -lnsl -lsocket -L$(FOAM_LIBBIN)/dummy -lPstream

wmake/rules/SunOS64Gcc/mplib

@@ -1,3 +0,0 @@
-PFLAGS     = 
-PINC       = 
-PLIBS      = 

wmake/rules/SunOS64Gcc/mplib

@@ -0,0 +1 @@
+../General/mplib

wmake/rules/SunOS64Gcc/mplibOPENMPI

@@ -1,3 +0,0 @@
-PFLAGS     = -DOMPI_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi

wmake/rules/SunOS64Gcc/mplibOPENMPI

@@ -0,0 +1 @@
+../General/mplibOPENMPI

wmake/rules/linux64Gcc/X

@@ -1,3 +0,0 @@
-XFLAGS     =
-XINC       = $(XFLAGS) -I/usr/include/X11
-XLIBS      = -L/usr/lib64 -lXext -lX11

wmake/rules/linux64Gcc/X

@@ -0,0 +1 @@
+../General/X

wmake/rules/linux64Gcc/general

@@ -1,6 +1,3 @@
-CPP        = /lib/cpp $(GFLAGS)
-LD         = ld
-
 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
 
 include $(GENERAL_RULES)/standard

wmake/rules/linux64Gcc/mplib

@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       =
-PLIBS      =

wmake/rules/linux64Gcc/mplib

@@ -0,0 +1 @@
+../General/mplib

wmake/rules/linux64Gcc/mplibGAMMA

@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lgamma

wmake/rules/linux64Gcc/mplibGAMMA

@@ -0,0 +1 @@
+../General/mplibGAMMA

wmake/rules/linux64Gcc/mplibMPICH

@@ -1,3 +0,0 @@
-PFLAGS     = -DMPICH_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt

wmake/rules/linux64Gcc/mplibMPICH

@@ -0,0 +1 @@
+../General/mplibMPICH

wmake/rules/linux64Gcc/mplibMPICH-GM

@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm

wmake/rules/linux64Gcc/mplibMPICH-GM

@@ -0,0 +1 @@
+../General/mplibMPICH-GM

wmake/rules/linux64Gcc/mplibOPENMPI

@@ -1,3 +0,0 @@
-PFLAGS     = -DOMPI_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi

wmake/rules/linux64Gcc/mplibOPENMPI

@@ -0,0 +1 @@
+../General/mplibOPENMPI

wmake/rules/linux64Gcc/mplibQSMPI

@@ -1,4 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
-

wmake/rules/linux64Gcc/mplibQSMPI

@@ -0,0 +1 @@
+../General/mplibQSMPI

wmake/rules/linux64Gcc42/X

@@ -1,3 +0,0 @@
-XFLAGS     =
-XINC       = $(XFLAGS) -I/usr/X11R6/include
-XLIBS      = -L/usr/X11R6/lib64 -lXext -lX11

wmake/rules/linux64Gcc42/c

@@ -1,16 +0,0 @@
-.SUFFIXES: .c .h
-
-cWARN        = -Wall
-
-cc          = gcc -m64
-
-include $(RULES)/c$(WM_COMPILE_OPTION)
-
-cFLAGS      = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
-
-ctoo        = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@
-
-LINK_LIBS   = $(cDBUG)
-
-LINKLIBSO   = $(cc) -shared
-LINKEXE     = $(cc) -Xlinker -z -Xlinker nodefs

wmake/rules/linux64Gcc42/c++

@@ -1,21 +0,0 @@
-.SUFFIXES: .C .cxx .cc .cpp
-
-c++WARN     = -Wall -Wno-strict-aliasing -Wextra -Wno-unused-parameter -Wold-style-cast
-
-CC          = g++ -m64
-
-include $(RULES)/c++$(WM_COMPILE_OPTION)
-
-ptFLAGS     = -DNoRepository -ftemplate-depth-60
-
-c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
-
-Ctoo        = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@
-cxxtoo      = $(Ctoo)
-cctoo       = $(Ctoo)
-cpptoo      = $(Ctoo)
-
-LINK_LIBS   = $(c++DBUG)
-
-LINKLIBSO   = $(CC) $(c++FLAGS) -shared
-LINKEXE     = $(CC) $(c++FLAGS)

wmake/rules/linux64Gcc42/c++Debug

@@ -1,2 +0,0 @@
-c++DBUG    = -ggdb3 -DFULLDEBUG
-c++OPT      = -O0 -fdefault-inline

wmake/rules/linux64Gcc42/c++Opt

@@ -1,4 +0,0 @@
-c++DBUG     =
-c++OPT      = -O3
-#c++OPT      = -march=nocona -O3
-# -ftree-vectorize -ftree-vectorizer-verbose=3

wmake/rules/linux64Gcc42/c++Prof

@@ -1,2 +0,0 @@
-c++DBUG    = -pg
-c++OPT     = -O2

wmake/rules/linux64Gcc42/cDebug

@@ -1,2 +0,0 @@
-cDBUG       = -ggdb -DFULLDEBUG
-cOPT        = -O1 -fdefault-inline -finline-functions

wmake/rules/linux64Gcc42/cOpt

@@ -1,2 +0,0 @@
-cDBUG       =
-cOPT        = -O3

wmake/rules/linux64Gcc42/cProf

@@ -1,2 +0,0 @@
-cDBUG       = -pg
-cOPT        = -O2

wmake/rules/linux64Gcc42/general

@@ -1,10 +0,0 @@
-CPP        = /lib/cpp $(GFLAGS)
-LD         = ld -A64
-
-PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
-
-include $(GENERAL_RULES)/standard
-
-include $(RULES)/X
-include $(RULES)/c
-include $(RULES)/c++

wmake/rules/linux64Gcc42/mplibHPMPI

@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include -D_MPICC_H
-PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_amd64 -lmpi

wmake/rules/linux64Gcc42/mplibMPICH

@@ -1,3 +0,0 @@
-PFLAGS     = -DMPICH_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt

wmake/rules/linux64Gcc42/mplibSYSTEMOPENMPI

@@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI

wmake/rules/linux64Gcc43/X

@@ -1,3 +0,0 @@
-XFLAGS     =
-XINC       = $(XFLAGS) -I/usr/X11R6/include
-XLIBS      = -L/usr/X11R6/lib64 -lXext -lX11

wmake/rules/linux64Gcc43/X

@@ -0,0 +1 @@
+../General/X

wmake/rules/linux64Gcc43/general

@@ -1,6 +1,3 @@
-CPP        = /lib/cpp $(GFLAGS)
-LD         = ld
-
 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
 
 include $(GENERAL_RULES)/standard

wmake/rules/linux64Gcc43/mplib

@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       =
-PLIBS      =

wmake/rules/linux64Gcc43/mplib

@@ -0,0 +1 @@
+../General/mplib

wmake/rules/linux64Gcc43/mplibGAMMA

@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lgamma

wmake/rules/linux64Gcc43/mplibGAMMA

@@ -0,0 +1 @@
+../General/mplibGAMMA

wmake/rules/linux64Gcc43/mplibMPICH

@@ -1,3 +0,0 @@
-PFLAGS     = -DMPICH_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt

wmake/rules/linux64Gcc43/mplibMPICH

@@ -0,0 +1 @@
+../General/mplibMPICH

wmake/rules/linux64Gcc43/mplibMPICH-GM

@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm

wmake/rules/linux64Gcc43/mplibMPICH-GM

@@ -0,0 +1 @@
+../General/mplibMPICH-GM

wmake/rules/linux64Gcc43/mplibOPENMPI

@@ -1,3 +0,0 @@
-PFLAGS     = -DOMPI_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi

wmake/rules/linux64Gcc43/mplibOPENMPI

@@ -0,0 +1 @@
+../General/mplibOPENMPI

wmake/rules/linux64Gcc43/mplibQSMPI

@@ -1,4 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
-

wmake/rules/linux64Gcc43/mplibQSMPI

@@ -0,0 +1 @@
+../General/mplibQSMPI

wmake/rules/linux64Gcc44/X

@@ -1,3 +0,0 @@
-XFLAGS     =
-XINC       = $(XFLAGS) -I/usr/X11R6/include
-XLIBS      = -L/usr/X11R6/lib64 -lXext -lX11

wmake/rules/linux64Gcc44/X

@@ -0,0 +1 @@
+../General/X

wmake/rules/linux64Gcc44/general

@@ -1,6 +1,3 @@
-CPP        = /lib/cpp $(GFLAGS)
-LD         = ld
-
 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
 
 include $(GENERAL_RULES)/standard

wmake/rules/linux64Gcc44/mplib

@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       =
-PLIBS      =

wmake/rules/linux64Gcc44/mplib

@@ -0,0 +1 @@
+../General/mplib

wmake/rules/linux64Gcc44/mplibGAMMA

@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lgamma

wmake/rules/linux64Gcc44/mplibGAMMA

@@ -0,0 +1 @@
+../General/mplibGAMMA

wmake/rules/linux64Gcc44/mplibMPICH

@@ -1,3 +0,0 @@
-PFLAGS     = -DMPICH_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt

wmake/rules/linux64Gcc44/mplibMPICH

@@ -0,0 +1 @@
+../General/mplibMPICH

wmake/rules/linux64Gcc44/mplibMPICH-GM

@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm

wmake/rules/linux64Gcc44/mplibMPICH-GM

@@ -0,0 +1 @@
+../General/mplibMPICH-GM

wmake/rules/linux64Gcc44/mplibOPENMPI

@@ -1,3 +0,0 @@
-PFLAGS     = -DOMPI_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi

wmake/rules/linux64Gcc44/mplibOPENMPI

@@ -0,0 +1 @@
+../General/mplibOPENMPI

wmake/rules/linux64Gcc44/mplibQSMPI

@@ -1,4 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
-

wmake/rules/linux64Gcc44/mplibQSMPI

@@ -0,0 +1 @@
+../General/mplibQSMPI

wmake/rules/linux64Icc/X

@@ -1,3 +0,0 @@
-XFLAGS     =
-XINC       = $(XFLAGS) -I/usr/X11R6/include
-XLIBS      = -L/usr/X11R6/lib64 -lXext -lX11

wmake/rules/linux64Icc/X

@@ -0,0 +1 @@
+../General/X

wmake/rules/linux64Icc/general

@@ -1,6 +1,3 @@
-CPP        = /lib/cpp $(GFLAGS)
-LD         = ld
-
 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
 
 include $(GENERAL_RULES)/standard

wmake/rules/linux64Icc/mplib

@@ -1,3 +0,0 @@
-PFLAGS     = 
-PINC       = 
-PLIBS      = 

wmake/rules/linux64Icc/mplib

@@ -0,0 +1 @@
+../General/mplib

wmake/rules/linux64Icc/mplibMPICH

@@ -1,3 +0,0 @@
-PFLAGS     = -DMPICH_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt

wmake/rules/linux64Icc/mplibMPICH

@@ -0,0 +1 @@
+../General/mplibMPICH