From 310482dd638555353fa817637a147112e95c807c Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 11 Apr 2019 18:22:33 +0200
Subject: [PATCH] COMP: adjust compilation order. Can compile OSspecific before
Pstream
STYLE: report MPI flavour (WM_MPLIB) when making mpi-related libraries
---
src/Allwmake | 4 ++--
src/Pstream/Allwmake | 4 ++--
src/Pstream/dummy/UPstream.C | 3 +--
src/Pstream/mpi/UPstream.C | 4 +---
src/parallel/decompose/Allwmake | 2 +-
5 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/src/Allwmake b/src/Allwmake
index 04d0d5a92ff..3b1b1cb5b0c 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -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
diff --git a/src/Pstream/Allwmake b/src/Pstream/Allwmake
index f7447abf1e2..647d646aeb1 100755
--- a/src/Pstream/Allwmake
+++ b/src/Pstream/Allwmake
@@ -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
diff --git a/src/Pstream/dummy/UPstream.C b/src/Pstream/dummy/UPstream.C
index 5d082c3ef98..1d365bfc527 100644
--- a/src/Pstream/dummy/UPstream.C
+++ b/src/Pstream/dummy/UPstream.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2011, 2016 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011, 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"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/Pstream/mpi/UPstream.C b/src/Pstream/mpi/UPstream.C
index fbef4daaca2..00671da41b6 100644
--- a/src/Pstream/mpi/UPstream.C
+++ b/src/Pstream/mpi/UPstream.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2004-2011, 2016 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2004-2011, 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>
diff --git a/src/parallel/decompose/Allwmake b/src/parallel/decompose/Allwmake
index ea5369a94cb..ddf560a4b14 100755
--- a/src/parallel/decompose/Allwmake
+++ b/src/parallel/decompose/Allwmake
@@ -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"
--
GitLab