zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

COMP: adjust compilation order. Can compile OSspecific before Pstream

Browse Source 
STYLE: report MPI flavour (WM_MPLIB) when making mpi-related libraries
This commit is contained in:
Mark Olesen
2019-04-11 18:22:33 +02:00
committed by Andrew Heather
parent 40e4f8a293
commit 0fab8abc76
5 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Allwmake
View File

@ -20,11 +20,11 @@ wmakeBuildInfo -check || wrmo OpenFOAM/global/global.o 2>/dev/null
wmakeLnInclude -u OpenFOAM
wmakeLnInclude -u OSspecific/"${WM_OSTYPE:-POSIX}"
OSspecific/"${WM_OSTYPE:-POSIX}"/Allwmake $targetType $*
Pstream/Allwmake $targetType $*
OSspecific/"${WM_OSTYPE:-POSIX}"/Allwmake $targetType $*
wmake $targetType OpenFOAM
wmake $targetType fileFormats
wmake $targetType surfMesh
wmake $targetType meshTools

4
src/Pstream/Allwmake
View File

@ -17,7 +17,7 @@ wmakeMpiLib()
objectsDir="$WM_PROJECT_DIR/build/$WM_OPTIONS/src/Pstream/$libName"
whichmpi="$objectsDir/using:$FOAM_MPI"
[ -e "$whichmpi" ] || wclean $libName
echo "wmake $targetType $libName"
echo "wmake $targetType $libName (mpi=$WM_MPLIB)"
wmake $targetType $libName
mkdir -p "$objectsDir"
touch "$whichmpi"
@ -25,7 +25,7 @@ wmakeMpiLib()
done
}
echo "wmake $targetType dummy"
echo "wmake $targetType dummy (mpi=$WM_MPLIB)"
wmake $targetType dummy
case "$WM_MPLIB" in

3
src/Pstream/dummy/UPstream.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2016 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2018 OpenFOAM Foundation
@ -27,7 +27,6 @@ License
#include "Pstream.H"
#include "PstreamReduceOps.H"
#include "OSspecific.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

4
src/Pstream/mpi/UPstream.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2016 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation
@ -27,7 +27,6 @@ License
#include "Pstream.H"
#include "PstreamReduceOps.H"
#include "OSspecific.H"
#include "PstreamGlobals.H"
#include "SubList.H"
#include "allReduce.H"
@ -35,7 +34,6 @@ License
#include "collatedFileOperation.H"
#include <mpi.h>
#include <cstring>
#include <cstdlib>
#include <csignal>

2
src/parallel/decompose/Allwmake
View File

@ -28,7 +28,7 @@ wmakeMpiLib()
whichmpi="$objectsDir/using:$FOAM_MPI"
whichdecomp="$objectsDir/using:$decompName"
[ -e "$whichmpi" -a -e "$whichdecomp" ] || wclean $libName
echo "wmake $targetType $libName"
echo "wmake $targetType $libName (mpi=$WM_MPLIB)"
wmake $targetType $libName
mkdir -p "$objectsDir"
touch "$whichdecomp" "$whichmpi"