Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: missing macros for GPU compilation added #59

Merged
merged 1 commit into from
May 3, 2024
Merged
Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion libs/superdrops/superdrop_ids.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* Author: Clara Bayley (CB)
* Additional Contributors: Tobias Kölling (TK)
* -----
* Last Modified: Saturday 20th April 2024
* Last Modified: Friday 3rd May 2024
* Modified By: CB
* -----
* License: BSD 3-Clause "New" or "Revised" License
Expand All @@ -33,6 +33,7 @@
struct IntID {
size_t value; /**< Value of the SD identity. */

KOKKOS_INLINE_FUNCTION
size_t get_value() const { return value; }

/**
Expand Down Expand Up @@ -81,6 +82,7 @@ struct IntID {
* @brief Struct for non-existent (no memory) SD identity.
*/
struct EmptyID {
KOKKOS_INLINE_FUNCTION
size_t get_value() const { return LIMITVALUES::uint64_t_max; }

/**
Expand Down
8 changes: 4 additions & 4 deletions src/main_impl.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* Author: Clara Bayley (CB)
* Additional Contributors:
* -----
* Last Modified: Tuesday 30th April 2024
* Last Modified: Friday 3rd May 2024
* Modified By: CB
* -----
* License: BSD 3-Clause "New" or "Revised" License
Expand Down Expand Up @@ -112,13 +112,13 @@ inline Motion<CartesianMaps> auto create_motion(const unsigned int motionstep) {
}

inline auto create_boundary_conditions(const Config &config) {
return AddSupersAtDomainTop(config.get_addsupersatdomaintop());
// return NullBoundaryConditions{};
// return AddSupersAtDomainTop(config.get_addsupersatdomaintop());
return NullBoundaryConditions{};
}

template <GridboxMaps GbxMaps>
inline auto create_movement(const Config &config, const Timesteps &tsteps, const GbxMaps &gbxmaps) {
const Motion<GbxMaps> auto motion(create_motion(tsteps.get_motionstep()));
const auto motion(create_motion(tsteps.get_motionstep()));

const auto boundary_conditions(create_boundary_conditions(config));

Expand Down
Loading