Commit 09db19c3 authored by mattijs's avatar mattijs
Browse files

Merge remote-tracking branch 'origin/master' into develop

parents 80b5d3a1 ff19bedb
...@@ -5,11 +5,10 @@ ...@@ -5,11 +5,10 @@
# \\ / A nd | www.openfoam.com # \\ / A nd | www.openfoam.com
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Copyright (C) 2018-2019 OpenCFD Ltd. # Copyright (C) 2018-2020 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM, licensed under GNU General Public License # This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
# <http://www.gnu.org/licenses/>.
# #
# File # File
# etc/config.csh/setup # etc/config.csh/setup
...@@ -89,7 +88,7 @@ endif ...@@ -89,7 +88,7 @@ endif
# Capture and evaluate any command-line parameters # Capture and evaluate any command-line parameters
# These can be used to set/unset values, specify additional files etc. # These can be used to set/unset values, specify additional files etc.
setenv FOAM_SETTINGS "${*}" setenv FOAM_SETTINGS "$argv[*]"
while ( $#argv > 0 ) while ( $#argv > 0 )
switch ($argv[1]) switch ($argv[1])
......
...@@ -180,7 +180,7 @@ endif ...@@ -180,7 +180,7 @@ endif
# Finalize setup of OpenFOAM environment # Finalize setup of OpenFOAM environment
if ( -d "$WM_PROJECT_DIR" ) then if ( -d "$WM_PROJECT_DIR" ) then
if ($?FOAM_VERBOSE && $?prompt) echo "source $WM_PROJECT_DIR/etc/config.csh/setup" if ($?FOAM_VERBOSE && $?prompt) echo "source $WM_PROJECT_DIR/etc/config.csh/setup"
source "$WM_PROJECT_DIR/etc/config.csh/setup" "${*}" source "$WM_PROJECT_DIR/etc/config.csh/setup" $argv[*]
else else
echo "Error: did not locate installation path for $WM_PROJECT-$WM_PROJECT_VERSION" echo "Error: did not locate installation path for $WM_PROJECT-$WM_PROJECT_VERSION"
echo "No directory: $WM_PROJECT_DIR" echo "No directory: $WM_PROJECT_DIR"
......
...@@ -82,15 +82,18 @@ void Foam::primitiveMesh::makeCellCentresAndVols ...@@ -82,15 +82,18 @@ void Foam::primitiveMesh::makeCellCentresAndVols
{ {
typedef Vector<solveScalar> solveVector; typedef Vector<solveScalar> solveVector;
// Clear the fields for accumulation. Note1: we're doing this before
// any precision conversion since this might complain about illegal numbers.
// Note2: zero is a special value which is perfectly converted into zero
// in the new precision
cellCtrs_s = Zero;
cellVols_s = 0.0;
PrecisionAdaptor<solveVector, vector> tcellCtrs(cellCtrs_s); PrecisionAdaptor<solveVector, vector> tcellCtrs(cellCtrs_s);
Field<solveVector>& cellCtrs = tcellCtrs.ref(); Field<solveVector>& cellCtrs = tcellCtrs.ref();
PrecisionAdaptor<solveScalar, scalar> tcellVols(cellVols_s); PrecisionAdaptor<solveScalar, scalar> tcellVols(cellVols_s);
Field<solveScalar>& cellVols = tcellVols.ref(); Field<solveScalar>& cellVols = tcellVols.ref();
// Clear the fields for accumulation
cellCtrs = Zero;
cellVols = 0.0;
const labelList& own = faceOwner(); const labelList& own = faceOwner();
const labelList& nei = faceNeighbour(); const labelList& nei = faceNeighbour();
......
...@@ -13,5 +13,4 @@ Eddy Simulation (IDDES) model ...@@ -13,5 +13,4 @@ Eddy Simulation (IDDES) model
For further details please visit: For further details please visit:
openfoam.com/documentation/cpp-guide/html/verification-validation-turbulent-surface-mounted-cube.html https://www.openfoam.com/documentation/guides/latest/doc/verification-validation-turbulent-surface-mounted-cube.html
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment