Merge pull request #409 from pdziekan/droplet_puddle

Droplet puddle

Author: pdziekan

include/libcloudph++/common/output.hpp

@@ -16,7 +16,8 @@ namespace libcloudphxx
       outS_VI = chem::S_VI,                        
       outH = chem::H,                          
       outliq_vol,
-      outdry_vol
+      outdry_vol,
+      outprtcl_num
     };
 
     const std::map<output_t, std::string> output_names
@@ -30,7 +31,8 @@ namespace libcloudphxx
       {outS_VI   , "S_VI"},                        
       {outH      , "H"},                          
       {outliq_vol, "liquid_volume"},
-      {outdry_vol, "dry_volume"}
+      {outdry_vol, "dry_volume"},
+      {outprtcl_num, "particle_number"}
     };
   };
 };

src/impl/particles_impl_bcnd.ipp

@@ -231,6 +231,13 @@ namespace libcloudphxx
                     thrust::plus<real_t>()
                   );
 
+                // add total number of particles that fell out in this step
+                output_puddle[common::outprtcl_num] += 
+                  thrust::reduce(
+                    n_filtered.begin(),            // input start
+                    n_filtered.begin() + n_part    // input end
+                  );
+
                 if(opts_init.chem_switch)
                 {
                   for (int i = 0; i < chem_all; ++i)

src/particles_ctor.ipp

@@ -75,7 +75,7 @@ namespace libcloudphxx
       pimpl->sanity_checks();
 
       // init output map to 0
-      for(int i=0; i < chem_all+2; ++i)
+      for(int i=0; i < common::output_names.size(); ++i)
         pimpl->output_puddle[static_cast<common::output_t>(i)] = 0.;
     }
 

src/particles_multi_gpu_diag.ipp

@@ -203,7 +203,7 @@ namespace libcloudphxx
     template<class real_t>
     std::map<common::output_t, real_t> add_puddle(std::map<common::output_t, real_t> x, std::map<common::output_t, real_t> y){
       std::map<common::output_t, real_t> res;
-      for(int i=0; i < chem_all+2; ++i) 
+      for(int i=0; i < common::output_names.size(); ++i) 
         res[static_cast<common::output_t>(i)] = x[static_cast<common::output_t>(i)] + y[static_cast<common::output_t>(i)];
       return res;
     }

tests/python/physics/puddle.py

@@ -68,7 +68,7 @@ def lognormal(lnr):
 
 assert(tab_out[0][0] == 0.)
 
-puddle_expected_per_cell = {0: 0.0, 1: 0.0, 2: 0.0, 3: 0.0, 4: 0.0, 5: 0.0, 6: 0.0, 7: 0.0, 8: 7.087802417148837e-05, 9: 5.630090090571395e-06}
+puddle_expected_per_cell = {0: 0.0, 1: 0.0, 2: 0.0, 3: 0.0, 4: 0.0, 5: 0.0, 6: 0.0, 7: 0.0, 8: 7.087802417148837e-05, 9: 5.630090090571395e-06, 10: 815411.5}
 
 for a in puddle:
   print(puddle[a], Opts_init.nx * puddle_expected_per_cell[a])