Coalesced the loops for max_q and avg_q in hydro data. Set the cells …

…to nan when there arent particles.

src/species_advance/standard/hydro_p.cc

@@ -201,6 +201,7 @@ accumulate_hydro_p_kokkos(
 #ifdef FIELD_IONIZATION
  dt_2mc = (sp->g->dt)/(2*mspc);
  dt_4mc2 = dt_2mc / (2*c);
+ Kokkos::View<int*, Kokkos::DefaultExecutionSpace> particle_count("particle_count", nv);
 #else 
  qsp = sp->q;
  qdt_2mc = (qsp*sp->g->dt)/(2*mspc);
@@ -215,27 +216,6 @@ accumulate_hydro_p_kokkos(
  VOXEL(1,0,0, sp->g->nx,sp->g->ny,sp->g->nz);
  const int stride_43 = VOXEL(0,0,1, sp->g->nx,sp->g->ny,sp->g->nz) -
  VOXEL(1,1,0, sp->g->nx,sp->g->ny,sp->g->nz);
-
- // Calculate the average macro charge
- //FIXME: check performace on cpu
- Kokkos::View<int*, Kokkos::DefaultExecutionSpace> particle_count("particle_count", nv);
- Kokkos::parallel_for("average_q", Kokkos::RangePolicy<Kokkos::DefaultExecutionSpace>(0, np),
- KOKKOS_LAMBDA(size_t p_index)
- {
- float p_q = k_particles(p_index, particle_var::charge); 
- int ii = k_particles_i(p_index);
- Kokkos::atomic_add(&particle_count(ii), 1); // number of particles in each cell
- Kokkos::atomic_add(&k_hydro(ii, hydro_var::avg_q), p_q); // total macro charge in each cell
- });
- Kokkos::parallel_for("calculate_mean_q", Kokkos::RangePolicy<Kokkos::DefaultExecutionSpace>(0, nv),
- KOKKOS_LAMBDA(size_t ii)
- {
- // Calculate mean charge only if there are particles in the cell
- if (particle_count(ii) > 0) {
- k_hydro(ii, hydro_var::avg_q) /= static_cast<float>(particle_count(ii));
- }
- });
-
 
  //for( n=0; n<np; n++ ) {
  Kokkos::parallel_for("advance_p", Kokkos::RangePolicy < Kokkos::DefaultExecutionSpace > (0, np),
@@ -350,12 +330,15 @@ accumulate_hydro_p_kokkos(
  // Accumulate the hydro fields
 #ifdef FIELD_IONIZATION
  //FIXME: check performace on cpu
- // there is no comperator so I need to do this with the view and not the SA
+ // Add maximum macro charge 
+ // there is no comperator so I need to do this with the view and not the SA
  if (p_q < 0) {
  Kokkos::atomic_fetch_min(&k_hydro(ii, hydro_var::max_q), p_q); //electrons
  } else {
  Kokkos::atomic_fetch_max(&k_hydro(ii, hydro_var::max_q), p_q);
  }
+ Kokkos::atomic_add(&particle_count(ii), 1); // number of particles in each cell
+ Kokkos::atomic_add(&k_hydro(ii, hydro_var::avg_q), p_q); // total macro charge in each cell
 
  #define ACCUM_HYDRO( wn, i ) \
  t = p_q*wn; /* t = (p_q w/V) trilin_n */ \
@@ -429,6 +412,23 @@ accumulate_hydro_p_kokkos(
 # undef ACCUM_HYDRO
  });
 
+#ifdef FIELD_IONIZATION
+ // Calculate the average macro charge
+ // Give nan values to cells without particles
+ //FIXME: check performace on cpu
+ Kokkos::parallel_for("calculate_mean_q", Kokkos::RangePolicy<Kokkos::DefaultExecutionSpace>(0, nv),
+ KOKKOS_LAMBDA(size_t ii)
+ {
+ // Calculate mean charge only if there are particles in the cell
+ if (particle_count(ii) > 0) {
+ k_hydro(ii, hydro_var::avg_q) /= static_cast<float>(particle_count(ii));
+ } else {
+ k_hydro(ii, hydro_var::avg_q) = std::numeric_limits<double>::quiet_NaN();
+ k_hydro(ii, hydro_var::max_q) = std::numeric_limits<double>::quiet_NaN();
+ }
+ });
+#endif
+
  Kokkos::Experimental::contribute(k_hydro, k_hydro_sv);
  Kokkos::fence(); // TODO: Check if I need this to block the contribute