zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
andy
2010-03-29 17:38:27 +01:00
parent e2f2bd1ff1 44faceb792
commit 76381a7b15
147 changed files with 143 additions and 462 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/finiteVolume/cfdTools/general/bound/bound.C
View File

@ -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;
}

3
src/finiteVolume/cfdTools/general/bound/bound.H
View File

@ -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);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

2
src/turbulenceModels/compressible/LES/LESModel/LESModel.C
View File

@ -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

4
src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
View File

@ -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();

2
src/turbulenceModels/incompressible/LES/LESModel/LESModel.C
View File

@ -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

4
src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C
View File

@ -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

4
src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
View File

@ -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();

6
src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
View File

@ -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();

12
src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C
View File

@ -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_))

10
src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C
View File

@ -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"

4
src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
View File

@ -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();

4
src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C
View File

@ -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_;

5
wmake/rules/General/X Normal file
View File

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

2
wmake/rules/General/flex
View File

@ -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)

2
wmake/rules/General/flex++
View File

@ -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)

6
wmake/rules/General/flex++.test
View File

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

1
wmake/rules/General/general
View File

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

0
wmake/rules/linux64Gcc42/mplib → wmake/rules/General/mplib
View File

0
wmake/rules/linux64Gcc42/mplibGAMMA → wmake/rules/General/mplibGAMMA
View File

2
wmake/rules/General/mplibMPICH
View File

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

0
wmake/rules/linux64Gcc42/mplibMPICH-GM → wmake/rules/General/mplibMPICH-GM
View File

3
wmake/rules/linux64Gcc42/mplibOPENMPI → wmake/rules/General/mplibQSMPI
View File

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

6
wmake/rules/SiCortex64Gcc/flex++
View File

@ -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)

1
wmake/rules/SiCortex64Gcc/general
View File

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

3
wmake/rules/SiCortex64Gcc/mplib
View File

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

1
wmake/rules/SiCortex64Gcc/mplib Symbolic link
View File

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

2
wmake/rules/SunOS64Gcc/general
View File

@ -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

3
wmake/rules/SunOS64Gcc/mplib
View File

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

1
wmake/rules/SunOS64Gcc/mplib Symbolic link
View File

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

3
wmake/rules/SunOS64Gcc/mplibOPENMPI
View File

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

1
wmake/rules/SunOS64Gcc/mplibOPENMPI Symbolic link
View File

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

3
wmake/rules/linux64Gcc/X
View File

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

1
wmake/rules/linux64Gcc/X Symbolic link
View File

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

BIN
wmake/rules/linux64Gcc/dirToString
View File

Binary file not shown.

3
wmake/rules/linux64Gcc/general
View File

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

3
wmake/rules/linux64Gcc/mplib
View File

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

1
wmake/rules/linux64Gcc/mplib Symbolic link
View File

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

3
wmake/rules/linux64Gcc/mplibGAMMA
View File

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

1
wmake/rules/linux64Gcc/mplibGAMMA Symbolic link
View File

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

3
wmake/rules/linux64Gcc/mplibMPICH
View File

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

1
wmake/rules/linux64Gcc/mplibMPICH Symbolic link
View File

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

3
wmake/rules/linux64Gcc/mplibMPICH-GM
View File

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

1
wmake/rules/linux64Gcc/mplibMPICH-GM Symbolic link
View File

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

3
wmake/rules/linux64Gcc/mplibOPENMPI
View File

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

1
wmake/rules/linux64Gcc/mplibOPENMPI Symbolic link
View File

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

4
wmake/rules/linux64Gcc/mplibQSMPI
View File

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

1
wmake/rules/linux64Gcc/mplibQSMPI Symbolic link
View File

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

BIN
wmake/rules/linux64Gcc/wmkdep
View File

Binary file not shown.

3
wmake/rules/linux64Gcc42/X
View File

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

16
wmake/rules/linux64Gcc42/c
View File

@ -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

21
wmake/rules/linux64Gcc42/c++
View File

@ -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)

2
wmake/rules/linux64Gcc42/c++Debug
View File

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

4
wmake/rules/linux64Gcc42/c++Opt
View File

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

2
wmake/rules/linux64Gcc42/c++Prof
View File

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

2
wmake/rules/linux64Gcc42/cDebug
View File

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

2
wmake/rules/linux64Gcc42/cOpt
View File

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

2
wmake/rules/linux64Gcc42/cProf
View File

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

BIN
wmake/rules/linux64Gcc42/dirToString
View File

Binary file not shown.

10
wmake/rules/linux64Gcc42/general
View File

@ -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++

3
wmake/rules/linux64Gcc42/mplibHPMPI
View File

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

3
wmake/rules/linux64Gcc42/mplibMPICH
View File

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

1
wmake/rules/linux64Gcc42/mplibSYSTEMOPENMPI
View File

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

BIN
wmake/rules/linux64Gcc42/wmkdep
View File

Binary file not shown.

3
wmake/rules/linux64Gcc43/X
View File

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

1
wmake/rules/linux64Gcc43/X Symbolic link
View File

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

3
wmake/rules/linux64Gcc43/general
View File

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

3
wmake/rules/linux64Gcc43/mplib
View File

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

1
wmake/rules/linux64Gcc43/mplib Symbolic link
View File

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

3
wmake/rules/linux64Gcc43/mplibGAMMA
View File

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

1
wmake/rules/linux64Gcc43/mplibGAMMA Symbolic link
View File

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

3
wmake/rules/linux64Gcc43/mplibMPICH
View File

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

1
wmake/rules/linux64Gcc43/mplibMPICH Symbolic link
View File

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

3
wmake/rules/linux64Gcc43/mplibMPICH-GM
View File

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

1
wmake/rules/linux64Gcc43/mplibMPICH-GM Symbolic link
View File

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

3
wmake/rules/linux64Gcc43/mplibOPENMPI
View File

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

1
wmake/rules/linux64Gcc43/mplibOPENMPI Symbolic link
View File

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

4
wmake/rules/linux64Gcc43/mplibQSMPI
View File

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

1
wmake/rules/linux64Gcc43/mplibQSMPI Symbolic link
View File

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

3
wmake/rules/linux64Gcc44/X
View File

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

1
wmake/rules/linux64Gcc44/X Symbolic link
View File

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

3
wmake/rules/linux64Gcc44/general
View File

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

3
wmake/rules/linux64Gcc44/mplib
View File

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

1
wmake/rules/linux64Gcc44/mplib Symbolic link
View File

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

3
wmake/rules/linux64Gcc44/mplibGAMMA
View File

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

1
wmake/rules/linux64Gcc44/mplibGAMMA Symbolic link
View File

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

3
wmake/rules/linux64Gcc44/mplibMPICH
View File

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

1
wmake/rules/linux64Gcc44/mplibMPICH Symbolic link
View File

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

3
wmake/rules/linux64Gcc44/mplibMPICH-GM
View File

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

1
wmake/rules/linux64Gcc44/mplibMPICH-GM Symbolic link
View File

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

3
wmake/rules/linux64Gcc44/mplibOPENMPI
View File

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

1
wmake/rules/linux64Gcc44/mplibOPENMPI Symbolic link
View File

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

4
wmake/rules/linux64Gcc44/mplibQSMPI
View File

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

1
wmake/rules/linux64Gcc44/mplibQSMPI Symbolic link
View File

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

3
wmake/rules/linux64Icc/X
View File

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

1
wmake/rules/linux64Icc/X Symbolic link
View File

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

3
wmake/rules/linux64Icc/general
View File

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

3
wmake/rules/linux64Icc/mplib
View File

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

1
wmake/rules/linux64Icc/mplib Symbolic link
View File

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

3
wmake/rules/linux64Icc/mplibMPICH
View File

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

1
wmake/rules/linux64Icc/mplibMPICH Symbolic link
View File

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

Some files were not shown because too many files have changed in this diff Show More