Merge pull request #315 from sandialabs/namespace_update

Namespace update

Author: kuberry

cmake/Compadre_Version.txt

@@ -1 +1 @@
-1.6.0
+1.6.1

examples/GMLS_Manifold.hpp

@@ -76,10 +76,10 @@ double sphere_harmonic54(double x, double y, double z) {
 
 KOKKOS_INLINE_FUNCTION
 void curl_sphere_harmonic54(double *curl, double x, double y, double z) {
-    const scalar_type lon = longitude(x, y, z); // theta
-    const scalar_type lat = acos(z); // phi
-    const scalar_type sigma_lon_comp = std::pow(sin(lat), 2) * (5.0* std::pow(cos(lat), 2) - 1.0) * cos(4.0 *lon);
-    const scalar_type sigma_lat_comp = 4*cos(lat) * std::pow(sin(lat), 3) * sin(4.0 * lon);
+    const Compadre::scalar_type lon = longitude(x, y, z); // theta
+    const Compadre::scalar_type lat = acos(z); // phi
+    const Compadre::scalar_type sigma_lon_comp = std::pow(sin(lat), 2) * (5.0* std::pow(cos(lat), 2) - 1.0) * cos(4.0 *lon);
+    const Compadre::scalar_type sigma_lat_comp = 4*cos(lat) * std::pow(sin(lat), 3) * sin(4.0 * lon);
     // solution oriented for inward normal, so we flip sign for outward
     curl[0] = -(-sin(lat)*sin(lon)*sigma_lon_comp + cos(lat)*cos(lon)*sigma_lat_comp);
     curl[1] = -(sin(lat)*cos(lon)*sigma_lon_comp + cos(lat)*sin(lon)*sigma_lat_comp);

src/Compadre_Typedefs.hpp

@@ -20,6 +20,7 @@
 #include <functional>
 #include <string>
 
+namespace Compadre {
 /*!
  
   Data types in Compadre Toolkit:
@@ -184,4 +185,6 @@ typename std::enable_if<2==T::rank,T>::type createView(std::string str, int dim_
 //! compadre_kernel_assert_extreme_debug is similar to compadre_assert_debug, but is a call on the device, 
 //! namely inside of a function marked KOKKOS_INLINE_FUNCTION
 
+}  // Compadre namespace
+
 #endif