Compare commits
2 Commits
maintenanc
...
feature-nu
| Author | SHA1 | Date | |
|---|---|---|---|
| 15ae6fcaac | |||
| 2a799fe728 |
4
Allwmake
4
Allwmake
@ -73,10 +73,10 @@ echo
|
||||
applications/Allwmake $targetType $*
|
||||
|
||||
# Additional components/modules
|
||||
if [ "$FOAM_MODULE_PREFIX" = false ] || [ "$FOAM_MODULE_PREFIX" = none ]
|
||||
if [ "$FOAM_MODULE_PREFIX" = false ]
|
||||
then
|
||||
echo "========================================"
|
||||
echo "OpenFOAM modules disabled (prefix=${FOAM_MODULE_PREFIX})"
|
||||
echo "OpenFOAM modules disabled (prefix=false)"
|
||||
echo
|
||||
elif [ -d "$WM_PROJECT_DIR/modules" ]
|
||||
then
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
api=2006
|
||||
patch=220610
|
||||
patch=201012
|
||||
|
||||
@ -6,7 +6,6 @@
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
Copyright (C) 2011-2016 OpenFOAM Foundation
|
||||
Copyright (C) 2020 OpenCFD Ltd.
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
This file is part of OpenFOAM.
|
||||
@ -63,13 +62,13 @@ void Foam::fluentFvMesh::writeFluentMesh() const
|
||||
/ time().caseName() + ".msh"
|
||||
);
|
||||
|
||||
Info<< "Writing Fluent Mesh" << endl;
|
||||
Info<< "Writing Header" << endl;
|
||||
|
||||
fluentMeshFile
|
||||
<< "(0 \"OpenFOAM to Fluent Mesh File\")" << nl << nl
|
||||
<< "(0 \"Dimension:\")" << nl
|
||||
<< "(2 3)" << nl << nl
|
||||
<< "(0 \"Grid dimensions:\")" << nl;
|
||||
<< "(0 \"FOAM to Fluent Mesh File\")" << std::endl << std::endl
|
||||
<< "(0 \"Dimension:\")" << std::endl
|
||||
<< "(2 3)" << std::endl << std::endl
|
||||
<< "(0 \"Grid dimensions:\")" << std::endl;
|
||||
|
||||
// Writing number of points
|
||||
fluentMeshFile
|
||||
@ -218,8 +217,8 @@ void Foam::fluentFvMesh::writeFluentMesh() const
|
||||
|
||||
// Writing cells
|
||||
fluentMeshFile
|
||||
<< "(12 (1 1 " << nCells() << " 1 0)" << nl
|
||||
<< '(';
|
||||
<< "(12 (1 1 "
|
||||
<< nCells() << " 1 0)(" << std::endl;
|
||||
|
||||
const cellModel& hex = cellModel::ref(cellModel::HEX);
|
||||
const cellModel& prism = cellModel::ref(cellModel::PRISM);
|
||||
@ -228,59 +227,44 @@ void Foam::fluentFvMesh::writeFluentMesh() const
|
||||
|
||||
const cellShapeList& cells = cellShapes();
|
||||
|
||||
label nPolys = 0;
|
||||
|
||||
int nElemPerLine = 25; // Start with linebreak and indent
|
||||
bool hasWarned = false;
|
||||
|
||||
forAll(cells, celli)
|
||||
{
|
||||
if (nElemPerLine == 25)
|
||||
{
|
||||
// 25 elements per line with initial indent (readability)
|
||||
fluentMeshFile << "\n ";
|
||||
nElemPerLine = 0;
|
||||
}
|
||||
else if (!(nElemPerLine % 5))
|
||||
{
|
||||
// Format in blocks of 5 (readability)
|
||||
fluentMeshFile << token::SPACE;
|
||||
}
|
||||
fluentMeshFile << token::SPACE;
|
||||
++nElemPerLine;
|
||||
|
||||
|
||||
if (cells[celli].model() == tet)
|
||||
{
|
||||
fluentMeshFile << 2;
|
||||
fluentMeshFile << " " << 2;
|
||||
}
|
||||
else if (cells[celli].model() == hex)
|
||||
{
|
||||
fluentMeshFile << 4;
|
||||
fluentMeshFile << " " << 4;
|
||||
}
|
||||
else if (cells[celli].model() == pyr)
|
||||
{
|
||||
fluentMeshFile << 5;
|
||||
fluentMeshFile << " " << 5;
|
||||
}
|
||||
else if (cells[celli].model() == prism)
|
||||
{
|
||||
fluentMeshFile << 6;
|
||||
fluentMeshFile << " " << 6;
|
||||
}
|
||||
else
|
||||
{
|
||||
fluentMeshFile << 7;
|
||||
++nPolys;
|
||||
if (!hasWarned)
|
||||
{
|
||||
hasWarned = true;
|
||||
|
||||
WarningInFunction
|
||||
<< "foamMeshToFluent: cell shape for cell "
|
||||
<< celli << " only supported by Fluent polyhedral meshes."
|
||||
<< nl
|
||||
<< " Suppressing any further messages for polyhedral"
|
||||
<< " cells." << endl;
|
||||
}
|
||||
fluentMeshFile << " " << 7;
|
||||
}
|
||||
}
|
||||
|
||||
fluentMeshFile
|
||||
<< nl << "))" << nl;
|
||||
|
||||
|
||||
if (nPolys)
|
||||
{
|
||||
Info<< "Mesh had " << nPolys << " polyhedrals." << endl;
|
||||
}
|
||||
|
||||
fluentMeshFile << ")())" << std::endl;
|
||||
|
||||
// Return to dec
|
||||
fluentMeshFile.setf(ios::dec, ios::basefield);
|
||||
|
||||
@ -169,22 +169,14 @@ int main(int argc, char *argv[])
|
||||
(
|
||||
"translate",
|
||||
"vector",
|
||||
"Translate by specified <vector> before rotations"
|
||||
);
|
||||
argList::addBoolOption
|
||||
(
|
||||
"auto-centre",
|
||||
"Use bounding box centre as centre for rotations"
|
||||
"Translate by specified <vector> - eg, '(1 0 0)' before rotations"
|
||||
);
|
||||
argList::addOption
|
||||
(
|
||||
"centre",
|
||||
"origin",
|
||||
"point",
|
||||
"Use specified <point> as centre for rotations"
|
||||
"Use specified <point> as origin for rotations"
|
||||
);
|
||||
argList::addOptionCompat("auto-centre", {"auto-origin", 2206});
|
||||
argList::addOptionCompat("centre", {"origin", 2206});
|
||||
|
||||
argList::addOption
|
||||
(
|
||||
"rotate",
|
||||
@ -298,24 +290,18 @@ int main(int argc, char *argv[])
|
||||
if (args.readIfPresent("translate", v))
|
||||
{
|
||||
Info<< "Translating points by " << v << endl;
|
||||
|
||||
points += v;
|
||||
}
|
||||
|
||||
vector rotationCentre;
|
||||
bool useRotationCentre = args.readIfPresent("centre", rotationCentre);
|
||||
if (args.found("auto-centre") && !useRotationCentre)
|
||||
vector origin;
|
||||
const bool useOrigin = args.readIfPresent("origin", origin);
|
||||
if (useOrigin)
|
||||
{
|
||||
useRotationCentre = true;
|
||||
rotationCentre = boundBox(points).centre();
|
||||
Info<< "Set origin for rotations to " << origin << endl;
|
||||
points -= origin;
|
||||
}
|
||||
|
||||
if (useRotationCentre)
|
||||
{
|
||||
Info<< "Set centre of rotation to " << rotationCentre << endl;
|
||||
points -= rotationCentre;
|
||||
}
|
||||
|
||||
|
||||
if (args.found("rotate"))
|
||||
{
|
||||
Pair<vector> n1n2
|
||||
@ -394,13 +380,6 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
}
|
||||
|
||||
if (useRotationCentre)
|
||||
{
|
||||
Info<< "Unset centre of rotation from " << rotationCentre << endl;
|
||||
points += rotationCentre;
|
||||
}
|
||||
|
||||
|
||||
List<scalar> scaling;
|
||||
if (args.readListIfPresent("scale", scaling))
|
||||
{
|
||||
@ -431,6 +410,12 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
}
|
||||
|
||||
if (useOrigin)
|
||||
{
|
||||
Info<< "Unset origin for rotations from " << origin << endl;
|
||||
points += origin;
|
||||
}
|
||||
|
||||
|
||||
// Set the precision of the points data to 10
|
||||
IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
|
||||
|
||||
@ -675,7 +675,7 @@ int main(int argc, char *argv[])
|
||||
{
|
||||
for
|
||||
(
|
||||
const char * const opt
|
||||
const word& opt
|
||||
: { "cellSet", "cellZone", "faceSet", "pointSet" }
|
||||
)
|
||||
{
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
\\ / A nd | www.openfoam.com
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
Copyright (C) 2019-2021 OpenCFD Ltd.
|
||||
Copyright (C) 2019-2020 OpenCFD Ltd.
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
This file is part of OpenFOAM.
|
||||
@ -771,7 +771,7 @@ int main(int argc, char *argv[])
|
||||
expressions::exprString
|
||||
expression
|
||||
(
|
||||
args["expression"],
|
||||
args[expression],
|
||||
dictionary::null
|
||||
);
|
||||
|
||||
|
||||
@ -92,7 +92,7 @@ bool setCellFieldType
|
||||
|
||||
fieldType field(fieldHeader, mesh, false);
|
||||
|
||||
const Type value = pTraits<Type>(fieldValueStream);
|
||||
const Type& value = pTraits<Type>(fieldValueStream);
|
||||
|
||||
if (selectedCells.size() == field.size())
|
||||
{
|
||||
@ -244,7 +244,7 @@ bool setFaceFieldType
|
||||
|
||||
fieldType field(fieldHeader, mesh);
|
||||
|
||||
const Type value = pTraits<Type>(fieldValueStream);
|
||||
const Type& value = pTraits<Type>(fieldValueStream);
|
||||
|
||||
// Create flat list of selected faces and their value.
|
||||
Field<Type> allBoundaryValues(mesh.nBoundaryFaces());
|
||||
|
||||
@ -112,20 +112,12 @@ int main(int argc, char *argv[])
|
||||
"vector",
|
||||
"Translate by specified <vector> - eg, '(1 0 0)' before rotations"
|
||||
);
|
||||
argList::addBoolOption
|
||||
(
|
||||
"auto-centre",
|
||||
"Use bounding box centre as centre for rotations"
|
||||
);
|
||||
argList::addOption
|
||||
(
|
||||
"centre",
|
||||
"origin",
|
||||
"point",
|
||||
"Use specified <point> as centre for rotations"
|
||||
"Use specified <point> as origin for rotations"
|
||||
);
|
||||
argList::addOptionCompat("auto-centre", {"auto-origin", 2206});
|
||||
argList::addOptionCompat("centre", {"origin", 2206});
|
||||
|
||||
argList::addOption
|
||||
(
|
||||
"rotate",
|
||||
@ -237,24 +229,18 @@ int main(int argc, char *argv[])
|
||||
if (args.readIfPresent("translate", v))
|
||||
{
|
||||
Info<< "Translating points by " << v << endl;
|
||||
|
||||
points += v;
|
||||
}
|
||||
|
||||
vector rotationCentre;
|
||||
bool useRotationCentre = args.readIfPresent("centre", rotationCentre);
|
||||
if (args.found("auto-centre") && !useRotationCentre)
|
||||
vector origin(Zero);
|
||||
const bool useOrigin = args.readIfPresent("origin", origin);
|
||||
if (useOrigin)
|
||||
{
|
||||
useRotationCentre = true;
|
||||
rotationCentre = boundBox(points).centre();
|
||||
Info<< "Set origin for rotations to " << origin << endl;
|
||||
points -= origin;
|
||||
}
|
||||
|
||||
if (useRotationCentre)
|
||||
{
|
||||
Info<< "Set centre of rotation to " << rotationCentre << endl;
|
||||
points -= rotationCentre;
|
||||
}
|
||||
|
||||
|
||||
if (args.found("rotate"))
|
||||
{
|
||||
Pair<vector> n1n2
|
||||
@ -313,13 +299,6 @@ int main(int argc, char *argv[])
|
||||
points = transform(rot, points);
|
||||
}
|
||||
|
||||
if (useRotationCentre)
|
||||
{
|
||||
Info<< "Unset centre of rotation from " << rotationCentre << endl;
|
||||
points += rotationCentre;
|
||||
}
|
||||
|
||||
|
||||
List<scalar> scaling;
|
||||
if (args.readListIfPresent("scale", scaling))
|
||||
{
|
||||
@ -359,6 +338,11 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
}
|
||||
|
||||
if (useOrigin)
|
||||
{
|
||||
Info<< "Unset origin for rotations from " << origin << endl;
|
||||
points += origin;
|
||||
}
|
||||
|
||||
surf1.movePoints(points);
|
||||
surf1.write(exportName, writeFileType);
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
# \\/ M anipulation |
|
||||
#------------------------------------------------------------------------------
|
||||
# Copyright (C) 2011-2016 OpenFOAM Foundation
|
||||
# Copyright (C) 2016-2021 OpenCFD Ltd.
|
||||
# Copyright (C) 2016-2020 OpenCFD Ltd.
|
||||
#------------------------------------------------------------------------------
|
||||
# License
|
||||
# This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
|
||||
@ -140,8 +140,8 @@ do
|
||||
esac
|
||||
else
|
||||
echo "Ignore bad/invalid plugin-path: $pluginPath" 1>&2
|
||||
unset pluginPath
|
||||
fi
|
||||
unset pluginPath
|
||||
;;
|
||||
|
||||
-block*) # Silently accepts -blockMesh
|
||||
@ -238,11 +238,8 @@ then
|
||||
;;
|
||||
esac
|
||||
|
||||
if [ -z "$pluginError" ]
|
||||
if [ -n "$pluginError" ]
|
||||
then
|
||||
# Ensure plugin is also in the lib-path
|
||||
LD_LIBRARY_PATH="${PV_PLUGIN_PATH}:$LD_LIBRARY_PATH"
|
||||
else
|
||||
cat<< NO_PLUGIN 1>&2
|
||||
$pluginError
|
||||
See '${0##*/} -help-build' for more information
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
# \\/ M anipulation |
|
||||
#------------------------------------------------------------------------------
|
||||
# Copyright (C) 2011-2016 OpenFOAM Foundation
|
||||
# Copyright (C) 2016-2021 OpenCFD Ltd.
|
||||
# Copyright (C) 2016-2020 OpenCFD Ltd.
|
||||
#------------------------------------------------------------------------------
|
||||
# License
|
||||
# This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
|
||||
@ -55,8 +55,6 @@ Equivalent options:
|
||||
-scotch-path --scotchArchPath | -scotchArchPath
|
||||
-system-compiler -system
|
||||
-third-compiler -third
|
||||
-openmpi-system -sys-openmpi
|
||||
-openmpi-third -openmpi
|
||||
|
||||
HELP_COMPAT
|
||||
exit 0 # A clean exit
|
||||
@ -91,9 +89,10 @@ Compiler
|
||||
mpc-VERSION For ThirdParty gcc (mpc-system for system library)
|
||||
|
||||
MPI
|
||||
-mpi=NAME Specify 'WM_MPLIB' type (eg, INTELMPI, etc)
|
||||
-openmpi[=VER] Use ThirdParty openmpi, with version for 'FOAM_MPI'
|
||||
-sys-openmpi[=MAJ] Use system openmpi, with specified major version
|
||||
-mpi NAME specify 'WM_MPLIB' type (eg, INTELMPI, etc)
|
||||
-openmpi VER use ThirdParty openmpi, with version for 'FOAM_MPI'
|
||||
-openmpi-system use system openmpi
|
||||
-openmpi-third use ThirdParty openmpi (using default version)
|
||||
|
||||
Components versions (ThirdParty)
|
||||
-adios VER specify 'adios2_version'
|
||||
@ -213,13 +212,12 @@ _inlineSed()
|
||||
# Local filename (for reporting)
|
||||
localFile="$(echo "$file" | sed -e "s#^$projectDir/##")"
|
||||
|
||||
if grep -q "$regexp" "$file" && sed -i -e "$cmd" "$file"
|
||||
then
|
||||
[ -n "$msg" ] && echo " $msg ($localFile)"
|
||||
else
|
||||
grep -q "$regexp" "$file" && sed -i -e "$cmd" "$file" || { \
|
||||
echo "Failed: ${msg:-replacement} in $localFile"
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
[ -n "$msg" ] && echo " $msg ($localFile)"
|
||||
|
||||
return 0
|
||||
}
|
||||
@ -280,8 +278,8 @@ replaceEtc()
|
||||
local file="$1"
|
||||
shift
|
||||
|
||||
file="$(_foamEtc "$file")"
|
||||
replace "$file" "$@"
|
||||
file=$(_foamEtc "$file")
|
||||
replace $file "$@"
|
||||
}
|
||||
|
||||
|
||||
@ -291,36 +289,24 @@ replaceEtcCsh()
|
||||
local file="$1"
|
||||
shift
|
||||
|
||||
file="$(_foamEtc "$file")"
|
||||
replaceCsh "$file" "$@"
|
||||
file=$(_foamEtc "$file")
|
||||
replaceCsh $file "$@"
|
||||
}
|
||||
|
||||
|
||||
# Get the option's value (argument), or die on missing or empty argument
|
||||
# $1 option
|
||||
# $2 value
|
||||
|
||||
# Returns values via optValue, nOptArgs variables!!
|
||||
optValue=""
|
||||
nOptArgs=0 # The number of args to shift
|
||||
|
||||
getOptionValue()
|
||||
{
|
||||
optValue="${1#*=}"
|
||||
if [ "$optValue" = "$1" ]
|
||||
then
|
||||
# Eg, -option value
|
||||
optValue="$2"
|
||||
[ -n "$optValue" ] || die "'$1' option requires an argument"
|
||||
nOptArgs=1
|
||||
else
|
||||
# Eg, -option=value
|
||||
nOptArgs=0
|
||||
fi
|
||||
local value="$2"
|
||||
[ -n "$value" ] || die "'$1' option requires an argument"
|
||||
|
||||
# Remove any surrounding double quotes
|
||||
optValue="${optValue%\"}"
|
||||
optValue="${optValue#\"}"
|
||||
value="${value%\"}"
|
||||
value="${value#\"}"
|
||||
|
||||
echo "$value"
|
||||
}
|
||||
|
||||
|
||||
@ -380,7 +366,7 @@ removeCshMagic()
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
unset adjusted
|
||||
unset adjusted optMpi
|
||||
# Parse options
|
||||
while [ "$#" -gt 0 ]
|
||||
do
|
||||
@ -434,37 +420,26 @@ CONFIG_CSH
|
||||
export FOAM_CONFIG_ETC="${1#*=}"
|
||||
;;
|
||||
|
||||
-project-path=* | -project-path)
|
||||
-project-path)
|
||||
# Replace WM_PROJECT_DIR=...
|
||||
getOptionValue "$@"
|
||||
shift "${nOptArgs:-0}"
|
||||
optionValue=$(getOptionValue "$@")
|
||||
replaceEtc bashrc WM_PROJECT_DIR "\"$optionValue\""
|
||||
replaceEtcCsh cshrc WM_PROJECT_DIR "\"$optionValue\""
|
||||
|
||||
if [ -n "$optValue" ]
|
||||
then
|
||||
replaceEtc bashrc WM_PROJECT_DIR "\"$optValue\""
|
||||
replaceEtcCsh cshrc WM_PROJECT_DIR "\"$optValue\""
|
||||
removeBashMagic $(_foamEtc bashrc)
|
||||
removeCshMagic $(_foamEtc cshrc)
|
||||
|
||||
removeBashMagic "$(_foamEtc bashrc)"
|
||||
removeCshMagic "$(_foamEtc cshrc)"
|
||||
adjusted=true
|
||||
else
|
||||
: "${adjusted:=empty}"
|
||||
fi
|
||||
adjusted=true
|
||||
shift
|
||||
;;
|
||||
|
||||
-version=* | -version | -foamVersion | --projectVersion)
|
||||
-version | -foamVersion | --projectVersion)
|
||||
# Replace WM_PROJECT_VERSION=...
|
||||
getOptionValue "$@"
|
||||
shift "${nOptArgs:-0}"
|
||||
|
||||
if [ -n "$optValue" ]
|
||||
then
|
||||
replaceEtc bashrc WM_PROJECT_VERSION "$optValue"
|
||||
replaceEtcCsh cshrc WM_PROJECT_VERSION "$optValue"
|
||||
adjusted=true
|
||||
else
|
||||
: "${adjusted:=empty}"
|
||||
fi
|
||||
optionValue=$(getOptionValue "$@")
|
||||
replaceEtc bashrc WM_PROJECT_VERSION "$optionValue"
|
||||
replaceEtcCsh cshrc WM_PROJECT_VERSION "$optionValue"
|
||||
adjusted=true
|
||||
shift
|
||||
;;
|
||||
|
||||
-sp | -SP | -float32)
|
||||
@ -490,169 +465,132 @@ CONFIG_CSH
|
||||
|
||||
-int32 | -int64)
|
||||
# Replace WM_LABEL_SIZE=...
|
||||
optValue="${1#-int}"
|
||||
replaceEtc bashrc WM_LABEL_SIZE "$optValue"
|
||||
replaceEtcCsh cshrc WM_LABEL_SIZE "$optValue"
|
||||
optionValue="${1#-int}"
|
||||
replaceEtc bashrc WM_LABEL_SIZE "$optionValue"
|
||||
replaceEtcCsh cshrc WM_LABEL_SIZE "$optionValue"
|
||||
adjusted=true
|
||||
;;
|
||||
|
||||
|
||||
## Compiler ##
|
||||
|
||||
-clang=* | -clang)
|
||||
-clang)
|
||||
# Replace default_clang_version=...
|
||||
getOptionValue "$@"
|
||||
shift "${nOptArgs:-0}"
|
||||
|
||||
if [ -n "$optValue" ]
|
||||
then
|
||||
replaceEtc config.sh/compiler default_clang_version "$optValue"
|
||||
replaceEtc config.csh/compiler default_clang_version "$optValue"
|
||||
adjusted=true
|
||||
else
|
||||
: "${adjusted:=empty}"
|
||||
fi
|
||||
optionValue=$(getOptionValue "$@")
|
||||
replaceEtc config.sh/compiler default_clang_version "$optionValue"
|
||||
replaceEtc config.csh/compiler default_clang_version "$optionValue"
|
||||
adjusted=true
|
||||
shift
|
||||
;;
|
||||
|
||||
-gcc=* | -gcc)
|
||||
-gcc)
|
||||
# Replace default_gcc_version=...
|
||||
getOptionValue "$@"
|
||||
shift "${nOptArgs:-0}"
|
||||
|
||||
if [ -n "$optValue" ]
|
||||
then
|
||||
replaceEtc config.sh/compiler default_gcc_version "$optValue"
|
||||
replaceEtc config.csh/compiler default_gcc_version "$optValue"
|
||||
adjusted=true
|
||||
else
|
||||
: "${adjusted:=empty}"
|
||||
fi
|
||||
optionValue=$(getOptionValue "$@")
|
||||
replaceEtc config.sh/compiler default_gcc_version "$optionValue"
|
||||
replaceEtc config.csh/compiler default_gcc_version "$optionValue"
|
||||
adjusted=true
|
||||
shift
|
||||
;;
|
||||
|
||||
-system-compiler | -system)
|
||||
# Replace WM_COMPILER_TYPE=... and WM_COMPILER=...
|
||||
getOptionValue "$@"
|
||||
shift "${nOptArgs:-0}"
|
||||
|
||||
if [ -n "$optValue" ]
|
||||
then
|
||||
replaceEtc bashrc \
|
||||
WM_COMPILER_TYPE system \
|
||||
WM_COMPILER "$optValue"
|
||||
replaceEtcCsh cshrc \
|
||||
WM_COMPILER_TYPE system \
|
||||
WM_COMPILER "$optValue"
|
||||
adjusted=true
|
||||
else
|
||||
: "${adjusted:=empty}"
|
||||
fi
|
||||
optionValue=$(getOptionValue "$@")
|
||||
replaceEtc bashrc \
|
||||
WM_COMPILER_TYPE system \
|
||||
WM_COMPILER "$optionValue"
|
||||
replaceEtcCsh cshrc \
|
||||
WM_COMPILER_TYPE system \
|
||||
WM_COMPILER "$optionValue"
|
||||
adjusted=true
|
||||
shift
|
||||
;;
|
||||
|
||||
-third-compiler | -third | -ThirdParty)
|
||||
# Replace WM_COMPILER_TYPE=... and WM_COMPILER=...
|
||||
getOptionValue "$@"
|
||||
shift "${nOptArgs:-0}"
|
||||
|
||||
if [ -n "$optValue" ]
|
||||
then
|
||||
replaceEtc bashrc \
|
||||
WM_COMPILER_TYPE ThirdParty \
|
||||
WM_COMPILER "$optValue"
|
||||
replaceEtcCsh cshrc \
|
||||
WM_COMPILER_TYPE ThirdParty \
|
||||
WM_COMPILER "$optValue"
|
||||
adjusted=true
|
||||
else
|
||||
: "${adjusted:=empty}"
|
||||
fi
|
||||
optionValue=$(getOptionValue "$@")
|
||||
replaceEtc bashrc \
|
||||
WM_COMPILER_TYPE ThirdParty \
|
||||
WM_COMPILER "$optionValue"
|
||||
replaceEtcCsh cshrc \
|
||||
WM_COMPILER_TYPE ThirdParty \
|
||||
WM_COMPILER "$optionValue"
|
||||
adjusted=true
|
||||
shift
|
||||
;;
|
||||
|
||||
gmp-[4-9]* | gmp-system)
|
||||
# gcc-related package
|
||||
optValue="${1#-}"
|
||||
replaceEtc config.sh/compiler default_gmp_version "$optValue"
|
||||
replaceEtc config.csh/compiler default_gmp_version "$optValue"
|
||||
replaceEtc config.sh/compiler default_gmp_version "$1"
|
||||
replaceEtc config.csh/compiler default_gmp_version "$1"
|
||||
adjusted=true
|
||||
;;
|
||||
|
||||
mpfr-[2-9]* | mpfr-system)
|
||||
# gcc-related package
|
||||
optValue="${1#-}"
|
||||
replaceEtc config.sh/compiler default_mpfr_version "$optValue"
|
||||
replaceEtc config.csh/compiler default_mpfr_version "$optValue"
|
||||
replaceEtc config.sh/compiler default_mpfr_version "$1"
|
||||
replaceEtc config.csh/compiler default_mpfr_version "$1"
|
||||
adjusted=true
|
||||
;;
|
||||
|
||||
mpc-[0-9]* | mpc-system)
|
||||
# gcc-related package
|
||||
optValue="${1#-}"
|
||||
replaceEtc config.sh/compiler default_mpc_version "$optValue"
|
||||
replaceEtc config.csh/compiler default_mpc_version "$optValue"
|
||||
replaceEtc config.sh/compiler default_mpc_version "$1"
|
||||
replaceEtc config.csh/compiler default_mpc_version "$1"
|
||||
adjusted=true
|
||||
;;
|
||||
|
||||
|
||||
## MPI ##
|
||||
|
||||
-mpi=* | -mpi)
|
||||
-mpi)
|
||||
# Explicitly set WM_MPLIB=...
|
||||
getOptionValue "$@"
|
||||
shift "${nOptArgs:-0}"
|
||||
|
||||
if [ -n "$optValue" ]
|
||||
then
|
||||
replaceEtc bashrc WM_MPLIB "$optValue"
|
||||
replaceEtcCsh cshrc WM_MPLIB "$optValue"
|
||||
adjusted=true
|
||||
else
|
||||
: "${adjusted:=empty}"
|
||||
fi
|
||||
optionValue=$(getOptionValue "$@")
|
||||
replaceEtc bashrc WM_MPLIB "$optionValue"
|
||||
replaceEtcCsh cshrc WM_MPLIB "$optionValue"
|
||||
optMpi=system
|
||||
adjusted=true
|
||||
shift
|
||||
;;
|
||||
|
||||
-sys-openmpi=* | -sys-openmpi | -openmpi-system)
|
||||
optValue="$(echo "$1" | sed -ne 's/^.*mpi=\([1-9][0-9]*\).*/\1/p')"
|
||||
# Explicitly set WM_MPLIB=SYSTEMOPENMPI
|
||||
if [ -n "$optValue" ]
|
||||
then
|
||||
replaceEtc bashrc WM_MPLIB SYSTEMOPENMPI"$optValue"
|
||||
replaceEtcCsh cshrc WM_MPLIB SYSTEMOPENMPI"$optValue"
|
||||
adjusted=true
|
||||
else
|
||||
: "${adjusted:=empty}"
|
||||
fi
|
||||
;;
|
||||
|
||||
-openmpi=* | -openmpi | -openmpi-third)
|
||||
# Explicitly set WM_MPLIB=OPENMPI
|
||||
# - use default setting for openmpi, or
|
||||
# replace FOAM_MPI=openmpi-<digits>..
|
||||
-openmpi)
|
||||
# Replace FOAM_MPI=openmpi-<digits>.. and set to use third-party
|
||||
# The edit is slightly fragile, but works
|
||||
|
||||
expected="openmpi-[1-9][.0-9]*"
|
||||
optValue="$(echo "$1" | sed -ne 's/^.*mpi=//p')"
|
||||
if [ -n "$optValue" ]
|
||||
then
|
||||
if [ "${optValue#openmpi-}" = "$optValue" ]
|
||||
then
|
||||
optValue="openmpi-$optValue"
|
||||
fi
|
||||
optMpi=$(getOptionValue "$@")
|
||||
|
||||
_matches "$optValue" "$expected" || \
|
||||
die "'${1%=*}' has bad value: '$optValue'"
|
||||
_matches "$optMpi" "$expected" || \
|
||||
die "'$1' has bad value: '$optMpi'"
|
||||
|
||||
_inlineSed "$(_foamEtc config.sh/mpi)" \
|
||||
"FOAM_MPI=$expected" \
|
||||
"FOAM_MPI=$optValue" \
|
||||
"Replaced 'FOAM_MPI=$expected' by 'FOAM_MPI=$optValue'"
|
||||
_inlineSed $(_foamEtc config.sh/mpi) \
|
||||
"FOAM_MPI=$expected" \
|
||||
"FOAM_MPI=$optMpi" \
|
||||
"Replaced 'FOAM_MPI=$expected' by 'FOAM_MPI=$optMpi'"
|
||||
|
||||
_inlineSed $(_foamEtc config.csh/mpi) \
|
||||
"FOAM_MPI $expected" \
|
||||
"FOAM_MPI $optMpi" \
|
||||
"Replaced 'FOAM_MPI $expected' by 'FOAM_MPI $optMpi'"
|
||||
|
||||
_inlineSed "$(_foamEtc config.csh/mpi)" \
|
||||
"FOAM_MPI=$expected" \
|
||||
"FOAM_MPI=$optValue" \
|
||||
"Replaced 'FOAM_MPI $expected' by 'FOAM_MPI $optValue'"
|
||||
fi
|
||||
replaceEtc bashrc WM_MPLIB OPENMPI
|
||||
replaceEtcCsh cshrc WM_MPLIB OPENMPI
|
||||
adjusted=true
|
||||
shift
|
||||
;;
|
||||
|
||||
-openmpi-system)
|
||||
# Explicitly set WM_MPLIB=SYSTEMOPENMPI
|
||||
replaceEtc bashrc WM_MPLIB SYSTEMOPENMPI
|
||||
replaceEtcCsh cshrc WM_MPLIB SYSTEMOPENMPI
|
||||
optMpi=system
|
||||
adjusted=true
|
||||
;;
|
||||
|
||||
-openmpi-third)
|
||||
# Explicitly set WM_MPLIB=OPENMPI, using default setting for openmpi
|
||||
replaceEtc bashrc WM_MPLIB OPENMPI
|
||||
replaceEtcCsh cshrc WM_MPLIB OPENMPI
|
||||
optMpi=third
|
||||
adjusted=true
|
||||
;;
|
||||
|
||||
|
||||
@ -660,242 +598,146 @@ CONFIG_CSH
|
||||
|
||||
-adios | -adios2)
|
||||
# Replace adios2_version=...
|
||||
getOptionValue "$@"
|
||||
shift "${nOptArgs:-0}"
|
||||
|
||||
if [ -n "$optValue" ]
|
||||
then
|
||||
replaceEtc config.sh/adios2 adios2_version "$optValue"
|
||||
replaceEtc config.csh/adios2 adios2_version "$optValue"
|
||||
adjusted=true
|
||||
else
|
||||
: "${adjusted:=empty}"
|
||||
fi
|
||||
optionValue=$(getOptionValue "$@")
|
||||
replaceEtc config.sh/adios2 adios2_version "$optionValue"
|
||||
replaceEtc config.csh/adios2 adios2_version "$optionValue"
|
||||
adjusted=true
|
||||
shift
|
||||
;;
|
||||
|
||||
-adios-path | -adios2-path)
|
||||
# Replace ADIOS2_ARCH_PATH=...
|
||||
getOptionValue "$@"
|
||||
shift "${nOptArgs:-0}"
|
||||
|
||||
if [ -n "$optValue" ]
|
||||
then
|
||||
replaceEtc config.sh/adios2 ADIOS2_ARCH_PATH "\"$optValue\""
|
||||
replaceEtcCsh config.csh/adios2 ADIOS2_ARCH_PATH "\"$optValue\""
|
||||
adjusted=true
|
||||
else
|
||||
: "${adjusted:=empty}"
|
||||
fi
|
||||
optionValue=$(getOptionValue "$@")
|
||||
replaceEtc config.sh/adios2 ADIOS2_ARCH_PATH "\"$optionValue\""
|
||||
replaceEtcCsh config.csh/adios2 ADIOS2_ARCH_PATH "\"$optionValue\""
|
||||
adjusted=true
|
||||
shift
|
||||
;;
|
||||
|
||||
-boost)
|
||||
# Replace boost_version=... (config is cgal or CGAL)
|
||||
getOptionValue "$@"
|
||||
shift "${nOptArgs:-0}"
|
||||
|
||||
optionValue=$(getOptionValue "$@")
|
||||
cfgName=cgal; _foamEtc -q config.sh/"$cfgName" || cfgName=CGAL
|
||||
if [ -n "$optValue" ]
|
||||
then
|
||||
replaceEtc config.sh/"$cfgName" boost_version "$optValue"
|
||||
replaceEtc config.csh/"$cfgName" boost_version "$optValue"
|
||||
adjusted=true
|
||||
else
|
||||
: "${adjusted:=empty}"
|
||||
fi
|
||||
replaceEtc config.sh/"$cfgName" boost_version "$optionValue"
|
||||
replaceEtc config.csh/"$cfgName" boost_version "$optionValue"
|
||||
adjusted=true
|
||||
shift
|
||||
;;
|
||||
|
||||
-boost-path)
|
||||
# Replace BOOST_ARCH_PATH=... (config is cgal or CGAL)
|
||||
getOptionValue "$@"
|
||||
shift "${nOptArgs:-0}"
|
||||
|
||||
optionValue=$(getOptionValue "$@")
|
||||
cfgName=cgal; _foamEtc -q config.sh/"$cfgName" || cfgName=CGAL
|
||||
if [ -n "$optValue" ]
|
||||
then
|
||||
replaceEtc config.sh/"$cfgName" BOOST_ARCH_PATH "\"$optValue\""
|
||||
replaceEtc config.csh/"$cfgName" BOOST_ARCH_PATH "\"$optValue\""
|
||||
adjusted=true
|
||||
else
|
||||
: "${adjusted:=empty}"
|
||||
fi
|
||||
replaceEtc config.sh/"$cfgName" BOOST_ARCH_PATH "\"$optionValue\""
|
||||
replaceEtc config.csh/"$cfgName" BOOST_ARCH_PATH "\"$optionValue\""
|
||||
adjusted=true
|
||||
shift
|
||||
;;
|
||||
|
||||
-cgal)
|
||||
# Replace cgal_version=... (config is cgal or CGAL)
|
||||
getOptionValue "$@"
|
||||
shift "${nOptArgs:-0}"
|
||||
|
||||
optionValue=$(getOptionValue "$@")
|
||||
cfgName=cgal; _foamEtc -q config.sh/"$cfgName" || cfgName=CGAL
|
||||
if [ -n "$optValue" ]
|
||||
then
|
||||
replaceEtc config.sh/"$cfgName" cgal_version "$optValue"
|
||||
replaceEtc config.csh/"$cfgName" cgal_version "$optValue"
|
||||
adjusted=true
|
||||
else
|
||||
: "${adjusted:=empty}"
|
||||
fi
|
||||
replaceEtc config.sh/"$cfgName" cgal_version "$optionValue"
|
||||
replaceEtc config.csh/"$cfgName" cgal_version "$optionValue"
|
||||
adjusted=true
|
||||
shift
|
||||
;;
|
||||
|
||||
-cgal-path)
|
||||
# Replace CGAL_ARCH_PATH=... (config is cgal or CGAL)
|
||||
getOptionValue "$@"
|
||||
shift "${nOptArgs:-0}"
|
||||
|
||||
optionValue=$(getOptionValue "$@")
|
||||
cfgName=cgal; _foamEtc -q config.sh/"$cfgName" || cfgName=CGAL
|
||||
if [ -n "$optValue" ]
|
||||
then
|
||||
replaceEtc config.sh/"$cfgName" CGAL_ARCH_PATH "$optValue"
|
||||
replaceEtcCsh config.csh/"$cfgName" CGAL_ARCH_PATH "$optValue"
|
||||
adjusted=true
|
||||
else
|
||||
: "${adjusted:=empty}"
|
||||
fi
|
||||
replaceEtc config.sh/"$cfgName" CGAL_ARCH_PATH "$optionValue"
|
||||
replaceEtcCsh config.csh/"$cfgName" CGAL_ARCH_PATH "$optionValue"
|
||||
adjusted=true
|
||||
shift
|
||||
;;
|
||||
|
||||
-fftw)
|
||||
# Replace fftw_version=...
|
||||
getOptionValue "$@"
|
||||
shift "${nOptArgs:-0}"
|
||||
|
||||
optionValue=$(getOptionValue "$@")
|
||||
# config.sh/fftw or config.sh/FFTW
|
||||
cfgName=fftw; _foamEtc -q config.sh/"$cfgName" || cfgName=FFTW
|
||||
if [ -n "$optValue" ]
|
||||
then
|
||||
replaceEtc config.sh/"$cfgName" fftw_version "$optValue"
|
||||
replaceEtc config.csh/"$cfgName" fftw_version "$optValue"
|
||||
adjusted=true
|
||||
else
|
||||
: "${adjusted:=empty}"
|
||||
fi
|
||||
replaceEtc config.sh/"$cfgName" fftw_version "$optionValue"
|
||||
replaceEtc config.csh/"$cfgName" fftw_version "$optionValue"
|
||||
adjusted=true
|
||||
shift
|
||||
;;
|
||||
|
||||
-fftw-path)
|
||||
# Replace FFTW_ARCH_PATH=...
|
||||
getOptionValue "$@"
|
||||
shift "${nOptArgs:-0}"
|
||||
|
||||
optionValue=$(getOptionValue "$@")
|
||||
# config.sh/fftw or config.sh/FFTW
|
||||
cfgName=fftw; _foamEtc -q config.sh/"$cfgName" || cfgName=FFTW
|
||||
if [ -n "$optValue" ]
|
||||
then
|
||||
replaceEtc config.sh/"$cfgName" FFTW_ARCH_PATH "\"$optValue\""
|
||||
replaceEtcCsh config.csh/"$cfgName" FFTW_ARCH_PATH "\"$optValue\""
|
||||
adjusted=true
|
||||
else
|
||||
: "${adjusted:=empty}"
|
||||
fi
|
||||
replaceEtc config.sh/"$cfgName" FFTW_ARCH_PATH "\"$optionValue\""
|
||||
replaceEtcCsh config.csh/"$cfgName" FFTW_ARCH_PATH "\"$optionValue\""
|
||||
adjusted=true
|
||||
shift
|
||||
;;
|
||||
|
||||
-cmake)
|
||||
# Replace cmake_version=...
|
||||
getOptionValue "$@"
|
||||
shift "${nOptArgs:-0}"
|
||||
|
||||
if [ -n "$optValue" ]
|
||||
then
|
||||
replaceEtc config.sh/cmake cmake_version "$optValue"
|
||||
adjusted=true
|
||||
else
|
||||
: "${adjusted:=empty}"
|
||||
fi
|
||||
optionValue=$(getOptionValue "$@")
|
||||
replaceEtc config.sh/cmake cmake_version "$optionValue"
|
||||
adjusted=true
|
||||
shift
|
||||
;;
|
||||
|
||||
-cmake-path)
|
||||
# Replace CMAKE_ARCH_PATH=...
|
||||
getOptionValue "$@"
|
||||
shift "${nOptArgs:-0}"
|
||||
|
||||
if [ -n "$optValue" ]
|
||||
then
|
||||
replaceEtc config.sh/cmake CMAKE_ARCH_PATH "$optValue"
|
||||
adjusted=true
|
||||
else
|
||||
: "${adjusted:=empty}"
|
||||
fi
|
||||
optionValue=$(getOptionValue "$@")
|
||||
replaceEtc config.sh/cmake CMAKE_ARCH_PATH "$optionValue"
|
||||
adjusted=true
|
||||
shift
|
||||
;;
|
||||
|
||||
-kahip)
|
||||
# Replace KAHIP_VERSION=...
|
||||
getOptionValue "$@"
|
||||
shift "${nOptArgs:-0}"
|
||||
|
||||
if [ -n "$optValue" ]
|
||||
then
|
||||
replaceEtc config.sh/kahip KAHIP_VERSION "$optValue"
|
||||
adjusted=true
|
||||
else
|
||||
: "${adjusted:=empty}"
|
||||
fi
|
||||
optionValue=$(getOptionValue "$@")
|
||||
replaceEtc config.sh/kahip KAHIP_VERSION "$optionValue"
|
||||
adjusted=true
|
||||
shift
|
||||
;;
|
||||
|
||||
-kahip-path)
|
||||
# Replace KAHIP_ARCH_PATH=...
|
||||
getOptionValue "$@"
|
||||
shift "${nOptArgs:-0}"
|
||||
|
||||
if [ -n "$optValue" ]
|
||||
then
|
||||
replaceEtc config.sh/kahip KAHIP_ARCH_PATH "\"$optValue\""
|
||||
adjusted=true
|
||||
else
|
||||
: "${adjusted:=empty}"
|
||||
fi
|
||||
optionValue=$(getOptionValue "$@")
|
||||
replaceEtc config.sh/kahip KAHIP_ARCH_PATH "\"$optionValue\""
|
||||
adjusted=true
|
||||
shift
|
||||
;;
|
||||
|
||||
-metis)
|
||||
# Replace METIS_VERSION=...
|
||||
getOptionValue "$@"
|
||||
shift "${nOptArgs:-0}"
|
||||
|
||||
if [ -n "$optValue" ]
|
||||
then
|
||||
replaceEtc config.sh/metis METIS_VERSION "$optValue"
|
||||
adjusted=true
|
||||
else
|
||||
: "${adjusted:=empty}"
|
||||
fi
|
||||
optionValue=$(getOptionValue "$@")
|
||||
replaceEtc config.sh/metis METIS_VERSION "$optionValue"
|
||||
adjusted=true
|
||||
shift
|
||||
;;
|
||||
|
||||
-metis-path)
|
||||
# Replace METIS_ARCH_PATH=...
|
||||
getOptionValue "$@"
|
||||
shift "${nOptArgs:-0}"
|
||||
|
||||
if [ -n "$optValue" ]
|
||||
then
|
||||
replaceEtc config.sh/metis METIS_ARCH_PATH "\"$optValue\""
|
||||
adjusted=true
|
||||
else
|
||||
: "${adjusted:=empty}"
|
||||
fi
|
||||
optionValue=$(getOptionValue "$@")
|
||||
replaceEtc config.sh/metis METIS_ARCH_PATH "\"$optionValue\""
|
||||
adjusted=true
|
||||
shift
|
||||
;;
|
||||
|
||||
-scotch | -scotchVersion | --scotchVersion)
|
||||
# Replace SCOTCH_VERSION=...
|
||||
getOptionValue "$@"
|
||||
shift "${nOptArgs:-0}"
|
||||
|
||||
if [ -n "$optValue" ]
|
||||
then
|
||||
replaceEtc config.sh/scotch SCOTCH_VERSION "$optValue"
|
||||
adjusted=true
|
||||
else
|
||||
: "${adjusted:=empty}"
|
||||
fi
|
||||
optionValue=$(getOptionValue "$@")
|
||||
replaceEtc config.sh/scotch SCOTCH_VERSION "$optionValue"
|
||||
adjusted=true
|
||||
shift
|
||||
;;
|
||||
|
||||
-scotch-path | -scotchArchPath | --scotchArchPath)
|
||||
# Replace SCOTCH_ARCH_PATH=...
|
||||
getOptionValue "$@"
|
||||
shift "${nOptArgs:-0}"
|
||||
|
||||
if [ -n "$optValue" ]
|
||||
then
|
||||
replaceEtc config.sh/scotch SCOTCH_ARCH_PATH "\"$optValue\""
|
||||
adjusted=true
|
||||
else
|
||||
: "${adjusted:=empty}"
|
||||
fi
|
||||
optionValue=$(getOptionValue "$@")
|
||||
replaceEtc config.sh/scotch SCOTCH_ARCH_PATH "\"$optionValue\""
|
||||
adjusted=true
|
||||
shift
|
||||
;;
|
||||
|
||||
|
||||
@ -904,156 +746,107 @@ CONFIG_CSH
|
||||
-paraview | -paraviewVersion | --paraviewVersion)
|
||||
# Replace ParaView_VERSION=...
|
||||
expected="[5-9][.0-9]*" # but also accept system
|
||||
getOptionValue "$@"
|
||||
_matches "$optValue" "$expected" || \
|
||||
[ "$optValue" != "${optValue%system}" ] || \
|
||||
die "'${1%=*}' has bad value: '$optValue'"
|
||||
|
||||
shift "${nOptArgs:-0}"
|
||||
if [ -n "$optValue" ]
|
||||
then
|
||||
replaceEtc config.sh/paraview ParaView_VERSION "$optValue"
|
||||
replaceEtc config.csh/paraview ParaView_VERSION "$optValue"
|
||||
adjusted=true
|
||||
else
|
||||
: "${adjusted:=empty}"
|
||||
fi
|
||||
optionValue=$(getOptionValue "$@")
|
||||
_matches "$optionValue" "$expected" || \
|
||||
[ "$optionValue" != "${optionValue%system}" ] || \
|
||||
die "'$1' has bad value: '$optionValue'"
|
||||
replaceEtc config.sh/paraview ParaView_VERSION "$optionValue"
|
||||
replaceEtc config.csh/paraview ParaView_VERSION "$optionValue"
|
||||
adjusted=true
|
||||
shift
|
||||
;;
|
||||
|
||||
-paraview-qt)
|
||||
# Replace ParaView_QT=...
|
||||
getOptionValue "$@"
|
||||
shift "${nOptArgs:-0}"
|
||||
|
||||
if [ -n "$optValue" ]
|
||||
then
|
||||
replaceEtc config.sh/paraview ParaView_QT "$optValue"
|
||||
replaceEtc config.csh/paraview ParaView_QT "$optValue"
|
||||
adjusted=true
|
||||
else
|
||||
: "${adjusted:=empty}"
|
||||
fi
|
||||
optionValue=$(getOptionValue "$@")
|
||||
replaceEtc config.sh/paraview ParaView_QT "$optionValue"
|
||||
replaceEtc config.csh/paraview ParaView_QT "$optionValue"
|
||||
adjusted=true
|
||||
shift
|
||||
;;
|
||||
|
||||
-paraview-path | -paraviewInstall | --paraviewInstall)
|
||||
# Replace ParaView_DIR=...
|
||||
getOptionValue "$@"
|
||||
shift "${nOptArgs:-0}"
|
||||
|
||||
if [ -n "$optValue" ]
|
||||
then
|
||||
replaceEtc config.sh/paraview ParaView_DIR \""$optValue\""
|
||||
replaceEtcCsh config.csh/paraview ParaView_DIR \""$optValue\""
|
||||
adjusted=true
|
||||
else
|
||||
: "${adjusted:=empty}"
|
||||
fi
|
||||
optionValue=$(getOptionValue "$@")
|
||||
replaceEtc config.sh/paraview ParaView_DIR \""$optionValue\""
|
||||
replaceEtcCsh config.csh/paraview ParaView_DIR \""$optionValue\""
|
||||
adjusted=true
|
||||
shift
|
||||
;;
|
||||
|
||||
-llvm)
|
||||
# Replace mesa_llvm=...
|
||||
getOptionValue "$@"
|
||||
shift "${nOptArgs:-0}"
|
||||
|
||||
if [ -n "$optValue" ]
|
||||
then
|
||||
replaceEtc config.sh/vtk mesa_llvm "$optValue"
|
||||
replaceEtc config.csh/vtk mesa_llvm "$optValue"
|
||||
adjusted=true
|
||||
else
|
||||
: "${adjusted:=empty}"
|
||||
fi
|
||||
optionValue=$(getOptionValue "$@")
|
||||
replaceEtc config.sh/vtk mesa_llvm "$optionValue"
|
||||
replaceEtc config.csh/vtk mesa_llvm "$optionValue"
|
||||
adjusted=true
|
||||
shift
|
||||
;;
|
||||
|
||||
-mesa)
|
||||
# Replace mesa_version=...
|
||||
getOptionValue "$@"
|
||||
shift "${nOptArgs:-0}"
|
||||
|
||||
if [ -n "$optValue" ]
|
||||
then
|
||||
replaceEtc config.sh/vtk mesa_version "$optValue"
|
||||
replaceEtc config.csh/vtk mesa_version "$optValue"
|
||||
adjusted=true
|
||||
else
|
||||
: "${adjusted:=empty}"
|
||||
fi
|
||||
optionValue=$(getOptionValue "$@")
|
||||
replaceEtc config.sh/vtk mesa_version "$optionValue"
|
||||
replaceEtc config.csh/vtk mesa_version "$optionValue"
|
||||
adjusted=true
|
||||
shift
|
||||
;;
|
||||
|
||||
-vtk)
|
||||
# Replace vtk_version=...
|
||||
getOptionValue "$@"
|
||||
shift "${nOptArgs:-0}"
|
||||
|
||||
if [ -n "$optValue" ]
|
||||
then
|
||||
replaceEtc config.sh/vtk vtk_version "$optValue"
|
||||
replaceEtc config.csh/vtk vtk_version "$optValue"
|
||||
adjusted=true
|
||||
else
|
||||
: "${adjusted:=empty}"
|
||||
fi
|
||||
optionValue=$(getOptionValue "$@")
|
||||
replaceEtc config.sh/vtk vtk_version "$optionValue"
|
||||
replaceEtc config.csh/vtk vtk_version "$optionValue"
|
||||
adjusted=true
|
||||
shift
|
||||
;;
|
||||
|
||||
-llvm-path)
|
||||
# Replace LLVM_ARCH_PATH=...
|
||||
getOptionValue "$@"
|
||||
shift "${nOptArgs:-0}"
|
||||
|
||||
if [ -n "$optValue" ]
|
||||
then
|
||||
replaceEtc config.sh/vtk LLVM_ARCH_PATH \""$optValue\""
|
||||
replaceEtcCsh config.csh/vtk LLVM_ARCH_PATH \""$optValue\""
|
||||
adjusted=true
|
||||
else
|
||||
: "${adjusted:=empty}"
|
||||
fi
|
||||
optionValue=$(getOptionValue "$@")
|
||||
replaceEtc config.sh/vtk LLVM_ARCH_PATH \""$optionValue\""
|
||||
replaceEtcCsh config.csh/vtk LLVM_ARCH_PATH \""$optionValue\""
|
||||
adjusted=true
|
||||
shift
|
||||
;;
|
||||
|
||||
-mesa-path)
|
||||
# Replace MESA_ARCH_PATH...
|
||||
getOptionValue "$@"
|
||||
shift "${nOptArgs:-0}"
|
||||
|
||||
if [ -n "$optValue" ]
|
||||
then
|
||||
replaceEtc config.sh/vtk MESA_ARCH_PATH \""$optValue\""
|
||||
replaceEtcCsh config.csh/vtk MESA_ARCH_PATH \""$optValue\""
|
||||
adjusted=true
|
||||
else
|
||||
: "${adjusted:=empty}"
|
||||
fi
|
||||
optionValue=$(getOptionValue "$@")
|
||||
replaceEtc config.sh/vtk MESA_ARCH_PATH \""$optionValue\""
|
||||
replaceEtcCsh config.csh/vtk MESA_ARCH_PATH \""$optionValue\""
|
||||
adjusted=true
|
||||
shift
|
||||
;;
|
||||
|
||||
-vtk-path)
|
||||
# Replace VTK_DIR...
|
||||
getOptionValue "$@"
|
||||
shift "${nOptArgs:-0}"
|
||||
|
||||
if [ -n "$optValue" ]
|
||||
then
|
||||
replaceEtc config.sh/vtk VTK_DIR \""$optValue\""
|
||||
replaceEtcCsh config.csh/vtk VTK_DIR \""$optValue\""
|
||||
adjusted=true
|
||||
else
|
||||
: "${adjusted:=empty}"
|
||||
fi
|
||||
optionValue=$(getOptionValue "$@")
|
||||
replaceEtc config.sh/vtk VTK_DIR \""$optionValue\""
|
||||
replaceEtcCsh config.csh/vtk VTK_DIR \""$optionValue\""
|
||||
adjusted=true
|
||||
shift
|
||||
;;
|
||||
|
||||
|
||||
## Misc ##
|
||||
|
||||
# Obsolete flags
|
||||
-sigfpe | -no-sigfpe)
|
||||
echo "Enable/disable FOAM_SIGFPE now via controlDict" 1>&2
|
||||
;;
|
||||
|
||||
# Obsolete options
|
||||
-archOption | --archOption | \
|
||||
-archOption | --archOption)
|
||||
# Replace WM_ARCH_OPTION=...
|
||||
optionValue=$(getOptionValue "$@")
|
||||
echo "Ignoring $1 option: no longer supported" 1>&2
|
||||
shift
|
||||
;;
|
||||
|
||||
-foamInstall | --foamInstall | -projectName | --projectName)
|
||||
echo "Ignoring obsolete option: $1" 1>&2
|
||||
getOptionValue "$@"
|
||||
shift "${nOptArgs:-0}"
|
||||
# Removed for 1812
|
||||
optionValue=$(getOptionValue "$@")
|
||||
echo "Ignoring $1 option: obsolete" 1>&2
|
||||
shift
|
||||
;;
|
||||
|
||||
*)
|
||||
|
||||
@ -1,430 +0,0 @@
|
||||
#!/bin/sh
|
||||
#------------------------------------------------------------------------------
|
||||
# ========= |
|
||||
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
# \\ / O peration |
|
||||
# \\ / A nd | www.openfoam.com
|
||||
# \\/ M anipulation |
|
||||
#------------------------------------------------------------------------------
|
||||
# Copyright (C) 2020 OpenCFD Ltd.
|
||||
#------------------------------------------------------------------------------
|
||||
# License
|
||||
# This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
|
||||
#
|
||||
# Script
|
||||
# install-dirs
|
||||
#
|
||||
# Example usage
|
||||
# install-dirs -prefix=/opt/openfoam/openfoamVER -core
|
||||
#
|
||||
# Description
|
||||
# Simple installer to copy architecture-independent directories.
|
||||
#
|
||||
#------------------------------------------------------------------------------
|
||||
printHelp() {
|
||||
cat<<USAGE
|
||||
|
||||
Usage: ${0##*/} [OPTION]
|
||||
|
||||
input options:
|
||||
-source=SOURCE Source directory
|
||||
[\$WM_PROJECT_DIR ${WM_PROJECT_DIR:-''}]
|
||||
-platform=PLATFORM OpenFOAM platform name [\$WM_OPTIONS ${WM_OPTIONS:-''}]
|
||||
-foam-mpi=FOAM_MPI OpenFOAM mpi name [\$FOAM_MPI ${FOAM_MPI:-''}]
|
||||
|
||||
target options:
|
||||
-prefix=PREFIX Top-level installation directory in PREFIX ['']
|
||||
|
||||
selections:
|
||||
-[no-]common [do not] install (bin, etc, META-INFO)
|
||||
-[no-]devel [do not] install (applications, src, wmake)
|
||||
-[no-]doc [do not] install (doc)
|
||||
-[no-]tut [do not] install (tutorials)
|
||||
-no-app, -no-apps do not install (applications)
|
||||
-no-src do not install (src)
|
||||
-no-wmake do not install (wmake)
|
||||
|
||||
bundled selections:
|
||||
-core Select: -common -devel
|
||||
-default Select: -common -devel -doc -tut
|
||||
|
||||
tuning options:
|
||||
-collate Collate modules (doc, tutorials)
|
||||
-collate-doc Collate modules (doc) into doc/modules
|
||||
-collate-tut Collate modules (tutorials) into tutorials/modules
|
||||
|
||||
general options:
|
||||
-dry-run, -n Do not perform any operations
|
||||
-force, -f Ignored
|
||||
-verbose, -v Additional verbosity
|
||||
-help Print the help and exit
|
||||
|
||||
|
||||
Simple installer to copy OpenFOAM non-binary directories.
|
||||
|
||||
Example,
|
||||
${0##*/} -prefix=/opt/openfoamVER
|
||||
|
||||
USAGE
|
||||
exit 0 # A clean exit
|
||||
}
|
||||
|
||||
unset optDryRun hadError
|
||||
# Report error and exit
|
||||
die()
|
||||
{
|
||||
exec 1>&2
|
||||
echo
|
||||
echo "Error encountered:"
|
||||
while [ "$#" -ge 1 ]; do echo " $1"; shift; done
|
||||
echo
|
||||
echo "See '${0##*/} -help' for usage"
|
||||
echo
|
||||
exit 1
|
||||
}
|
||||
|
||||
# Report error and exit
|
||||
warnOrDie()
|
||||
{
|
||||
if [ -n "$optDryRun" ]
|
||||
then
|
||||
hadError=true
|
||||
while [ "$#" -ge 1 ]; do echo "Error: $1" 1>&2; shift; done
|
||||
else
|
||||
die "$@"
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
# Get the option's value (argument), or die on missing or empty value
|
||||
# $1 option=value
|
||||
getOptionValue()
|
||||
{
|
||||
local value="${1#*=}"
|
||||
# Remove any surrounding double quotes
|
||||
value="${value%\"}"
|
||||
value="${value#\"}"
|
||||
|
||||
[ -n "$value" ] || die "'${1%=}' option requires a value"
|
||||
echo "$value"
|
||||
}
|
||||
|
||||
# Test for '-no-' or '-without-' prefix. Return "false" or "true"
|
||||
# $1 option
|
||||
# [$2] truth value <true>
|
||||
getBoolOption()
|
||||
{
|
||||
case "$1" in
|
||||
(-no-* | -without-*) echo "false" ;;
|
||||
(*) echo "${2:-true}" ;;
|
||||
esac
|
||||
}
|
||||
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
# Defaults from current OpenFOAM environment
|
||||
sourceDir="$WM_PROJECT_DIR"
|
||||
platform="$WM_OPTIONS"
|
||||
foam_mpi="$FOAM_MPI"
|
||||
|
||||
unset install_common install_devel
|
||||
unset install_app install_src install_wmake
|
||||
unset install_doc optCollate_doc
|
||||
unset install_tut optCollate_tut
|
||||
unset optCollate
|
||||
|
||||
unset prefix exec_prefix bindir libdir libdir_mpi optVerbose
|
||||
|
||||
# Parse options
|
||||
while [ "$#" -gt 0 ]
|
||||
do
|
||||
case "$1" in
|
||||
-h | -help*) printHelp ;;
|
||||
-n | -dry-run) optDryRun="(dry-run) " ;;
|
||||
-v | -verbose) optVerbose=true ;;
|
||||
-f | -force) echo "Ignored option: ${1%%=*}" 1>&2 ;;
|
||||
|
||||
# Inputs
|
||||
-source=*) sourceDir="$(getOptionValue "$1")" ;;
|
||||
-platform=*) echo "Ignored option: ${1%%=*}" 1>&2 ;;
|
||||
-foam-mpi=*) echo "Ignored option: ${1%%=*}" 1>&2 ;;
|
||||
|
||||
# Targets
|
||||
-prefix=*) prefix="$(getOptionValue "$1")" ;;
|
||||
-exec-prefix=*) echo "Ignored option: ${1%%=*}" 1>&2 ;;
|
||||
|
||||
# Selections
|
||||
-common | -no-common) install_common="$(getBoolOption "$1")" ;;
|
||||
-devel | -no-devel) install_devel="$(getBoolOption "$1")" ;;
|
||||
-doc | -no-doc) install_doc="$(getBoolOption "$1")" ;;
|
||||
-tut | -no-tut) install_tut="$(getBoolOption "$1")" ;;
|
||||
-no-app | -no-apps) install_app="$(getBoolOption "$1")" ;;
|
||||
-no-src) install_src="$(getBoolOption "$1")" ;;
|
||||
-no-wmake) install_wmake="$(getBoolOption "$1")" ;;
|
||||
|
||||
-core)
|
||||
install_common=true
|
||||
install_devel=true
|
||||
;;
|
||||
|
||||
-default | -all)
|
||||
[ "$1" = "-all" ] && echo "Compat: treat $1 like -default" 1>&2
|
||||
install_common=true
|
||||
install_devel=true
|
||||
install_doc=true
|
||||
install_tut=true
|
||||
;;
|
||||
|
||||
-collate | -no-collate)
|
||||
optCollate="$(getBoolOption "$1")"
|
||||
if [ "${optCollate:-false}" = false ]
|
||||
then
|
||||
unset optCollate optCollate_doc optCollate_tut
|
||||
fi
|
||||
;;
|
||||
-collate-doc) optCollate_doc=true ;;
|
||||
-collate-tut) optCollate_tut=true ;;
|
||||
|
||||
(*) die "Unknown option/argument: $1" ;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
[ "${install_common:-false}" = false ] && unset install_common
|
||||
if [ "${install_devel:-false}" = false ]
|
||||
then
|
||||
unset install_devel install_app install_src install_wmake
|
||||
fi
|
||||
|
||||
if [ "${install_doc:-false}" = false ]
|
||||
then
|
||||
unset install_doc
|
||||
elif [ "$optCollate_doc" = true ] || [ "$optCollate" = true ]
|
||||
then
|
||||
install_doc=collate
|
||||
fi
|
||||
|
||||
if [ "${install_tut:-false}" = false ]
|
||||
then
|
||||
unset install_tut
|
||||
elif [ "$optCollate_tut" = true ] || [ "$optCollate" = true ]
|
||||
then
|
||||
install_tut=collate
|
||||
fi
|
||||
|
||||
|
||||
# Input checks
|
||||
[ -d "$sourceDir" ] || warnOrDie "Invalid -source directory: $sourceDir"
|
||||
|
||||
# Installation sanity check
|
||||
[ -n "$prefix" ] || warnOrDie "Must specify -prefix"
|
||||
|
||||
if [ -n "$hadError" ]
|
||||
then
|
||||
echo "Errors encounters in dry-run. Stopping" 1>&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -z "${install_common}${install_devel}${install_doc}${install_tut}" ]
|
||||
then
|
||||
exec 1>&2
|
||||
echo "Nothing specified to install"
|
||||
echo
|
||||
echo "See '${0##*/} -help' for usage"
|
||||
echo
|
||||
exit 0 # Treat as not an error
|
||||
fi
|
||||
|
||||
# Report settings
|
||||
echo "Preparing install with the following parameters" 1>&2
|
||||
echo "source:" 1>&2
|
||||
echo " directory $sourceDir" 1>&2
|
||||
echo 1>&2
|
||||
echo "target" 1>&2
|
||||
echo " prefix ${prefix-[]}" 1>&2
|
||||
##echo " binary ${install_binary:-[disabled]}" 1>&2
|
||||
echo " common ${install_common:-[disabled]}" 1>&2
|
||||
echo -n " devel " 1>&2
|
||||
if [ -n "$install_devel" ]
|
||||
then
|
||||
echo -n "true" 1>&2
|
||||
[ "$install_app" = false ] && echo -n " [app=disabled]" 1>&2
|
||||
[ "$install_src" = false ] && echo -n " [src=disabled]" 1>&2
|
||||
[ "$install_wmake" = false ] && echo -n " [wmake=disabled]" 1>&2
|
||||
echo 1>&2
|
||||
else
|
||||
echo "[disabled]" 1>&2
|
||||
fi
|
||||
echo " doc ${install_doc:-[disabled]}" 1>&2
|
||||
echo " tut ${install_tut:-[disabled]}" 1>&2
|
||||
echo 1>&2
|
||||
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# Proper umask
|
||||
umask 022
|
||||
|
||||
# The commands
|
||||
copy_cmd="cp -a ${optVerbose:+-v}"
|
||||
mkdir_cmd="mkdir -p"
|
||||
|
||||
if [ -n "$optDryRun" ]
|
||||
then
|
||||
if [ -n "$optVerbose" ]
|
||||
then
|
||||
copy_cmd="echo cp -a"
|
||||
mkdir_cmd="echo mkdir -p"
|
||||
else
|
||||
copy_cmd="true"
|
||||
mkdir_cmd="true"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
# Copy file or directory to <prefix>
|
||||
doCopy()
|
||||
{
|
||||
$mkdir_cmd "$prefix" 2>/dev/null
|
||||
|
||||
for i in "$@"
|
||||
do
|
||||
if [ -e "$sourceDir/$i" ]
|
||||
then
|
||||
$copy_cmd "$sourceDir/$i" "$prefix"
|
||||
nCopied="x$nCopied"
|
||||
else
|
||||
echo "Missing? $sourceDir/$i" 1>&2
|
||||
fi
|
||||
done
|
||||
echo "${optDryRun}${#nCopied} items copied" 1>&2
|
||||
}
|
||||
|
||||
|
||||
|
||||
# Collate (doc | tutorials)
|
||||
# Eg,
|
||||
# modules/{NAME}/tutorials
|
||||
# => tutorials/modules/{NAME}
|
||||
collateModuleFiles()
|
||||
{
|
||||
local subDir="$1"
|
||||
local subTarget="$prefix/$subDir/modules"
|
||||
|
||||
if [ -d "$sourceDir/modules" ]
|
||||
then
|
||||
(
|
||||
cd "$sourceDir/modules" || exit
|
||||
|
||||
$mkdir_cmd "$subTarget"
|
||||
|
||||
for i in $(find . -mindepth 2 -maxdepth 2 -name "$subDir" -type d)
|
||||
do
|
||||
$mkdir_cmd "$subTarget/${i%/*}"
|
||||
$copy_cmd "$i"/* "$subTarget/${i%/*}"
|
||||
done
|
||||
)
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
# common
|
||||
# ----
|
||||
message="${optDryRun}Install common:"
|
||||
if [ -n "$install_common" ]
|
||||
then
|
||||
echo "${message} bin etc META-INFO" 1>&2
|
||||
doCopy bin etc META-INFO
|
||||
else
|
||||
echo "${message} [disabled]" 1>&2
|
||||
fi
|
||||
# ----
|
||||
|
||||
|
||||
# develop (or source)
|
||||
# ----
|
||||
message="${optDryRun}Install devel:" 1>&2
|
||||
unset dirNames blockMessage
|
||||
if [ -n "$install_devel" ]
|
||||
then
|
||||
if [ "$install_wmake" = false ]
|
||||
then
|
||||
blockMessage="$blockMessage [wmake=disabled]"
|
||||
else
|
||||
dirNames="$dirNames wmake"
|
||||
fi
|
||||
if [ "$install_src" = false ]
|
||||
then
|
||||
blockMessage="$blockMessage [src=disabled]"
|
||||
else
|
||||
dirNames="$dirNames src"
|
||||
fi
|
||||
if [ "$install_app" = false ]
|
||||
then
|
||||
blockMessage="$blockMessage [app=disabled]"
|
||||
else
|
||||
dirNames="$dirNames applications"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -n "$dirNames" ]
|
||||
then
|
||||
echo "${message}${dirNames}${blockMessage}" 1>&2
|
||||
doCopy $dirNames # Unquoted - uses word splitting
|
||||
else
|
||||
echo "${message} [disabled]" 1>&2
|
||||
fi
|
||||
# ----
|
||||
|
||||
|
||||
# doc
|
||||
# ----
|
||||
message="${optDryRun}Install doc:" 1>&2
|
||||
if [ -n "$install_doc" ]
|
||||
then
|
||||
echo "${message}" 1>&2
|
||||
doCopy doc
|
||||
|
||||
if [ "$install_doc" = collate ]
|
||||
then
|
||||
echo "${optDryRun}Collate module doc:" 1>&2
|
||||
collateModuleFiles doc
|
||||
fi
|
||||
else
|
||||
echo "${message} [disabled]" 1>&2
|
||||
fi
|
||||
# ----
|
||||
|
||||
|
||||
# tutorials
|
||||
# ----
|
||||
message="${optDryRun}Install tutorials:" 1>&2
|
||||
if [ -n "$install_tut" ]
|
||||
then
|
||||
echo "${message}" 1>&2
|
||||
doCopy tutorials
|
||||
|
||||
if [ "$install_tut" = collate ]
|
||||
then
|
||||
echo "${optDryRun}Collate module tutorials:" 1>&2
|
||||
collateModuleFiles tutorials
|
||||
fi
|
||||
else
|
||||
echo "${message} [disabled]" 1>&2
|
||||
fi
|
||||
# ----
|
||||
|
||||
|
||||
if [ -n "$optDryRun" ]
|
||||
then
|
||||
[ -n "$optVerbose" ] && echo 1>&2
|
||||
echo "${optDryRun}Done" 1>&2
|
||||
fi
|
||||
|
||||
|
||||
exit 0 # clean exit
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
@ -1,375 +0,0 @@
|
||||
#!/bin/sh
|
||||
#------------------------------------------------------------------------------
|
||||
# ========= |
|
||||
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
# \\ / O peration |
|
||||
# \\ / A nd | www.openfoam.com
|
||||
# \\/ M anipulation |
|
||||
#------------------------------------------------------------------------------
|
||||
# Copyright (C) 2020 OpenCFD Ltd.
|
||||
#------------------------------------------------------------------------------
|
||||
# License
|
||||
# This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
|
||||
#
|
||||
# Script
|
||||
# install-platform
|
||||
#
|
||||
# Example usage
|
||||
# install-platform -prefix=/opt/openfoam/openfoamVER
|
||||
#
|
||||
# Description
|
||||
# Simple installer to copy OpenFOAM binary bin/, lib/ (platforms)
|
||||
# directories.
|
||||
#
|
||||
# Note
|
||||
# The platforms/tools directory still must be handled separately
|
||||
#
|
||||
# Layout of OpenFOAM platforms
|
||||
#
|
||||
# platforms
|
||||
# |-- <WM_OPTIONS>
|
||||
# |-- bin
|
||||
# | |-- ...
|
||||
# `-- lib
|
||||
# |-- ...
|
||||
# |-- dummy
|
||||
# | `-- ...
|
||||
# |-- sys-openmpi
|
||||
# | |-- libPstream.so
|
||||
# | `-- libptscotchDecomp.so
|
||||
# `-- paraview-MAJ.MIN
|
||||
# `-- ...
|
||||
#
|
||||
#------------------------------------------------------------------------------
|
||||
printHelp() {
|
||||
cat<<USAGE
|
||||
|
||||
Usage: ${0##*/} [OPTION]
|
||||
|
||||
input options:
|
||||
-source=SOURCE Source directory
|
||||
[\$WM_PROJECT_DIR ${WM_PROJECT_DIR:-''}]
|
||||
-platform=PLATFORM OpenFOAM platform name [\$WM_OPTIONS ${WM_OPTIONS:-''}]
|
||||
-foam-mpi=FOAM_MPI OpenFOAM mpi name [\$FOAM_MPI ${FOAM_MPI:-''}]
|
||||
|
||||
target options:
|
||||
-prefix=PREFIX Top-level installation directory in PREFIX ['']
|
||||
-exec-prefix=EPREFIX Architecture-dependent in EPREFIX
|
||||
[PREFIX/platforms/PLATFORM]
|
||||
-bindir=DIR bin directory [EPREFIX/bin]
|
||||
-libdir=DIR lib directory [EPREFIX/lib]
|
||||
-mpi-libdir=DIR mpi libdir [<libdir>/FOAM_MPI]
|
||||
|
||||
tuning options:
|
||||
-no-bin Do not install bin directory
|
||||
-no-lib Do not install lib directory
|
||||
-no-mpi Do not install mpi lib directory
|
||||
-mpi-only Only install mpi lib directory
|
||||
-mpi-mkdir Create foam-mpi directory within libdir
|
||||
|
||||
general options:
|
||||
-dry-run, -n Do not perform any operations
|
||||
-force, -f Ignored
|
||||
-verbose, -v Additional verbosity
|
||||
-help Print the help and exit
|
||||
|
||||
|
||||
Simple installer to copy OpenFOAM binary bin/, lib/ (platforms) directories.
|
||||
|
||||
Example,
|
||||
${0##*/} -prefix=/opt/openfoamVER
|
||||
|
||||
USAGE
|
||||
exit 0 # A clean exit
|
||||
}
|
||||
|
||||
unset optDryRun hadError
|
||||
# Report error and exit
|
||||
die()
|
||||
{
|
||||
exec 1>&2
|
||||
echo
|
||||
echo "Error encountered:"
|
||||
while [ "$#" -ge 1 ]; do echo " $1"; shift; done
|
||||
echo
|
||||
echo "See '${0##*/} -help' for usage"
|
||||
echo
|
||||
exit 1
|
||||
}
|
||||
|
||||
# Report error and exit
|
||||
warnOrDie()
|
||||
{
|
||||
if [ -n "$optDryRun" ]
|
||||
then
|
||||
hadError=true
|
||||
while [ "$#" -ge 1 ]; do echo "Error: $1" 1>&2; shift; done
|
||||
else
|
||||
die "$@"
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
# Get the option's value (argument), or die on missing or empty value
|
||||
# $1 option=value
|
||||
getOptionValue()
|
||||
{
|
||||
local value="${1#*=}"
|
||||
# Remove any surrounding double quotes
|
||||
value="${value%\"}"
|
||||
value="${value#\"}"
|
||||
|
||||
[ -n "$value" ] || die "'${1%=}' option requires a value"
|
||||
echo "$value"
|
||||
}
|
||||
|
||||
|
||||
# Test for '-no-' or '-without-' prefix. Return "false" or "true"
|
||||
# $1 option
|
||||
# [$2] truth value <true>
|
||||
getBoolOption()
|
||||
{
|
||||
case "$1" in
|
||||
(-no-* | -without-*) echo "false" ;;
|
||||
(*) echo "${2:-true}" ;;
|
||||
esac
|
||||
}
|
||||
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
# Defaults from current OpenFOAM environment
|
||||
sourceDir="$WM_PROJECT_DIR"
|
||||
platform="$WM_OPTIONS"
|
||||
foam_mpi="$FOAM_MPI"
|
||||
|
||||
unset install_bin install_lib
|
||||
unset optMkdir_mpi
|
||||
install_mpi=true
|
||||
|
||||
unset prefix exec_prefix bindir libdir libdir_mpi optVerbose
|
||||
|
||||
# Parse options
|
||||
while [ "$#" -gt 0 ]
|
||||
do
|
||||
case "$1" in
|
||||
-h | -help*) printHelp ;;
|
||||
-n | -dry-run) optDryRun="(dry-run) " ;;
|
||||
-v | -verbose) optVerbose=true ;;
|
||||
-f | -force) echo "Ignored option: ${1%%=*}" 1>&2 ;;
|
||||
|
||||
# Inputs
|
||||
-source=*) sourceDir="$(getOptionValue "$1")" ;;
|
||||
-platform=*) platform="$(getOptionValue "$1")" ;;
|
||||
-foam-mpi=*) foam_mpi="$(getOptionValue "$1")" ;;
|
||||
|
||||
# Targets
|
||||
-prefix=*) prefix="$(getOptionValue "$1")" ;;
|
||||
-exec-prefix=*) exec_prefix="$(getOptionValue "$1")" ;;
|
||||
|
||||
-bindir=*) bindir="$(getOptionValue "$1")" ;;
|
||||
-libdir=*) libdir="$(getOptionValue "$1")" ;;
|
||||
-mpi-libdir=*) libdir_mpi="$(getOptionValue "$1")" ;;
|
||||
|
||||
-no-bin) install_bin=false ;;
|
||||
-no-lib) install_lib=false ;;
|
||||
-no-mpi) install_mpi=false ;;
|
||||
-mpi-only) install_mpi=exclusive ;;
|
||||
-mpi-mkdir) optMkdir_mpi=true ;;
|
||||
|
||||
(*) die "Unknown option/argument: $1" ;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
# Default <exec_prefix> based on <prefix>
|
||||
if [ -z "$exec_prefix" ] && [ -n "$prefix" ]
|
||||
then
|
||||
exec_prefix="$prefix/platforms/$platform"
|
||||
fi
|
||||
|
||||
# Default <bindir>, <libdir> based on <exec_prefix>
|
||||
if [ -n "$exec_prefix" ]
|
||||
then
|
||||
[ -n "$bindir" ] || bindir="$exec_prefix/bin"
|
||||
[ -n "$libdir" ] || libdir="$exec_prefix/lib"
|
||||
fi
|
||||
|
||||
# Default <mpi-libdir> based on <libdir> and <foam-mpi>
|
||||
if [ -z "$libdir_mpi" ] && [ -n "$libdir" ]
|
||||
then
|
||||
libdir_mpi="$libdir/$foam_mpi"
|
||||
fi
|
||||
|
||||
# Exclusions
|
||||
if [ "$install_bin" = false ] || [ "$install_mpi" = exclusive ]
|
||||
then
|
||||
unset bindir
|
||||
fi
|
||||
if [ "$install_lib" = false ] || [ "$install_mpi" = exclusive ]
|
||||
then
|
||||
unset libdir
|
||||
fi
|
||||
if [ "$install_mpi" = false ]
|
||||
then
|
||||
unset libdir_mpi
|
||||
fi
|
||||
|
||||
|
||||
# Input checks
|
||||
|
||||
sourcePlatform="$sourceDir/platforms/$platform"
|
||||
|
||||
[ -d "$sourceDir" ] || warnOrDie "Invalid -source directory: $sourceDir"
|
||||
[ -n "$platform" ] || warnOrDie "No -platform detected or specified"
|
||||
[ -n "$foam_mpi" ] || warnOrDie "No -foam-mpi detected or specified"
|
||||
|
||||
[ -d "$sourcePlatform" ] || \
|
||||
warnOrDie "Missing platforms directory for: $platform"
|
||||
|
||||
|
||||
# Installation sanity check
|
||||
[ -n "$bindir$libdir$libdir_mpi" ] || \
|
||||
warnOrDie "Must specify at least one of -prefix, -exec-prefix, -bindir, -libdir, -mpi-libdir"
|
||||
|
||||
|
||||
if [ -n "$hadError" ]
|
||||
then
|
||||
echo "Errors encounters in dry-run. Stopping" 1>&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Report settings
|
||||
echo "Preparing install with the following parameters" 1>&2
|
||||
echo "source:" 1>&2
|
||||
echo " directory $sourceDir" 1>&2
|
||||
echo " platform $platform" 1>&2
|
||||
echo " foam-mpi $foam_mpi" 1>&2
|
||||
echo 1>&2
|
||||
echo "target (mpi-install: $install_mpi)" 1>&2
|
||||
echo " prefix ${prefix-[]}" 1>&2
|
||||
echo " exec-prefix ${exec_prefix:-[]}" 1>&2
|
||||
echo " bindir ${bindir:-[]}" 1>&2
|
||||
echo " libdir ${libdir:-[]}" 1>&2
|
||||
echo " libdir(mpi) ${libdir_mpi:-[]}" 1>&2
|
||||
echo 1>&2
|
||||
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# Proper umask
|
||||
umask 022
|
||||
|
||||
# The commands
|
||||
copy_cmd="cp -a ${optVerbose:+-v}"
|
||||
mkdir_cmd="mkdir -p"
|
||||
|
||||
if [ -n "$optDryRun" ]
|
||||
then
|
||||
if [ -n "$optVerbose" ]
|
||||
then
|
||||
copy_cmd="echo cp -a"
|
||||
mkdir_cmd="echo mkdir -p"
|
||||
else
|
||||
copy_cmd="true"
|
||||
mkdir_cmd="true"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
# bin/
|
||||
# ----
|
||||
message="${optDryRun}Install bindir:"
|
||||
if [ -n "$bindir" ]
|
||||
then
|
||||
input="$sourcePlatform/bin"
|
||||
|
||||
echo "From $input" 1>&2
|
||||
echo "${message} $bindir" 1>&2
|
||||
|
||||
$mkdir_cmd "$bindir" 2>/dev/null
|
||||
|
||||
for i in "$input/"*
|
||||
do
|
||||
if [ -e "$i" ]
|
||||
then
|
||||
$copy_cmd "$i" "$bindir"
|
||||
fi
|
||||
done
|
||||
else
|
||||
echo "${message} [disabled]" 1>&2
|
||||
fi
|
||||
# ----
|
||||
|
||||
|
||||
# lib/ without mpi
|
||||
# ----
|
||||
message="${optDryRun}Install libdir(non-mpi):"
|
||||
if [ -n "$libdir" ]
|
||||
then
|
||||
input="$sourcePlatform/lib"
|
||||
|
||||
echo "From $input" 1>&2
|
||||
echo "${message} $libdir" 1>&2
|
||||
|
||||
$mkdir_cmd "$libdir" 2>/dev/null
|
||||
|
||||
for i in "$input/"*
|
||||
do
|
||||
if [ "${i##*/}" = "$foam_mpi" ]
|
||||
then
|
||||
if [ "$optMkdir_mpi" = true ]
|
||||
then
|
||||
$mkdir_cmd "$libdir/$foam_mpi"
|
||||
fi
|
||||
elif [ -e "$i" ]
|
||||
then
|
||||
$copy_cmd "$i" "$libdir"
|
||||
else
|
||||
echo "bogus lib entry? $i" 1>&2
|
||||
fi
|
||||
done
|
||||
else
|
||||
echo "${message} [disabled]" 1>&2
|
||||
fi
|
||||
# ----
|
||||
|
||||
|
||||
# lib/mpi
|
||||
# ----
|
||||
message="${optDryRun}Install libdir(mpi):"
|
||||
if [ -n "$libdir_mpi" ]
|
||||
then
|
||||
input="$sourcePlatform/lib/$foam_mpi"
|
||||
|
||||
echo "From $input" 1>&2
|
||||
echo "${message} $libdir_mpi" 1>&2
|
||||
|
||||
$mkdir_cmd "$libdir_mpi" 2>/dev/null
|
||||
|
||||
for i in "$input"/*
|
||||
do
|
||||
if [ -e "$i" ]
|
||||
then
|
||||
# Always verbose (not many files anyhow)
|
||||
$copy_cmd -v "$i" "$libdir_mpi"
|
||||
else
|
||||
echo "bogus mpi-lib entry? $i" 1>&2
|
||||
fi
|
||||
done
|
||||
else
|
||||
echo "${message} [disabled]" 1>&2
|
||||
fi
|
||||
# ----
|
||||
|
||||
|
||||
if [ -n "$optDryRun" ]
|
||||
then
|
||||
[ -n "$optVerbose" ] && echo 1>&2
|
||||
echo "${optDryRun}Done" 1>&2
|
||||
fi
|
||||
|
||||
|
||||
exit 0 # A clean exit
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
@ -1,75 +0,0 @@
|
||||
#!/bin/sh
|
||||
FOAM_MPI="@FOAM_MPI@"
|
||||
FOAM_SYSTEM_MPI_LIBBIN="@FOAM_SYSTEM_MPI_LIBBIN@"
|
||||
#------------------------------------------------------------------------------
|
||||
# ========= |
|
||||
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
# \\ / O peration |
|
||||
# \\ / A nd | www.openfoam.com
|
||||
# \\/ M anipulation |
|
||||
#------------------------------------------------------------------------------
|
||||
# Copyright (C) 2020 OpenCFD Ltd.
|
||||
#------------------------------------------------------------------------------
|
||||
# License
|
||||
# This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
|
||||
#
|
||||
# Description
|
||||
# Update of links from system mpi lib/ to local lib/mpi-name
|
||||
#
|
||||
# Note
|
||||
# Normally located as a trigger within the platforms/ directory
|
||||
# Uses hard-coded values (eg, generated with autoconfig).
|
||||
#
|
||||
#------------------------------------------------------------------------------
|
||||
cd "${0%/*}" || exit # Run from this directory
|
||||
|
||||
# Local values
|
||||
FOAM_LIBBIN="$(pwd -P)/lib"
|
||||
FOAM_MPI_LIBBIN="$FOAM_LIBBIN/$FOAM_MPI"
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
echo "Link OpenFOAM ($FOAM_MPI) from system locations"
|
||||
echo "Target: $FOAM_MPI_LIBBIN"
|
||||
echo "Source: $FOAM_SYSTEM_MPI_LIBBIN"
|
||||
|
||||
if [ -z "$FOAM_MPI" ]
|
||||
then
|
||||
echo "FOAM_MPI not defined - skipping"
|
||||
exit 0
|
||||
fi
|
||||
if [ -z "$FOAM_SYSTEM_MPI_LIBBIN" ]
|
||||
then
|
||||
echo "FOAM_SYSTEM_MPI_LIBBIN not defined - skipping"
|
||||
exit 0
|
||||
fi
|
||||
if [ ! -d "$FOAM_SYSTEM_MPI_LIBBIN" ]
|
||||
then
|
||||
echo "No system mpi lib: $FOAM_SYSTEM_MPI_LIBBIN"
|
||||
echo "... not updating"
|
||||
exit 0
|
||||
fi
|
||||
if [ ! -d "$FOAM_LIBBIN" ]
|
||||
then
|
||||
echo "Missing $FOAM_LIBBIN"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
mkdir -p "$FOAM_MPI_LIBBIN"
|
||||
|
||||
# Create symlinks
|
||||
(
|
||||
cd "$FOAM_MPI_LIBBIN" || exit
|
||||
|
||||
for i in "$FOAM_SYSTEM_MPI_LIBBIN"/*
|
||||
do
|
||||
if [ -f "$i" ]
|
||||
then
|
||||
ln -svf "$i" "${i##*/}"
|
||||
fi
|
||||
done
|
||||
)
|
||||
|
||||
exit 0 # clean exit
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
@ -52,7 +52,7 @@ Foam::functionObjects::FUNCTIONOBJECT::FUNCTIONOBJECT
|
||||
)
|
||||
:
|
||||
fvMeshFunctionObject(name, runTime, dict),
|
||||
boolData_(dict.getOrDefault<bool>("boolData", true)),
|
||||
boolData_(dict.getOrDefault<bool>("boolData"), true),
|
||||
labelData_(dict.get<label>("labelData")),
|
||||
wordData_(dict.getOrDefault<word>("wordData", "defaultWord")),
|
||||
scalarData_(dict.getOrDefault<scalar>("scalarData", 1.0))
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
# \\/ M anipulation |
|
||||
#------------------------------------------------------------------------------
|
||||
# Copyright (C) 2011-2016 OpenFOAM Foundation
|
||||
# Copyright (C) 2016-2021 OpenCFD Ltd.
|
||||
# Copyright (C) 2016-2020 OpenCFD Ltd.
|
||||
#------------------------------------------------------------------------------
|
||||
# License
|
||||
# This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
|
||||
@ -172,13 +172,12 @@ _foamAddPath "${FOAM_USER_APPBIN}:${FOAM_SITE_APPBIN}:${FOAM_APPBIN}"
|
||||
# Dummy versions of external libraries. To be found last in library path
|
||||
_foamAddLib "$FOAM_LIBBIN/dummy"
|
||||
|
||||
# External (ThirdParty) libraries:
|
||||
# - check if already compiled, or will be compiled.
|
||||
# can also be unset
|
||||
unsetenv FOAM_EXT_LIBBIN
|
||||
if ( -d "$WM_THIRD_PARTY_DIR/platforms" || -f "$WM_THIRD_PARTY_DIR/Allwmake" ) then
|
||||
# External (ThirdParty) libraries. Also allowed to be unset
|
||||
if ( -d "$WM_THIRD_PARTY_DIR" ) then
|
||||
setenv FOAM_EXT_LIBBIN "$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION/lib"
|
||||
_foamAddLib "$FOAM_EXT_LIBBIN"
|
||||
else
|
||||
unsetenv FOAM_EXT_LIBBIN
|
||||
endif
|
||||
|
||||
# OpenFOAM libraries (user, group, standard)
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
# \\/ M anipulation |
|
||||
#------------------------------------------------------------------------------
|
||||
# Copyright (C) 2011-2016 OpenFOAM Foundation
|
||||
# Copyright (C) 2016-2021 OpenCFD Ltd.
|
||||
# Copyright (C) 2016-2020 OpenCFD Ltd.
|
||||
#------------------------------------------------------------------------------
|
||||
# License
|
||||
# This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
|
||||
@ -169,14 +169,13 @@ _foamAddPath "$FOAM_USER_APPBIN:$FOAM_SITE_APPBIN:$FOAM_APPBIN"
|
||||
# Dummy versions of external libraries. To be found last in library path
|
||||
_foamAddLib "$FOAM_LIBBIN/dummy"
|
||||
|
||||
# External (ThirdParty) libraries:
|
||||
# - check if already compiled, or will be compiled.
|
||||
# can also be unset
|
||||
unset FOAM_EXT_LIBBIN
|
||||
if [ -d "$WM_THIRD_PARTY_DIR/platforms" ] || [ -f "$WM_THIRD_PARTY_DIR/Allwmake" ]
|
||||
# External (ThirdParty) libraries. Also allowed to be unset
|
||||
if [ -d "$WM_THIRD_PARTY_DIR" ]
|
||||
then
|
||||
export FOAM_EXT_LIBBIN="$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION/lib"
|
||||
_foamAddLib "$FOAM_EXT_LIBBIN"
|
||||
else
|
||||
unset FOAM_EXT_LIBBIN
|
||||
fi
|
||||
|
||||
# OpenFOAM libraries (user, group, standard)
|
||||
|
||||
@ -12,13 +12,7 @@ targetType=libso
|
||||
export FOAM_MODULE_PREFIX
|
||||
|
||||
echo "========================================"
|
||||
if [ "$FOAM_MODULE_PREFIX" = false ] || [ "$FOAM_MODULE_PREFIX" = none ]
|
||||
then
|
||||
echo "OpenFOAM modules disabled (prefix=${FOAM_MODULE_PREFIX})"
|
||||
echo
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo "Compile OpenFOAM modules"
|
||||
echo "prefix = $FOAM_MODULE_PREFIX"
|
||||
echo
|
||||
echo " ignoring possible compilation errors"
|
||||
|
||||
@ -50,7 +50,6 @@ void Foam::List<T>::doResize(const label newSize)
|
||||
{
|
||||
if (newSize > 0)
|
||||
{
|
||||
// With sign-check to avoid spurious -Walloc-size-larger-than
|
||||
T* nv = new T[newSize];
|
||||
|
||||
const label overlap = min(this->size_, newSize);
|
||||
|
||||
@ -31,9 +31,8 @@ License
|
||||
template<class T>
|
||||
inline void Foam::List<T>::doAlloc()
|
||||
{
|
||||
if (this->size_ > 0)
|
||||
if (this->size_)
|
||||
{
|
||||
// With sign-check to avoid spurious -Walloc-size-larger-than
|
||||
this->v_ = new T[this->size_];
|
||||
}
|
||||
}
|
||||
|
||||
@ -32,8 +32,8 @@ Description
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#ifndef Foam_OSHA1stream_H
|
||||
#define Foam_OSHA1stream_H
|
||||
#ifndef OSHA1stream_H
|
||||
#define OSHA1stream_H
|
||||
|
||||
#include "OSstream.H"
|
||||
#include "SHA1.H"
|
||||
@ -63,17 +63,10 @@ class osha1stream
|
||||
|
||||
protected:
|
||||
|
||||
//- Handle overflow
|
||||
virtual int overflow(int c = EOF)
|
||||
{
|
||||
if (c != EOF) sha1_.append(c);
|
||||
return c;
|
||||
}
|
||||
|
||||
//- Put sequence of characters
|
||||
virtual std::streamsize xsputn(const char* s, std::streamsize n)
|
||||
{
|
||||
if (n) sha1_.append(s, n);
|
||||
sha1_.append(s, n);
|
||||
return n;
|
||||
}
|
||||
|
||||
|
||||
@ -158,7 +158,7 @@ Foam::tokenList Foam::functionEntries::evalEntry::evaluate
|
||||
OTstream toks;
|
||||
result.writeValue(toks);
|
||||
|
||||
return tokenList(std::move(toks.tokens()));
|
||||
return std::move(toks);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
Copyright (C) 2011-2016 OpenFOAM Foundation
|
||||
Copyright (C) 2019-2021 OpenCFD Ltd.
|
||||
Copyright (C) 2019 OpenCFD Ltd.
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
This file is part of OpenFOAM.
|
||||
@ -26,7 +26,7 @@ License
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
|
||||
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
||||
|
||||
template<class Type>
|
||||
Foam::autoPtr<Foam::pointPatchField<Type>> Foam::pointPatchField<Type>::New
|
||||
@ -55,22 +55,20 @@ Foam::autoPtr<Foam::pointPatchField<Type>> Foam::pointPatchField<Type>::New
|
||||
|
||||
if
|
||||
(
|
||||
actualPatchType.empty()
|
||||
actualPatchType == word::null
|
||||
|| actualPatchType != p.type()
|
||||
)
|
||||
{
|
||||
if (pfPtr().constraintType() != p.constraintType())
|
||||
{
|
||||
// Incompatible (constraint-wise) with the patch type
|
||||
// - use default constraint type
|
||||
|
||||
// Use default constraint type
|
||||
auto patchTypeCstrIter =
|
||||
pointPatchConstructorTablePtr_->cfind(p.type());
|
||||
|
||||
if (!patchTypeCstrIter.found())
|
||||
{
|
||||
FatalErrorInFunction
|
||||
<< "Inconsistent patch and patchField types for\n"
|
||||
<< "inconsistent patch and patchField types for \n"
|
||||
<< " patch type " << p.type()
|
||||
<< " and patchField type " << patchFieldType
|
||||
<< exit(FatalError);
|
||||
@ -140,17 +138,20 @@ Foam::autoPtr<Foam::pointPatchField<Type>> Foam::pointPatchField<Type>::New
|
||||
|
||||
if
|
||||
(
|
||||
!dict.found("patchType")
|
||||
!dict.found("patchType")
|
||||
|| dict.get<word>("patchType") != p.type()
|
||||
)
|
||||
{
|
||||
if (pfPtr().constraintType() != p.constraintType())
|
||||
if (pfPtr().constraintType() == p.constraintType())
|
||||
{
|
||||
// Incompatible (constraint-wise) with the patch type
|
||||
// - use default constraint type
|
||||
|
||||
auto patchTypeCstrIter =
|
||||
dictionaryConstructorTablePtr_->cfind(p.type());
|
||||
// Compatible (constraint-wise) with the patch type
|
||||
return pfPtr;
|
||||
}
|
||||
else
|
||||
{
|
||||
// Use default constraint type
|
||||
auto patchTypeCstrIter
|
||||
= dictionaryConstructorTablePtr_->cfind(p.type());
|
||||
|
||||
if (!patchTypeCstrIter.found())
|
||||
{
|
||||
@ -165,7 +166,7 @@ Foam::autoPtr<Foam::pointPatchField<Type>> Foam::pointPatchField<Type>::New
|
||||
}
|
||||
}
|
||||
|
||||
return pfPtr;
|
||||
return cstrIter()(p, iF, dict);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
Copyright (C) 2011-2017 OpenFOAM Foundation
|
||||
Copyright (C) 2015-2021 OpenCFD Ltd.
|
||||
Copyright (C) 2015-2020 OpenCFD Ltd.
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
This file is part of OpenFOAM.
|
||||
@ -1195,7 +1195,7 @@ void Foam::argList::parse
|
||||
{
|
||||
parRunControl_.distributed(true);
|
||||
source = "-roots";
|
||||
if (roots.size() > 1)
|
||||
if (roots.size() != 1)
|
||||
{
|
||||
dictNProcs = roots.size()+1;
|
||||
}
|
||||
@ -1204,7 +1204,6 @@ void Foam::argList::parse
|
||||
{
|
||||
roots.resize(Pstream::nProcs()-1, fileName::null);
|
||||
|
||||
parRunControl_.distributed(true);
|
||||
source = "-hostRoots";
|
||||
ITstream is(source, options_["hostRoots"]);
|
||||
|
||||
@ -1243,7 +1242,7 @@ void Foam::argList::parse
|
||||
}
|
||||
}
|
||||
|
||||
if (roots.size() > 1)
|
||||
if (roots.size() != 1)
|
||||
{
|
||||
dictNProcs = roots.size()+1;
|
||||
}
|
||||
@ -1271,12 +1270,6 @@ void Foam::argList::parse
|
||||
{
|
||||
parRunControl_.distributed(true);
|
||||
decompDict.readEntry("roots", roots);
|
||||
if (roots.empty())
|
||||
{
|
||||
DetailInfo
|
||||
<< "WARNING: running distributed"
|
||||
<< " but did not specify roots!" << nl;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1344,8 +1337,8 @@ void Foam::argList::parse
|
||||
{
|
||||
options_.set("case", roots[slave-1]/globalCase_);
|
||||
|
||||
OPstream toProc(Pstream::commsTypes::scheduled, slave);
|
||||
toProc << args_ << options_ << parRunControl_.distributed();
|
||||
OPstream toSlave(Pstream::commsTypes::scheduled, slave);
|
||||
toSlave << args_ << options_ << roots.size();
|
||||
}
|
||||
options_.erase("case");
|
||||
|
||||
@ -1395,24 +1388,24 @@ void Foam::argList::parse
|
||||
slave++
|
||||
)
|
||||
{
|
||||
OPstream toProc(Pstream::commsTypes::scheduled, slave);
|
||||
toProc << args_ << options_ << parRunControl_.distributed();
|
||||
OPstream toSlave(Pstream::commsTypes::scheduled, slave);
|
||||
toSlave << args_ << options_ << roots.size();
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// Collect the master's argument list
|
||||
bool isDistributed;
|
||||
label nroots;
|
||||
|
||||
IPstream fromMaster
|
||||
(
|
||||
Pstream::commsTypes::scheduled,
|
||||
Pstream::masterNo()
|
||||
);
|
||||
fromMaster >> args_ >> options_ >> isDistributed;
|
||||
fromMaster >> args_ >> options_ >> nroots;
|
||||
|
||||
parRunControl_.distributed(isDistributed);
|
||||
parRunControl_.distributed(nroots);
|
||||
|
||||
// Establish rootPath_/globalCase_/case_ for slave
|
||||
setCasePaths();
|
||||
|
||||
@ -202,8 +202,7 @@ inline Foam::Matrix<Form, Type>::Matrix
|
||||
)
|
||||
:
|
||||
mRows_(Mb.m()),
|
||||
nCols_(Mb.n()),
|
||||
v_(nullptr)
|
||||
nCols_(Mb.n())
|
||||
{
|
||||
doAlloc();
|
||||
|
||||
@ -225,8 +224,7 @@ inline Foam::Matrix<Form, Type>::Matrix
|
||||
)
|
||||
:
|
||||
mRows_(Mb.m()),
|
||||
nCols_(Mb.n()),
|
||||
v_(nullptr)
|
||||
nCols_(Mb.n())
|
||||
{
|
||||
doAlloc();
|
||||
|
||||
|
||||
@ -35,9 +35,8 @@ inline void Foam::Matrix<Form, Type>::doAlloc()
|
||||
{
|
||||
const label len = size();
|
||||
|
||||
if (len > 0)
|
||||
if (len)
|
||||
{
|
||||
// With sign-check to avoid spurious -Walloc-size-larger-than
|
||||
v_ = new Type[len];
|
||||
}
|
||||
}
|
||||
|
||||
@ -45,9 +45,6 @@ Description
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "mathematicalConstants.H"
|
||||
#include "error.H"
|
||||
#include <cmath>
|
||||
#include <limits>
|
||||
|
||||
using namespace Foam::constant::mathematical;
|
||||
|
||||
|
||||
@ -43,10 +43,6 @@ Description
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "mathematicalConstants.H"
|
||||
#include "error.H"
|
||||
#include <cmath>
|
||||
#include <limits>
|
||||
|
||||
using namespace Foam::constant::mathematical;
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -513,10 +513,6 @@ inline Foam::Tensor<Cmpt> Foam::Tensor<Cmpt>::T() const
|
||||
|
||||
|
||||
template<class Cmpt>
|
||||
#if defined(__GNUC__) && !defined(__clang__)
|
||||
// Workaround for gcc (11+) that fails to handle tensor dot vector
|
||||
__attribute__((optimize("no-tree-vectorize")))
|
||||
#endif
|
||||
inline Foam::Tensor<Cmpt>
|
||||
Foam::Tensor<Cmpt>::inner(const Tensor<Cmpt>& t2) const
|
||||
{
|
||||
@ -540,10 +536,6 @@ Foam::Tensor<Cmpt>::inner(const Tensor<Cmpt>& t2) const
|
||||
|
||||
|
||||
template<class Cmpt>
|
||||
#if defined(__GNUC__) && !defined(__clang__)
|
||||
// Workaround for gcc (11+) that fails to handle tensor dot vector
|
||||
__attribute__((optimize("no-tree-vectorize")))
|
||||
#endif
|
||||
inline Foam::Tensor<Cmpt>
|
||||
Foam::Tensor<Cmpt>::schur(const Tensor<Cmpt>& t2) const
|
||||
{
|
||||
@ -978,10 +970,6 @@ operator&(const Tensor<Cmpt>& t1, const Tensor<Cmpt>& t2)
|
||||
|
||||
//- Inner-product of a SphericalTensor and a Tensor
|
||||
template<class Cmpt>
|
||||
#if defined(__GNUC__) && !defined(__clang__)
|
||||
// Workaround for gcc (11+) that fails to handle tensor dot vector
|
||||
__attribute__((optimize("no-tree-vectorize")))
|
||||
#endif
|
||||
inline Tensor<Cmpt>
|
||||
operator&(const SphericalTensor<Cmpt>& st1, const Tensor<Cmpt>& t2)
|
||||
{
|
||||
@ -996,10 +984,6 @@ operator&(const SphericalTensor<Cmpt>& st1, const Tensor<Cmpt>& t2)
|
||||
|
||||
//- Inner-product of a Tensor and a SphericalTensor
|
||||
template<class Cmpt>
|
||||
#if defined(__GNUC__) && !defined(__clang__)
|
||||
// Workaround for gcc (11+) that fails to handle tensor dot vector
|
||||
__attribute__((optimize("no-tree-vectorize")))
|
||||
#endif
|
||||
inline Tensor<Cmpt>
|
||||
operator&(const Tensor<Cmpt>& t1, const SphericalTensor<Cmpt>& st2)
|
||||
{
|
||||
@ -1014,10 +998,6 @@ operator&(const Tensor<Cmpt>& t1, const SphericalTensor<Cmpt>& st2)
|
||||
|
||||
//- Inner-product of a SymmTensor and a Tensor
|
||||
template<class Cmpt>
|
||||
#if defined(__GNUC__) && !defined(__clang__)
|
||||
// Workaround for gcc (11+) that fails to handle tensor dot vector
|
||||
__attribute__((optimize("no-tree-vectorize")))
|
||||
#endif
|
||||
inline Tensor<Cmpt>
|
||||
operator&(const SymmTensor<Cmpt>& st1, const Tensor<Cmpt>& t2)
|
||||
{
|
||||
@ -1040,10 +1020,6 @@ operator&(const SymmTensor<Cmpt>& st1, const Tensor<Cmpt>& t2)
|
||||
|
||||
//- Inner-product of a Tensor and a SymmTensor
|
||||
template<class Cmpt>
|
||||
#if defined(__GNUC__) && !defined(__clang__)
|
||||
// Workaround for gcc (11+) that fails to handle tensor dot vector
|
||||
__attribute__((optimize("no-tree-vectorize")))
|
||||
#endif
|
||||
inline Tensor<Cmpt>
|
||||
operator&(const Tensor<Cmpt>& t1, const SymmTensor<Cmpt>& st2)
|
||||
{
|
||||
@ -1066,11 +1042,7 @@ operator&(const Tensor<Cmpt>& t1, const SymmTensor<Cmpt>& st2)
|
||||
|
||||
//- Inner-product of a Tensor and a Vector
|
||||
template<class Cmpt>
|
||||
#if defined(__GNUC__) && !defined(__clang__)
|
||||
// Workaround for gcc (11+) that fails to handle tensor dot vector
|
||||
__attribute__((optimize("no-tree-vectorize")))
|
||||
#endif
|
||||
inline Vector<Cmpt>
|
||||
inline typename innerProduct<Tensor<Cmpt>, Vector<Cmpt>>::type
|
||||
operator&(const Tensor<Cmpt>& t, const Vector<Cmpt>& v)
|
||||
{
|
||||
return Vector<Cmpt>
|
||||
@ -1084,11 +1056,7 @@ operator&(const Tensor<Cmpt>& t, const Vector<Cmpt>& v)
|
||||
|
||||
//- Inner-product of a Vector and a Tensor
|
||||
template<class Cmpt>
|
||||
#if defined(__GNUC__) && !defined(__clang__)
|
||||
// Workaround for gcc (11+) that fails to handle tensor dot vector
|
||||
__attribute__((optimize("no-tree-vectorize")))
|
||||
#endif
|
||||
inline Vector<Cmpt>
|
||||
inline typename innerProduct<Vector<Cmpt>, Tensor<Cmpt>>::type
|
||||
operator&(const Vector<Cmpt>& v, const Tensor<Cmpt>& t)
|
||||
{
|
||||
return Vector<Cmpt>
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
Copyright (C) 2011-2016 OpenFOAM Foundation
|
||||
Copyright (C) 2019-2022 OpenCFD Ltd.
|
||||
Copyright (C) 2019 OpenCFD Ltd.
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
This file is part of OpenFOAM.
|
||||
@ -42,8 +42,8 @@ SourceFiles
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#ifndef Foam_SHA1_H
|
||||
#define Foam_SHA1_H
|
||||
#ifndef SHA1_H
|
||||
#define SHA1_H
|
||||
|
||||
#include <string>
|
||||
#include <cstdint>
|
||||
@ -113,9 +113,6 @@ public:
|
||||
//- Reset the hashed data before appending more
|
||||
void clear();
|
||||
|
||||
//- Append single character
|
||||
inline void append(char c);
|
||||
|
||||
//- Append data for processing
|
||||
inline SHA1& append(const char* str);
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
Copyright (C) 2011 OpenFOAM Foundation
|
||||
Copyright (C) 2019-2022 OpenCFD Ltd.
|
||||
Copyright (C) 2019 OpenCFD Ltd.
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
This file is part of OpenFOAM.
|
||||
@ -53,12 +53,6 @@ inline Foam::SHA1::SHA1(const std::string& str)
|
||||
|
||||
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
||||
|
||||
inline void Foam::SHA1::append(char c)
|
||||
{
|
||||
processBytes(&c, 1);
|
||||
}
|
||||
|
||||
|
||||
inline Foam::SHA1& Foam::SHA1::append(const char* data, size_t len)
|
||||
{
|
||||
processBytes(data, len);
|
||||
|
||||
@ -29,7 +29,6 @@ License
|
||||
#include "word.H"
|
||||
#include "debug.H"
|
||||
#include <cctype>
|
||||
#include <cstdint>
|
||||
#include <sstream>
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
|
||||
@ -976,17 +976,7 @@ void Foam::UPstream::allocatePstreamCommunicator
|
||||
|
||||
void Foam::UPstream::freePstreamCommunicator(const label communicator)
|
||||
{
|
||||
// Not touching the first communicator (WORLD)
|
||||
// or anything out-of bounds.
|
||||
//
|
||||
// No UPstream communicator indices when MPI is initialized outside
|
||||
// of OpenFOAM - thus needs a bounds check too!
|
||||
|
||||
if
|
||||
(
|
||||
communicator > 0
|
||||
&& (communicator < PstreamGlobals::MPICommunicators_.size())
|
||||
)
|
||||
if (communicator != UPstream::worldComm)
|
||||
{
|
||||
if (PstreamGlobals::MPICommunicators_[communicator] != MPI_COMM_NULL)
|
||||
{
|
||||
|
||||
@ -190,6 +190,15 @@ realizableKE<BasicTurbulenceModel>::realizableKE
|
||||
1.2
|
||||
)
|
||||
),
|
||||
implicitKEpsilonSource_
|
||||
(
|
||||
Switch::lookupOrAddToDict
|
||||
(
|
||||
"implicitKEpsilonSource",
|
||||
this->coeffDict_,
|
||||
false
|
||||
)
|
||||
),
|
||||
|
||||
k_
|
||||
(
|
||||
@ -237,6 +246,11 @@ bool realizableKE<BasicTurbulenceModel>::read()
|
||||
C2_.readIfPresent(this->coeffDict());
|
||||
sigmak_.readIfPresent(this->coeffDict());
|
||||
sigmaEps_.readIfPresent(this->coeffDict());
|
||||
implicitKEpsilonSource_.readIfPresent
|
||||
(
|
||||
"implicitKEpsilonSource",
|
||||
this->coeffDict()
|
||||
);
|
||||
|
||||
return true;
|
||||
}
|
||||
@ -288,6 +302,41 @@ void realizableKE<BasicTurbulenceModel>::correct()
|
||||
)
|
||||
);
|
||||
|
||||
tmp<fvScalarMatrix> tEpsilonSourceEq
|
||||
(
|
||||
new fvScalarMatrix
|
||||
(
|
||||
epsilon_,
|
||||
dimVolume*rho.dimensions()*epsilon_.dimensions()/dimTime
|
||||
)
|
||||
);
|
||||
|
||||
|
||||
tmp<volScalarField> Cmu(rCmu(tgradU(), S2, magS));
|
||||
|
||||
if (implicitKEpsilonSource_)
|
||||
{
|
||||
tmp<volScalarField> tEpsSp
|
||||
(
|
||||
- C1*alpha*rho*eta/sqrt(this->nut_/Cmu())
|
||||
+ alpha*rho*C2_/(sqrt(this->nut_/Cmu()) + sqrt(this->nu()))
|
||||
);
|
||||
|
||||
tEpsilonSourceEq.ref() +=
|
||||
0.5*tEpsSp()*pow(epsilon_, 1.5)
|
||||
- fvm::Sp(1.5*tEpsSp()*sqrt(epsilon_), epsilon_);
|
||||
}
|
||||
else
|
||||
{
|
||||
tEpsilonSourceEq.ref() +=
|
||||
C1*alpha*rho*magS*epsilon_
|
||||
- fvm::Sp
|
||||
(
|
||||
C2_*alpha*rho*epsilon_/(k_ + sqrt(nuLimited*epsilon_)),
|
||||
epsilon_
|
||||
);
|
||||
}
|
||||
|
||||
// Dissipation equation
|
||||
tmp<fvScalarMatrix> epsEqn
|
||||
(
|
||||
@ -295,12 +344,7 @@ void realizableKE<BasicTurbulenceModel>::correct()
|
||||
+ fvm::div(alphaRhoPhi, epsilon_)
|
||||
- fvm::laplacian(alpha*rho*DepsilonEff(), epsilon_)
|
||||
==
|
||||
C1*alpha*rho*magS*epsilon_
|
||||
- fvm::Sp
|
||||
(
|
||||
C2_*alpha*rho*epsilon_/(k_ + sqrt(nuLimited*epsilon_)),
|
||||
epsilon_
|
||||
)
|
||||
tEpsilonSourceEq()
|
||||
+ epsilonSource()
|
||||
+ fvOptions(alpha, rho, epsilon_)
|
||||
);
|
||||
@ -314,6 +358,26 @@ void realizableKE<BasicTurbulenceModel>::correct()
|
||||
|
||||
|
||||
// Turbulent kinetic energy equation
|
||||
tmp<fvScalarMatrix> tkSourceEq
|
||||
(
|
||||
new fvScalarMatrix
|
||||
(
|
||||
k_,
|
||||
dimVolume*rho.dimensions()*k_.dimensions()/dimTime
|
||||
)
|
||||
);
|
||||
|
||||
if (implicitKEpsilonSource_)
|
||||
{
|
||||
tkSourceEq.ref() +=
|
||||
alpha*rho*G + alpha*alpha*rho*rho*Cmu()/this->nut_*sqr(k_)
|
||||
- fvm::Sp(2.0*alpha*alpha*rho*rho*Cmu()*k_/this->nut_, k_);
|
||||
}
|
||||
else
|
||||
{
|
||||
tkSourceEq.ref() += alpha*rho*G - fvm::Sp(alpha*rho*epsilon_/k_, k_);
|
||||
}
|
||||
|
||||
|
||||
tmp<fvScalarMatrix> kEqn
|
||||
(
|
||||
@ -321,9 +385,8 @@ void realizableKE<BasicTurbulenceModel>::correct()
|
||||
+ fvm::div(alphaRhoPhi, k_)
|
||||
- fvm::laplacian(alpha*rho*DkEff(), k_)
|
||||
==
|
||||
alpha*rho*G
|
||||
- fvm::SuSp(2.0/3.0*alpha*rho*divU, k_)
|
||||
- fvm::Sp(alpha*rho*epsilon_/k_, k_)
|
||||
+ tkSourceEq()
|
||||
+ kSource()
|
||||
+ fvOptions(alpha, rho, k_)
|
||||
);
|
||||
|
||||
@ -97,6 +97,9 @@ protected:
|
||||
dimensionedScalar sigmak_;
|
||||
dimensionedScalar sigmaEps_;
|
||||
|
||||
//- Use implicit k-Epilon source
|
||||
Switch implicitKEpsilonSource_;
|
||||
|
||||
|
||||
// Fields
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
Copyright (C) 2011-2016 OpenFOAM Foundation
|
||||
Copyright (C) 2016-2021 OpenCFD Ltd.
|
||||
Copyright (C) 2016-2020 OpenCFD Ltd.
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
This file is part of OpenFOAM.
|
||||
@ -199,9 +199,6 @@ void Foam::ensightMesh::correct()
|
||||
|
||||
if (returnReduce(!zn.empty(), orOp<bool>()))
|
||||
{
|
||||
// Ensure full mesh coverage
|
||||
cellSelection.resize(mesh_.nCells());
|
||||
|
||||
cellSelection.set(zn);
|
||||
|
||||
ensightCells& part = cellZoneParts_(zoneId);
|
||||
@ -270,7 +267,6 @@ void Foam::ensightMesh::correct()
|
||||
|
||||
if (returnReduce(!cellSelection.empty(), orOp<bool>()))
|
||||
{
|
||||
// Ensure full mesh coverage
|
||||
excludeFace.resize(mesh_.nFaces());
|
||||
|
||||
const labelList& owner = mesh_.faceOwner();
|
||||
@ -292,7 +288,6 @@ void Foam::ensightMesh::correct()
|
||||
|
||||
if (fzoneIds.size())
|
||||
{
|
||||
// Ensure full mesh coverage
|
||||
excludeFace.resize(mesh_.nFaces());
|
||||
|
||||
for (const polyPatch& p : mesh_.boundaryMesh())
|
||||
|
||||
@ -161,38 +161,38 @@ Foam::turbulentDigitalFilterInletFvPatchVectorField::indexPairs()
|
||||
|
||||
void Foam::turbulentDigitalFilterInletFvPatchVectorField::checkR() const
|
||||
{
|
||||
label badFacei = -1;
|
||||
const vectorField& faceCentres = this->patch().patch().faceCentres();
|
||||
|
||||
forAll(R_, facei)
|
||||
{
|
||||
if (R_[facei].xx() <= 0)
|
||||
{
|
||||
badFacei = facei;
|
||||
FatalErrorInFunction
|
||||
<< "Reynolds stress tensor component Rxx cannot be negative"
|
||||
<< " or zero, where Rxx = " << R_[facei].xx();
|
||||
break;
|
||||
<< " or zero, where Rxx = " << R_[facei].xx()
|
||||
<< " at the face centre = " << faceCentres[facei]
|
||||
<< exit(FatalError);
|
||||
}
|
||||
|
||||
if (R_[facei].yy() < 0 || R_[facei].zz() < 0)
|
||||
{
|
||||
badFacei = facei;
|
||||
FatalErrorInFunction
|
||||
<< "Reynolds stress tensor components Ryy or Rzz cannot be"
|
||||
<< " negative where Ryy = " << R_[facei].yy()
|
||||
<< ", and Rzz = " << R_[facei].zz();
|
||||
break;
|
||||
<< ", and Rzz = " << R_[facei].zz()
|
||||
<< " at the face centre = " << faceCentres[facei]
|
||||
<< exit(FatalError);
|
||||
}
|
||||
|
||||
const scalar x0 = R_[facei].xx()*R_[facei].yy() - sqr(R_[facei].xy());
|
||||
|
||||
if (x0 <= 0)
|
||||
{
|
||||
badFacei = facei;
|
||||
FatalErrorInFunction
|
||||
<< "Reynolds stress tensor component group, Rxx*Ryy - Rxy^2"
|
||||
<< " cannot be negative or zero";
|
||||
break;
|
||||
<< " cannot be negative or zero"
|
||||
<< " at the face centre = " << faceCentres[facei]
|
||||
<< exit(FatalError);
|
||||
}
|
||||
|
||||
const scalar x1 = R_[facei].zz() - sqr(R_[facei].xz())/R_[facei].xx();
|
||||
@ -202,23 +202,15 @@ void Foam::turbulentDigitalFilterInletFvPatchVectorField::checkR() const
|
||||
|
||||
if (x3 < 0)
|
||||
{
|
||||
badFacei = facei;
|
||||
FatalErrorInFunction
|
||||
<< "Reynolds stress tensor component group, "
|
||||
<< "Rzz - Rxz^2/Rxx - (Ryz - Rxy*Rxz/(Rxx*(Rxx*Ryy - Rxy^2)))^2"
|
||||
<< " cannot be negative";
|
||||
break;
|
||||
<< " cannot be negative at the face centre = "
|
||||
<< faceCentres[facei]
|
||||
<< exit(FatalError);
|
||||
}
|
||||
}
|
||||
|
||||
if (badFacei >= 0)
|
||||
{
|
||||
FatalError
|
||||
<< " at the face centre = "
|
||||
<< this->patch().patch().faceCentres()[badFacei]
|
||||
<< exit(FatalError);
|
||||
}
|
||||
|
||||
Info<< " # Reynolds stress tensor on patch is consistent #" << endl;
|
||||
}
|
||||
|
||||
|
||||
@ -0,0 +1,276 @@
|
||||
/*---------------------------------------------------------------------------*\
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | www.openfoam.com
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
Copyright (C) 2019 OpenCFD Ltd.
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
This file is part of OpenFOAM.
|
||||
|
||||
OpenFOAM is free software: you can redistribute it and/or modify it
|
||||
under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
|
||||
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "relaxedNonOrthoGaussLaplacianScheme.H"
|
||||
#include "surfaceInterpolate.H"
|
||||
#include "fvcDiv.H"
|
||||
#include "fvcGrad.H"
|
||||
#include "fvMatrices.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
namespace Foam
|
||||
{
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
namespace fv
|
||||
{
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
template<class Type, class GType>
|
||||
tmp<fvMatrix<Type>>
|
||||
relaxedNonOrthoGaussLaplacianScheme<Type, GType>::fvmLaplacianUncorrected
|
||||
(
|
||||
const surfaceScalarField& gammaMagSf,
|
||||
const surfaceScalarField& deltaCoeffs,
|
||||
const GeometricField<Type, fvPatchField, volMesh>& vf
|
||||
)
|
||||
{
|
||||
tmp<fvMatrix<Type>> tfvm
|
||||
(
|
||||
new fvMatrix<Type>
|
||||
(
|
||||
vf,
|
||||
deltaCoeffs.dimensions()*gammaMagSf.dimensions()*vf.dimensions()
|
||||
)
|
||||
);
|
||||
fvMatrix<Type>& fvm = tfvm.ref();
|
||||
|
||||
fvm.upper() = deltaCoeffs.primitiveField()*gammaMagSf.primitiveField();
|
||||
fvm.negSumDiag();
|
||||
|
||||
forAll(vf.boundaryField(), patchi)
|
||||
{
|
||||
const fvPatchField<Type>& pvf = vf.boundaryField()[patchi];
|
||||
const fvsPatchScalarField& pGamma = gammaMagSf.boundaryField()[patchi];
|
||||
const fvsPatchScalarField& pDeltaCoeffs =
|
||||
deltaCoeffs.boundaryField()[patchi];
|
||||
|
||||
if (pvf.coupled())
|
||||
{
|
||||
fvm.internalCoeffs()[patchi] =
|
||||
pGamma*pvf.gradientInternalCoeffs(pDeltaCoeffs);
|
||||
fvm.boundaryCoeffs()[patchi] =
|
||||
-pGamma*pvf.gradientBoundaryCoeffs(pDeltaCoeffs);
|
||||
}
|
||||
else
|
||||
{
|
||||
fvm.internalCoeffs()[patchi] = pGamma*pvf.gradientInternalCoeffs();
|
||||
fvm.boundaryCoeffs()[patchi] = -pGamma*pvf.gradientBoundaryCoeffs();
|
||||
}
|
||||
}
|
||||
|
||||
return tfvm;
|
||||
}
|
||||
|
||||
|
||||
template<class Type, class GType>
|
||||
tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
|
||||
relaxedNonOrthoGaussLaplacianScheme<Type, GType>::gammaSnGradCorr
|
||||
(
|
||||
const surfaceVectorField& SfGammaCorr,
|
||||
const GeometricField<Type, fvPatchField, volMesh>& vf
|
||||
)
|
||||
{
|
||||
const fvMesh& mesh = this->mesh();
|
||||
|
||||
tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tgammaSnGradCorr
|
||||
(
|
||||
new GeometricField<Type, fvsPatchField, surfaceMesh>
|
||||
(
|
||||
IOobject
|
||||
(
|
||||
"gammaSnGradCorr("+vf.name()+')',
|
||||
vf.instance(),
|
||||
mesh,
|
||||
IOobject::NO_READ,
|
||||
IOobject::NO_WRITE
|
||||
),
|
||||
mesh,
|
||||
SfGammaCorr.dimensions()
|
||||
*vf.dimensions()*mesh.deltaCoeffs().dimensions()
|
||||
)
|
||||
);
|
||||
|
||||
for (direction cmpt = 0; cmpt < pTraits<Type>::nComponents; cmpt++)
|
||||
{
|
||||
tgammaSnGradCorr.ref().replace
|
||||
(
|
||||
cmpt,
|
||||
fvc::dotInterpolate(SfGammaCorr, fvc::grad(vf.component(cmpt)))
|
||||
);
|
||||
}
|
||||
|
||||
return tgammaSnGradCorr;
|
||||
}
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
template<class Type, class GType>
|
||||
tmp<GeometricField<Type, fvPatchField, volMesh>>
|
||||
relaxedNonOrthoGaussLaplacianScheme<Type, GType>::fvcLaplacian
|
||||
(
|
||||
const GeometricField<Type, fvPatchField, volMesh>& vf
|
||||
)
|
||||
{
|
||||
const fvMesh& mesh = this->mesh();
|
||||
|
||||
tmp<GeometricField<Type, fvPatchField, volMesh>> tLaplacian
|
||||
(
|
||||
fvc::div(this->tsnGradScheme_().snGrad(vf)*mesh.magSf())
|
||||
);
|
||||
|
||||
tLaplacian.ref().rename("laplacian(" + vf.name() + ')');
|
||||
|
||||
return tLaplacian;
|
||||
}
|
||||
|
||||
|
||||
template<class Type, class GType>
|
||||
tmp<fvMatrix<Type>>
|
||||
relaxedNonOrthoGaussLaplacianScheme<Type, GType>::fvmLaplacian
|
||||
(
|
||||
const GeometricField<GType, fvsPatchField, surfaceMesh>& gamma,
|
||||
const GeometricField<Type, fvPatchField, volMesh>& vf
|
||||
)
|
||||
{
|
||||
const fvMesh& mesh = this->mesh();
|
||||
|
||||
typedef GeometricField<Type, fvsPatchField, surfaceMesh> SType;
|
||||
|
||||
const surfaceVectorField Sn(mesh.Sf()/mesh.magSf());
|
||||
|
||||
const surfaceVectorField SfGamma(mesh.Sf() & gamma);
|
||||
const GeometricField<scalar, fvsPatchField, surfaceMesh> SfGammaSn
|
||||
(
|
||||
SfGamma & Sn
|
||||
);
|
||||
const surfaceVectorField SfGammaCorr(SfGamma - SfGammaSn*Sn);
|
||||
|
||||
tmp<fvMatrix<Type>> tfvm = fvmLaplacianUncorrected
|
||||
(
|
||||
SfGammaSn,
|
||||
this->tsnGradScheme_().deltaCoeffs(vf),
|
||||
vf
|
||||
);
|
||||
fvMatrix<Type>& fvm = tfvm.ref();
|
||||
|
||||
tmp<SType> tfaceFluxCorrection = gammaSnGradCorr(SfGammaCorr, vf);
|
||||
|
||||
if (this->tsnGradScheme_().corrected())
|
||||
{
|
||||
tfaceFluxCorrection.ref() +=
|
||||
SfGammaSn*this->tsnGradScheme_().correction(vf);
|
||||
}
|
||||
|
||||
const word corrName(tfaceFluxCorrection().name());
|
||||
|
||||
tmp<SType> trelaxedCorrection(new SType(tfaceFluxCorrection()));
|
||||
|
||||
const word oldName(corrName + "_0");
|
||||
const scalar relax(vf.mesh().equationRelaxationFactor(oldName));
|
||||
|
||||
const objectRegistry& obr = vf.db();
|
||||
if (obr.foundObject<SType>(oldName))
|
||||
{
|
||||
SType& oldCorrection = obr.lookupObjectRef<SType>(oldName);
|
||||
|
||||
trelaxedCorrection.ref() *= relax;
|
||||
trelaxedCorrection.ref() += (1.0-relax)*oldCorrection;
|
||||
|
||||
oldCorrection = tfaceFluxCorrection;
|
||||
}
|
||||
else
|
||||
{
|
||||
SType* s = new SType(oldName, tfaceFluxCorrection);
|
||||
s->store();
|
||||
}
|
||||
|
||||
fvm.source() -=
|
||||
mesh.V()
|
||||
*fvc::div
|
||||
(
|
||||
trelaxedCorrection()
|
||||
)().primitiveField();
|
||||
|
||||
if (mesh.fluxRequired(vf.name()))
|
||||
{
|
||||
fvm.faceFluxCorrectionPtr() = trelaxedCorrection.ptr();
|
||||
}
|
||||
|
||||
return tfvm;
|
||||
}
|
||||
|
||||
|
||||
template<class Type, class GType>
|
||||
tmp<GeometricField<Type, fvPatchField, volMesh>>
|
||||
relaxedNonOrthoGaussLaplacianScheme<Type, GType>::fvcLaplacian
|
||||
(
|
||||
const GeometricField<GType, fvsPatchField, surfaceMesh>& gamma,
|
||||
const GeometricField<Type, fvPatchField, volMesh>& vf
|
||||
)
|
||||
{
|
||||
const fvMesh& mesh = this->mesh();
|
||||
|
||||
const surfaceVectorField Sn(mesh.Sf()/mesh.magSf());
|
||||
const surfaceVectorField SfGamma(mesh.Sf() & gamma);
|
||||
const GeometricField<scalar, fvsPatchField, surfaceMesh> SfGammaSn
|
||||
(
|
||||
SfGamma & Sn
|
||||
);
|
||||
const surfaceVectorField SfGammaCorr(SfGamma - SfGammaSn*Sn);
|
||||
|
||||
tmp<GeometricField<Type, fvPatchField, volMesh>> tLaplacian
|
||||
(
|
||||
fvc::div
|
||||
(
|
||||
SfGammaSn*this->tsnGradScheme_().snGrad(vf)
|
||||
+ gammaSnGradCorr(SfGammaCorr, vf)
|
||||
)
|
||||
);
|
||||
|
||||
tLaplacian.ref().rename
|
||||
(
|
||||
"laplacian(" + gamma.name() + ',' + vf.name() + ')'
|
||||
);
|
||||
|
||||
return tLaplacian;
|
||||
}
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
} // End namespace fv
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
} // End namespace Foam
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -0,0 +1,190 @@
|
||||
/*---------------------------------------------------------------------------*\
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | www.openfoam.com
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
Copyright (C) 2019 OpenCFD Ltd.
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
This file is part of OpenFOAM.
|
||||
|
||||
OpenFOAM is free software: you can redistribute it and/or modify it
|
||||
under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
|
||||
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
Class
|
||||
Foam::fv::relaxedNonOrthoGaussLaplacianScheme
|
||||
|
||||
Description
|
||||
Basic second-order laplacian using face-gradients and Gauss' theorem.
|
||||
|
||||
SourceFiles
|
||||
relaxedNonOrthoGaussLaplacianScheme.C
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#ifndef relaxedNonOrthoGaussLaplacianScheme_H
|
||||
#define relaxedNonOrthoGaussLaplacianScheme_H
|
||||
|
||||
#include "laplacianScheme.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
namespace Foam
|
||||
{
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
namespace fv
|
||||
{
|
||||
|
||||
/*---------------------------------------------------------------------------*\
|
||||
Class relaxedNonOrthoGaussLaplacianScheme Declaration
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
template<class Type, class GType>
|
||||
class relaxedNonOrthoGaussLaplacianScheme
|
||||
:
|
||||
public fv::laplacianScheme<Type, GType>
|
||||
{
|
||||
// Private Member Functions
|
||||
|
||||
tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> gammaSnGradCorr
|
||||
(
|
||||
const surfaceVectorField& SfGammaCorr,
|
||||
const GeometricField<Type, fvPatchField, volMesh>&
|
||||
);
|
||||
|
||||
//- No copy construct
|
||||
relaxedNonOrthoGaussLaplacianScheme
|
||||
(
|
||||
const relaxedNonOrthoGaussLaplacianScheme&
|
||||
) = delete;
|
||||
|
||||
//- No copy assignment
|
||||
void operator=(const relaxedNonOrthoGaussLaplacianScheme&) = delete;
|
||||
|
||||
|
||||
public:
|
||||
|
||||
//- Runtime type information
|
||||
TypeName("relaxedNonOrthoGauss");
|
||||
|
||||
|
||||
// Constructors
|
||||
|
||||
//- Construct null
|
||||
relaxedNonOrthoGaussLaplacianScheme(const fvMesh& mesh)
|
||||
:
|
||||
laplacianScheme<Type, GType>(mesh)
|
||||
{}
|
||||
|
||||
//- Construct from Istream
|
||||
relaxedNonOrthoGaussLaplacianScheme(const fvMesh& mesh, Istream& is)
|
||||
:
|
||||
laplacianScheme<Type, GType>(mesh, is)
|
||||
{}
|
||||
|
||||
//- Construct from mesh, interpolation and snGradScheme schemes
|
||||
relaxedNonOrthoGaussLaplacianScheme
|
||||
(
|
||||
const fvMesh& mesh,
|
||||
const tmp<surfaceInterpolationScheme<GType>>& igs,
|
||||
const tmp<snGradScheme<Type>>& sngs
|
||||
)
|
||||
:
|
||||
laplacianScheme<Type, GType>(mesh, igs, sngs)
|
||||
{}
|
||||
|
||||
|
||||
//- Destructor
|
||||
virtual ~relaxedNonOrthoGaussLaplacianScheme() = default;
|
||||
|
||||
|
||||
// Member Functions
|
||||
|
||||
static tmp<fvMatrix<Type>> fvmLaplacianUncorrected
|
||||
(
|
||||
const surfaceScalarField& gammaMagSf,
|
||||
const surfaceScalarField& deltaCoeffs,
|
||||
const GeometricField<Type, fvPatchField, volMesh>&
|
||||
);
|
||||
|
||||
tmp<GeometricField<Type, fvPatchField, volMesh>> fvcLaplacian
|
||||
(
|
||||
const GeometricField<Type, fvPatchField, volMesh>&
|
||||
);
|
||||
|
||||
tmp<fvMatrix<Type>> fvmLaplacian
|
||||
(
|
||||
const GeometricField<GType, fvsPatchField, surfaceMesh>&,
|
||||
const GeometricField<Type, fvPatchField, volMesh>&
|
||||
);
|
||||
|
||||
tmp<GeometricField<Type, fvPatchField, volMesh>> fvcLaplacian
|
||||
(
|
||||
const GeometricField<GType, fvsPatchField, surfaceMesh>&,
|
||||
const GeometricField<Type, fvPatchField, volMesh>&
|
||||
);
|
||||
};
|
||||
|
||||
|
||||
// Use macros to emulate partial-specialisation of the Laplacian functions
|
||||
// for scalar diffusivity gamma
|
||||
|
||||
#define defineFvmLaplacianScalarGamma(Type) \
|
||||
\
|
||||
template<> \
|
||||
tmp<fvMatrix<Type>> \
|
||||
relaxedNonOrthoGaussLaplacianScheme<Type, scalar>::fvmLaplacian \
|
||||
( \
|
||||
const GeometricField<scalar, fvsPatchField, surfaceMesh>&, \
|
||||
const GeometricField<Type, fvPatchField, volMesh>& \
|
||||
); \
|
||||
\
|
||||
template<> \
|
||||
tmp<GeometricField<Type, fvPatchField, volMesh>> \
|
||||
relaxedNonOrthoGaussLaplacianScheme<Type, scalar>::fvcLaplacian \
|
||||
( \
|
||||
const GeometricField<scalar, fvsPatchField, surfaceMesh>&, \
|
||||
const GeometricField<Type, fvPatchField, volMesh>& \
|
||||
);
|
||||
|
||||
|
||||
defineFvmLaplacianScalarGamma(scalar);
|
||||
defineFvmLaplacianScalarGamma(vector);
|
||||
defineFvmLaplacianScalarGamma(sphericalTensor);
|
||||
defineFvmLaplacianScalarGamma(symmTensor);
|
||||
defineFvmLaplacianScalarGamma(tensor);
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
} // End namespace fv
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
} // End namespace Foam
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
#ifdef NoRepository
|
||||
#include "relaxedNonOrthoGaussLaplacianScheme.C"
|
||||
#endif
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
#endif
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -0,0 +1,140 @@
|
||||
/*---------------------------------------------------------------------------*\
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | www.openfoam.com
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
Copyright (C) 2019 OpenCFD Ltd.
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
This file is part of OpenFOAM.
|
||||
|
||||
OpenFOAM is free software: you can redistribute it and/or modify it
|
||||
under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
|
||||
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "relaxedNonOrthoGaussLaplacianScheme.H"
|
||||
#include "fvMesh.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
makeFvLaplacianScheme(relaxedNonOrthoGaussLaplacianScheme)
|
||||
|
||||
#define declareFvmLaplacianScalarGamma(Type) \
|
||||
\
|
||||
template<> \
|
||||
Foam::tmp<Foam::fvMatrix<Foam::Type>> \
|
||||
Foam::fv::relaxedNonOrthoGaussLaplacianScheme<Foam::Type, Foam::scalar>:: \
|
||||
fvmLaplacian \
|
||||
( \
|
||||
const GeometricField<scalar, fvsPatchField, surfaceMesh>& gamma, \
|
||||
const GeometricField<Type, fvPatchField, volMesh>& vf \
|
||||
) \
|
||||
{ \
|
||||
const fvMesh& mesh = this->mesh(); \
|
||||
\
|
||||
typedef GeometricField<Type, fvsPatchField, surfaceMesh> SType; \
|
||||
\
|
||||
GeometricField<scalar, fvsPatchField, surfaceMesh> gammaMagSf \
|
||||
( \
|
||||
gamma*mesh.magSf() \
|
||||
); \
|
||||
\
|
||||
tmp<fvMatrix<Type>> tfvm = fvmLaplacianUncorrected \
|
||||
( \
|
||||
gammaMagSf, \
|
||||
this->tsnGradScheme_().deltaCoeffs(vf), \
|
||||
vf \
|
||||
); \
|
||||
fvMatrix<Type>& fvm = tfvm.ref(); \
|
||||
\
|
||||
if (this->tsnGradScheme_().corrected()) \
|
||||
{ \
|
||||
tmp<SType> tCorr(this->tsnGradScheme_().correction(vf)); \
|
||||
const word corrName(tCorr().name()); \
|
||||
tmp<SType> tfaceFluxCorrection(gammaMagSf*tCorr); \
|
||||
\
|
||||
tmp<SType> trelaxedCorrection(new SType(tfaceFluxCorrection())); \
|
||||
\
|
||||
const word oldName(corrName + "_0"); \
|
||||
const scalar relax(vf.mesh().equationRelaxationFactor(corrName)); \
|
||||
const objectRegistry& obr = vf.db(); \
|
||||
if (obr.foundObject<SType>(oldName)) \
|
||||
{ \
|
||||
SType& oldCorrection = obr.lookupObjectRef<SType>(oldName); \
|
||||
trelaxedCorrection.ref() *= relax; \
|
||||
trelaxedCorrection.ref() += (1.0-relax)*oldCorrection; \
|
||||
\
|
||||
oldCorrection = trelaxedCorrection(); \
|
||||
} \
|
||||
else \
|
||||
{ \
|
||||
SType* s = new SType(oldName, tfaceFluxCorrection); \
|
||||
s->store(); \
|
||||
} \
|
||||
\
|
||||
tmp<Field<Type>> tcorr \
|
||||
( \
|
||||
mesh.V() \
|
||||
*fvc::div \
|
||||
( \
|
||||
trelaxedCorrection() \
|
||||
)().primitiveField() \
|
||||
); \
|
||||
\
|
||||
fvm.source() -= tcorr(); \
|
||||
\
|
||||
if (mesh.fluxRequired(vf.name())) \
|
||||
{ \
|
||||
fvm.faceFluxCorrectionPtr() = trelaxedCorrection.ptr(); \
|
||||
} \
|
||||
} \
|
||||
\
|
||||
return tfvm; \
|
||||
} \
|
||||
\
|
||||
\
|
||||
template<> \
|
||||
Foam::tmp<Foam::GeometricField<Foam::Type, Foam::fvPatchField, Foam::volMesh>> \
|
||||
Foam::fv::relaxedNonOrthoGaussLaplacianScheme<Foam::Type, Foam::scalar>::fvcLaplacian \
|
||||
( \
|
||||
const GeometricField<scalar, fvsPatchField, surfaceMesh>& gamma, \
|
||||
const GeometricField<Type, fvPatchField, volMesh>& vf \
|
||||
) \
|
||||
{ \
|
||||
const fvMesh& mesh = this->mesh(); \
|
||||
\
|
||||
tmp<GeometricField<Type, fvPatchField, volMesh>> tLaplacian \
|
||||
( \
|
||||
fvc::div(gamma*this->tsnGradScheme_().snGrad(vf)*mesh.magSf()) \
|
||||
); \
|
||||
\
|
||||
tLaplacian.ref().rename \
|
||||
( \
|
||||
"laplacian(" + gamma.name() + ',' + vf.name() + ')' \
|
||||
); \
|
||||
\
|
||||
return tLaplacian; \
|
||||
}
|
||||
|
||||
|
||||
declareFvmLaplacianScalarGamma(scalar);
|
||||
declareFvmLaplacianScalarGamma(vector);
|
||||
declareFvmLaplacianScalarGamma(sphericalTensor);
|
||||
declareFvmLaplacianScalarGamma(symmTensor);
|
||||
declareFvmLaplacianScalarGamma(tensor);
|
||||
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -5,7 +5,7 @@
|
||||
\\ / A nd | www.openfoam.com
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
Copyright (C) 2017-2021 OpenCFD Ltd.
|
||||
Copyright (C) 2017-2020 OpenCFD Ltd.
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
This file is part of OpenFOAM.
|
||||
@ -213,16 +213,13 @@ bool Foam::functionObjects::Curle::execute()
|
||||
|
||||
forAll(observerPositions_, pointi)
|
||||
{
|
||||
const vectorField r(observerPositions_[pointi] - Cfp);
|
||||
const vectorField r(Cfp - observerPositions_[pointi]);
|
||||
const scalarField invMagR(1/(mag(r) + ROOTVSMALL));
|
||||
|
||||
pDash[pointi] +=
|
||||
sum((pp*sqr(invMagR) + invMagR/c0_*dpdtp)*(Sfp & (r*invMagR)));
|
||||
sum((pp*sqr(invMagR) + invMagR/c0_*dpdtp)*(Sfp & r));
|
||||
}
|
||||
}
|
||||
|
||||
pDash /= 4*mathematical::pi;
|
||||
|
||||
Pstream::listCombineGather(pDash, plusEqOp<scalar>());
|
||||
Pstream::listCombineScatter(pDash);
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
Copyright (C) 2011-2017 OpenFOAM Foundation
|
||||
Copyright (C) 2017-2021 OpenCFD Ltd.
|
||||
Copyright (C) 2017-2020 OpenCFD Ltd.
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
This file is part of OpenFOAM.
|
||||
@ -899,16 +899,6 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::read
|
||||
mesh_,
|
||||
dict.subDict("sampledSurfaceDict")
|
||||
);
|
||||
|
||||
if (sampledPtr_->interpolate())
|
||||
{
|
||||
// Should probably ignore interpolate entirely,
|
||||
// but the oldest isoSurface algorithm requires it!
|
||||
WarningInFunction
|
||||
<< type() << ' ' << name() << ": "
|
||||
<< "sampledSurface with interpolate = true "
|
||||
<< "is likely incorrect" << nl << nl;
|
||||
}
|
||||
}
|
||||
|
||||
Info<< type() << " " << name() << ":" << nl
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
Copyright (C) 2011-2017 OpenFOAM Foundation
|
||||
Copyright (C) 2015-2021 OpenCFD Ltd.
|
||||
Copyright (C) 2015-2020 OpenCFD Ltd.
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
This file is part of OpenFOAM.
|
||||
@ -388,15 +388,6 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::writeValues
|
||||
false // serial - already merged
|
||||
);
|
||||
|
||||
// Point data? Should probably disallow
|
||||
if (sampledPtr_)
|
||||
{
|
||||
surfaceWriterPtr_->isPointData() =
|
||||
sampledPtr_->interpolate();
|
||||
}
|
||||
|
||||
surfaceWriterPtr_->nFields() = 1; // Needed for VTK legacy
|
||||
|
||||
surfaceWriterPtr_->write(fieldName, allValues);
|
||||
|
||||
surfaceWriterPtr_->clear();
|
||||
|
||||
@ -79,7 +79,7 @@ void Foam::functionObjects::nearWallFields::calcAddressing()
|
||||
const vectorField nf(patch.nf());
|
||||
const vectorField faceCellCentres(patch.patch().faceCellCentres());
|
||||
const labelUList& faceCells = patch.patch().faceCells();
|
||||
const vectorField::subField faceCentres = patch.patch().faceCentres();
|
||||
const vectorField::subField& faceCentres = patch.patch().faceCentres();
|
||||
|
||||
forAll(patch, patchFacei)
|
||||
{
|
||||
|
||||
@ -419,6 +419,8 @@ void Foam::ParticleCollector<CloudType>::write()
|
||||
massTotal_[facei] += mass_[facei];
|
||||
}
|
||||
|
||||
const label proci = Pstream::myProcNo();
|
||||
|
||||
Info<< type() << " output:" << nl;
|
||||
|
||||
Field<scalar> faceMassTotal(mass_.size(), Zero);
|
||||
@ -432,11 +434,15 @@ void Foam::ParticleCollector<CloudType>::write()
|
||||
scalar sumAverageMFR = 0.0;
|
||||
forAll(faces_, facei)
|
||||
{
|
||||
faceMassTotal[facei] +=
|
||||
returnReduce(massTotal_[facei], sumOp<scalar>());
|
||||
scalarList allProcMass(Pstream::nProcs());
|
||||
allProcMass[proci] = massTotal_[facei];
|
||||
Pstream::gatherList(allProcMass);
|
||||
faceMassTotal[facei] += sum(allProcMass);
|
||||
|
||||
faceMassFlowRate[facei] +=
|
||||
returnReduce(massFlowRate_[facei], sumOp<scalar>());
|
||||
scalarList allProcMassFlowRate(Pstream::nProcs());
|
||||
allProcMassFlowRate[proci] = massFlowRate_[facei];
|
||||
Pstream::gatherList(allProcMassFlowRate);
|
||||
faceMassFlowRate[facei] += sum(allProcMassFlowRate);
|
||||
|
||||
sumTotalMass += faceMassTotal[facei];
|
||||
sumAverageMFR += faceMassFlowRate[facei];
|
||||
|
||||
@ -453,13 +453,12 @@ Foam::label Foam::meshRefinement::markSurfaceGapRefinement
|
||||
|
||||
forAll(surf1, i)
|
||||
{
|
||||
// Combine selfProx of shell and surfaces.
|
||||
// Ignore regions for now
|
||||
// Combine selfProx of shell and surfaces. Ignore regions for
|
||||
// now
|
||||
const label cellI = cellMap[i];
|
||||
|
||||
const label shelli =
|
||||
(
|
||||
(cellI != -1 && cellToCompact[cellI] != -1)
|
||||
cellToCompact[cellI] != -1
|
||||
? gapShell[cellToCompact[cellI]]
|
||||
: -1
|
||||
);
|
||||
@ -483,6 +482,8 @@ Foam::label Foam::meshRefinement::markSurfaceGapRefinement
|
||||
)
|
||||
{
|
||||
// Found intersection with surface. Check opposite normal.
|
||||
label cellI = cellMap[i];
|
||||
|
||||
if
|
||||
(
|
||||
cellI != -1
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
Copyright (C) 2015 OpenFOAM Foundation
|
||||
Copyright (C) 2016-2021 OpenCFD Ltd.
|
||||
Copyright (C) 2016-2017 OpenCFD Ltd.
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
This file is part of OpenFOAM.
|
||||
@ -396,43 +396,22 @@ Foam::AABBTree<Type>::AABBTree
|
||||
// transfer flattened tree to persistent storage
|
||||
DynamicList<treeBoundBox> boundBoxes(2*bbs.size());
|
||||
DynamicList<labelList> addressing(2*addr.size());
|
||||
|
||||
forAll(nodes, nodeI)
|
||||
{
|
||||
if (nodes[nodeI].first() < 0)
|
||||
{
|
||||
boundBoxes.append(bbs[nodeI].first());
|
||||
addressing.append(addr[-(nodes[nodeI].first() + 1)]);
|
||||
addressing.append(addr[nodeI + 1]);
|
||||
}
|
||||
if (nodes[nodeI].second() < 0)
|
||||
{
|
||||
boundBoxes.append(bbs[nodeI].second());
|
||||
addressing.append(addr[-(nodes[nodeI].second() + 1)]);
|
||||
addressing.append(addr[nodeI + 1]);
|
||||
}
|
||||
}
|
||||
|
||||
boundBoxes_.transfer(boundBoxes);
|
||||
addressing_.transfer(addressing);
|
||||
|
||||
|
||||
if (0)
|
||||
{
|
||||
bitSet checked(objects.size());
|
||||
for (const auto& box : addressing_)
|
||||
{
|
||||
for (const auto& id : box)
|
||||
{
|
||||
checked.set(id);
|
||||
}
|
||||
}
|
||||
|
||||
const label unsetSize = checked.count(false);
|
||||
|
||||
if (unsetSize)
|
||||
{
|
||||
Info<< "*** Problem: IDs not set: " << unsetSize << endl;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -142,7 +142,8 @@ public:
|
||||
AABBTree();
|
||||
|
||||
//- Construct from components
|
||||
// equalBinSize: divide into equal number of elements or equal span
|
||||
// equalBinSize: divide into equal number of elements or
|
||||
// equal span
|
||||
AABBTree
|
||||
(
|
||||
const UList<Type>& objects,
|
||||
@ -170,7 +171,7 @@ public:
|
||||
bool pointInside(const point& pt) const;
|
||||
|
||||
//- Determine whether a bounding box overlaps the tree bounding
|
||||
//- boxes
|
||||
// boxes
|
||||
bool overlaps(const boundBox& bbIn) const;
|
||||
|
||||
|
||||
|
||||
@ -155,7 +155,7 @@ bool Foam::vtk::writePointSet
|
||||
|
||||
if (parallel)
|
||||
{
|
||||
vtk::writeListParallel(format.ref(), mesh.points(), pointLabels);
|
||||
vtk::writeListParallel(format(), mesh.points(), pointLabels);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@ -175,6 +175,9 @@ void optimisationType::update()
|
||||
|
||||
void optimisationType::update(scalarField& direction)
|
||||
{
|
||||
// Compute eta if needed
|
||||
computeEta(direction);
|
||||
|
||||
// Multiply with line search step, if necessary
|
||||
scalarField correction(direction);
|
||||
if (lineSearch_.valid())
|
||||
@ -215,9 +218,6 @@ tmp<scalarField> optimisationType::computeDirection()
|
||||
scalarField& correction = tcorrection.ref();
|
||||
correction = updateMethod_->returnCorrection();
|
||||
|
||||
// Compute eta if needed
|
||||
computeEta(correction);
|
||||
|
||||
return tcorrection;
|
||||
}
|
||||
|
||||
|
||||
@ -376,7 +376,7 @@ Foam::scalar Foam::updateMethod::computeMeritFunction()
|
||||
|
||||
Foam::scalar Foam::updateMethod::meritFunctionDirectionalDerivative()
|
||||
{
|
||||
return globalSum(objectiveDerivatives_*correction_);
|
||||
return sum(objectiveDerivatives_*correction_);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -1912,28 +1912,31 @@ void Foam::NURBS3DVolume::writeCps(const fileName& baseName) const
|
||||
|
||||
void Foam::NURBS3DVolume::writeCpsInDict() const
|
||||
{
|
||||
IOdictionary cpsDict
|
||||
(
|
||||
IOobject
|
||||
if (Pstream::master())
|
||||
{
|
||||
IOdictionary cpsDict
|
||||
(
|
||||
name_ + "cpsBsplines" + mesh_.time().timeName(),
|
||||
mesh_.time().caseConstant(),
|
||||
cpsFolder_,
|
||||
mesh_,
|
||||
IOobject::NO_READ,
|
||||
IOobject::NO_WRITE,
|
||||
false
|
||||
)
|
||||
);
|
||||
IOobject
|
||||
(
|
||||
name_ + "cpsBsplines" + mesh_.time().timeName(),
|
||||
mesh_.time().caseConstant(),
|
||||
cpsFolder_,
|
||||
mesh_,
|
||||
IOobject::NO_READ,
|
||||
IOobject::NO_WRITE,
|
||||
false
|
||||
)
|
||||
);
|
||||
|
||||
cpsDict.add("controlPoints", cps_);
|
||||
cpsDict.add("controlPoints", cps_);
|
||||
|
||||
// Always write in ASCII, but allow compression
|
||||
cpsDict.regIOobject::writeObject
|
||||
(
|
||||
IOstreamOption(IOstream::ASCII, mesh_.time().writeCompression()),
|
||||
true
|
||||
);
|
||||
// Always write in ASCII, but allow compression
|
||||
cpsDict.regIOobject::writeObject
|
||||
(
|
||||
IOstreamOption(IOstream::ASCII, mesh_.time().writeCompression()),
|
||||
true
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -291,7 +291,6 @@ Foam::scalar surfaceNoise::writeSurfaceData
|
||||
false // serial - already merged
|
||||
);
|
||||
|
||||
writerPtr_->nFields() = 1; // Legacy VTK
|
||||
writerPtr_->write(title, allData);
|
||||
|
||||
writerPtr_->endTime();
|
||||
@ -324,7 +323,6 @@ Foam::scalar surfaceNoise::writeSurfaceData
|
||||
false // serial - already merged
|
||||
);
|
||||
|
||||
writerPtr_->nFields() = 1; // Legacy VTK
|
||||
writerPtr_->write(title, data);
|
||||
|
||||
writerPtr_->endTime();
|
||||
|
||||
@ -157,7 +157,7 @@ void Foam::meshToMesh::mapInternalTgtToSrc
|
||||
const bool secondOrder
|
||||
) const
|
||||
{
|
||||
mapTgtToSrc(field, cop, result.primitiveFieldRef());
|
||||
mapSrcToTgt(field, cop, result.primitiveFieldRef());
|
||||
}
|
||||
|
||||
|
||||
@ -170,7 +170,7 @@ void Foam::meshToMesh::mapInternalTgtToSrc
|
||||
const bool secondOrder
|
||||
) const
|
||||
{
|
||||
mapTgtToSrc(field, cop, result.primitiveFieldRef());
|
||||
mapSrcToTgt(field, cop, result.primitiveFieldRef());
|
||||
}
|
||||
|
||||
|
||||
@ -183,7 +183,7 @@ void Foam::meshToMesh::mapInternalTgtToSrc
|
||||
const bool secondOrder
|
||||
) const
|
||||
{
|
||||
mapTgtToSrc(field, cop, result.primitiveFieldRef());
|
||||
mapSrcToTgt(field, cop, result.primitiveFieldRef());
|
||||
}
|
||||
|
||||
|
||||
@ -196,7 +196,7 @@ void Foam::meshToMesh::mapInternalTgtToSrc
|
||||
const bool secondOrder
|
||||
) const
|
||||
{
|
||||
mapTgtToSrc(field, cop, result.primitiveFieldRef());
|
||||
mapSrcToTgt(field, cop, result.primitiveFieldRef());
|
||||
}
|
||||
|
||||
|
||||
@ -209,7 +209,7 @@ void Foam::meshToMesh::mapInternalTgtToSrc
|
||||
const bool secondOrder
|
||||
) const
|
||||
{
|
||||
mapTgtToSrc(field, cop, result.primitiveFieldRef());
|
||||
mapSrcToTgt(field, cop, result.primitiveFieldRef());
|
||||
}
|
||||
|
||||
|
||||
@ -222,7 +222,7 @@ void Foam::meshToMesh::mapInternalTgtToSrc
|
||||
const bool secondOrder
|
||||
) const
|
||||
{
|
||||
mapTgtToSrc(field, cop, result.primitiveFieldRef());
|
||||
mapSrcToTgt(field, cop, result.primitiveFieldRef());
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -843,15 +843,15 @@ Foam::meshToMesh::mapTgtToSrc
|
||||
label srcPatchi = srcPatchID_[i];
|
||||
label tgtPatchi = tgtPatchID_[i];
|
||||
|
||||
if (!srcPatchFields.set(srcPatchi))
|
||||
if (!srcPatchFields.set(tgtPatchi))
|
||||
{
|
||||
srcPatchFields.set
|
||||
(
|
||||
srcPatchi,
|
||||
fvPatchField<Type>::New
|
||||
(
|
||||
tgtBfld[tgtPatchi],
|
||||
srcMesh.boundary()[srcPatchi],
|
||||
tgtBfld[srcPatchi],
|
||||
srcMesh.boundary()[tgtPatchi],
|
||||
DimensionedField<Type, volMesh>::null(),
|
||||
directFvPatchFieldMapper
|
||||
(
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
\\ / A nd | www.openfoam.com
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
Copyright (C) 2019-2022 OpenCFD Ltd.
|
||||
Copyright (C) 2019 OpenCFD Ltd.
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
This file is part of OpenFOAM.
|
||||
@ -107,7 +107,7 @@ void Foam::polySurface::storeField
|
||||
|
||||
if (dimfield)
|
||||
{
|
||||
dimfield->dimensions().reset(dims); // Dimensions may have changed
|
||||
dimfield->dimensions() = dims;
|
||||
dimfield->field() = values;
|
||||
}
|
||||
else
|
||||
@ -148,7 +148,7 @@ void Foam::polySurface::storeField
|
||||
|
||||
if (dimfield)
|
||||
{
|
||||
dimfield->dimensions().reset(dims); // Dimensions may have changed
|
||||
dimfield->dimensions() = dims;
|
||||
dimfield->field() = std::move(values);
|
||||
}
|
||||
else
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
\\ / A nd | www.openfoam.com
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
Copyright (C) 2019-2022 OpenCFD Ltd.
|
||||
Copyright (C) 2019 OpenCFD Ltd.
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
This file is part of OpenFOAM.
|
||||
@ -45,7 +45,7 @@ void Foam::surfMesh::storeField
|
||||
|
||||
if (dimfield)
|
||||
{
|
||||
dimfield->dimensions().reset(dims); // Dimensions may have changed
|
||||
dimfield->dimensions() = dims;
|
||||
dimfield->field() = values;
|
||||
}
|
||||
else
|
||||
@ -85,7 +85,7 @@ void Foam::surfMesh::storeField
|
||||
|
||||
if (dimfield)
|
||||
{
|
||||
dimfield->dimensions().reset(dims); // Dimensions may have changed
|
||||
dimfield->dimensions() = dims;
|
||||
dimfield->field() = std::move(values);
|
||||
}
|
||||
else
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
Copyright (C) 2015 OpenFOAM Foundation
|
||||
Copyright (C) 2015-2021 OpenCFD Ltd.
|
||||
Copyright (C) 2015-2020 OpenCFD Ltd.
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
This file is part of OpenFOAM.
|
||||
@ -106,57 +106,6 @@ Foam::surfaceWriters::boundaryDataWriter::boundaryDataWriter
|
||||
|
||||
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
||||
|
||||
void Foam::surfaceWriters::boundaryDataWriter::serialWriteGeometry
|
||||
(
|
||||
const regIOobject& iopts,
|
||||
const meshedSurf& surf
|
||||
)
|
||||
{
|
||||
const pointField& points = surf.points();
|
||||
const faceList& faces = surf.faces();
|
||||
|
||||
if (verbose_)
|
||||
{
|
||||
if (this->isPointData())
|
||||
{
|
||||
Info<< "Writing points: " << iopts.objectPath() << endl;
|
||||
}
|
||||
else
|
||||
{
|
||||
Info<< "Writing face centres: " << iopts.objectPath() << endl;
|
||||
}
|
||||
}
|
||||
|
||||
// Like regIOobject::writeObject without instance() adaptation
|
||||
// since this would write to e.g. 0/ instead of postProcessing/
|
||||
|
||||
OFstream osGeom(iopts.objectPath(), streamOpt_);
|
||||
|
||||
if (header_)
|
||||
{
|
||||
iopts.writeHeader(osGeom);
|
||||
}
|
||||
|
||||
if (this->isPointData())
|
||||
{
|
||||
// Just like writeData, but without copying beforehand
|
||||
osGeom << points;
|
||||
}
|
||||
else
|
||||
{
|
||||
primitivePatch pp(SubList<face>(faces), points);
|
||||
|
||||
// Just like writeData, but without copying beforehand
|
||||
osGeom << pp.faceCentres();
|
||||
}
|
||||
|
||||
if (header_)
|
||||
{
|
||||
iopts.writeEndDivider(osGeom);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Foam::fileName Foam::surfaceWriters::boundaryDataWriter::write()
|
||||
{
|
||||
checkOpen();
|
||||
@ -178,7 +127,6 @@ Foam::fileName Foam::surfaceWriters::boundaryDataWriter::write()
|
||||
mkDir(surfaceDir);
|
||||
}
|
||||
|
||||
// Write sample locations
|
||||
pointIOField iopts
|
||||
(
|
||||
IOobject
|
||||
@ -190,9 +138,30 @@ Foam::fileName Foam::surfaceWriters::boundaryDataWriter::write()
|
||||
false
|
||||
)
|
||||
);
|
||||
iopts.note() = (this->isPointData() ? "point data" : "face data");
|
||||
|
||||
serialWriteGeometry(iopts, surf);
|
||||
if (verbose_)
|
||||
{
|
||||
Info<< "Writing points: " << iopts.objectPath() << endl;
|
||||
}
|
||||
|
||||
|
||||
// Like regIOobject::writeObject without instance() adaptation
|
||||
// since this would write to e.g. 0/ instead of postProcessing/
|
||||
|
||||
OFstream osGeom(iopts.objectPath(), streamOpt_);
|
||||
|
||||
if (header_)
|
||||
{
|
||||
iopts.writeHeader(osGeom);
|
||||
}
|
||||
|
||||
// Just like writeData, but without copying beforehand
|
||||
osGeom << surf.points();
|
||||
|
||||
if (header_)
|
||||
{
|
||||
iopts.writeEndDivider(osGeom);
|
||||
}
|
||||
}
|
||||
|
||||
wroteGeom_ = true;
|
||||
@ -230,29 +199,67 @@ Foam::fileName Foam::surfaceWriters::boundaryDataWriter::writeTemplate
|
||||
|
||||
if (Pstream::master() || !parallel_)
|
||||
{
|
||||
const pointField& points = surf.points();
|
||||
const faceList& faces = surf.faces();
|
||||
|
||||
if (!isDir(outputFile.path()))
|
||||
{
|
||||
mkDir(outputFile.path());
|
||||
}
|
||||
|
||||
// Write sample locations
|
||||
{
|
||||
pointIOField iopts
|
||||
pointIOField iopts
|
||||
(
|
||||
IOobject
|
||||
(
|
||||
IOobject
|
||||
(
|
||||
surfaceDir/"points",
|
||||
*dummyTimePtr,
|
||||
IOobject::NO_READ,
|
||||
IOobject::NO_WRITE,
|
||||
false
|
||||
)
|
||||
);
|
||||
iopts.note() = (this->isPointData() ? "point data" : "face data");
|
||||
surfaceDir/"points",
|
||||
*dummyTimePtr,
|
||||
IOobject::NO_READ,
|
||||
IOobject::NO_WRITE,
|
||||
false
|
||||
)
|
||||
);
|
||||
|
||||
serialWriteGeometry(iopts, surf);
|
||||
if (verbose_)
|
||||
{
|
||||
if (this->isPointData())
|
||||
{
|
||||
Info<< "Writing points: " << iopts.objectPath() << endl;
|
||||
}
|
||||
else
|
||||
{
|
||||
Info<< "Writing face centres: " << iopts.objectPath() << endl;
|
||||
}
|
||||
}
|
||||
|
||||
// Like regIOobject::writeObject without instance() adaptation
|
||||
// since this would write to e.g. 0/ instead of postProcessing/
|
||||
|
||||
OFstream osGeom(iopts.objectPath(), streamOpt_);
|
||||
|
||||
if (header_)
|
||||
{
|
||||
iopts.writeHeader(osGeom);
|
||||
}
|
||||
|
||||
if (this->isPointData())
|
||||
{
|
||||
// Just like writeData, but without copying beforehand
|
||||
osGeom << points;
|
||||
}
|
||||
else
|
||||
{
|
||||
primitivePatch pp(SubList<face>(faces), points);
|
||||
|
||||
// Just like writeData, but without copying beforehand
|
||||
osGeom << pp.faceCentres();
|
||||
}
|
||||
|
||||
if (header_)
|
||||
{
|
||||
iopts.writeEndDivider(osGeom);
|
||||
}
|
||||
|
||||
|
||||
// Write field
|
||||
{
|
||||
IOField<Type> iofld
|
||||
@ -266,7 +273,6 @@ Foam::fileName Foam::surfaceWriters::boundaryDataWriter::writeTemplate
|
||||
false
|
||||
)
|
||||
);
|
||||
iofld.note() = (this->isPointData() ? "point data" : "face data");
|
||||
|
||||
OFstream osField(iofld.objectPath(), streamOpt_);
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
\\ / A nd | www.openfoam.com
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
Copyright (C) 2015-2021 OpenCFD Ltd.
|
||||
Copyright (C) 2015-2020 OpenCFD Ltd.
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
This file is part of OpenFOAM.
|
||||
@ -129,10 +129,6 @@ SourceFiles
|
||||
|
||||
namespace Foam
|
||||
{
|
||||
|
||||
// Forward Declarations
|
||||
class regIOobject;
|
||||
|
||||
namespace surfaceWriters
|
||||
{
|
||||
|
||||
@ -155,9 +151,6 @@ class boundaryDataWriter
|
||||
|
||||
// Private Member Functions
|
||||
|
||||
//- Write serial surface geometry to "points" file.
|
||||
void serialWriteGeometry(const regIOobject&, const meshedSurf& surf);
|
||||
|
||||
//- Templated write field operation
|
||||
template<class Type>
|
||||
fileName writeTemplate
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
\\ / A nd | www.openfoam.com
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
Copyright (C) 2019-2021 OpenCFD Ltd.
|
||||
Copyright (C) 2019 OpenCFD Ltd.
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
This file is part of OpenFOAM.
|
||||
@ -416,11 +416,11 @@ bool Foam::surfaceWriter::empty() const
|
||||
|
||||
Foam::label Foam::surfaceWriter::size() const
|
||||
{
|
||||
const label value =
|
||||
const bool value =
|
||||
(
|
||||
useComponents_
|
||||
? surfComp_.faces().size()
|
||||
: surf_.get().faces().size()
|
||||
? surfComp_.faces().empty()
|
||||
: surf_.get().faces().empty()
|
||||
);
|
||||
|
||||
return (parallel_ ? returnReduce(value, sumOp<label>()) : value);
|
||||
|
||||
@ -140,6 +140,17 @@ Foam::radiation::radiativeIntensityRay::radiativeIntensityRay
|
||||
|
||||
if (mesh_.nSolutionD() == 2)
|
||||
{
|
||||
// Omega for 2D
|
||||
omega_ = deltaPhi;
|
||||
|
||||
// dAve for 2D
|
||||
dAve_ = vector
|
||||
(
|
||||
2*sinPhi*Foam::sin(0.5*deltaPhi),
|
||||
2*cosPhi*Foam::sin(0.5*deltaPhi),
|
||||
0
|
||||
);
|
||||
|
||||
vector meshDir(Zero);
|
||||
if (dom_.meshOrientation() != vector::zero)
|
||||
{
|
||||
@ -161,6 +172,7 @@ Foam::radiation::radiativeIntensityRay::radiativeIntensityRay
|
||||
|
||||
dAve_ = coordRot & dAve_;
|
||||
d_ = coordRot & d_;
|
||||
|
||||
}
|
||||
else if (mesh_.nSolutionD() == 1)
|
||||
{
|
||||
@ -183,6 +195,9 @@ Foam::radiation::radiativeIntensityRay::radiativeIntensityRay
|
||||
|
||||
dAve_ = (dAve_ & normal)*meshDir;
|
||||
d_ = (d_ & normal)*meshDir;
|
||||
|
||||
// Omega normalization for 1D
|
||||
omega_ /= 2;
|
||||
}
|
||||
|
||||
autoPtr<volScalarField> IDefaultPtr;
|
||||
|
||||
@ -136,7 +136,7 @@ void Foam::faceReflecting::initialise(const dictionary& coeffs)
|
||||
forAll(patches, patchI)
|
||||
{
|
||||
const polyPatch& pp = patches[patchI];
|
||||
const vectorField::subField cf = pp.faceCentres();
|
||||
const pointField& cf = pp.faceCentres();
|
||||
|
||||
if (!pp.coupled() && !isA<cyclicAMIPolyPatch>(pp))
|
||||
{
|
||||
|
||||
@ -155,7 +155,7 @@ void Foam::faceShading::calculate()
|
||||
forAll(patches, patchI)
|
||||
{
|
||||
const polyPatch& pp = patches[patchI];
|
||||
const vectorField::subField cf = pp.faceCentres();
|
||||
const pointField& cf = pp.faceCentres();
|
||||
|
||||
if (!pp.coupled() && !isA<cyclicAMIPolyPatch>(pp))
|
||||
{
|
||||
|
||||
@ -72,16 +72,16 @@ Foam::liquidProperties::liquidProperties
|
||||
Foam::liquidProperties::liquidProperties(const dictionary& dict)
|
||||
:
|
||||
thermophysicalProperties(dict),
|
||||
Tc_(dict.get<scalar>("Tc")),
|
||||
Pc_(dict.get<scalar>("Pc")),
|
||||
Vc_(dict.get<scalar>("Vc")),
|
||||
Zc_(dict.get<scalar>("Zc")),
|
||||
Tt_(dict.get<scalar>("Tt")),
|
||||
Pt_(dict.get<scalar>("Pt")),
|
||||
Tb_(dict.get<scalar>("Tb")),
|
||||
dipm_(dict.get<scalar>("dipm")),
|
||||
omega_(dict.get<scalar>("omega")),
|
||||
delta_(dict.get<scalar>("delta"))
|
||||
Tc_(dict.get<label>("Tc")),
|
||||
Pc_(dict.get<label>("Pc")),
|
||||
Vc_(dict.get<label>("Vc")),
|
||||
Zc_(dict.get<label>("Zc")),
|
||||
Tt_(dict.get<label>("Tt")),
|
||||
Pt_(dict.get<label>("Pt")),
|
||||
Tb_(dict.get<label>("Tb")),
|
||||
dipm_(dict.get<label>("dipm")),
|
||||
omega_(dict.get<label>("omega")),
|
||||
delta_(dict.get<label>("delta"))
|
||||
{}
|
||||
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
Copyright (C) 2011-2017 OpenFOAM Foundation
|
||||
Copyright (C) 2018-2020 OpenCFD Ltd.
|
||||
Copyright (C) 2018-2019 OpenCFD Ltd.
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
This file is part of OpenFOAM.
|
||||
@ -77,7 +77,7 @@ void Foam::solidProperties::readIfPresent(const dictionary& dict)
|
||||
dict.readIfPresent("rho", rho_);
|
||||
dict.readIfPresent("Cp", Cp_);
|
||||
dict.readIfPresentCompat("kappa", {{"K", 1612}}, kappa_);
|
||||
dict.readIfPresent("Hf", Hf_);
|
||||
dict.readIfPresent("Hf_", Hf_);
|
||||
dict.readIfPresent("emissivity", emissivity_);
|
||||
dict.readIfPresent("W", W_);
|
||||
}
|
||||
|
||||
@ -24,6 +24,8 @@ RAS
|
||||
turbulence on;
|
||||
|
||||
printCoeffs on;
|
||||
|
||||
implicitKEpsilonSource true;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -22,14 +22,14 @@ solvers
|
||||
solver GAMG;
|
||||
smoother GaussSeidel;
|
||||
|
||||
tolerance 1e-06;
|
||||
tolerance 1e-09;
|
||||
relTol 0.05;
|
||||
}
|
||||
|
||||
pFinal
|
||||
{
|
||||
$p;
|
||||
tolerance 1e-06;
|
||||
tolerance 1e-09;
|
||||
relTol 0;
|
||||
}
|
||||
|
||||
@ -37,14 +37,14 @@ solvers
|
||||
{
|
||||
solver smoothSolver;
|
||||
smoother symGaussSeidel;
|
||||
tolerance 1e-05;
|
||||
tolerance 1e-015;
|
||||
relTol 0.1;
|
||||
}
|
||||
|
||||
"(U|k|epsilon)Final"
|
||||
{
|
||||
$U;
|
||||
tolerance 1e-05;
|
||||
tolerance 1e-15;
|
||||
relTol 0;
|
||||
}
|
||||
}
|
||||
@ -61,12 +61,14 @@ PIMPLE
|
||||
SIMPLE
|
||||
{
|
||||
nNonOrthogonalCorrectors 0;
|
||||
/*
|
||||
residualControl
|
||||
{
|
||||
p 1e-2;
|
||||
U 1e-3;
|
||||
"(k|epsilon)" 1e-3;
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
relaxationFactors
|
||||
@ -79,7 +81,7 @@ relaxationFactors
|
||||
{
|
||||
U 0.7;
|
||||
k 0.7;
|
||||
"epsilon.*" 0.7;
|
||||
epsilon 0.7;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -26,6 +26,8 @@ RAS
|
||||
turbulence on;
|
||||
|
||||
printCoeffs on;
|
||||
|
||||
implicitKEpsilonSource true;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@ include $(RULES)/c++$(WM_COMPILE_OPTION)
|
||||
|
||||
c++FLAGS = $(c++ARCH) $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS)
|
||||
|
||||
Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $< -o $@
|
||||
Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -Wno-alloc-size-larger-than -c $< -o $@
|
||||
cxxtoo = $(Ctoo)
|
||||
cctoo = $(Ctoo)
|
||||
cpptoo = $(Ctoo)
|
||||
|
||||
@ -62,7 +62,7 @@ Executing ${0##*/} is equivalent to
|
||||
|
||||
With additional options:
|
||||
-l | -log Tee output to log.\$WM_OPTIONS
|
||||
-log=FILE Tee output to given filename
|
||||
-log=NAME Tee output to given filename
|
||||
-prefix=... Define FOAM_MODULE_PREFIX (same as wmake -module-prefix)
|
||||
-no-recursion Prevent recursive call (do NOT call 'wmake -all')
|
||||
-fromWmake Same as -no-recursion
|
||||
@ -79,8 +79,7 @@ USAGE
|
||||
# Parse the arguments and options
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
unset optDebug optLog optNonRecursive optQueue
|
||||
unset optWmakeFrontend
|
||||
unset optDebug optLog optNonRecursive optPrefix optQueue
|
||||
|
||||
for arg in "$@"
|
||||
do
|
||||
@ -99,24 +98,27 @@ do
|
||||
;;
|
||||
|
||||
-module-prefix=* | -prefix=* | --prefix=*)
|
||||
# As per setModulePrefix (wmakeFunctions)
|
||||
export FOAM_MODULE_PREFIX="${arg#*=}"
|
||||
case "$FOAM_MODULE_PREFIX" in
|
||||
optPrefix="${arg#*=}"
|
||||
case "$optPrefix" in
|
||||
# Prefix: user
|
||||
(u | user) FOAM_MODULE_PREFIX="${FOAM_USER_LIBBIN%/*}" ;;
|
||||
(u | user)
|
||||
export FOAM_MODULE_PREFIX="${FOAM_USER_LIBBIN%/*}"
|
||||
;;
|
||||
|
||||
# Prefix: group
|
||||
(g | group) FOAM_MODULE_PREFIX="${FOAM_SITE_LIBBIN%/*}" ;;
|
||||
(g | group)
|
||||
export FOAM_MODULE_PREFIX="${FOAM_SITE_LIBBIN%/*}"
|
||||
;;
|
||||
|
||||
# Prefix: openfoam (other)
|
||||
(o | openfoam) FOAM_MODULE_PREFIX="${FOAM_LIBBIN%/*}" ;;
|
||||
(o | openfoam)
|
||||
export FOAM_MODULE_PREFIX="${FOAM_LIBBIN%/*}"
|
||||
;;
|
||||
|
||||
# Prefix: false | none (ie, 'disabled')
|
||||
(false | none) FOAM_MODULE_PREFIX=false ;;
|
||||
|
||||
# Prefix: directory (absolute or relative)
|
||||
# Prefix: custom (absolute or relative)
|
||||
(*)
|
||||
: "${FOAM_MODULE_PREFIX:=/usr/local}" # Fallback (autoconf-like)
|
||||
export FOAM_MODULE_PREFIX="$optPrefix"
|
||||
: "${FOAM_MODULE_PREFIX:=/usr/local}" # Default (autoconf)
|
||||
|
||||
# Require absolute path
|
||||
[ "${FOAM_MODULE_PREFIX#/}" != "${FOAM_MODULE_PREFIX}" ] || \
|
||||
@ -124,21 +126,20 @@ do
|
||||
;;
|
||||
esac
|
||||
|
||||
# Avoid potential conflicts
|
||||
unset FOAM_MODULE_APPBIN FOAM_MODULE_LIBBIN
|
||||
echo "Module prefix = ${FOAM_MODULE_PREFIX:-[]}" 1>&2
|
||||
continue # Argument handled, remove it
|
||||
echo "Module prefix = $FOAM_MODULE_PREFIX" 1>&2
|
||||
continue # Handled argument
|
||||
;;
|
||||
|
||||
-k | -keep-going | -non-stop)
|
||||
# Keep going, ignoring errors
|
||||
export WM_CONTINUE_ON_ERROR=true
|
||||
continue # Argument handled, remove it
|
||||
continue # Permanently remove arg
|
||||
;;
|
||||
|
||||
-l | -log)
|
||||
optLog="log.${WM_OPTIONS:-build}"
|
||||
continue # Argument handled, remove it
|
||||
continue # Permanently remove arg
|
||||
;;
|
||||
|
||||
-log=*)
|
||||
@ -150,17 +151,17 @@ do
|
||||
then
|
||||
optLog="log.${WM_OPTIONS:-build}"
|
||||
fi
|
||||
continue # Argument handled, remove it
|
||||
continue # Permanently remove arg
|
||||
;;
|
||||
|
||||
-debug)
|
||||
optDebug="-debug"
|
||||
continue # Argument handled, remove it
|
||||
continue # Permanently remove arg
|
||||
;;
|
||||
|
||||
-q | -queue)
|
||||
optQueue="-queue"
|
||||
continue # Argument handled, remove it
|
||||
continue # Permanently remove arg
|
||||
;;
|
||||
|
||||
lib | libo | libso | dep | objects)
|
||||
@ -182,14 +183,12 @@ if [ -z "$optNonRecursive" ]
|
||||
then
|
||||
if [ -z "$optLog" ]
|
||||
then
|
||||
exec wmake $optWmakeFrontend -all \
|
||||
$optDebug $optQueue $*
|
||||
exec wmake -all $optDebug $optQueue $*
|
||||
exit $? # Unneeded, but just in case something went wrong
|
||||
else
|
||||
echo "Logging wmake -all output to '$optLog'" 1>&2
|
||||
echo 1>&2
|
||||
exec wmake $optWmakeFrontend -all \
|
||||
$optDebug $optQueue $* 2>&1 | /usr/bin/tee $optLog
|
||||
exec wmake -all $optDebug $optQueue $* 2>&1 | /usr/bin/tee $optLog
|
||||
# Need to cleanup after the tee
|
||||
rc=$? # Error code from tee (not wmake), but not entirely important
|
||||
echo "Done logging to '$optLog'" 1>&2
|
||||
@ -212,8 +211,7 @@ fi
|
||||
# Cleanup local variables and functions
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
unset optWmakeFrontend
|
||||
unset optNonRecursive optDebug optLog optQueue
|
||||
unset optNonRecursive optDebug optLog optPrefix optQueue
|
||||
unset -f usage
|
||||
|
||||
|
||||
|
||||
@ -37,50 +37,6 @@
|
||||
# PTSCOTCH_INC_DIR
|
||||
# PTSCOTCH_LIB_DIR
|
||||
#
|
||||
#
|
||||
# System files can be hiding in a large variety of locations.
|
||||
# For x86_64 system:
|
||||
#
|
||||
# ArchLinux
|
||||
# ---------
|
||||
# scotch include: /usr/include/scotch
|
||||
# scotch library: /usr/lib64
|
||||
#
|
||||
# ptscotch include: /usr/include/ptscotch
|
||||
# ptscotch library: /usr/lib64
|
||||
#
|
||||
#
|
||||
# Debian/Ubuntu
|
||||
# -------------
|
||||
# scotch include: /usr/include/scotch-int32
|
||||
# scotch library: /usr/lib/x86_64-linux-gnu
|
||||
#
|
||||
# ptscotch include: /usr/include/scotch-int32
|
||||
# ptscotch library: /usr/lib/x86_64-linux-gnu
|
||||
#
|
||||
#
|
||||
# RedHat
|
||||
# ------
|
||||
# scotch include: /usr/include
|
||||
# scotch library: /usr/lib64
|
||||
#
|
||||
# ptscotch include: /usr/include/openmpi-x86_64
|
||||
# ptscotch library: /usr/lib64/openmpi/lib
|
||||
#
|
||||
# when MPI_ARCH_PATH=/usr/lib64/openmpi
|
||||
# and mpicc --showme:compile -> -I/usr/include/openmpi-x86_64
|
||||
#
|
||||
#
|
||||
# openSUSE
|
||||
# --------
|
||||
# scotch include: /usr/include
|
||||
# scotch library: /usr/lib64
|
||||
#
|
||||
# ptscotch include: /usr/lib64/mpi/gcc/openmpi2/include
|
||||
# ptscotch library: /usr/lib64/mpi/gcc/openmpi2/lib64
|
||||
#
|
||||
# when MPI_ARCH_PATH=/usr/lib64/mpi/gcc/openmpi2
|
||||
#
|
||||
#------------------------------------------------------------------------------
|
||||
. ${WM_PROJECT_DIR:?}/wmake/scripts/sysFunctions # General system functions
|
||||
|
||||
@ -236,9 +192,6 @@ search_ptscotch()
|
||||
local prefix="${1:-system}"
|
||||
local header library
|
||||
|
||||
local mpiPrefix="$MPI_ARCH_PATH"
|
||||
local mpiName="${MPI_ARCH_PATH##*/}"
|
||||
|
||||
# ----------------------------------
|
||||
if isNone "$prefix"
|
||||
then
|
||||
@ -251,10 +204,7 @@ search_ptscotch()
|
||||
"$prefix/include/$localDir/$incName" \
|
||||
"$prefix/include/ptscotch/$incName" \
|
||||
"$prefix/include/scotch/$incName" \
|
||||
"$prefix/include/$incName" \
|
||||
"$mpiPrefix/include/$incName" \
|
||||
"$prefix/include/$mpiName/$incName" \
|
||||
"$prefix/include/${mpiName}-$(uname -m)/$incName" \
|
||||
"$prefix/include/$incName"
|
||||
)
|
||||
library="$(findExtLib $FOAM_MPI/$libName $libName)"
|
||||
elif isSystem "$prefix"
|
||||
@ -268,9 +218,6 @@ search_ptscotch()
|
||||
"/usr/include/ptscotch/$incName" \
|
||||
"/usr/include/scotch/$incName" \
|
||||
"/usr/include/$incName" \
|
||||
"$mpiPrefix/include/$incName" \
|
||||
"/usr/include/$mpiName/$incName" \
|
||||
"$prefix/include/${mpiName}-$(uname -m)/$incName" \
|
||||
)
|
||||
prefix=$(sysPrefix "$header")
|
||||
else
|
||||
@ -288,7 +235,6 @@ search_ptscotch()
|
||||
# Library
|
||||
[ -n "$library" ] \
|
||||
|| library=$(findLibrary -prefix="$prefix" -name="$libName" -local="$localDir") \
|
||||
|| library=$(findLibrary -prefix="$mpiPrefix" -name="$libName" -local="$localDir") \
|
||||
|| {
|
||||
[ -n "$warn" ] && echo "$warn (no library)"
|
||||
return 2
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
# \\/ M anipulation |
|
||||
#------------------------------------------------------------------------------
|
||||
# Copyright (C) 2015-2016 OpenFOAM Foundation
|
||||
# Copyright (C) 2018-2021 OpenCFD Ltd.
|
||||
# Copyright (C) 2018-2020 OpenCFD Ltd.
|
||||
#------------------------------------------------------------------------------
|
||||
# License
|
||||
# This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
|
||||
@ -55,43 +55,6 @@ checkEnv()
|
||||
}
|
||||
|
||||
|
||||
# Set FOAM_MODULE_PREFIX according to
|
||||
# - absolute/relative path
|
||||
# - predefined type (u,user | g,group | o,openfoam)
|
||||
setModulePrefix()
|
||||
{
|
||||
export FOAM_MODULE_PREFIX="$1"
|
||||
case "$FOAM_MODULE_PREFIX" in
|
||||
# Prefix: user
|
||||
(u | user) FOAM_MODULE_PREFIX="${FOAM_USER_LIBBIN%/*}" ;;
|
||||
|
||||
# Prefix: group
|
||||
(g | group) FOAM_MODULE_PREFIX="${FOAM_SITE_LIBBIN%/*}" ;;
|
||||
|
||||
# Prefix: openfoam (other)
|
||||
(o | openfoam) FOAM_MODULE_PREFIX="${FOAM_LIBBIN%/*}" ;;
|
||||
|
||||
# Prefix: false | none (ie, 'disabled')
|
||||
(false | none) FOAM_MODULE_PREFIX=false ;;
|
||||
|
||||
# Prefix: directory (absolute or relative)
|
||||
(*)
|
||||
: "${FOAM_MODULE_PREFIX:=/usr/local}" # Fallback (autoconf-like)
|
||||
|
||||
# Require absolute path
|
||||
[ "${FOAM_MODULE_PREFIX#/}" != "${FOAM_MODULE_PREFIX}" ] || \
|
||||
FOAM_MODULE_PREFIX="${PWD}/${FOAM_MODULE_PREFIX}"
|
||||
;;
|
||||
esac
|
||||
|
||||
# Avoid potential conflicts
|
||||
unset FOAM_MODULE_APPBIN FOAM_MODULE_LIBBIN
|
||||
echo "Module prefix = ${FOAM_MODULE_PREFIX:-[]}" 1>&2
|
||||
}
|
||||
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
# Return the absolute (physical) path for a directory or
|
||||
# for a file's parent directory
|
||||
# expandPath dirName
|
||||
|
||||
Reference in New Issue
Block a user