From 909780110559a83a8f3f95ea4dd4e29e6110f9b0 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Tue, 11 Jul 2017 08:48:10 +0200 Subject: [PATCH 1/6] STYLE: additional divisions for code templates --- etc/codeTemplates/foamCommentStyles | 6 ++++++ etc/codeTemplates/source/_Template.C | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/etc/codeTemplates/foamCommentStyles b/etc/codeTemplates/foamCommentStyles index db5fa120b9..3c8f9f8b40 100644 --- a/etc/codeTemplates/foamCommentStyles +++ b/etc/codeTemplates/foamCommentStyles @@ -12,6 +12,12 @@ // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // +// * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * // + +// * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * // + +// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * // + // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // diff --git a/etc/codeTemplates/source/_Template.C b/etc/codeTemplates/source/_Template.C index 3d6f46ded1..704fbe62a9 100644 --- a/etc/codeTemplates/source/_Template.C +++ b/etc/codeTemplates/source/_Template.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) YEAR OpenFOAM Foundation + \\ / A nd | Copyright (C) YEAR AUTHOR,AFFILIATION \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -30,6 +30,9 @@ License const dataType Foam::CLASSNAME::staticData(); +// * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * // + + // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * // From 2b249e1ad374c1ee2c1e966b98b41f0e775780a3 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Tue, 11 Jul 2017 08:58:52 +0200 Subject: [PATCH 2/6] STYLE: avoid default copyright assignment when generating from code templates --- etc/codeTemplates/BC/BC.C | 2 +- etc/codeTemplates/BC/BC.H | 2 +- etc/codeTemplates/BC/BCs.C | 2 +- etc/codeTemplates/BC/BCs.H | 2 +- etc/codeTemplates/BC/BCsFwd.H | 2 +- etc/codeTemplates/app/app.C | 2 +- etc/codeTemplates/dynamicCode/codeStreamTemplate.C | 2 +- etc/codeTemplates/dynamicCode/codedFvOptionTemplate.C | 2 +- etc/codeTemplates/dynamicCode/codedFvOptionTemplate.H | 2 +- etc/codeTemplates/dynamicCode/fixedValueFvPatchFieldTemplate.C | 2 +- etc/codeTemplates/dynamicCode/fixedValueFvPatchFieldTemplate.H | 2 +- .../dynamicCode/fixedValuePointPatchFieldTemplate.C | 2 +- .../dynamicCode/fixedValuePointPatchFieldTemplate.H | 2 +- etc/codeTemplates/dynamicCode/functionObjectTemplate.C | 2 +- etc/codeTemplates/dynamicCode/functionObjectTemplate.H | 2 +- etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.C | 2 +- etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.H | 2 +- etc/codeTemplates/foamScript | 2 +- etc/codeTemplates/functionObject/FUNCTIONOBJECT.C | 2 +- etc/codeTemplates/functionObject/FUNCTIONOBJECT.H | 2 +- etc/codeTemplates/source/_Template.H | 2 +- etc/codeTemplates/source/_TemplateApp.C | 2 +- etc/codeTemplates/source/_TemplateI.H | 2 +- etc/codeTemplates/source/_TemplateIO.C | 2 +- etc/codeTemplates/template/_TemplateTemplate.C | 2 +- etc/codeTemplates/template/_TemplateTemplate.H | 2 +- etc/codeTemplates/template/_TemplateTemplateI.H | 2 +- etc/codeTemplates/template/_TemplateTemplateIO.C | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/etc/codeTemplates/BC/BC.C b/etc/codeTemplates/BC/BC.C index d31c281a5f..10e55a5aff 100644 --- a/etc/codeTemplates/BC/BC.C +++ b/etc/codeTemplates/BC/BC.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) YEAR OpenFOAM Foundation + \\ / A nd | Copyright (C) YEAR AUTHOR,AFFILIATION \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/etc/codeTemplates/BC/BC.H b/etc/codeTemplates/BC/BC.H index 72f66462f6..313cacfc9a 100644 --- a/etc/codeTemplates/BC/BC.H +++ b/etc/codeTemplates/BC/BC.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) YEAR OpenFOAM Foundation + \\ / A nd | Copyright (C) YEAR AUTHOR,AFFILIATION \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/etc/codeTemplates/BC/BCs.C b/etc/codeTemplates/BC/BCs.C index b8b4642918..315970677c 100644 --- a/etc/codeTemplates/BC/BCs.C +++ b/etc/codeTemplates/BC/BCs.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) YEAR OpenFOAM Foundation + \\ / A nd | Copyright (C) YEAR AUTHOR,AFFILIATION \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/etc/codeTemplates/BC/BCs.H b/etc/codeTemplates/BC/BCs.H index f32d209bbe..0ef53653cd 100644 --- a/etc/codeTemplates/BC/BCs.H +++ b/etc/codeTemplates/BC/BCs.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) YEAR OpenFOAM Foundation + \\ / A nd | Copyright (C) YEAR AUTHOR,AFFILIATION \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/etc/codeTemplates/BC/BCsFwd.H b/etc/codeTemplates/BC/BCsFwd.H index 2aeabb56ff..14773d584e 100644 --- a/etc/codeTemplates/BC/BCsFwd.H +++ b/etc/codeTemplates/BC/BCsFwd.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) YEAR OpenFOAM Foundation + \\ / A nd | Copyright (C) YEAR AUTHOR,AFFILIATION \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/etc/codeTemplates/app/app.C b/etc/codeTemplates/app/app.C index 0b765eb1e2..602a5e52b8 100644 --- a/etc/codeTemplates/app/app.C +++ b/etc/codeTemplates/app/app.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) YEAR OpenFOAM Foundation + \\ / A nd | Copyright (C) YEAR AUTHOR,AFFILIATION \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/etc/codeTemplates/dynamicCode/codeStreamTemplate.C b/etc/codeTemplates/dynamicCode/codeStreamTemplate.C index 58671e5876..0b1d173710 100644 --- a/etc/codeTemplates/dynamicCode/codeStreamTemplate.C +++ b/etc/codeTemplates/dynamicCode/codeStreamTemplate.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) YEAR OpenFOAM Foundation + \\ / A nd | Copyright (C) YEAR AUTHOR,AFFILIATION \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.C b/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.C index 046412bd68..0e78abcf2a 100644 --- a/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.C +++ b/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) YEAR OpenFOAM Foundation + \\ / A nd | Copyright (C) YEAR AUTHOR,AFFILIATION \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.H b/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.H index a25fe3d30d..63e30f0869 100644 --- a/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.H +++ b/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) YEAR OpenFOAM Foundation + \\ / A nd | Copyright (C) YEAR AUTHOR,AFFILIATION \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/etc/codeTemplates/dynamicCode/fixedValueFvPatchFieldTemplate.C b/etc/codeTemplates/dynamicCode/fixedValueFvPatchFieldTemplate.C index e0a3943411..82cbf68927 100644 --- a/etc/codeTemplates/dynamicCode/fixedValueFvPatchFieldTemplate.C +++ b/etc/codeTemplates/dynamicCode/fixedValueFvPatchFieldTemplate.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) YEAR OpenFOAM Foundation + \\ / A nd | Copyright (C) YEAR AUTHOR,AFFILIATION \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/etc/codeTemplates/dynamicCode/fixedValueFvPatchFieldTemplate.H b/etc/codeTemplates/dynamicCode/fixedValueFvPatchFieldTemplate.H index 468ef1326c..ff395d1c18 100644 --- a/etc/codeTemplates/dynamicCode/fixedValueFvPatchFieldTemplate.H +++ b/etc/codeTemplates/dynamicCode/fixedValueFvPatchFieldTemplate.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) YEAR OpenFOAM Foundation + \\ / A nd | Copyright (C) YEAR AUTHOR,AFFILIATION \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.C b/etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.C index c1cc7e66c9..5362cf9d7d 100644 --- a/etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.C +++ b/etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) YEAR OpenFOAM Foundation + \\ / A nd | Copyright (C) YEAR AUTHOR,AFFILIATION \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.H b/etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.H index ce92b09fb2..6b14d20519 100644 --- a/etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.H +++ b/etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) YEAR OpenFOAM Foundation + \\ / A nd | Copyright (C) YEAR AUTHOR,AFFILIATION \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/etc/codeTemplates/dynamicCode/functionObjectTemplate.C b/etc/codeTemplates/dynamicCode/functionObjectTemplate.C index b2d65aad5d..333387024f 100644 --- a/etc/codeTemplates/dynamicCode/functionObjectTemplate.C +++ b/etc/codeTemplates/dynamicCode/functionObjectTemplate.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) YEAR OpenFOAM Foundation + \\ / A nd | Copyright (C) YEAR AUTHOR,AFFILIATION \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/etc/codeTemplates/dynamicCode/functionObjectTemplate.H b/etc/codeTemplates/dynamicCode/functionObjectTemplate.H index bd2580a9be..0bc6fa5bd5 100644 --- a/etc/codeTemplates/dynamicCode/functionObjectTemplate.H +++ b/etc/codeTemplates/dynamicCode/functionObjectTemplate.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) YEAR OpenFOAM Foundation + \\ / A nd | Copyright (C) YEAR AUTHOR,AFFILIATION \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.C b/etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.C index 651ee6018a..22fbd27f7e 100644 --- a/etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.C +++ b/etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) YEAR OpenFOAM Foundation + \\ / A nd | Copyright (C) YEAR AUTHOR,AFFILIATION \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.H b/etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.H index cb59d0a1f5..3ac5cec49f 100644 --- a/etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.H +++ b/etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) YEAR OpenFOAM Foundation + \\ / A nd | Copyright (C) YEAR AUTHOR,AFFILIATION \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/etc/codeTemplates/foamScript b/etc/codeTemplates/foamScript index 48cc73bb5c..02d8fb6c4a 100755 --- a/etc/codeTemplates/foamScript +++ b/etc/codeTemplates/foamScript @@ -3,7 +3,7 @@ # ========= | # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / O peration | -# \\ / A nd | Copyright (C) YEAR OpenFOAM Foundation +# \\ / A nd | Copyright (C) YEAR AUTHOR,AFFILIATION # \\/ M anipulation | #------------------------------------------------------------------------------ # License diff --git a/etc/codeTemplates/functionObject/FUNCTIONOBJECT.C b/etc/codeTemplates/functionObject/FUNCTIONOBJECT.C index 5318dbead7..a862aadf3b 100644 --- a/etc/codeTemplates/functionObject/FUNCTIONOBJECT.C +++ b/etc/codeTemplates/functionObject/FUNCTIONOBJECT.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) YEAR OpenFOAM Foundation + \\ / A nd | Copyright (C) YEAR AUTHOR,AFFILIATION \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/etc/codeTemplates/functionObject/FUNCTIONOBJECT.H b/etc/codeTemplates/functionObject/FUNCTIONOBJECT.H index dc3a3edb2f..0cd4d7b8cd 100644 --- a/etc/codeTemplates/functionObject/FUNCTIONOBJECT.H +++ b/etc/codeTemplates/functionObject/FUNCTIONOBJECT.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) YEAR OpenFOAM Foundation + \\ / A nd | Copyright (C) YEAR AUTHOR,AFFILIATION \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/etc/codeTemplates/source/_Template.H b/etc/codeTemplates/source/_Template.H index df90d5e4fe..ade3d6f0f1 100644 --- a/etc/codeTemplates/source/_Template.H +++ b/etc/codeTemplates/source/_Template.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) YEAR OpenFOAM Foundation + \\ / A nd | Copyright (C) YEAR AUTHOR,AFFILIATION \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/etc/codeTemplates/source/_TemplateApp.C b/etc/codeTemplates/source/_TemplateApp.C index aa6efc53f7..0e1b436b32 100644 --- a/etc/codeTemplates/source/_TemplateApp.C +++ b/etc/codeTemplates/source/_TemplateApp.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) YEAR OpenFOAM Foundation + \\ / A nd | Copyright (C) YEAR AUTHOR,AFFILIATION \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/etc/codeTemplates/source/_TemplateI.H b/etc/codeTemplates/source/_TemplateI.H index dd1ba9ecf1..fb489e8586 100644 --- a/etc/codeTemplates/source/_TemplateI.H +++ b/etc/codeTemplates/source/_TemplateI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) YEAR OpenFOAM Foundation + \\ / A nd | Copyright (C) YEAR AUTHOR,AFFILIATION \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/etc/codeTemplates/source/_TemplateIO.C b/etc/codeTemplates/source/_TemplateIO.C index 4097eaa24f..4fb730df3b 100644 --- a/etc/codeTemplates/source/_TemplateIO.C +++ b/etc/codeTemplates/source/_TemplateIO.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) YEAR OpenFOAM Foundation + \\ / A nd | Copyright (C) YEAR AUTHOR,AFFILIATION \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/etc/codeTemplates/template/_TemplateTemplate.C b/etc/codeTemplates/template/_TemplateTemplate.C index 2f733dfc3f..c97d9a2911 100644 --- a/etc/codeTemplates/template/_TemplateTemplate.C +++ b/etc/codeTemplates/template/_TemplateTemplate.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) YEAR OpenFOAM Foundation + \\ / A nd | Copyright (C) YEAR AUTHOR,AFFILIATION \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/etc/codeTemplates/template/_TemplateTemplate.H b/etc/codeTemplates/template/_TemplateTemplate.H index ad98aca4af..bdc0903c2d 100644 --- a/etc/codeTemplates/template/_TemplateTemplate.H +++ b/etc/codeTemplates/template/_TemplateTemplate.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) YEAR OpenFOAM Foundation + \\ / A nd | Copyright (C) YEAR AUTHOR,AFFILIATION \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/etc/codeTemplates/template/_TemplateTemplateI.H b/etc/codeTemplates/template/_TemplateTemplateI.H index dd1ba9ecf1..fb489e8586 100644 --- a/etc/codeTemplates/template/_TemplateTemplateI.H +++ b/etc/codeTemplates/template/_TemplateTemplateI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) YEAR OpenFOAM Foundation + \\ / A nd | Copyright (C) YEAR AUTHOR,AFFILIATION \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/etc/codeTemplates/template/_TemplateTemplateIO.C b/etc/codeTemplates/template/_TemplateTemplateIO.C index f17a357c97..7723d55f80 100644 --- a/etc/codeTemplates/template/_TemplateTemplateIO.C +++ b/etc/codeTemplates/template/_TemplateTemplateIO.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) YEAR OpenFOAM Foundation + \\ / A nd | Copyright (C) YEAR AUTHOR,AFFILIATION \\/ M anipulation | ------------------------------------------------------------------------------- License From c76ae7abb33fc16815dbb6c2c035824a5d6fd1fb Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Tue, 11 Jul 2017 11:36:37 +0200 Subject: [PATCH 3/6] COMP: add support for metis, scotch static libraries (eg, EasyBuild) --- src/parallel/decompose/Allwmake | 35 +++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/src/parallel/decompose/Allwmake b/src/parallel/decompose/Allwmake index b29e68ce29..15c73ac768 100755 --- a/src/parallel/decompose/Allwmake +++ b/src/parallel/decompose/Allwmake @@ -7,6 +7,19 @@ cd ${0%/*} || exit 1 # Run from this directory : ${FOAM_EXT_LIBBIN:=/usr/lib$WM_COMPILER_LIB_ARCH} # Extra safety export FOAM_EXT_LIBBIN +# Check for the existence of any of the files +hasAnyFile() +{ + local file + for file + do + [ -f "$file" -a -r "$file" ] && return 0 + done + + return 2 +} + + # Test for metis. # - return 0 and export METIS_ARCH_PATH on success hasMetis() @@ -38,10 +51,13 @@ hasMetis() } # Library - [ -r $FOAM_EXT_LIBBIN/libmetis.so ] || \ - [ -r $METIS_ARCH_PATH/lib/libmetis.so ] || \ - [ -r $METIS_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmetis.so ] || \ - [ "${METIS_ARCH_PATH##*-}" = system ] || { + hasAnyFile \ + $FOAM_EXT_LIBBIN/libmetis.so \ + $METIS_ARCH_PATH/lib/libmetis.a \ + $METIS_ARCH_PATH/lib/libmetis.so \ + $METIS_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmetis.a \ + $METIS_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmetis.so \ + || [ "${METIS_ARCH_PATH##*-}" = system ] || { echo "$warning (missing library)" return 2 } @@ -93,10 +109,13 @@ hasScotch() } # Library - [ -r $FOAM_EXT_LIBBIN/libscotch.so ] || \ - [ -r $SCOTCH_ARCH_PATH/lib/libscotch.so ] || \ - [ -r $SCOTCH_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libscotch.so ] || \ - [ "${SCOTCH_ARCH_PATH##*-}" = system ] || { + hasAnyFile \ + $FOAM_EXT_LIBBIN/libscotch.so \ + $SCOTCH_ARCH_PATH/lib/libscotch.a \ + $SCOTCH_ARCH_PATH/lib/libscotch.so \ + $SCOTCH_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libscotch.a \ + $SCOTCH_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libscotch.so \ + || [ "${SCOTCH_ARCH_PATH##*-}" = system ] || { echo "$warning (missing library)" return 2 } From ded09d6461cca461a8d785d6e59e3c465c40493e Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Tue, 11 Jul 2017 14:47:50 +0200 Subject: [PATCH 4/6] STYLE: relocate deprecated utilities into separate directory --- bin/deprecated/foamGraphExecTime | 52 +++++++++++++++++++++++++ bin/deprecated/foamGraphResKE | 64 +++++++++++++++++++++++++++++++ bin/deprecated/foamGraphResUVWP | 64 +++++++++++++++++++++++++++++++ bin/deprecated/stressComponents | 39 +++++++++++++++++++ bin/deprecated/wallGradU | 37 ++++++++++++++++++ bin/deprecated/wdot | 37 ++++++++++++++++++ bin/foamGraphExecTime | 53 +------------------------- bin/foamGraphResKE | 65 +------------------------------- bin/foamGraphResUVWP | 65 +------------------------------- bin/stressComponents | 40 +------------------- bin/wallGradU | 38 +------------------ bin/wdot | 38 +------------------ 12 files changed, 299 insertions(+), 293 deletions(-) create mode 100755 bin/deprecated/foamGraphExecTime create mode 100755 bin/deprecated/foamGraphResKE create mode 100755 bin/deprecated/foamGraphResUVWP create mode 100755 bin/deprecated/stressComponents create mode 100755 bin/deprecated/wallGradU create mode 100755 bin/deprecated/wdot mode change 100755 => 120000 bin/foamGraphExecTime mode change 100755 => 120000 bin/foamGraphResKE mode change 100755 => 120000 bin/foamGraphResUVWP mode change 100755 => 120000 bin/stressComponents mode change 100755 => 120000 bin/wallGradU mode change 100755 => 120000 bin/wdot diff --git a/bin/deprecated/foamGraphExecTime b/bin/deprecated/foamGraphExecTime new file mode 100755 index 0000000000..5bacabe4a1 --- /dev/null +++ b/bin/deprecated/foamGraphExecTime @@ -0,0 +1,52 @@ +#!/bin/sh +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox +# \\ / O peration | +# \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation +# \\/ M anipulation | +#------------------------------------------------------------------------------- +# 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 . +# +# Script +# foamGraphExecTime +# +# Description +# Deprecated script extract the 'ExecutionTime' for each time-step from a +# log file for graphing. +# +# Superseded by the more general foamLog script. +#------------------------------------------------------------------------------ +Script=${0##*/} + +if [ ! -f "$1" ]; then + echo "$Script: $1 is not a valid filename" + exit 1 +fi + +tmpTime=newTime$$.dat +cat $1 | \ + grep "ExecutionTime = " | \ + awk 'BEGIN { NENTRIES = 0 ; TPREV = 0.0 }{NENTRIES++; printf("%f %e\n", NENTRIES, $3 - TPREV); TPREV = $3}' - > $tmpTime + +if [ "$(cat $tmpTime | wc -l)" -gt 1 ]; then + mv $tmpTime executionTime.dat +fi + +rm -f $tmpTime + +#------------------------------------------------------------------------------ diff --git a/bin/deprecated/foamGraphResKE b/bin/deprecated/foamGraphResKE new file mode 100755 index 0000000000..e023c71090 --- /dev/null +++ b/bin/deprecated/foamGraphResKE @@ -0,0 +1,64 @@ +#!/bin/sh +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox +# \\ / O peration | +# \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation +# \\/ M anipulation | +#------------------------------------------------------------------------------- +# 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 . +# +# Script +# foamGraphResKE +# +# Description +# Deprecated script extract initial turbulence residuals for each time-step +# from a log file for graphing. +# +# Superseded by the more general foamLog script. +#------------------------------------------------------------------------------ +Script=${0##*/} + +if [ ! -f "$1" ]; then + echo "$Script: $1 is not a valid filename" + exit 1 +fi + +scan() +{ + tmpFile=new$1$$.dat + cat $2 | \ + grep "Solving for $1" | \ + grep -v "solution singularity" | \ + sed s/,//g | \ + awk 'BEGIN { NENTRIES = 0 }{NENTRIES++; printf("%d %e\n", NENTRIES, $8)}' - > $tmpFile + + if [ "$(cat $tmpFile | wc -l)" -gt 1 ]; then + echo >> residualKE.dat + cat $tmpFile >> residualKE.dat + fi + + rm $tmpFile +} + +rm -f residualKE.dat +scan "k" $1 +scan "epsilon" $1 +scan "omega" $1 +scan "nuTilda" $1 + +#------------------------------------------------------------------------------ diff --git a/bin/deprecated/foamGraphResUVWP b/bin/deprecated/foamGraphResUVWP new file mode 100755 index 0000000000..8f8fcaccd3 --- /dev/null +++ b/bin/deprecated/foamGraphResUVWP @@ -0,0 +1,64 @@ +#!/bin/sh +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox +# \\ / O peration | +# \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation +# \\/ M anipulation | +#------------------------------------------------------------------------------- +# 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 . +# +# Script +# foamGraphResUVWP +# +# Description +# Deprecated script extract initial velocity and pressure residuals for each +# time-step from a log file for graphing. +# +# Superseded by the more general foamLog script. +#------------------------------------------------------------------------------ +Script=${0##*/} + +if [ ! -f "$1" ]; then + echo "$Script: $1 is not a valid filename" + exit 1 +fi + +scan() +{ + tmpFile=new$1$$.dat + cat $2 | \ + grep "Solving for $1" | \ + grep -v "solution singularity" | \ + sed s/,//g | \ + awk 'BEGIN { NENTRIES = 0 }{NENTRIES++; printf("%d %e\n", NENTRIES, $8)}' - > $tmpFile + + if [ "$(cat $tmpFile | wc -l)" -gt 1 ]; then + echo >> residualUVWP.dat + cat $tmpFile >> residualUVWP.dat + fi + + rm $tmpFile +} + +rm -f residualUVWP.dat +scan "Ux" $1 +scan "Uy" $1 +scan "Uz" $1 +scan "p" $1 + +#------------------------------------------------------------------------------ diff --git a/bin/deprecated/stressComponents b/bin/deprecated/stressComponents new file mode 100755 index 0000000000..45888e2564 --- /dev/null +++ b/bin/deprecated/stressComponents @@ -0,0 +1,39 @@ +#!/bin/sh +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox +# \\ / O peration | +# \\ / A nd | Copyright (C) 2016-2017 OpenFOAM Foundation +# \\/ M anipulation | +#------------------------------------------------------------------------------- +# 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 . +# +# Script +# stressComponents +# +# Description +# Script to suggest using the new "-postProcess" solver option. +# +#------------------------------------------------------------------------------ +Script=${0##*/} + +echo $Script "has been superseded by the -postProcess solver option:" +echo " -funcs '(R components(turbulenceProperties:R))'" +echo "e.g." +echo "simpleFoam -postProcess -funcs '(R components(turbulenceProperties:R))'" + +#------------------------------------------------------------------------------ diff --git a/bin/deprecated/wallGradU b/bin/deprecated/wallGradU new file mode 100755 index 0000000000..c44ed73ff8 --- /dev/null +++ b/bin/deprecated/wallGradU @@ -0,0 +1,37 @@ +#!/bin/sh +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox +# \\ / O peration | +# \\ / A nd | Copyright (C) 2017 OpenFOAM Foundation +# \\/ M anipulation | +#------------------------------------------------------------------------------- +# 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 . +# +# Script +# wallGradU +# +# Description +# Script to suggest using the new "postProcess" utility. +# +#------------------------------------------------------------------------------ +Script=${0##*/} + +echo $Script "has been superseded by the postProcess utility:" +echo " postProcess -func 'grad(U)'" + +#------------------------------------------------------------------------------ diff --git a/bin/deprecated/wdot b/bin/deprecated/wdot new file mode 100755 index 0000000000..d569cbfe6f --- /dev/null +++ b/bin/deprecated/wdot @@ -0,0 +1,37 @@ +#!/bin/sh +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox +# \\ / O peration | +# \\ / A nd | Copyright (C) 2017 OpenFOAM Foundation +# \\/ M anipulation | +#------------------------------------------------------------------------------- +# 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 . +# +# Script +# wdot +# +# Description +# Script to suggest using the new "postProcess" utility. +# +#------------------------------------------------------------------------------ +Script=${0##*/} + +echo $Script "has been superseded by the postProcess utility:" +echo "postProcess -func XiReactionRate" + +#------------------------------------------------------------------------------ diff --git a/bin/foamGraphExecTime b/bin/foamGraphExecTime deleted file mode 100755 index 5bacabe4a1..0000000000 --- a/bin/foamGraphExecTime +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh -#------------------------------------------------------------------------------ -# ========= | -# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox -# \\ / O peration | -# \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation -# \\/ M anipulation | -#------------------------------------------------------------------------------- -# 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 . -# -# Script -# foamGraphExecTime -# -# Description -# Deprecated script extract the 'ExecutionTime' for each time-step from a -# log file for graphing. -# -# Superseded by the more general foamLog script. -#------------------------------------------------------------------------------ -Script=${0##*/} - -if [ ! -f "$1" ]; then - echo "$Script: $1 is not a valid filename" - exit 1 -fi - -tmpTime=newTime$$.dat -cat $1 | \ - grep "ExecutionTime = " | \ - awk 'BEGIN { NENTRIES = 0 ; TPREV = 0.0 }{NENTRIES++; printf("%f %e\n", NENTRIES, $3 - TPREV); TPREV = $3}' - > $tmpTime - -if [ "$(cat $tmpTime | wc -l)" -gt 1 ]; then - mv $tmpTime executionTime.dat -fi - -rm -f $tmpTime - -#------------------------------------------------------------------------------ diff --git a/bin/foamGraphExecTime b/bin/foamGraphExecTime new file mode 120000 index 0000000000..f6fb34291e --- /dev/null +++ b/bin/foamGraphExecTime @@ -0,0 +1 @@ +deprecated/foamGraphExecTime \ No newline at end of file diff --git a/bin/foamGraphResKE b/bin/foamGraphResKE deleted file mode 100755 index e023c71090..0000000000 --- a/bin/foamGraphResKE +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh -#------------------------------------------------------------------------------ -# ========= | -# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox -# \\ / O peration | -# \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation -# \\/ M anipulation | -#------------------------------------------------------------------------------- -# 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 . -# -# Script -# foamGraphResKE -# -# Description -# Deprecated script extract initial turbulence residuals for each time-step -# from a log file for graphing. -# -# Superseded by the more general foamLog script. -#------------------------------------------------------------------------------ -Script=${0##*/} - -if [ ! -f "$1" ]; then - echo "$Script: $1 is not a valid filename" - exit 1 -fi - -scan() -{ - tmpFile=new$1$$.dat - cat $2 | \ - grep "Solving for $1" | \ - grep -v "solution singularity" | \ - sed s/,//g | \ - awk 'BEGIN { NENTRIES = 0 }{NENTRIES++; printf("%d %e\n", NENTRIES, $8)}' - > $tmpFile - - if [ "$(cat $tmpFile | wc -l)" -gt 1 ]; then - echo >> residualKE.dat - cat $tmpFile >> residualKE.dat - fi - - rm $tmpFile -} - -rm -f residualKE.dat -scan "k" $1 -scan "epsilon" $1 -scan "omega" $1 -scan "nuTilda" $1 - -#------------------------------------------------------------------------------ diff --git a/bin/foamGraphResKE b/bin/foamGraphResKE new file mode 120000 index 0000000000..6f00aa885b --- /dev/null +++ b/bin/foamGraphResKE @@ -0,0 +1 @@ +deprecated/foamGraphResKE \ No newline at end of file diff --git a/bin/foamGraphResUVWP b/bin/foamGraphResUVWP deleted file mode 100755 index 8f8fcaccd3..0000000000 --- a/bin/foamGraphResUVWP +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh -#------------------------------------------------------------------------------ -# ========= | -# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox -# \\ / O peration | -# \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation -# \\/ M anipulation | -#------------------------------------------------------------------------------- -# 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 . -# -# Script -# foamGraphResUVWP -# -# Description -# Deprecated script extract initial velocity and pressure residuals for each -# time-step from a log file for graphing. -# -# Superseded by the more general foamLog script. -#------------------------------------------------------------------------------ -Script=${0##*/} - -if [ ! -f "$1" ]; then - echo "$Script: $1 is not a valid filename" - exit 1 -fi - -scan() -{ - tmpFile=new$1$$.dat - cat $2 | \ - grep "Solving for $1" | \ - grep -v "solution singularity" | \ - sed s/,//g | \ - awk 'BEGIN { NENTRIES = 0 }{NENTRIES++; printf("%d %e\n", NENTRIES, $8)}' - > $tmpFile - - if [ "$(cat $tmpFile | wc -l)" -gt 1 ]; then - echo >> residualUVWP.dat - cat $tmpFile >> residualUVWP.dat - fi - - rm $tmpFile -} - -rm -f residualUVWP.dat -scan "Ux" $1 -scan "Uy" $1 -scan "Uz" $1 -scan "p" $1 - -#------------------------------------------------------------------------------ diff --git a/bin/foamGraphResUVWP b/bin/foamGraphResUVWP new file mode 120000 index 0000000000..0414911d86 --- /dev/null +++ b/bin/foamGraphResUVWP @@ -0,0 +1 @@ +deprecated/foamGraphResUVWP \ No newline at end of file diff --git a/bin/stressComponents b/bin/stressComponents deleted file mode 100755 index 45888e2564..0000000000 --- a/bin/stressComponents +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -#------------------------------------------------------------------------------ -# ========= | -# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox -# \\ / O peration | -# \\ / A nd | Copyright (C) 2016-2017 OpenFOAM Foundation -# \\/ M anipulation | -#------------------------------------------------------------------------------- -# 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 . -# -# Script -# stressComponents -# -# Description -# Script to suggest using the new "-postProcess" solver option. -# -#------------------------------------------------------------------------------ -Script=${0##*/} - -echo $Script "has been superseded by the -postProcess solver option:" -echo " -funcs '(R components(turbulenceProperties:R))'" -echo "e.g." -echo "simpleFoam -postProcess -funcs '(R components(turbulenceProperties:R))'" - -#------------------------------------------------------------------------------ diff --git a/bin/stressComponents b/bin/stressComponents new file mode 120000 index 0000000000..2f3bb9ee36 --- /dev/null +++ b/bin/stressComponents @@ -0,0 +1 @@ +deprecated/stressComponents \ No newline at end of file diff --git a/bin/wallGradU b/bin/wallGradU deleted file mode 100755 index c44ed73ff8..0000000000 --- a/bin/wallGradU +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -#------------------------------------------------------------------------------ -# ========= | -# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox -# \\ / O peration | -# \\ / A nd | Copyright (C) 2017 OpenFOAM Foundation -# \\/ M anipulation | -#------------------------------------------------------------------------------- -# 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 . -# -# Script -# wallGradU -# -# Description -# Script to suggest using the new "postProcess" utility. -# -#------------------------------------------------------------------------------ -Script=${0##*/} - -echo $Script "has been superseded by the postProcess utility:" -echo " postProcess -func 'grad(U)'" - -#------------------------------------------------------------------------------ diff --git a/bin/wallGradU b/bin/wallGradU new file mode 120000 index 0000000000..70dbc7d577 --- /dev/null +++ b/bin/wallGradU @@ -0,0 +1 @@ +deprecated/wallGradU \ No newline at end of file diff --git a/bin/wdot b/bin/wdot deleted file mode 100755 index d569cbfe6f..0000000000 --- a/bin/wdot +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -#------------------------------------------------------------------------------ -# ========= | -# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox -# \\ / O peration | -# \\ / A nd | Copyright (C) 2017 OpenFOAM Foundation -# \\/ M anipulation | -#------------------------------------------------------------------------------- -# 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 . -# -# Script -# wdot -# -# Description -# Script to suggest using the new "postProcess" utility. -# -#------------------------------------------------------------------------------ -Script=${0##*/} - -echo $Script "has been superseded by the postProcess utility:" -echo "postProcess -func XiReactionRate" - -#------------------------------------------------------------------------------ diff --git a/bin/wdot b/bin/wdot new file mode 120000 index 0000000000..433eb78038 --- /dev/null +++ b/bin/wdot @@ -0,0 +1 @@ +deprecated/wdot \ No newline at end of file From cce74d493b7d4ac06b644b8555d3219ea3a4eb54 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Tue, 11 Jul 2017 14:57:05 +0200 Subject: [PATCH 5/6] ENH: remove deprecated ensight output order (issue #523) - Added for transition purposes only in 1612 but can now be removed. --- .../foamToEnsight/foamToEnsight.C | 11 ------- etc/config.sh/bashcompletion | 2 +- src/conversion/ensight/mesh/ensightMesh.H | 12 ------- src/conversion/ensight/mesh/ensightMeshI.H | 6 ---- src/conversion/ensight/mesh/ensightMeshIO.C | 22 ------------- .../ensight/mesh/ensightMeshOptions.C | 13 -------- src/conversion/ensight/output/ensightOutput.H | 3 +- .../ensight/output/ensightOutputTemplates.C | 31 ++----------------- 8 files changed, 4 insertions(+), 96 deletions(-) diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C index bf15ffef0a..e95296e1b5 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C +++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C @@ -61,9 +61,6 @@ Usage - \par -width \ Width of EnSight data subdir (default: 8) - - \par -deprecatedOrder - Use older ordering for volume cells (hex prism pyr tet poly) - Note Writes to \a EnSight directory to avoid collisions with foamToEnsightParts @@ -181,13 +178,6 @@ int main(int argc, char *argv[]) "n", "width of ensight data subdir" ); - argList::addBoolOption - ( - "deprecatedOrder", - "Use old ordering (hex prism pyr tet poly) " - "instead of the ascending number of points " - "(tet pyr prism hex poly)." - ); // The volume field types that we handle const hashedWordList volFieldTypes @@ -261,7 +251,6 @@ int main(int argc, char *argv[]) // ensightMesh::options writeOpts(format); writeOpts.noPatches(args.optionFound("noPatches")); - writeOpts.deprecatedOrder(args.optionFound("deprecatedOrder")); if (args.optionFound("patches")) { diff --git a/etc/config.sh/bashcompletion b/etc/config.sh/bashcompletion index 77f8612599..c2589be81f 100644 --- a/etc/config.sh/bashcompletion +++ b/etc/config.sh/bashcompletion @@ -2309,7 +2309,7 @@ _of_foamToEnsight() local cur="${COMP_WORDS[COMP_CWORD]}" local prev="${COMP_WORDS[COMP_CWORD-1]}" - local opts="-ascii -constant -deprecatedOrder -latestTime -newTimes -noFunctionObjects -noLagrangian -noPatches -noZero -nodeValues -parallel -srcDoc -doc -help " + local opts="-ascii -constant -latestTime -newTimes -noFunctionObjects -noLagrangian -noPatches -noZero -nodeValues -parallel -srcDoc -doc -help " local optsWithArgs="-case -cellZone -decomposeParDict -faceZones -fields -name -patches -region -roots -time -width " case ${prev} in diff --git a/src/conversion/ensight/mesh/ensightMesh.H b/src/conversion/ensight/mesh/ensightMesh.H index 41ebb07aa7..120a1b59a3 100644 --- a/src/conversion/ensight/mesh/ensightMesh.H +++ b/src/conversion/ensight/mesh/ensightMesh.H @@ -293,9 +293,6 @@ public: //- Using internalMesh? inline bool useInternalMesh() const; - //- Using deprecated order? (hex prism pyr tet poly) - inline bool deprecatedOrder() const; - //- The volume cells (internalMesh) inline const ensightCells& meshCells() const; @@ -369,9 +366,6 @@ class ensightMesh::options //- Suppress patches bool noPatches_; - //- Using deprecated order (hex prism pyr tet poly) - bool deprecatedOrder_; - //- Output selected patches only autoPtr patchPatterns_; @@ -399,9 +393,6 @@ public: //- Using internalMesh? bool useInternalMesh() const; - //- Using deprecated order? (hex prism pyr tet poly) - bool deprecatedOrder() const; - //- Using patches? bool usePatches() const; @@ -426,9 +417,6 @@ public: //- Lazy creation - ensightMesh starts as needsUpdate. void lazy(const bool); - //- Alter deprecated order. - void deprecatedOrder(const bool); - //- Alter the patches/no-patches state void noPatches(const bool); diff --git a/src/conversion/ensight/mesh/ensightMeshI.H b/src/conversion/ensight/mesh/ensightMeshI.H index 1f0bc4a146..8213182e27 100644 --- a/src/conversion/ensight/mesh/ensightMeshI.H +++ b/src/conversion/ensight/mesh/ensightMeshI.H @@ -49,12 +49,6 @@ inline bool Foam::ensightMesh::useInternalMesh() const } -inline bool Foam::ensightMesh::deprecatedOrder() const -{ - return options_->deprecatedOrder(); -} - - inline const Foam::ensightCells& Foam::ensightMesh::meshCells() const { return meshCells_; diff --git a/src/conversion/ensight/mesh/ensightMeshIO.C b/src/conversion/ensight/mesh/ensightMeshIO.C index 213fd57eb5..037b8d98a2 100644 --- a/src/conversion/ensight/mesh/ensightMeshIO.C +++ b/src/conversion/ensight/mesh/ensightMeshIO.C @@ -452,28 +452,6 @@ void Foam::ensightMesh::writeCellConnectivity ensightGeoFile& os ) const { - if (deprecatedOrder()) - { - // element ordering used in older versions - ensightCells::elemType oldOrder[5] = - { - ensightCells::HEXA8, - ensightCells::PENTA6, - ensightCells::PYRAMID5, - ensightCells::TETRA4, - ensightCells::NFACED - }; - - for (label typei=0; typei < ensightCells::nTypes; ++typei) - { - const ensightCells::elemType& what = oldOrder[typei]; - - writeCellConnectivity(what, ensCells, pointToGlobal, os); - } - - return; - } - for (label typei=0; typei < ensightCells::nTypes; ++typei) { const ensightCells::elemType what = ensightCells::elemType(typei); diff --git a/src/conversion/ensight/mesh/ensightMeshOptions.C b/src/conversion/ensight/mesh/ensightMeshOptions.C index ea89d43993..d2a9185172 100644 --- a/src/conversion/ensight/mesh/ensightMeshOptions.C +++ b/src/conversion/ensight/mesh/ensightMeshOptions.C @@ -33,7 +33,6 @@ Foam::ensightMesh::options::options(IOstream::streamFormat format) format_(format), lazy_(false), noPatches_(false), - deprecatedOrder_(false), patchPatterns_(), faceZonePatterns_() {} @@ -59,12 +58,6 @@ bool Foam::ensightMesh::options::useInternalMesh() const } -bool Foam::ensightMesh::options::deprecatedOrder() const -{ - return deprecatedOrder_; -} - - bool Foam::ensightMesh::options::usePatches() const { return !noPatches_; @@ -97,12 +90,6 @@ void Foam::ensightMesh::options::lazy(const bool b) } -void Foam::ensightMesh::options::deprecatedOrder(const bool b) -{ - deprecatedOrder_ = b; -} - - void Foam::ensightMesh::options::noPatches(const bool b) { noPatches_ = b; diff --git a/src/conversion/ensight/output/ensightOutput.H b/src/conversion/ensight/output/ensightOutput.H index 1f33b3f830..bdead411f4 100644 --- a/src/conversion/ensight/output/ensightOutput.H +++ b/src/conversion/ensight/output/ensightOutput.H @@ -91,8 +91,7 @@ class ensightOutput ( const Field& fld, const ensightCells&, - ensightFile& os, - const bool deprecatedOrder = false + ensightFile& os ); diff --git a/src/conversion/ensight/output/ensightOutputTemplates.C b/src/conversion/ensight/output/ensightOutputTemplates.C index 2ce1af6cd7..a29fa3ea58 100644 --- a/src/conversion/ensight/output/ensightOutputTemplates.C +++ b/src/conversion/ensight/output/ensightOutputTemplates.C @@ -171,8 +171,7 @@ bool Foam::ensightOutput::writeCellField ( const Field& vf, const ensightCells& ensCells, - ensightFile& os, - const bool deprecatedOrder + ensightFile& os ) { if (ensCells.total()) @@ -182,32 +181,6 @@ bool Foam::ensightOutput::writeCellField os.beginPart(ensCells.index()); } - if (deprecatedOrder) - { - // element ordering used in older versions - ensightCells::elemType oldOrder[5] = - { - ensightCells::HEXA8, - ensightCells::PENTA6, - ensightCells::PYRAMID5, - ensightCells::TETRA4, - ensightCells::NFACED - }; - - for (label typei=0; typei < ensightCells::nTypes; ++typei) - { - const ensightCells::elemType& what = oldOrder[typei]; - - writeFieldContent - ( - ensightCells::key(what), - Field(vf, ensCells.cellIds(what)), - os - ); - } - return true; - } - for (label typei=0; typei < ensightCells::nTypes; ++typei) { const ensightCells::elemType what = ensightCells::elemType(typei); @@ -248,7 +221,7 @@ bool Foam::ensightOutput::writeField // if (ensMesh.useInternalMesh()) { - writeCellField(vf, meshCells, os, ensMesh.deprecatedOrder()); + writeCellField(vf, meshCells, os); } // From a6ef10506dd7c8a9c1492c5ff719dd0498aa7c8a Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 12 Jul 2017 11:02:04 +0200 Subject: [PATCH 6/6] ENH: respect the I_MPI_ROOT setting for INTELMPI (issue #524) - add note in BuildIssues about the I_MPI_CC variable, which is needed when building with Intel-MPI and gcc/clang. This additional setting is needed since the changes needed to solve the issue of building scotch with Intel-MPI and icc (issue #434) means that mpiicc is now being used as the wrapper when compiling scotch. - have the FOAM_MPI short name for INTELMPI start with 'impi-' instead of just the version number. Intel-MPI is often installed as /opt/intel/impi/4.1.3.049, which results in 'FOAM_MPI=4.1.3.049' and the mpi flavour is lost. Prefix these cases with 'impi-' --- BuildIssues.txt | 15 ++++++++ etc/config.csh/mpi | 93 ++++++++++++++++++++++++++++++---------------- etc/config.sh/mpi | 87 ++++++++++++++++++++++++++----------------- 3 files changed, 128 insertions(+), 67 deletions(-) diff --git a/BuildIssues.txt b/BuildIssues.txt index 011b5dc048..fbb6b6dcb5 100644 --- a/BuildIssues.txt +++ b/BuildIssues.txt @@ -3,6 +3,21 @@ OpenFOAM-1706 Known Build Issues ================== +--------------------- +Intel MPI (Gcc/Clang) +--------------------- + + Either I_MPI_ROOT or MPI_ROOT can be used to specify the Intel-MPI + installation directory path. + + The ThirdParty build of ptscotch uses `mpiicc` for Intel-MPI + instead of the usual `mpicc`. + When gcc or clang are used, it is highly likely that the + I_MPI_CC environment variable also needs to be set accordingly. + + See `mpiicc -help` for more information about environment variables. + + -------------- Intel Compiler -------------- diff --git a/etc/config.csh/mpi b/etc/config.csh/mpi index e1e7fba8e1..e2ec875e4f 100644 --- a/etc/config.csh/mpi +++ b/etc/config.csh/mpi @@ -33,13 +33,14 @@ # #------------------------------------------------------------------------------ unsetenv MPI_ARCH_PATH MPI_HOME +setenv FOAM_MPI dummy # Fallback value switch ("$WM_MPLIB") case SYSTEMOPENMPI: # Use the system installed openmpi, get library directory via mpicc setenv FOAM_MPI openmpi-system - # Bit of a hack: strip off 'lib' and hope this is the prefix for openmpi + # Bit of a hack: strip off 'lib' and assume it is the prefix for openmpi # include files and libraries. set libDir=`mpicc --showme:link | sed -e 's/.*-L\([^ ]*\).*/\1/'` @@ -58,9 +59,9 @@ case OPENMPI: setenv OPAL_PREFIX $MPI_ARCH_PATH if ($?FOAM_VERBOSE && $?prompt) then - echo "Using OPENMPI:" - echo " OPAL_PREFIX : $OPAL_PREFIX" + echo "Using $WM_MPLIB" echo " FOAM_MPI : $FOAM_MPI" + echo " OPAL_PREFIX : $MPI_ARCH_PATH" endif _foamAddPath $MPI_ARCH_PATH/bin @@ -191,10 +192,9 @@ case SGIMPI: if ( ! -d "$MPI_ROOT" ) then echo "Warning in $WM_PROJECT_DIR/etc/config.csh/mpi:" - echo " MPI_ROOT not a valid mpt installation directory." - echo " Please set MPI_ROOT to the mpt installation directory." - echo " (usually done by loading the mpt module)" - echo " MPI_ROOT currently set to '$MPI_ROOT'" + echo " Not a valid $WM_MPLIB installation directory." + echo " Please set MPI_ROOT properly (usually via the mpt module)" + echo " Currently using '$MPI_ARCH_PATH'" endif if ( "${MPI_ROOT:h}/" == $MPI_ROOT ) then @@ -205,9 +205,9 @@ case SGIMPI: setenv MPI_ARCH_PATH $MPI_ROOT if ($?FOAM_VERBOSE && $?prompt) then - echo "Using SGI MPT:" - echo " MPI_ROOT : $MPI_ROOT" + echo "Using $WM_MPLIB" echo " FOAM_MPI : $FOAM_MPI" + echo " MPI_ROOT : $MPI_ARCH_PATH" endif _foamAddPath $MPI_ARCH_PATH/bin @@ -215,36 +215,65 @@ case SGIMPI: breaksw case INTELMPI: - if ( ! $?MPI_ROOT ) setenv MPI_ROOT /dummy + if ( $?I_MPI_ROOT ) then + # I_MPI_ROOT: The Intel MPI Library installation directory - if ( ! -d "$MPI_ROOT" ) then + # Remove trailing slash + if ( "${I_MPI_ROOT:h}/" == $I_MPI_ROOT ) then + setenv I_MPI_ROOT ${I_MPI_ROOT:h} + endif + setenv MPI_ARCH_PATH $I_MPI_ROOT + setenv FOAM_MPI ${MPI_ARCH_PATH:t} + + # If subdirectory is version number only, prefix with 'impi-' + switch ("$FOAM_MPI") + case [0-9]*: + setenv FOAM_MPI "impi-$FOAM_MPI" + breaksw + endsw + + if ($?FOAM_VERBOSE && $?prompt) then + echo "Using $WM_MPLIB" + echo " FOAM_MPI : $FOAM_MPI" + echo " I_MPI_ROOT : $MPI_ARCH_PATH" + endif + else if ( $?MPI_ROOT ) then + # MPI_ROOT: General specification + + # Remove trailing slash + if ( "${MPI_ROOT:h}/" == $MPI_ROOT ) then + setenv MPI_ROOT ${MPI_ROOT:h} + endif + + setenv MPI_ARCH_PATH $MPI_ROOT + setenv FOAM_MPI ${MPI_ARCH_PATH:t} + + # If subdirectory is version number only, prefix with 'impi-' + switch ("$FOAM_MPI") + case [0-9]*: + setenv FOAM_MPI "impi-$FOAM_MPI" + breaksw + endsw + + if ($?FOAM_VERBOSE && $?prompt) then + echo "Using $WM_MPLIB" + echo " FOAM_MPI : $FOAM_MPI" + echo " MPI_ROOT : $MPI_ARCH_PATH" + endif + else + setenv MPI_ARCH_PATH /dummy + endif + + if ( ! -d "$MPI_ARCH_PATH" ) then echo "Warning in $WM_PROJECT_DIR/etc/config.csh/mpi:" - echo " MPI_ROOT not a valid mpt installation directory." - echo " Please set MPI_ROOT to the mpt installation directory." - echo " (usually done by loading the mpt module)" - echo " MPI_ROOT currently set to '$MPI_ROOT'" - endif - - if ( "${MPI_ROOT:h}/" == $MPI_ROOT ) then - setenv MPI_ROOT ${MPI_ROOT:h} - endif - - setenv FOAM_MPI ${MPI_ROOT:t} - setenv MPI_ARCH_PATH $MPI_ROOT - - if ($?FOAM_VERBOSE && $?prompt) then - echo "Using INTEL MPT:" - echo " MPI_ROOT : $MPI_ROOT" - echo " FOAM_MPI : $FOAM_MPI" + echo " Not a valid $WM_MPLIB installation directory." + echo " Please set I_MPI_ROOT or MPI_ROOT properly." + echo " Currently using '$MPI_ARCH_PATH'" endif _foamAddPath $MPI_ARCH_PATH/bin64 _foamAddLib $MPI_ARCH_PATH/lib64 breaksw - -default: - setenv FOAM_MPI dummy - breaksw endsw diff --git a/etc/config.sh/mpi b/etc/config.sh/mpi index 9d22c3e700..a2d676d76b 100644 --- a/etc/config.sh/mpi +++ b/etc/config.sh/mpi @@ -33,6 +33,7 @@ # #------------------------------------------------------------------------------ unset MPI_ARCH_PATH MPI_HOME +export FOAM_MPI=dummy # Fallback value case "$WM_MPLIB" in SYSTEMOPENMPI) @@ -45,7 +46,7 @@ SYSTEMOPENMPI) unset OPAL_PREFIX fi - # Bit of a hack: strip off 'lib' and hope this is the prefix for openmpi + # Bit of a hack: strip off 'lib' and assume it is the prefix for openmpi # include files and libraries. libDir=$(mpicc --showme:link | sed -e 's/.*-L\([^ ]*\).*/\1/') @@ -65,9 +66,9 @@ OPENMPI) if [ "$FOAM_VERBOSE" -a "$PS1" ] then - echo "Using OPENMPI:" 1>&2 - echo " OPAL_PREFIX : $OPAL_PREFIX" 1>&2 + echo "Using $WM_MPLIB" 1>&2 echo " FOAM_MPI : $FOAM_MPI" 1>&2 + echo " OPAL_PREFIX : $MPI_ARCH_PATH" 1>&2 fi # Could be sourced from ThirdParty with incomplete environment @@ -208,25 +209,23 @@ QSMPI) SGIMPI) # No trailing slash - [ "${MPI_ROOT%/}" = "${MPI_ROOT}" ] || MPI_ROOT="${MPI_ROOT%/}" + MPI_ROOT="${MPI_ROOT%/}" # Remove trailing slash - export FOAM_MPI="${MPI_ROOT##*/}" - export MPI_ARCH_PATH=$MPI_ROOT + export MPI_ARCH_PATH="${MPI_ROOT%/}" # Remove trailing slash + export FOAM_MPI="${MPI_ARCH_PATH##*/}" - if [ ! -d "$MPI_ROOT" -o -z "$MPI_ARCH_PATH" ] - then + [ -d "$MPI_ARCH_PATH" ] || { echo "Warning in $WM_PROJECT_DIR/etc/config.sh/mpi:" 1>&2 - echo " MPI_ROOT not a valid mpt installation directory or ending" \ - " in a '/'." 1>&2 - echo " Please set MPI_ROOT to the mpt installation directory." 1>&2 - echo " MPI_ROOT currently set to '$MPI_ROOT'" 1>&2 - fi + echo " Not a valid $WM_MPLIB installation directory." 1>&2 + echo " Please set MPI_ROOT properly (usually via the mpt module)" 1>&2 + echo " Currently using '$MPI_ARCH_PATH'" 1>&2 + } if [ "$FOAM_VERBOSE" -a "$PS1" ] then - echo "Using SGI MPT:" 1>&2 - echo " MPI_ROOT : $MPI_ROOT" 1>&2 + echo "Using $WM_MPLIB" 1>&2 echo " FOAM_MPI : $FOAM_MPI" 1>&2 + echo " MPI_ROOT : $MPI_ARCH_PATH" 1>&2 fi _foamAddPath $MPI_ARCH_PATH/bin @@ -234,35 +233,53 @@ SGIMPI) ;; INTELMPI) - MPI_ROOT="${MPI_ROOT%/}" # No trailing slash - - export FOAM_MPI="${MPI_ROOT##*/}" - export MPI_ARCH_PATH=$MPI_ROOT - - if [ ! -d "$MPI_ROOT" -o -z "$MPI_ARCH_PATH" ] + if [ -n "$I_MPI_ROOT" ] then + # I_MPI_ROOT: The Intel MPI Library installation directory + + MPI_ARCH_PATH="${I_MPI_ROOT%/}" # Remove trailing slash + FOAM_MPI="${MPI_ARCH_PATH##*/}" + + # If subdirectory is version number only, prefix with 'impi-' + case "$FOAM_MPI" in ([0-9]*) FOAM_MPI="impi-$FOAM_MPI";; esac + + if [ "$FOAM_VERBOSE" -a "$PS1" ] + then + echo "Using $WM_MPLIB" 1>&2 + echo " FOAM_MPI : $FOAM_MPI" 1>&2 + echo " I_MPI_ROOT : $MPI_ARCH_PATH" 1>&2 + fi + else + # MPI_ROOT: General specification + MPI_ARCH_PATH="${MPI_ROOT%/}" # Remove trailing slash + FOAM_MPI="${MPI_ARCH_PATH##*/}" + + # If subdirectory is version number only, prefix with 'impi-' + case "$FOAM_MPI" in ([0-9]*) FOAM_MPI="impi-$FOAM_MPI";; esac + + if [ "$FOAM_VERBOSE" -a "$PS1" ] + then + echo "Using $WM_MPLIB" 1>&2 + echo " FOAM_MPI : $FOAM_MPI" 1>&2 + echo " MPI_ROOT : $MPI_ARCH_PATH" 1>&2 + fi + fi + + [ -d "$MPI_ARCH_PATH" ] || { echo "Warning in $WM_PROJECT_DIR/etc/config.sh/mpi:" 1>&2 - echo " MPI_ROOT not a valid mpt installation directory or ending" \ - " in a '/'." 1>&2 - echo " Please set MPI_ROOT to the mpt installation directory." 1>&2 - echo " MPI_ROOT currently set to '$MPI_ROOT'" 1>&2 - fi + echo " Not a valid $WM_MPLIB installation directory." 1>&2 + echo " Please set I_MPI_ROOT or MPI_ROOT properly." 1>&2 + echo " Currently using '$MPI_ARCH_PATH'" 1>&2 + } - if [ "$FOAM_VERBOSE" -a "$PS1" ] - then - echo "Using INTEL MPI:" 1>&2 - echo " MPI_ROOT : $MPI_ROOT" 1>&2 - echo " FOAM_MPI : $FOAM_MPI" 1>&2 - fi + export FOAM_MPI MPI_ARCH_PATH _foamAddPath $MPI_ARCH_PATH/bin64 _foamAddLib $MPI_ARCH_PATH/lib64 ;; -*) - export FOAM_MPI=dummy - ;; esac + # Add (non-dummy) MPI implementation # - dummy MPI already added to LD_LIBRARY_PATH and has no external libraries if [ "$FOAM_MPI" != dummy ] && type _foamAddLib > /dev/null 2>&1