zhyang-dev/OpenFOAM-12
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 1d6637a81b
commit 48e3fb7805
80 changed files with 42 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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