Move MPI support from flesh to a thorn

Move MPI support from flesh to thorn ExternalLibraries/MPI. This also
requires thorns that call MPI directly to declare this in their
configuration.ccl. Existing configurations using MPI need to include
ExternalLibraries/MPI into their thorn list.

16 files changed, 17 insertions, 28 deletions

diff --git a/Carpet/Carpet/configuration.ccl b/Carpet/Carpet/configuration.ccl
index 8ba5c6403..d41eb1ae1 100644
--- a/Carpet/Carpet/configuration.ccl
+++ b/Carpet/Carpet/configuration.ccl
@@ -4,9 +4,8 @@ PROVIDES Carpet
 {
 }
 
-REQUIRES IOUtil CarpetLib
+REQUIRES IOUtil CarpetLib MPI
+
 OPTIONAL LoopControl
 {
 }
-
-REQUIRES THORNS: IOUtil CarpetLib
diff --git a/Carpet/CarpetEvolutionMask/configuration.ccl b/Carpet/CarpetEvolutionMask/configuration.ccl
new file mode 100644
index 000000000..e4972bbbb
--- /dev/null
+++ b/Carpet/CarpetEvolutionMask/configuration.ccl
@@ -0,0 +1,3 @@
+# Configuration definition for thorn CarpetEvolutionMask
+
+REQUIRES Carpet
diff --git a/Carpet/CarpetIOASCII/configuration.ccl b/Carpet/CarpetIOASCII/configuration.ccl
index 00590922e..b7571313d 100644
--- a/Carpet/CarpetIOASCII/configuration.ccl
+++ b/Carpet/CarpetIOASCII/configuration.ccl
@@ -2,8 +2,6 @@
 
 REQUIRES Carpet CarpetLib IOUtil
 
-REQUIRES THORNS: Carpet CarpetLib IOUtil
-
 OPTIONAL SDF
 {
 }
diff --git a/Carpet/CarpetIOBasic/configuration.ccl b/Carpet/CarpetIOBasic/configuration.ccl
index da6707df5..f74b86045 100644
--- a/Carpet/CarpetIOBasic/configuration.ccl
+++ b/Carpet/CarpetIOBasic/configuration.ccl
@@ -1,5 +1,3 @@
 # Configuration definitions for thorn CarpetIOBasic
 
 REQUIRES Carpet CarpetLib IOUtil
-
-REQUIRES THORNS: Carpet CarpetLib IOUtil
diff --git a/Carpet/CarpetIOHDF5/configuration.ccl b/Carpet/CarpetIOHDF5/configuration.ccl
index f66848e02..094af09e5 100644
--- a/Carpet/CarpetIOHDF5/configuration.ccl
+++ b/Carpet/CarpetIOHDF5/configuration.ccl
@@ -2,4 +2,6 @@
 
 REQUIRES Carpet CarpetLib IOUtil HDF5
 
-REQUIRES THORNS: Carpet CarpetLib IOUtil
+PROVIDES CarpetIOHDF5
+{
+}
diff --git a/Carpet/CarpetIOScalar/configuration.ccl b/Carpet/CarpetIOScalar/configuration.ccl
index 22ec527bb..c2e8fef75 100644
--- a/Carpet/CarpetIOScalar/configuration.ccl
+++ b/Carpet/CarpetIOScalar/configuration.ccl
@@ -1,5 +1,3 @@
 # Configuration definitions for thorn CarpetIOScalar
 
 REQUIRES Carpet CarpetLib IOUtil
-
-REQUIRES THORNS: Carpet CarpetLib IOUtil
diff --git a/Carpet/CarpetIOStreamedHDF5/configuration.ccl b/Carpet/CarpetIOStreamedHDF5/configuration.ccl
index da13af17d..72dedff78 100644
--- a/Carpet/CarpetIOStreamedHDF5/configuration.ccl
+++ b/Carpet/CarpetIOStreamedHDF5/configuration.ccl
@@ -1,5 +1,3 @@
 # Configuration definitions for thorn CarpetIOStreamedHDF5
 
-REQUIRES Socket CarpetLib
-
-REQUIRES THORNS: CarpetIOHDF5
+REQUIRES Socket CarpetLib CarpetIOHDF5
diff --git a/Carpet/CarpetInterp/configuration.ccl b/Carpet/CarpetInterp/configuration.ccl
index f28a712b8..7584b9774 100644
--- a/Carpet/CarpetInterp/configuration.ccl
+++ b/Carpet/CarpetInterp/configuration.ccl
@@ -1,5 +1,3 @@
 # Configuration definitions for thorn CarpetInterp
 
-REQUIRES Carpet CarpetLib
-
-REQUIRES THORNS: Carpet CarpetLib
+REQUIRES Carpet CarpetLib MPI
diff --git a/Carpet/CarpetInterp2/configuration.ccl b/Carpet/CarpetInterp2/configuration.ccl
index 1391494a9..f365e894e 100644
--- a/Carpet/CarpetInterp2/configuration.ccl
+++ b/Carpet/CarpetInterp2/configuration.ccl
@@ -1,5 +1,3 @@
 # Configuration definitions for thorn CarpetInterp2
 
 REQUIRES Carpet CarpetLib
-
-REQUIRES THORNS: Carpet CarpetLib
diff --git a/Carpet/CarpetLib/configuration.ccl b/Carpet/CarpetLib/configuration.ccl
index 7e9f0f8bd..17ffa1f79 100644
--- a/Carpet/CarpetLib/configuration.ccl
+++ b/Carpet/CarpetLib/configuration.ccl
@@ -6,7 +6,7 @@ PROVIDES CarpetLib
   LANG
 }
 
-REQUIRES Vectors
+REQUIRES MPI Vectors
 
 OPTIONAL LoopControl
 {
diff --git a/Carpet/CarpetReduce/configuration.ccl b/Carpet/CarpetReduce/configuration.ccl
index 3f6421b59..caaf1dcef 100644
--- a/Carpet/CarpetReduce/configuration.ccl
+++ b/Carpet/CarpetReduce/configuration.ccl
@@ -1,8 +1,7 @@
 # Configuration definitions for thorn CarpetReduce
 
-REQUIRES Carpet CarpetLib
+REQUIRES Carpet CarpetLib MPI
+
 OPTIONAL LoopControl
 {
 }
-
-REQUIRES THORNS: Carpet CarpetLib
diff --git a/Carpet/CarpetRegrid/configuration.ccl b/Carpet/CarpetRegrid/configuration.ccl
index 6ba380b63..682be106d 100644
--- a/Carpet/CarpetRegrid/configuration.ccl
+++ b/Carpet/CarpetRegrid/configuration.ccl
@@ -1,5 +1,3 @@
 # Configuration definitions for thorn CarpetRegrid
 
 REQUIRES Carpet CarpetLib
-
-REQUIRES THORNS: Carpet CarpetLib
diff --git a/Carpet/CarpetRegrid2/configuration.ccl b/Carpet/CarpetRegrid2/configuration.ccl
index e01ba00b7..16e848764 100644
--- a/Carpet/CarpetRegrid2/configuration.ccl
+++ b/Carpet/CarpetRegrid2/configuration.ccl
@@ -1,5 +1,3 @@
 # Configuration definitions for thorn CarpetRegrid2
 
 REQUIRES Carpet CarpetLib
-
-REQUIRES THORNS: Carpet CarpetLib
diff --git a/Carpet/CarpetSlab/configuration.ccl b/Carpet/CarpetSlab/configuration.ccl
index 7e82108d3..730c8f94d 100644
--- a/Carpet/CarpetSlab/configuration.ccl
+++ b/Carpet/CarpetSlab/configuration.ccl
@@ -1,5 +1,3 @@
 # Configuration definitions for thorn CarpetSlab
 
 REQUIRES Carpet CarpetLib
-
-REQUIRES THORNS: Carpet CarpetLib
diff --git a/CarpetExtra/CarpetIntegrateTest/configuration.ccl b/CarpetExtra/CarpetIntegrateTest/configuration.ccl
new file mode 100644
index 000000000..d99fbb9e7
--- /dev/null
+++ b/CarpetExtra/CarpetIntegrateTest/configuration.ccl
@@ -0,0 +1 @@
+REQUIRES Carpet
diff --git a/CarpetExtra/TestCarpetGridInfo/configuration.ccl b/CarpetExtra/TestCarpetGridInfo/configuration.ccl
new file mode 100644
index 000000000..ed395d847
--- /dev/null
+++ b/CarpetExtra/TestCarpetGridInfo/configuration.ccl
@@ -0,0 +1,3 @@
+# Configuration definition for thorn TestCarpetGridInfo
+
+REQUIRES Carpet