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

[DO NOT MERGE!] cheating: replace negative rv with small positive values #359

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
34 changes: 34 additions & 0 deletions src/detail/negtozero.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#pragma once

// functor for testing not-positive values
struct isneg {
template<class real_t>
BOOST_GPU_ENABLED
bool operator()(const real_t a) const {
return a <= real_t(0);
}
};

#define _LIBCLOUDPHXX_SMALL_POSITIVE_VALUE 1e-10

// make not-positive values slightly positive...
#ifdef NDEBUG
#define negtozero(arr, name) {\
thrust::replace_if(\
arr.begin(), arr.end(), \
isneg(), \
real_t(_LIBCLOUDPHXX_SMALL_POSITIVE_VALUE) \
);}
#else
#define negtozero(arr, name) {\
auto min_position = thrust::min_element(arr.begin(), arr.end());\
if(*min_position <= 0.)\
{\
printf("A non-positive number (%g) detected in: " name " at position %g\n", *min_position, min_position);\
printf("Cheating in libcloudphxx: replacing non-positive values with small positive ones\n");\
thrust::replace_if(\
arr.begin(), arr.end(), \
isneg(), \
real_t(_LIBCLOUDPHXX_SMALL_POSITIVE_VALUE) \
);}}
#endif
2 changes: 2 additions & 0 deletions src/impl/particles_impl_sstp.ipp
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ namespace libcloudphxx
arg::_1 + arg::_2 / sstp // op: rv = rv + drv_adv / sstp
);
}
negtozero((*scl[ix]), "Eulerian field after per-cell sstp_step");
}
}

Expand Down Expand Up @@ -138,6 +139,7 @@ namespace libcloudphxx
arg::_1 + arg::_2 // op: rv = rv + drv_adv
);
}
negtozero((*tmp[ix]), "Eulerian field after per-particle sstp_step");
}
}
};
Expand Down
2 changes: 1 addition & 1 deletion src/impl/particles_impl_update_th_rv.ipp
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ namespace libcloudphxx
rv.begin(), // output
thrust::plus<real_t>()
);
assert(*thrust::min_element(rv.begin(), rv.end()) >= 0);
negtozero(rv, "rv after post-cond updating rv");
nancheck(rv, "update_th_rv: rv after update");

// updating th
Expand Down
1 change: 1 addition & 0 deletions src/particles.tpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "detail/wang_collision_enhancement.hpp"
#include "detail/kernel_onishi_nograv.hpp"
#include "detail/checknan.hpp"
#include "detail/negtozero.hpp"
#include "detail/formatter.cpp"
#include "detail/tpl_calc_wrapper.hpp"
#include "detail/kernels.hpp"
Expand Down