diff options
| author | Erik Schnetter <schnetter@gmail.com> | 2013-01-22 14:41:18 -0500 |
|---|---|---|
| committer | Erik Schnetter <schnetter@gmail.com> | 2013-01-22 14:41:18 -0500 |
| commit | bcf3bb045b9b26b4daacf39584e6fc25c03da3ad (patch) | |
| tree | 1718d35520a084eb1f795ec13c0c3d9979c8775f | |
| parent | 954c610f54667697a8a821370d09db04f54548ef (diff) | |
CarpetLib, LoopControl: Correct required/optional capabilities
| -rw-r--r-- | Carpet/CarpetLib/configuration.ccl | 4 | ||||
| -rw-r--r-- | Carpet/CarpetLib/src/gdata.cc | 2 | ||||
| -rw-r--r-- | Carpet/LoopControl/configuration.ccl | 6 |
3 files changed, 4 insertions, 8 deletions
diff --git a/Carpet/CarpetLib/configuration.ccl b/Carpet/CarpetLib/configuration.ccl index 12ba9306c..f992cca04 100644 --- a/Carpet/CarpetLib/configuration.ccl +++ b/Carpet/CarpetLib/configuration.ccl @@ -6,9 +6,9 @@ PROVIDES CarpetLib LANG } -REQUIRES CycleClock MPI Vectors +REQUIRES CycleClock MPI -OPTIONAL LoopControl MPI +OPTIONAL hwloc LoopControl Vectors { } diff --git a/Carpet/CarpetLib/src/gdata.cc b/Carpet/CarpetLib/src/gdata.cc index 0a3d81803..c26d374a1 100644 --- a/Carpet/CarpetLib/src/gdata.cc +++ b/Carpet/CarpetLib/src/gdata.cc @@ -158,7 +158,7 @@ allocated_memory_shape (vect<int,D> shape) } } } -#if VECTORISE_ALIGNED_ARRAYS +#if VECTORISE && VECTORISE_ALIGNED_ARRAYS // Enlarge shape in the x direction to ensure it is a multiple of // the vector size // TODO: Support other datatypes as well, don't target only diff --git a/Carpet/LoopControl/configuration.ccl b/Carpet/LoopControl/configuration.ccl index ec31d6f78..229929fe2 100644 --- a/Carpet/LoopControl/configuration.ccl +++ b/Carpet/LoopControl/configuration.ccl @@ -1,10 +1,6 @@ # Configuration definition for thorn LoopControl -OPTIONAL CycleClock -{ -} - -OPTIONAL Vectors +OPTIONAL CycleClock hwloc Vectors { } |