Commit 5d0e4e1b authored by sjplimp's avatar sjplimp Committed by GitHub
Browse files

Merge pull request #346 from stanmoore1/kokkos_fixes

Kokkos fixes
parents f8d3c4c7 fc94f1bd
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -354,7 +354,6 @@ void DomainKokkos::pbc()
  }

  atomKK->sync(Device,X_MASK|V_MASK|MASK_MASK|IMAGE_MASK);
  atomKK->modified(Device,X_MASK|V_MASK|IMAGE_MASK);

  if (xperiodic || yperiodic || zperiodic) {
    if (deform_vremap) {
@@ -385,8 +384,9 @@ void DomainKokkos::pbc()
      Kokkos::parallel_for(nlocal,f);
    }
  }

  LMPDeviceType::fence();

  atomKK->modified(Device,X_MASK|V_MASK|IMAGE_MASK);
}

/* ----------------------------------------------------------------------
+0 −2
Original line number Diff line number Diff line
@@ -360,9 +360,7 @@ void ModifyKokkos::post_run()
  for (int i = 0; i < nfix; i++) {
    atomKK->sync(fix[i]->execution_space,
                 fix[i]->datamask_read);
    if (!fix[i]->kokkosable) lmp->kokkos->auto_sync = 1;
    fix[i]->post_run();
    lmp->kokkos->auto_sync = 0;
    atomKK->modified(fix[i]->execution_space,
                     fix[i]->datamask_modify);
  }
+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ void VerletKokkos::setup()

  modify->setup(vflag);
  output->setup();
  lmp->kokkos->auto_sync = 0;
  lmp->kokkos->auto_sync = 1;
  update->setupflag = 1;
}