diff --git a/src/finiteVolume/finiteVolume/fvc/fvcLaplacian.C b/src/finiteVolume/finiteVolume/fvc/fvcLaplacian.C index 6bcdfaba13..5fbade3a50 100644 --- a/src/finiteVolume/finiteVolume/fvc/fvcLaplacian.C +++ b/src/finiteVolume/finiteVolume/fvc/fvcLaplacian.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -110,7 +110,20 @@ laplacian const word& name ) { - return gamma*fvc::laplacian(vf, name); + GeometricField 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& vf ) { - return gamma*fvc::laplacian + GeometricField 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); } diff --git a/src/transportModels/incompressible/viscosityModels/HerschelBulkley/HerschelBulkley.C b/src/transportModels/incompressible/viscosityModels/HerschelBulkley/HerschelBulkley.C index 90d7164476..52085f8b69 100644 --- a/src/transportModels/incompressible/viscosityModels/HerschelBulkley/HerschelBulkley.C +++ b/src/transportModels/incompressible/viscosityModels/HerschelBulkley/HerschelBulkley.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -54,7 +54,7 @@ Foam::viscosityModels::HerschelBulkley::calcNu() const dimensionedScalar rtone("rtone", dimless/dimTime, 1.0); tmp sr(strainRate()); 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))))); } diff --git a/wmake/rules/SiCortex64Gcc/general b/wmake/rules/SiCortex64Gcc/general index aeab411b5b..c0c59a7220 100644 --- a/wmake/rules/SiCortex64Gcc/general +++ b/wmake/rules/SiCortex64Gcc/general @@ -1,7 +1,7 @@ CPP = cpp -traditional-cpp $(GFLAGS) LD = ld -A64 -PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl +PROJECT_LIBS = -l$(WM_PROJECT) -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/SunOS64Gcc/general b/wmake/rules/SunOS64Gcc/general index d24e8f0056..83b7ebf4e0 100644 --- a/wmake/rules/SunOS64Gcc/general +++ b/wmake/rules/SunOS64Gcc/general @@ -1,7 +1,7 @@ CPP = /lib/cpp 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 diff --git a/wmake/rules/linux64Clang/general b/wmake/rules/linux64Clang/general index 809751cd0a..243cb7d8c7 100644 --- a/wmake/rules/linux64Clang/general +++ b/wmake/rules/linux64Clang/general @@ -1,6 +1,6 @@ CPP = cpp -traditional-cpp $(GFLAGS) -PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl +PROJECT_LIBS = -l$(WM_PROJECT) -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linux64Gcc++0x/general b/wmake/rules/linux64Gcc++0x/general index 809751cd0a..243cb7d8c7 100644 --- a/wmake/rules/linux64Gcc++0x/general +++ b/wmake/rules/linux64Gcc++0x/general @@ -1,6 +1,6 @@ CPP = cpp -traditional-cpp $(GFLAGS) -PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl +PROJECT_LIBS = -l$(WM_PROJECT) -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linux64Gcc/general b/wmake/rules/linux64Gcc/general index 809751cd0a..243cb7d8c7 100644 --- a/wmake/rules/linux64Gcc/general +++ b/wmake/rules/linux64Gcc/general @@ -1,6 +1,6 @@ CPP = cpp -traditional-cpp $(GFLAGS) -PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl +PROJECT_LIBS = -l$(WM_PROJECT) -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linux64Gcc43/general b/wmake/rules/linux64Gcc43/general index 809751cd0a..243cb7d8c7 100644 --- a/wmake/rules/linux64Gcc43/general +++ b/wmake/rules/linux64Gcc43/general @@ -1,6 +1,6 @@ CPP = cpp -traditional-cpp $(GFLAGS) -PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl +PROJECT_LIBS = -l$(WM_PROJECT) -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linux64Gcc44/general b/wmake/rules/linux64Gcc44/general index 809751cd0a..243cb7d8c7 100644 --- a/wmake/rules/linux64Gcc44/general +++ b/wmake/rules/linux64Gcc44/general @@ -1,6 +1,6 @@ CPP = cpp -traditional-cpp $(GFLAGS) -PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl +PROJECT_LIBS = -l$(WM_PROJECT) -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linux64Gcc45/general b/wmake/rules/linux64Gcc45/general index fcd79624e9..4a42b11b1e 100644 --- a/wmake/rules/linux64Gcc45/general +++ b/wmake/rules/linux64Gcc45/general @@ -1,6 +1,6 @@ CPP = cpp -traditional-cpp -PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl +PROJECT_LIBS = -l$(WM_PROJECT) -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linux64Icc/general b/wmake/rules/linux64Icc/general index 4f411aec98..45c285f1ee 100644 --- a/wmake/rules/linux64Icc/general +++ b/wmake/rules/linux64Icc/general @@ -1,6 +1,6 @@ CPP = /lib/cpp -traditional-cpp $(GFLAGS) -PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl +PROJECT_LIBS = -l$(WM_PROJECT) -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linuxClang/general b/wmake/rules/linuxClang/general index 97ce8c940c..fa1eb5b925 100644 --- a/wmake/rules/linuxClang/general +++ b/wmake/rules/linuxClang/general @@ -1,7 +1,7 @@ CPP = cpp -traditional-cpp $(GFLAGS) LD = ld -melf_i386 -PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl +PROJECT_LIBS = -l$(WM_PROJECT) -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linuxGcc/general b/wmake/rules/linuxGcc/general index 97ce8c940c..fa1eb5b925 100644 --- a/wmake/rules/linuxGcc/general +++ b/wmake/rules/linuxGcc/general @@ -1,7 +1,7 @@ CPP = cpp -traditional-cpp $(GFLAGS) LD = ld -melf_i386 -PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl +PROJECT_LIBS = -l$(WM_PROJECT) -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linuxGcc43/general b/wmake/rules/linuxGcc43/general index 97ce8c940c..fa1eb5b925 100644 --- a/wmake/rules/linuxGcc43/general +++ b/wmake/rules/linuxGcc43/general @@ -1,7 +1,7 @@ CPP = cpp -traditional-cpp $(GFLAGS) LD = ld -melf_i386 -PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl +PROJECT_LIBS = -l$(WM_PROJECT) -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linuxGcc44/general b/wmake/rules/linuxGcc44/general index 97ce8c940c..fa1eb5b925 100644 --- a/wmake/rules/linuxGcc44/general +++ b/wmake/rules/linuxGcc44/general @@ -1,7 +1,7 @@ CPP = cpp -traditional-cpp $(GFLAGS) LD = ld -melf_i386 -PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl +PROJECT_LIBS = -l$(WM_PROJECT) -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linuxGcc45/general b/wmake/rules/linuxGcc45/general index fdd03dc9a5..4b051e6b98 100644 --- a/wmake/rules/linuxGcc45/general +++ b/wmake/rules/linuxGcc45/general @@ -1,7 +1,7 @@ CPP = cpp -traditional-cpp LD = ld -melf_i386 -PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl +PROJECT_LIBS = -l$(WM_PROJECT) -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linuxIA64Gcc/general b/wmake/rules/linuxIA64Gcc/general index 44c2e33667..a19f130aae 100644 --- a/wmake/rules/linuxIA64Gcc/general +++ b/wmake/rules/linuxIA64Gcc/general @@ -1,5 +1,5 @@ CPP = cpp -traditional-cpp $(GFLAGS) -PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl +PROJECT_LIBS = -l$(WM_PROJECT) -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linuxIA64Icc/general b/wmake/rules/linuxIA64Icc/general index 748cfe770d..9dc446d4b2 100644 --- a/wmake/rules/linuxIA64Icc/general +++ b/wmake/rules/linuxIA64Icc/general @@ -1,6 +1,6 @@ CPP = /lib/cpp -traditional-cpp $(GFLAGS) -DICC_IA64_PREFETCH -GLIBS = -liberty +GLIBS = include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linuxIcc/general b/wmake/rules/linuxIcc/general index e4d0cb7d7b..8a38ddf6d4 100644 --- a/wmake/rules/linuxIcc/general +++ b/wmake/rules/linuxIcc/general @@ -1,7 +1,7 @@ CPP = /lib/cpp -traditional-cpp $(GFLAGS) LD = ld -melf_i386 -PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl +PROJECT_LIBS = -l$(WM_PROJECT) -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linuxPPC64Gcc/general b/wmake/rules/linuxPPC64Gcc/general index ad4126abe8..fa717f9645 100644 --- a/wmake/rules/linuxPPC64Gcc/general +++ b/wmake/rules/linuxPPC64Gcc/general @@ -1,7 +1,7 @@ CPP = cpp -traditional-cpp $(GFLAGS) LD = ld -m elf64ppc -PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl +PROJECT_LIBS = -l$(WM_PROJECT) -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/solarisGcc/general b/wmake/rules/solarisGcc/general index c8641ef7e5..cda7ba8673 100644 --- a/wmake/rules/solarisGcc/general +++ b/wmake/rules/solarisGcc/general @@ -1,6 +1,6 @@ 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