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:
sergio
2011-03-07 13:00:52 +00:00
parent b3adb680f8 1a1abe9ce7
commit 8efc98480d
21 changed files with 48 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/finiteVolume/finiteVolume/fvc/fvcLaplacian.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -110,7 +110,20 @@ laplacian
const word& name const word& name
) )
{ {
return gamma*fvc::laplacian(vf, name); GeometricField<GType, fvsPatchField, surfaceMesh> Gamma
(
IOobject
(
gamma.name(),
vf.instance(),
vf.mesh(),
IOobject::NO_READ
),
vf.mesh(),
gamma
);
return fvc::laplacian(Gamma, vf, name);
} }
@ -140,10 +153,20 @@ laplacian
const GeometricField<Type, fvPatchField, volMesh>& vf const GeometricField<Type, fvPatchField, volMesh>& vf
) )
{ {
return gamma*fvc::laplacian GeometricField<GType, fvsPatchField, surfaceMesh> Gamma
( (
vf, "laplacian(" + gamma.name() + ',' + vf.name() + ')' IOobject
(
gamma.name(),
vf.instance(),
vf.mesh(),
IOobject::NO_READ
),
vf.mesh(),
gamma
); );
return fvc::laplacian(Gamma, vf);
} }

4
src/transportModels/incompressible/viscosityModels/HerschelBulkley/HerschelBulkley.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -54,7 +54,7 @@ Foam::viscosityModels::HerschelBulkley::calcNu() const
dimensionedScalar rtone("rtone", dimless/dimTime, 1.0); dimensionedScalar rtone("rtone", dimless/dimTime, 1.0);
tmp<volScalarField> sr(strainRate()); tmp<volScalarField> sr(strainRate());
return (min(nu0_,(tau0_ + k_* rtone *( pow(tone * sr(), n_) return (min(nu0_,(tau0_ + k_* rtone *( pow(tone * sr(), n_)
+ pow(tone*tau0_/nu0_,n_))) / (max(sr(), dimensionedScalar - pow(tone*tau0_/nu0_,n_))) / (max(sr(), dimensionedScalar
("VSMALL", dimless/dimTime, VSMALL))))); ("VSMALL", dimless/dimTime, VSMALL)))));
} }

2
wmake/rules/SiCortex64Gcc/general
View File

@ -1,7 +1,7 @@
CPP = cpp -traditional-cpp $(GFLAGS) CPP = cpp -traditional-cpp $(GFLAGS)
LD = ld -A64 LD = ld -A64
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl PROJECT_LIBS = -l$(WM_PROJECT) -ldl
include $(GENERAL_RULES)/standard include $(GENERAL_RULES)/standard

2
wmake/rules/SunOS64Gcc/general
View File

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

2
wmake/rules/linux64Clang/general
View File

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

2
wmake/rules/linux64Gcc++0x/general
View File

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

2
wmake/rules/linux64Gcc/general
View File

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

2
wmake/rules/linux64Gcc43/general
View File

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

2
wmake/rules/linux64Gcc44/general
View File

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

2
wmake/rules/linux64Gcc45/general
View File

@ -1,6 +1,6 @@
CPP = cpp -traditional-cpp CPP = cpp -traditional-cpp
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl PROJECT_LIBS = -l$(WM_PROJECT) -ldl
include $(GENERAL_RULES)/standard include $(GENERAL_RULES)/standard

2
wmake/rules/linux64Icc/general
View File

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

2
wmake/rules/linuxClang/general
View File

@ -1,7 +1,7 @@
CPP = cpp -traditional-cpp $(GFLAGS) CPP = cpp -traditional-cpp $(GFLAGS)
LD = ld -melf_i386 LD = ld -melf_i386
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl PROJECT_LIBS = -l$(WM_PROJECT) -ldl
include $(GENERAL_RULES)/standard include $(GENERAL_RULES)/standard

2
wmake/rules/linuxGcc/general
View File

@ -1,7 +1,7 @@
CPP = cpp -traditional-cpp $(GFLAGS) CPP = cpp -traditional-cpp $(GFLAGS)
LD = ld -melf_i386 LD = ld -melf_i386
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl PROJECT_LIBS = -l$(WM_PROJECT) -ldl
include $(GENERAL_RULES)/standard include $(GENERAL_RULES)/standard

2
wmake/rules/linuxGcc43/general
View File

@ -1,7 +1,7 @@
CPP = cpp -traditional-cpp $(GFLAGS) CPP = cpp -traditional-cpp $(GFLAGS)
LD = ld -melf_i386 LD = ld -melf_i386
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl PROJECT_LIBS = -l$(WM_PROJECT) -ldl
include $(GENERAL_RULES)/standard include $(GENERAL_RULES)/standard

2
wmake/rules/linuxGcc44/general
View File

@ -1,7 +1,7 @@
CPP = cpp -traditional-cpp $(GFLAGS) CPP = cpp -traditional-cpp $(GFLAGS)
LD = ld -melf_i386 LD = ld -melf_i386
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl PROJECT_LIBS = -l$(WM_PROJECT) -ldl
include $(GENERAL_RULES)/standard include $(GENERAL_RULES)/standard

2
wmake/rules/linuxGcc45/general
View File

@ -1,7 +1,7 @@
CPP = cpp -traditional-cpp CPP = cpp -traditional-cpp
LD = ld -melf_i386 LD = ld -melf_i386
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl PROJECT_LIBS = -l$(WM_PROJECT) -ldl
include $(GENERAL_RULES)/standard include $(GENERAL_RULES)/standard

2
wmake/rules/linuxIA64Gcc/general
View File

@ -1,5 +1,5 @@
CPP = cpp -traditional-cpp $(GFLAGS) CPP = cpp -traditional-cpp $(GFLAGS)
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl PROJECT_LIBS = -l$(WM_PROJECT) -ldl
include $(GENERAL_RULES)/standard include $(GENERAL_RULES)/standard

2
wmake/rules/linuxIA64Icc/general
View File

@ -1,6 +1,6 @@
CPP = /lib/cpp -traditional-cpp $(GFLAGS) -DICC_IA64_PREFETCH CPP = /lib/cpp -traditional-cpp $(GFLAGS) -DICC_IA64_PREFETCH
GLIBS = -liberty GLIBS =
include $(GENERAL_RULES)/standard include $(GENERAL_RULES)/standard

2
wmake/rules/linuxIcc/general
View File

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

2
wmake/rules/linuxPPC64Gcc/general
View File

@ -1,7 +1,7 @@
CPP = cpp -traditional-cpp $(GFLAGS) CPP = cpp -traditional-cpp $(GFLAGS)
LD = ld -m elf64ppc LD = ld -m elf64ppc
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl PROJECT_LIBS = -l$(WM_PROJECT) -ldl
include $(GENERAL_RULES)/standard include $(GENERAL_RULES)/standard

2
wmake/rules/solarisGcc/general
View File

@ -1,6 +1,6 @@
CPP = /usr/lib/cpp -undef CPP = /usr/lib/cpp -undef
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -lnsl -lsocket -L$(FOAM_LIBBIN)/dummy -lPstream PROJECT_LIBS = -l$(WM_PROJECT) -lnsl -lsocket -L$(FOAM_LIBBIN)/dummy -lPstream
include $(GENERAL_RULES)/standard include $(GENERAL_RULES)/standard