songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allwmake: Remove 'set -x' which generates a lot of noise

Browse Source 
'set -x' should be used for debugging.

Added command printing into wmake and Allwmake as a replacement for
'set -x' to log current target.
This commit is contained in:
Henry Weller 2016-11-13 18:08:22 +00:00
parent 5981836326
commit 80db302666
80 changed files with 42 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
applications/Allwmake
View File

@ -17,10 +17,7 @@ wmakeCheckPwd "$WM_PROJECT_DIR/applications" || {
exit 1
}
set -x
wmake -all $targetType solvers
wmake -all $targetType utilities
#------------------------------------------------------------------------------

1
applications/solvers/compressible/rhoCentralFoam/Allwclean
View File

@ -1,6 +1,5 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
set -x
wclean libso BCs
wclean

1
applications/solvers/compressible/rhoCentralFoam/Allwmake
View File

@ -3,7 +3,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
(wmake $targetType BCs && wmake $targetType && wmake $targetType rhoCentralDyMFoam)

1
applications/solvers/lagrangian/DPMFoam/Allwclean
View File

@ -1,7 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1
set -x
wclean libso DPMTurbulenceModels
wclean

1
applications/solvers/lagrangian/DPMFoam/Allwmake
View File

@ -3,7 +3,6 @@ cd ${0%/*} || exit 1
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
wmake $targetType DPMTurbulenceModels

1
applications/solvers/multiphase/compressibleInterFoam/Allwclean
View File

@ -1,6 +1,5 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
set -x
wclean libso twoPhaseMixtureThermo
wclean

1
applications/solvers/multiphase/compressibleInterFoam/Allwmake
View File

@ -3,7 +3,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
wmake $targetType twoPhaseMixtureThermo

1
applications/solvers/multiphase/compressibleMultiphaseInterFoam/Allwclean
View File

@ -1,6 +1,5 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
set -x
wclean libso multiphaseMixtureThermo
wclean

1
applications/solvers/multiphase/compressibleMultiphaseInterFoam/Allwmake
View File

@ -3,7 +3,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
wmake $targetType multiphaseMixtureThermo
wmake $targetType

1
applications/solvers/multiphase/driftFluxFoam/Allwclean
View File

@ -1,6 +1,5 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
set -x
wclean libso mixtureViscosityModels
wclean libso relativeVelocityModels

1
applications/solvers/multiphase/driftFluxFoam/Allwmake
View File

@ -3,7 +3,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
wmake $targetType mixtureViscosityModels
wmake $targetType relativeVelocityModels

1
applications/solvers/multiphase/interPhaseChangeFoam/Allwclean
View File

@ -1,6 +1,5 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
set -x
wclean libso phaseChangeTwoPhaseMixtures
wclean

1
applications/solvers/multiphase/interPhaseChangeFoam/Allwmake
View File

@ -3,7 +3,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
wmake $targetType phaseChangeTwoPhaseMixtures
wmake $targetType

1
applications/solvers/multiphase/multiphaseEulerFoam/Allwclean
View File

@ -1,6 +1,5 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
set -x
wclean libso multiphaseSystem
wclean libso interfacialModels

1
applications/solvers/multiphase/multiphaseEulerFoam/Allwmake
View File

@ -3,7 +3,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
wmakeLnInclude interfacialModels
wmake $targetType multiphaseSystem

1
applications/solvers/multiphase/multiphaseInterFoam/Allwclean
View File

@ -1,6 +1,5 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
set -x
wclean libso multiphaseMixture
wclean

1
applications/solvers/multiphase/multiphaseInterFoam/Allwmake
View File

@ -3,7 +3,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
wmake $targetType multiphaseMixture
wmake $targetType

1
applications/solvers/multiphase/reactingEulerFoam/Allwclean
View File

@ -1,6 +1,5 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
set -x
wclean libso phaseSystems
wclean libso interfacialModels

1
applications/solvers/multiphase/reactingEulerFoam/Allwmake
View File

@ -3,7 +3,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
wmakeLnInclude interfacialModels
wmakeLnInclude interfacialCompositionModels

1
applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwclean
View File

@ -1,6 +1,5 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
set -x
wclean libso multiphaseSystem
wclean libso multiphaseCompressibleTurbulenceModels

1
applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwmake
View File

@ -3,7 +3,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
wmake $targetType multiphaseSystem
wmake $targetType multiphaseCompressibleTurbulenceModels

1
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwclean
View File

@ -1,6 +1,5 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
set -x
wclean libso twoPhaseSystem
wclean libso twoPhaseCompressibleTurbulenceModels

1
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwmake
View File

@ -3,7 +3,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
wmake $targetType twoPhaseSystem
wmake $targetType twoPhaseCompressibleTurbulenceModels

1
applications/solvers/multiphase/twoPhaseEulerFoam/Allwclean
View File

@ -1,6 +1,5 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
set -x
wclean libso twoPhaseSystem
wclean libso interfacialModels

1
applications/solvers/multiphase/twoPhaseEulerFoam/Allwmake
View File

@ -3,7 +3,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
wmakeLnInclude interfacialModels
wmake $targetType twoPhaseSystem

1
applications/utilities/mesh/conversion/Optional/Allwmake
View File

@ -6,7 +6,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for compilation (at least for error catching)
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
# build libccmio and create lnInclude directory
$WM_THIRD_PARTY_DIR/AllwmakeLibccmio

1
applications/utilities/mesh/generation/extrude2DMesh/Allwclean
View File

@ -1,6 +1,5 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
set -x
wclean libso extrude2DMesh
wclean

1
applications/utilities/mesh/generation/extrude2DMesh/Allwmake
View File

@ -3,7 +3,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
wmake $targetType extrude2DMesh
wmake $targetType

1
applications/utilities/mesh/generation/foamyMesh/Allwclean
View File

@ -1,6 +1,5 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
set -x
wclean conformalVoronoiMesh
wclean conformalVoronoi2DMesh

1
applications/utilities/mesh/generation/foamyMesh/Allwmake
View File

@ -3,7 +3,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
wmake $targetType conformalVoronoiMesh
wmake $targetType conformalVoronoi2DMesh

1
applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Allwmake
View File

@ -3,7 +3,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for compilation (at least for error catching)
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
if [ -d "${FASTDUALOCTREE_SRC_PATH}" ]
then

2
applications/utilities/mesh/manipulation/setSet/Allwmake
View File

@ -11,7 +11,7 @@ unset COMP_FLAGS LINK_FLAGS
#
if [ -f /usr/include/readline/readline.h ]
then
echo "Found <readline/readline.h> -- enabling readline support."
echo " found <readline/readline.h> -- enabling readline support."
export COMP_FLAGS="-DHAS_READLINE"
export LINK_FLAGS="-lreadline"
fi

1
applications/utilities/miscellaneous/foamHelp/Allwmake
View File

@ -3,7 +3,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
wmake $targetType helpTypes
wmake $targetType

4
applications/utilities/postProcessing/dataConversion/foamToTecplot360/Allwmake
View File

@ -4,10 +4,8 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for application compilation (at least for error control)
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
if [ ! -d ${WM_THIRD_PARTY_DIR}/tecio ]
if [ -d ${WM_THIRD_PARTY_DIR}/tecio ]
then
echo "Did not find tecio in ${WM_THIRD_PARTY_DIR}. Not building foamToTecplot360."
else
wmake $targetType
fi

1
applications/utilities/postProcessing/dataConversion/foamToVTK/Allwmake
View File

@ -3,7 +3,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
wmake $targetType foamToVTK
wmake $targetType

1
applications/utilities/postProcessing/graphics/PV3Readers/Allwclean
View File

@ -1,6 +1,5 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
set -x
wclean libso vtkPV3Readers
PV3blockMeshReader/Allwclean

6
applications/utilities/postProcessing/graphics/PV3Readers/Allwmake
View File

@ -3,7 +3,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
#set -x
case "$ParaView_VERSION" in
3*)
@ -22,12 +21,9 @@ case "$ParaView_VERSION" in
PV3blockMeshReader/Allwmake $targetType $*
PV3FoamReader/Allwmake $targetType $*
else
echo "ERROR: ParaView not found in $ParaView_DIR"
echo " ERROR: ParaView not found in $ParaView_DIR"
fi
;;
*)
echo "WARN: PV3 readers not building: ParaView_VERSION=$ParaView_VERSION"
;;
esac
#------------------------------------------------------------------------------

1
applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/Allwclean
View File

@ -1,6 +1,5 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
set -x
# deal with client/server vs combined plugins
rm -f $FOAM_LIBBIN/libPV3FoamReader* 2>/dev/null

1
applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/Allwmake
View File

@ -3,7 +3,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
then

1
applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/Allwclean
View File

@ -1,6 +1,5 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
set -x
# deal with client/server vs combined plugins
rm -f $FOAM_LIBBIN/libPV3blockMeshReader* 2>/dev/null

1
applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/Allwmake
View File

@ -3,7 +3,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
then

1
applications/utilities/postProcessing/graphics/PVReaders/Allwclean
View File

@ -1,6 +1,5 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
set -x
wclean libso vtkPVReaders
PVblockMeshReader/Allwclean

6
applications/utilities/postProcessing/graphics/PVReaders/Allwmake
View File

@ -3,7 +3,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
#set -x
case "$ParaView_VERSION" in
4* | 5*)
@ -22,12 +21,9 @@ case "$ParaView_VERSION" in
PVblockMeshReader/Allwmake $targetType $*
PVFoamReader/Allwmake $targetType $*
else
echo "ERROR: ParaView not found in $ParaView_DIR"
echo " ERROR: ParaView not found in $ParaView_DIR"
fi
;;
*)
echo "WARN: PV readers not building: ParaView_VERSION=$ParaView_VERSION"
;;
esac
#------------------------------------------------------------------------------

1
applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwclean
View File

@ -1,6 +1,5 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
set -x
# deal with client/server vs combined plugins
rm -f $FOAM_LIBBIN/libPVFoamReader* 2>/dev/null

1
applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwmake
View File

@ -3,7 +3,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
then

1
applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwclean
View File

@ -1,6 +1,5 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
set -x
# deal with client/server vs combined plugins
rm -f $FOAM_LIBBIN/libPVblockMeshReader* 2>/dev/null

1
applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwmake
View File

@ -3,7 +3,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
then

1
applications/utilities/preProcessing/wallFunctionTable/Allwmake
View File

@ -3,7 +3,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
wmake $targetType tabulatedWallFunction
wmake $targetType

1
doc/Allwmake
View File

@ -1,6 +1,5 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
set -x
# fix permissions (NB: '+X' and not '+x'!)
chmod a+rX $WM_PROJECT_DIR $WM_PROJECT_DIR/doc Doxygen

8
doc/Doxygen/Allwmake
View File

@ -2,9 +2,9 @@
cd ${0%/*} || exit 1 # Run from this directory
[ -d "$WM_PROJECT_DIR" ] || {
echo "Error: WM_PROJECT_DIR directory does not exist"
echo " Check the OpenFOAM entries in your dot-files and source them."
echo " WM_PROJECT_DIR=$WM_PROJECT_DIR"
echo " Error: WM_PROJECT_DIR directory does not exist"
echo " Check the OpenFOAM entries in your dot-files and source them."
echo " WM_PROJECT_DIR=$WM_PROJECT_DIR"
exit 1
}
@ -62,8 +62,6 @@ done
#------------------------------------------------------------------------------
set -x
rm -rf latex man
# remove html directory in background

17
doc/tools/find-its
View File

@ -1,17 +0,0 @@
#!/bin/sh
#------------------------------------------------------------------------------
# Script
# find-its
#
# Description
# Search for files with "it's"
# This contraction (== "it is") looks too much like "its" (possesive)
# and confuses non-native (and some native) English speakers.
#
#------------------------------------------------------------------------------
set -x
cd $WM_PROJECT_DIR || exit 1
git grep -e "it's"
#------------------------------------------------------------------------------

1
doc/tools/find-trailingspace
View File

@ -7,7 +7,6 @@
# Search for files with trailing whitesapce
#
#------------------------------------------------------------------------------
set -x
cd $WM_PROJECT_DIR || exit 1
tab=$'\t'

2
src/Allwmake
View File

@ -17,8 +17,6 @@ wmakeCheckPwd "$WM_PROJECT_DIR/src" || {
exit 1
}
set -x
# Update OpenFOAM version strings if required
wmakePrintBuild -check || wrmo OpenFOAM/global/global.o 2>/dev/null

2
src/OSspecific/POSIX/Allwmake
View File

@ -12,7 +12,7 @@ unset COMP_FLAGS LINK_FLAGS
#
if [ -f /usr/include/sys/inotify.h ]
then
echo "Found <sys/inotify.h> -- enabling inotify for file monitoring."
echo " found <sys/inotify.h> -- enabling inotify for file monitoring."
export COMP_FLAGS="-DFOAM_USE_INOTIFY"
else
unset COMP_FLAGS

4
src/Pstream/Allwclean
View File

@ -5,7 +5,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# clean the qualified directory
wcleanMpiLib()
{
set +x
for libName
do
(
@ -13,15 +12,12 @@ wcleanMpiLib()
wclean $libName
)
done
set -x
}
set -x
wclean dummy
case "$WM_MPLIB" in
*MPI*)
set +x
wcleanMpiLib mpi
;;
esac

5
src/Pstream/Allwmake
View File

@ -10,27 +10,22 @@ cd ${0%/*} || exit 1 # Run from this directory
# use sentinel file to handle version changes
wmakeMpiLib()
{
set +x
for libName
do
(
WM_OPTIONS="$WM_OPTIONS$WM_MPLIB"
whichmpi="$WM_PROJECT_DIR/platforms/$WM_OPTIONS/src/Pstream/$libName/using:$FOAM_MPI"
[ -e "$whichmpi" ] || wclean $libName
echo "wmake $targetType $libName"
wmake $targetType $libName
touch "$whichmpi"
)
done
set -x
}
set -x
wmake $targetType dummy
case "$WM_MPLIB" in
*MPI*)
set +x
wmakeMpiLib mpi
;;
esac

1
src/TurbulenceModels/Allwmake
View File

@ -3,7 +3,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
wmake $targetType turbulenceModels
wmake $targetType incompressible

1
src/conversion/Allwmake
View File

@ -3,7 +3,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
wmake $targetType

2
src/dummyThirdParty/Allwmake vendored
View File

@ -3,12 +3,10 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
wmake $targetType scotchDecomp
wmake $targetType ptscotchDecomp
wmake $targetType metisDecomp
wmake $targetType MGridGen
#------------------------------------------------------------------------------

1
src/functionObjects/Allwmake
View File

@ -3,7 +3,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
wmake $targetType field
wmake $targetType forces

2
src/fvAgglomerationMethods/Allwmake
View File

@ -3,7 +3,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
export ParMGridGen=$WM_THIRD_PARTY_DIR/ParMGridGen-1.0
@ -14,5 +13,4 @@ fi
wmake $targetType pairPatchAgglomeration
#------------------------------------------------------------------------------

1
src/lagrangian/Allwmake
View File

@ -3,7 +3,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
wmake $targetType distributionModels
wmake $targetType basic

1
src/lagrangian/molecularDynamics/Allwmake
View File

@ -3,7 +3,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
wmake $targetType potential
wmake $targetType molecularMeasurements

1
src/mesh/Allwmake
View File

@ -3,7 +3,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
wmake $targetType snappyHexMesh
wmake $targetType blockMesh

2
src/parallel/Allwmake
View File

@ -3,11 +3,9 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
decompose/Allwmake $targetType $*
reconstruct/Allwmake $targetType $*
wmake $targetType distributed
#------------------------------------------------------------------------------

19
src/parallel/decompose/Allwclean
View File

@ -5,20 +5,17 @@ cd ${0%/*} || exit 1 # Run from this directory
if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config.sh/scotch`
then
. $settings
echo "using SCOTCH_ARCH_PATH=$SCOTCH_ARCH_PATH"
echo " using SCOTCH_ARCH_PATH=$SCOTCH_ARCH_PATH"
else
echo
echo "Error: no config.sh/scotch settings"
echo " Error: no config.sh/scotch settings"
echo
fi
#
# define how to clean an mpi-versioned library
#
# Define how to clean an mpi-versioned library
wcleanMpiLib()
{
set +x
for libName
do
(
@ -28,11 +25,8 @@ wcleanMpiLib()
wclean $libName
)
done
set -x
}
set -x
if [ -n "$SCOTCH_ARCH_PATH" ]
then
wclean scotchDecomp
@ -42,16 +36,11 @@ then
wcleanMpiLib ptscotchDecomp
fi
else
echo
echo "Skipping scotchDecomp (ptscotchDecomp)"
echo
echo " skipping scotchDecomp (ptscotchDecomp)"
fi
wclean metisDecomp
wclean decompositionMethods
wclean decompose
#------------------------------------------------------------------------------

22
src/parallel/decompose/Allwmake
View File

@ -4,26 +4,24 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
# get SCOTCH_VERSION, SCOTCH_ARCH_PATH
# Get SCOTCH_VERSION, SCOTCH_ARCH_PATH
if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config.sh/scotch`
then
. $settings
echo "using SCOTCH_ARCH_PATH=$SCOTCH_ARCH_PATH"
echo " using SCOTCH_ARCH_PATH=$SCOTCH_ARCH_PATH"
else
echo
echo "Error: no config.sh/scotch settings"
echo " Error: no config.sh/scotch settings"
echo
fi
#
# define how to create an mpi-versioned library of $targetType
# Define how to create an mpi-versioned library of $targetType
# compile into qualified directory
# use sentinel file to handle version changes
#
wmakeMpiLib()
{
set +x
for libName
do
(
@ -36,11 +34,8 @@ wmakeMpiLib()
touch "$whichmpi" "$whichscotch"
)
done
set -x
}
set -x
wmakeLnInclude decompositionMethods
if [ -n "$SCOTCH_ARCH_PATH" ]
@ -52,18 +47,15 @@ then
wmakeMpiLib ptscotchDecomp
fi
else
echo
echo "Skipping scotchDecomp (ptscotchDecomp)"
echo
echo " skipping scotchDecomp (ptscotchDecomp)"
fi
# Try and build metisDecomp (has own logic)
(cd metisDecomp && ./Allwmake $targetType)
wmake $targetType decompositionMethods
wmake $targetType decompose
#------------------------------------------------------------------------------

1
src/parallel/decompose/AllwmakeLnInclude
View File

@ -1,6 +1,5 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
set -x
wmakeLnInclude decompositionMethods
wmakeLnInclude metisDecomp

4
src/parallel/decompose/metisDecomp/Allwmake
View File

@ -8,14 +8,14 @@ cd ${0%/*} || exit 1 # Run from this directory
if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config.sh/metis`
then
. $settings
echo "using METIS_ARCH_PATH=$METIS_ARCH_PATH"
echo " using METIS_ARCH_PATH=$METIS_ARCH_PATH"
if [ -r $METIS_ARCH_PATH/lib/libmetis.so ]
then
wmake $targetType
fi
else
echo
echo "Error: no config.sh/metis settings"
echo " Error: no config.sh/metis settings"
echo
fi

1
src/parallel/reconstruct/Allwmake
View File

@ -3,7 +3,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
wmake $targetType reconstruct

2
src/regionModels/Allwclean
View File

@ -1,7 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
makeType=${1:-libso}
set -x
wclean $makeType regionModel
wclean $makeType pyrolysisModels
@ -9,5 +8,4 @@ wclean $makeType surfaceFilmModels
wclean $makeType thermalBaffleModels
wclean $makeType regionCoupling
#------------------------------------------------------------------------------

2
src/regionModels/Allwmake
View File

@ -3,7 +3,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
wmake $targetType regionModel
wmake $targetType pyrolysisModels
@ -12,5 +11,4 @@ wmake $targetType surfaceFilmModels/derivedFvPatchFields/wallFunctions
wmake $targetType thermalBaffleModels
wmake $targetType regionCoupling
#------------------------------------------------------------------------------

8
src/renumber/Allwmake
View File

@ -4,8 +4,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
wmake $targetType renumberMethods
# Deprecate SloanRenumber due to dependency on BOOST causing build and
# installation problems on a range of legacy systems.
# wmake $targetType SloanRenumber
@ -14,9 +12,9 @@ if [ -n "$ZOLTAN_ARCH_PATH" ]
then
wmake $targetType zoltanRenumber
else
echo
echo "Skipping zoltanRenumber"
echo
echo " skipping zoltanRenumber"
fi
wmake $targetType renumberMethods
#------------------------------------------------------------------------------

1
src/thermophysicalModels/Allwmake
View File

@ -3,7 +3,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
wmake $targetType specie
wmake $targetType solidSpecie

2
src/thermophysicalModels/properties/Allwmake
View File

@ -3,12 +3,10 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
wmake $targetType liquidProperties
wmake $targetType liquidMixtureProperties
wmake $targetType solidProperties
wmake $targetType solidMixtureProperties
#------------------------------------------------------------------------------

1
src/transportModels/Allwmake
View File

@ -3,7 +3,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
wmake $targetType twoPhaseMixture
wmake $targetType interfaceProperties

2
tutorials/incompressible/SRFPimpleFoam/rotor2D/makeMesh
View File

@ -1,8 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
set -x
m4 < system/blockMeshDict.m4 > system/blockMeshDict
blockMesh > log.blockMesh 2>&1

8
wmake/scripts/AllwmakeParseArguments
View File

@ -90,6 +90,14 @@ do
done
#------------------------------------------------------------------------------
# Print command
#------------------------------------------------------------------------------
[ -z "$targetType" ] || targetSpace=" "
echo "$Script $targetType$targetSpace$(echo $PWD | sed s%$WM_PROJECT_DIR/%% )"
#------------------------------------------------------------------------------
# Execute wmake -all if not called from wmake
#------------------------------------------------------------------------------

9
wmake/wclean
View File

@ -122,8 +122,9 @@ then
}
fi
# Provide some feedback
echo "$Script $targetType ${dir:-.}"
# Print command
[ -z "$targetType" ] || targetSpace=" "
echo "$Script $targetType$targetSpace${dir:-.}"
fi
@ -164,7 +165,7 @@ then
if [ -d $objectsDir ]
then
echo "Removing redundant object directories in $objectsDir"
echo " Removing redundant object directories in $objectsDir"
find $objectsDir -name 'variables' -print | \
while read variablesFile
@ -253,7 +254,7 @@ unset targetType
if [ -d $MakeDir ]
then
objectsDir=$MakeDir/$WM_OPTIONS
if echo $PWD | grep "$WM_PROJECT_DIR"
if [ $(echo $PWD | grep "$WM_PROJECT_DIR") ]
then
platformPath=$WM_PROJECT_DIR/platforms/${WM_OPTIONS}
objectsDir=$platformPath$(echo $PWD | sed s%$WM_PROJECT_DIR%% )

6
wmake/wmake
View File

@ -268,6 +268,10 @@ then
exit 1
}
fi
# Print command
[ -z "$targetType" ] || targetSpace=" "
echo "$Script $targetType$targetSpace${dir:-.}"
fi
@ -386,7 +390,7 @@ fi
#------------------------------------------------------------------------------
objectsDir=$MakeDir/$WM_OPTIONS
if echo $PWD | grep "$WM_PROJECT_DIR"
if [ $(echo $PWD | grep "$WM_PROJECT_DIR") ]
then
platformPath=$WM_PROJECT_DIR/platforms/${WM_OPTIONS}
objectsDir=$platformPath$(echo $PWD | sed s%$WM_PROJECT_DIR%% )