Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 2 additions & 13 deletions raster/r.sim/simlib/hydro.c
Original file line number Diff line number Diff line change
Expand Up @@ -150,21 +150,10 @@ void main_loop(const Setup *setup, const Geometry *geometry,
nwalka = 0;
sim->nstack = 0;

#pragma omp parallel firstprivate(l, lw, k) reduction(+ : nwalka)
#pragma omp parallel firstprivate(l, k) reduction(+ : nwalka)
{
#if defined(_OPENMP)
int steps = (sim->nwalk + omp_get_num_threads() - 1) /
omp_get_num_threads();
int tid = omp_get_thread_num();
int min_loop = tid * steps;
int max_loop = ((tid + 1) * steps) > sim->nwalk
? sim->nwalk
: (tid + 1) * steps;

for (lw = min_loop; lw < max_loop; lw++) {
#else
#pragma omp for schedule(static)
for (lw = 0; lw < sim->nwalk; lw++) {
#endif
if (sim->w[lw].m > EPS) { /* check the walker weight */
++(nwalka);
l = (int)((sim->w[lw].x + stxm) / geometry->stepx) -
Expand Down
Loading