Merge pull request #407 from pdziekan/master

get rid of warnings

Author: pdziekan

CMakeLists.txt

@@ -108,7 +108,7 @@ target_include_directories(cloudphxx_lgrngn
 )
 
 # enabling additional warnings
-target_compile_options(cloudphxx_lgrngn PRIVATE $<$<COMPILE_LANGUAGE:CXX>: -Wextra>)
+#target_compile_options(cloudphxx_lgrngn PRIVATE $<$<COMPILE_LANGUAGE:CXX>: -Wextra>)
 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra")
 
 # enabling c++11

include/libcloudph++/common/detail/toms748.hpp

@@ -295,6 +295,9 @@ T toms748_solve(F f, const T& ax, const T& bx, const T& fax, const T& fbx, Tol t
 
    a = ax;
    b = bx;
+   
+   fa = fax;
+   fb = fbx;
 
 #if !defined(NDEBUG)
    if(a >= b)
@@ -303,10 +306,6 @@ T toms748_solve(F f, const T& ax, const T& bx, const T& fax, const T& fbx, Tol t
      assert(0);
    }
 #endif
-   
-
-   fa = fax;
-   fb = fbx;
 
    if(tol(a, b) || (fa == 0) || (fb == 0))
    {

src/detail/kernels.hpp

@@ -28,7 +28,6 @@ namespace libcloudphxx
         k_params(k_params), n_user_params(n_user_params), r_max(r_max) {}
 
       // thrust requires that a default ctor exists
-      BOOST_GPU_ENABLED
       kernel_base() = default;
 
       BOOST_GPU_ENABLED
@@ -45,7 +44,6 @@ namespace libcloudphxx
       kernel_golovin(thrust_device::pointer<real_t> k_params) : kernel_base<real_t, n_t>(k_params, 1) {}
 
       // thrust requires that a default ctor exists
-      BOOST_GPU_ENABLED
       kernel_golovin() = default;
 
       BOOST_GPU_ENABLED
@@ -134,7 +132,6 @@ namespace libcloudphxx
       kernel_geometric_with_multiplier(thrust_device::pointer<real_t> k_params) : kernel_geometric<real_t, n_t>(k_params, 1) {}
 
       // thrust requires that a default ctor exists
-      BOOST_GPU_ENABLED
       kernel_geometric_with_multiplier() = default;
 
       BOOST_GPU_ENABLED
@@ -186,7 +183,6 @@ namespace libcloudphxx
       kernel_geometric_with_efficiencies(thrust_device::pointer<real_t> k_params, real_t r_max) : kernel_geometric<real_t, n_t>(k_params, 0, r_max) {}
 
       // thrust requires that a default ctor exists
-      BOOST_GPU_ENABLED
       kernel_geometric_with_efficiencies() = default;
 
       BOOST_GPU_ENABLED
@@ -220,7 +216,6 @@ namespace libcloudphxx
       kernel_onishi(thrust_device::pointer<real_t> k_params, real_t r_max) : kernel_geometric<real_t, n_t>(k_params, 1, r_max) {}
 
       // thrust requires that a default ctor exists
-      BOOST_GPU_ENABLED
       kernel_onishi() = default;
 
       BOOST_GPU_ENABLED

src/impl/particles_impl_hskpng_count.ipp

@@ -28,7 +28,6 @@ namespace libcloudphxx
         count_num.begin()                       // output - values
       );
       count_n = n.first - count_ijk.begin();
-      assert(count_n >= 0);
       assert(count_n <= n_cell);
     }   
   };  

src/impl/particles_impl_init_count_num.ipp

@@ -124,8 +124,8 @@ namespace libcloudphxx
 
       switch(n_dims)
       {
-        case 0 : throw std::runtime_error("init_count_num_src called in 0D"); break;
-        case 1 : throw std::runtime_error("init_count_num_src called in 1D"); break;
+        case 0 : throw std::runtime_error("init_count_num_src called in 0D");
+        case 1 : throw std::runtime_error("init_count_num_src called in 1D");
         case 2:
           thrust::transform(
             zero,

src/impl/particles_impl_moms.ipp

@@ -216,7 +216,7 @@ namespace libcloudphxx
         }
       }
 #endif
-      assert(count_n >= 0 && count_n <= n_cell);
+      assert(count_n <= n_cell);
       if(specific)
       {
         // dividing by dv