diff --git a/etc/config/settings.csh b/etc/config/settings.csh index 2264c4ee03..a909e02de6 100644 --- a/etc/config/settings.csh +++ b/etc/config/settings.csh @@ -242,8 +242,7 @@ case ThirdParty: # using clang - not gcc setenv WM_CC 'clang' setenv WM_CXX 'clang++' - set clang_version=llvm-3.1 - #set clang_version=llvm-svn + set clang_version=llvm-3.2 breaksw default: echo diff --git a/etc/config/settings.sh b/etc/config/settings.sh index 5a77479b56..1d4800d471 100644 --- a/etc/config/settings.sh +++ b/etc/config/settings.sh @@ -262,8 +262,7 @@ OpenFOAM | ThirdParty) # using clang - not gcc export WM_CC='clang' export WM_CXX='clang++' - clang_version=llvm-3.1 - #clang_version=llvm-svn + clang_version=llvm-3.2 ;; *) echo 1>&2 diff --git a/src/postProcessing/foamCalcFunctions/basic/addSubtract/addSubtract.C b/src/postProcessing/foamCalcFunctions/basic/addSubtract/addSubtract.C index c284e2c042..66bb8c7497 100644 --- a/src/postProcessing/foamCalcFunctions/basic/addSubtract/addSubtract.C +++ b/src/postProcessing/foamCalcFunctions/basic/addSubtract/addSubtract.C @@ -297,4 +297,3 @@ void Foam::calcTypes::addSubtract::calc // ************************************************************************* // - diff --git a/src/postProcessing/foamCalcFunctions/basic/addSubtract/writeAddSubtractField.C b/src/postProcessing/foamCalcFunctions/basic/addSubtract/writeAddSubtractField.C index e069cd1fc0..8304569ae4 100644 --- a/src/postProcessing/foamCalcFunctions/basic/addSubtract/writeAddSubtractField.C +++ b/src/postProcessing/foamCalcFunctions/basic/addSubtract/writeAddSubtractField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -72,7 +72,9 @@ void Foam::calcTypes::addSubtract::writeAddSubtractField mesh, IOobject::NO_READ ), - calcMode_ == ADD ? baseField + addField : baseField - addField + calcMode_ == ADD + ? (baseField + addField)() + : (baseField - addField)() ); newField.write(); }