replaced direct "USE MPI" calls by preprocessor defs to prepare for b…

…uilds where mpi does not have a (compatible) module file.
vraj004 · Sep 16, 2015 · dd47ddf · dd47ddf
1 parent 5ab7306
commit dd47ddf
Show file tree

Hide file tree

Showing 171 changed files with 1,197 additions and 10 deletions.
diff --git a/...icProblems/Stokes/3D/HEX/QuadraticVelocityLinearPressure/LEVEL_3/100k/src/100kExample.f90 b/...icProblems/Stokes/3D/HEX/QuadraticVelocityLinearPressure/LEVEL_3/100k/src/100kExample.f90
@@ -59,7 +59,9 @@ PROGRAM ANALYTICSTOKESEXAMPLE
 
   USE OPENCMISS
   USE FLUID_MECHANICS_IO_ROUTINES
+#ifndef NOMPIMOD
   USE MPI
+#endif
 
 #ifdef WIN32
   USE IFQWINCMISS
@@ -73,6 +75,11 @@ PROGRAM ANALYTICSTOKESEXAMPLE
 
   IMPLICIT NONE
 
+#ifdef NOMPIMOD
+#include "mpif.h"
+#endif
+
+
   INTEGER(CMISSIntg), PARAMETER :: EquationsSetFieldUserNumber=1337
   TYPE(CMISSFieldType) :: EquationsSetField
 

diff --git a/...aticProblems/Stokes/3D/HEX/QuadraticVelocityLinearPressure/LEVEL_3/10k/src/10kExample.f90 b/...aticProblems/Stokes/3D/HEX/QuadraticVelocityLinearPressure/LEVEL_3/10k/src/10kExample.f90
@@ -59,7 +59,9 @@ PROGRAM ANALYTICSTOKESEXAMPLE
 
   USE OPENCMISS
   USE FLUID_MECHANICS_IO_ROUTINES
+#ifndef NOMPIMOD
   USE MPI
+#endif
 
 #ifdef WIN32
   USE IFQWINCMISS
@@ -73,6 +75,11 @@ PROGRAM ANALYTICSTOKESEXAMPLE
 
   IMPLICIT NONE
 
+#ifdef NOMPIMOD
+#include "mpif.h"
+#endif
+
+
   INTEGER(CMISSIntg), PARAMETER :: EquationsSetFieldUserNumber=1337
   TYPE(CMISSFieldType) :: EquationsSetField
 

diff --git a/...StaticProblems/Stokes/3D/HEX/QuadraticVelocityLinearPressure/LEVEL_3/1k/src/1kExample.f90 b/...StaticProblems/Stokes/3D/HEX/QuadraticVelocityLinearPressure/LEVEL_3/1k/src/1kExample.f90
@@ -59,7 +59,9 @@ PROGRAM ANALYTICSTOKESEXAMPLE
 
   USE OPENCMISS
   USE FLUID_MECHANICS_IO_ROUTINES
+#ifndef NOMPIMOD
   USE MPI
+#endif
 
 #ifdef WIN32
   USE IFQWINCMISS
@@ -73,6 +75,11 @@ PROGRAM ANALYTICSTOKESEXAMPLE
 
   IMPLICIT NONE
 
+#ifdef NOMPIMOD
+#include "mpif.h"
+#endif
+
+
   INTEGER(CMISSIntg), PARAMETER :: EquationsSetFieldUserNumber=1337
   TYPE(CMISSFieldType) :: EquationsSetField
 

diff --git a/...cProblems/NavierStokes/2D/QUAD/CubicVelocityLinearPressure/LEVEL_2/src/LEVEL_2Example.f90 b/...cProblems/NavierStokes/2D/QUAD/CubicVelocityLinearPressure/LEVEL_2/src/LEVEL_2Example.f90
@@ -59,7 +59,9 @@ PROGRAM ANALYTICNAVIERSTOKESEXAMPLE
 
   USE OPENCMISS
   USE FLUID_MECHANICS_IO_ROUTINES
+#ifndef NOMPIMOD
   USE MPI
+#endif
 
 #ifdef WIN32
   USE IFQWINCMISS
@@ -73,6 +75,11 @@ PROGRAM ANALYTICNAVIERSTOKESEXAMPLE
 
   IMPLICIT NONE
 
+#ifdef NOMPIMOD
+#include "mpif.h"
+#endif
+
+
   INTEGER(CMISSIntg), PARAMETER :: EquationsSetFieldUserNumber=1337
   TYPE(CMISSFieldType) :: EquationsSetField
 

diff --git a/...oblems/NavierStokes/2D/QUAD/CubicVelocityQuadraticPressure/LEVEL_2/src/LEVEL_2Example.f90 b/...oblems/NavierStokes/2D/QUAD/CubicVelocityQuadraticPressure/LEVEL_2/src/LEVEL_2Example.f90
@@ -59,7 +59,9 @@ PROGRAM ANALYTICNAVIERSTOKESEXAMPLE
 
   USE OPENCMISS
   USE FLUID_MECHANICS_IO_ROUTINES
+#ifndef NOMPIMOD
   USE MPI
+#endif
 
 #ifdef WIN32
   USE IFQWINCMISS
@@ -73,6 +75,11 @@ PROGRAM ANALYTICNAVIERSTOKESEXAMPLE
 
   IMPLICIT NONE
 
+#ifdef NOMPIMOD
+#include "mpif.h"
+#endif
+
+
   INTEGER(CMISSIntg), PARAMETER :: EquationsSetFieldUserNumber=1337
   TYPE(CMISSFieldType) :: EquationsSetField
 

diff --git a/...blems/NavierStokes/2D/QUAD/QuadraticVelocityLinearPressure/LEVEL_2/src/LEVEL_2Example.f90 b/...blems/NavierStokes/2D/QUAD/QuadraticVelocityLinearPressure/LEVEL_2/src/LEVEL_2Example.f90
@@ -59,7 +59,9 @@ PROGRAM ANALYTICNAVIERSTOKESEXAMPLE
 
   USE OPENCMISS
   USE FLUID_MECHANICS_IO_ROUTINES
+#ifndef NOMPIMOD
   USE MPI
+#endif
 
 #ifdef WIN32
   USE IFQWINCMISS
@@ -73,6 +75,11 @@ PROGRAM ANALYTICNAVIERSTOKESEXAMPLE
 
   IMPLICIT NONE
 
+#ifdef NOMPIMOD
+#include "mpif.h"
+#endif
+
+
   INTEGER(CMISSIntg), PARAMETER :: EquationsSetFieldUserNumber=1337
   TYPE(CMISSFieldType) :: EquationsSetField
 

diff --git a/...icProblems/NavierStokes/2D/TRI/CubicVelocityLinearPressure/LEVEL_2/src/LEVEL_2Example.f90 b/...icProblems/NavierStokes/2D/TRI/CubicVelocityLinearPressure/LEVEL_2/src/LEVEL_2Example.f90
@@ -59,7 +59,9 @@ PROGRAM ANALYTICNAVIERSTOKESEXAMPLE
 
   USE OPENCMISS
   USE FLUID_MECHANICS_IO_ROUTINES
+#ifndef NOMPIMOD
   USE MPI
+#endif
 
 #ifdef WIN32
   USE IFQWINCMISS
@@ -73,6 +75,11 @@ PROGRAM ANALYTICNAVIERSTOKESEXAMPLE
 
   IMPLICIT NONE
 
+#ifdef NOMPIMOD
+#include "mpif.h"
+#endif
+
+
   INTEGER(CMISSIntg), PARAMETER :: EquationsSetFieldUserNumber=1337
   TYPE(CMISSFieldType) :: EquationsSetField
 

diff --git a/...roblems/NavierStokes/2D/TRI/CubicVelocityQuadraticPressure/LEVEL_2/src/LEVEL_2Example.f90 b/...roblems/NavierStokes/2D/TRI/CubicVelocityQuadraticPressure/LEVEL_2/src/LEVEL_2Example.f90
@@ -59,7 +59,9 @@ PROGRAM ANALYTICNAVIERSTOKESEXAMPLE
 
   USE OPENCMISS
   USE FLUID_MECHANICS_IO_ROUTINES
+#ifndef NOMPIMOD
   USE MPI
+#endif
 
 #ifdef WIN32
   USE IFQWINCMISS
@@ -73,6 +75,11 @@ PROGRAM ANALYTICNAVIERSTOKESEXAMPLE
 
   IMPLICIT NONE
 
+#ifdef NOMPIMOD
+#include "mpif.h"
+#endif
+
+
   INTEGER(CMISSIntg), PARAMETER :: EquationsSetFieldUserNumber=1337
   TYPE(CMISSFieldType) :: EquationsSetField
 

diff --git a/...oblems/NavierStokes/2D/TRI/QuadraticVelocityLinearPressure/LEVEL_2/src/LEVEL_2Example.f90 b/...oblems/NavierStokes/2D/TRI/QuadraticVelocityLinearPressure/LEVEL_2/src/LEVEL_2Example.f90
@@ -59,7 +59,9 @@ PROGRAM ANALYTICNAVIERSTOKESEXAMPLE
 
   USE OPENCMISS
   USE FLUID_MECHANICS_IO_ROUTINES
+#ifndef NOMPIMOD
   USE MPI
+#endif
 
 #ifdef WIN32
   USE IFQWINCMISS
@@ -73,6 +75,11 @@ PROGRAM ANALYTICNAVIERSTOKESEXAMPLE
 
   IMPLICIT NONE
 
+#ifdef NOMPIMOD
+#include "mpif.h"
+#endif
+
+
   INTEGER(CMISSIntg), PARAMETER :: EquationsSetFieldUserNumber=1337
   TYPE(CMISSFieldType) :: EquationsSetField
 

diff --git a/...icProblems/NavierStokes/3D/HEX/CubicVelocityLinearPressure/LEVEL_2/src/LEVEL_2Example.f90 b/...icProblems/NavierStokes/3D/HEX/CubicVelocityLinearPressure/LEVEL_2/src/LEVEL_2Example.f90
@@ -59,7 +59,9 @@ PROGRAM ANALYTICNAVIERSTOKESEXAMPLE
 
   USE OPENCMISS
   USE FLUID_MECHANICS_IO_ROUTINES
+#ifndef NOMPIMOD
   USE MPI
+#endif
 
 #ifdef WIN32
   USE IFQWINCMISS
@@ -73,6 +75,11 @@ PROGRAM ANALYTICNAVIERSTOKESEXAMPLE
 
   IMPLICIT NONE
 
+#ifdef NOMPIMOD
+#include "mpif.h"
+#endif
+
+
   INTEGER(CMISSIntg), PARAMETER :: EquationsSetFieldUserNumber=1337
   TYPE(CMISSFieldType) :: EquationsSetField
 

diff --git a/...roblems/NavierStokes/3D/HEX/CubicVelocityQuadraticPressure/LEVEL_2/src/LEVEL_2Example.f90 b/...roblems/NavierStokes/3D/HEX/CubicVelocityQuadraticPressure/LEVEL_2/src/LEVEL_2Example.f90
@@ -59,7 +59,9 @@ PROGRAM ANALYTICNAVIERSTOKESEXAMPLE
 
   USE OPENCMISS
   USE FLUID_MECHANICS_IO_ROUTINES
+#ifndef NOMPIMOD
   USE MPI
+#endif
 
 #ifdef WIN32
   USE IFQWINCMISS
@@ -73,6 +75,11 @@ PROGRAM ANALYTICNAVIERSTOKESEXAMPLE
 
   IMPLICIT NONE
 
+#ifdef NOMPIMOD
+#include "mpif.h"
+#endif
+
+
   INTEGER(CMISSIntg), PARAMETER :: EquationsSetFieldUserNumber=1337
   TYPE(CMISSFieldType) :: EquationsSetField
 

diff --git a/...oblems/NavierStokes/3D/HEX/QuadraticVelocityLinearPressure/LEVEL_2/src/LEVEL_2Example.f90 b/...oblems/NavierStokes/3D/HEX/QuadraticVelocityLinearPressure/LEVEL_2/src/LEVEL_2Example.f90
@@ -59,7 +59,9 @@ PROGRAM ANALYTICNAVIERSTOKESEXAMPLE
 
   USE OPENCMISS
   USE FLUID_MECHANICS_IO_ROUTINES
+#ifndef NOMPIMOD
   USE MPI
+#endif
 
 #ifdef WIN32
   USE IFQWINCMISS
@@ -73,6 +75,11 @@ PROGRAM ANALYTICNAVIERSTOKESEXAMPLE
 
   IMPLICIT NONE
 
+#ifdef NOMPIMOD
+#include "mpif.h"
+#endif
+
+
   INTEGER(CMISSIntg), PARAMETER :: EquationsSetFieldUserNumber=1337
   TYPE(CMISSFieldType) :: EquationsSetField
 

diff --git a/...icProblems/NavierStokes/3D/TET/CubicVelocityLinearPressure/LEVEL_2/src/LEVEL_2Example.f90 b/...icProblems/NavierStokes/3D/TET/CubicVelocityLinearPressure/LEVEL_2/src/LEVEL_2Example.f90
@@ -59,7 +59,9 @@ PROGRAM ANALYTICNAVIERSTOKESEXAMPLE
 
   USE OPENCMISS
   USE FLUID_MECHANICS_IO_ROUTINES
+#ifndef NOMPIMOD
   USE MPI
+#endif
 
 #ifdef WIN32
   USE IFQWINCMISS
@@ -73,6 +75,11 @@ PROGRAM ANALYTICNAVIERSTOKESEXAMPLE
 
   IMPLICIT NONE
 
+#ifdef NOMPIMOD
+#include "mpif.h"
+#endif
+
+
   INTEGER(CMISSIntg), PARAMETER :: EquationsSetFieldUserNumber=1337
   TYPE(CMISSFieldType) :: EquationsSetField
 

diff --git a/...roblems/NavierStokes/3D/TET/CubicVelocityQuadraticPressure/LEVEL_2/src/LEVEL_2Example.f90 b/...roblems/NavierStokes/3D/TET/CubicVelocityQuadraticPressure/LEVEL_2/src/LEVEL_2Example.f90
@@ -59,7 +59,9 @@ PROGRAM ANALYTICNAVIERSTOKESEXAMPLE
 
   USE OPENCMISS
   USE FLUID_MECHANICS_IO_ROUTINES
+#ifndef NOMPIMOD
   USE MPI
+#endif
 
 #ifdef WIN32
   USE IFQWINCMISS
@@ -73,6 +75,11 @@ PROGRAM ANALYTICNAVIERSTOKESEXAMPLE
 
   IMPLICIT NONE
 
+#ifdef NOMPIMOD
+#include "mpif.h"
+#endif
+
+
   INTEGER(CMISSIntg), PARAMETER :: EquationsSetFieldUserNumber=1337
   TYPE(CMISSFieldType) :: EquationsSetField
 

diff --git a/...oblems/NavierStokes/3D/TET/QuadraticVelocityLinearPressure/LEVEL_2/src/LEVEL_2Example.f90 b/...oblems/NavierStokes/3D/TET/QuadraticVelocityLinearPressure/LEVEL_2/src/LEVEL_2Example.f90
@@ -59,7 +59,9 @@ PROGRAM ANALYTICNAVIERSTOKESEXAMPLE
 
   USE OPENCMISS
   USE FLUID_MECHANICS_IO_ROUTINES
+#ifndef NOMPIMOD
   USE MPI
+#endif
 
 #ifdef WIN32
   USE IFQWINCMISS
@@ -73,6 +75,11 @@ PROGRAM ANALYTICNAVIERSTOKESEXAMPLE
 
   IMPLICIT NONE
 
+#ifdef NOMPIMOD
+#include "mpif.h"
+#endif
+
+
   INTEGER(CMISSIntg), PARAMETER :: EquationsSetFieldUserNumber=1337
   TYPE(CMISSFieldType) :: EquationsSetField
 

diff --git a/...lems/NavierStokes/3D/HEX/QuadraticVelocityLinearPressure/LEVEL_3/100k/src/100kExample.f90 b/...lems/NavierStokes/3D/HEX/QuadraticVelocityLinearPressure/LEVEL_3/100k/src/100kExample.f90
@@ -59,7 +59,9 @@ PROGRAM ANALYTICNAVIERSTOKESEXAMPLE
 
   USE OPENCMISS
   USE FLUID_MECHANICS_IO_ROUTINES
+#ifndef NOMPIMOD
   USE MPI
+#endif
 
 #ifdef WIN32
   USE IFQWINCMISS
@@ -73,6 +75,11 @@ PROGRAM ANALYTICNAVIERSTOKESEXAMPLE
 
   IMPLICIT NONE
 
+#ifdef NOMPIMOD
+#include "mpif.h"
+#endif
+
+
   INTEGER(CMISSIntg), PARAMETER :: EquationsSetFieldUserNumber=1337
   TYPE(CMISSFieldType) :: EquationsSetField
 

diff --git a/...oblems/NavierStokes/3D/HEX/QuadraticVelocityLinearPressure/LEVEL_3/10k/src/10kExample.f90 b/...oblems/NavierStokes/3D/HEX/QuadraticVelocityLinearPressure/LEVEL_3/10k/src/10kExample.f90
@@ -59,7 +59,9 @@ PROGRAM ANALYTICNAVIERSTOKESEXAMPLE
 
   USE OPENCMISS
   USE FLUID_MECHANICS_IO_ROUTINES
+#ifndef NOMPIMOD
   USE MPI
+#endif
 
 #ifdef WIN32
   USE IFQWINCMISS
@@ -73,6 +75,11 @@ PROGRAM ANALYTICNAVIERSTOKESEXAMPLE
 
   IMPLICIT NONE
 
+#ifdef NOMPIMOD
+#include "mpif.h"
+#endif
+
+
   INTEGER(CMISSIntg), PARAMETER :: EquationsSetFieldUserNumber=1337
   TYPE(CMISSFieldType) :: EquationsSetField
 

diff --git a/...Problems/NavierStokes/3D/HEX/QuadraticVelocityLinearPressure/LEVEL_3/1k/src/1kExample.f90 b/...Problems/NavierStokes/3D/HEX/QuadraticVelocityLinearPressure/LEVEL_3/1k/src/1kExample.f90
@@ -59,7 +59,9 @@ PROGRAM ANALYTICNAVIERSTOKESEXAMPLE
 
   USE OPENCMISS
   USE FLUID_MECHANICS_IO_ROUTINES
+#ifndef NOMPIMOD
   USE MPI
+#endif
 
 #ifdef WIN32
   USE IFQWINCMISS
@@ -73,6 +75,11 @@ PROGRAM ANALYTICNAVIERSTOKESEXAMPLE
 
   IMPLICIT NONE
 
+#ifdef NOMPIMOD
+#include "mpif.h"
+#endif
+
+
   INTEGER(CMISSIntg), PARAMETER :: EquationsSetFieldUserNumber=1337
   TYPE(CMISSFieldType) :: EquationsSetField