Fix namespaces

include/aspect/coordinate_systems.h

@@ -25,6 +25,20 @@ namespace aspect
 {
   namespace Utilities
   {
+    /**
+     * Because many places in ASPECT assume that all functions in the namespace
+     * <code>dealii::Utilities</code> are available without qualification as
+     * <code>Utilities::function</code>, just as all the function in the
+     * namespace <code>aspect::Utilities</code>, we make sure all these functions
+     * are available inside <code>aspect::Utilities</code>. This is maybe not
+     * the cleanest solution, but it is most compatible with a lot of existing
+     * code, and also allows to migrate ASPECT functions into deal.II when
+     * useful without introducing incompatibilities.
+     * 
+     * We need to do this in every header that introduces something into the
+     * namespace <code>aspect::Utilities</code>, because it needs to happen
+     * no matter which header files of ASPECT are included.
+     */
     using namespace dealii::Utilities;
 
     namespace Coordinates

include/aspect/particle/property/elastic_tensor_decomposition.h

@@ -28,6 +28,19 @@ namespace aspect
     {
       namespace Utilities
       {
+        /**
+         * Because many places in ASPECT assume that all functions in the namespace
+         * <code>aspect::Utilities</code> are available without qualification as
+         * <code>Utilities::function</code>, we make sure all these functions
+         * are also available inside <code>aspect::Particle::Property::Utilities</code>. 
+         * This is maybe not the cleanest solution, but it is most compatible
+         * with a lot of existing code.
+         * 
+         * We need to do this in every header that creates a new namespace named
+         * <code>Utilities</code>, because otherwise the compiler may not find
+         * the requested function in this namespace and issue an error, even
+         * though the function is available in the namespace <code>aspect::Utilities</code>.
+         */
         using namespace aspect::Utilities;
 
         /**

include/aspect/structured_data.h

@@ -31,6 +31,20 @@ namespace aspect
 {
   namespace Utilities
   {
+    /**
+     * Because many places in ASPECT assume that all functions in the namespace
+     * <code>dealii::Utilities</code> are available without qualification as
+     * <code>Utilities::function</code>, just as all the function in the
+     * namespace <code>aspect::Utilities</code>, we make sure all these functions
+     * are available inside <code>aspect::Utilities</code>. This is maybe not
+     * the cleanest solution, but it is most compatible with a lot of existing
+     * code, and also allows to migrate ASPECT functions into deal.II when
+     * useful without introducing incompatibilities.
+     * 
+     * We need to do this in every header that introduces something into the
+     * namespace <code>aspect::Utilities</code>, because it needs to happen
+     * no matter which header files of ASPECT are included.
+     */
     using namespace dealii::Utilities;
 
     /**

source/structured_data.cc

@@ -54,8 +54,6 @@ namespace aspect
 {
   namespace Utilities
   {
-    using namespace dealii::Utilities;
-
     template <int dim>
     StructuredDataLookup<dim>::StructuredDataLookup(const unsigned int n_components,
                                                     const double scale_factor)

source/utilities.cc

@@ -63,8 +63,6 @@ namespace aspect
    */
   namespace Utilities
   {
-    using namespace dealii::Utilities;
-
     namespace internal
     {
       namespace MPI

source/volume_of_fluid/utilities.cc

@@ -26,8 +26,6 @@ namespace aspect
   {
     namespace Utilities
     {
-      using namespace dealii::Utilities;
-
       double compute_fluid_fraction (const Tensor<1, 2> normal,
                                      const double d)
       {