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.

Sign up for GitHub

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

n_of_lnrd_stp : always work on doubles #437

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

n_of_lnrd_stp : always work on doubles #437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d710db
n_of_lnrd_stp : always work on doubles
pdziekan Mar 8, 2022
ba08e62
Merge branch 'master' into init_distro_double
pdziekan Jan 26, 2023
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: 2 additions & 2 deletions include/libcloudph++/lgrngn/opts_init.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ namespace libcloudphxx
// uses shared_ptr to make opts_init copyable
typedef std::unordered_map<
real_t, // kappa
std::shared_ptr<unary_function<real_t>> // n(ln(rd)) @ STP; alternatively it's n(ln(rd)) independent of rhod if aerosol_independent_of_rhod=true
std::shared_ptr<unary_function<double>> // n(ln(rd)) @ STP; alternatively it's n(ln(rd)) independent of rhod if aerosol_independent_of_rhod=true
> dry_distros_t;
dry_distros_t dry_distros;

Expand Down Expand Up @@ -163,7 +163,7 @@ namespace libcloudphxx
typedef std::unordered_map<
real_t, // kappa
std::tuple<
std::shared_ptr<unary_function<real_t>>, // n(ln(rd)) @ STP; alternatively it's n(ln(rd)) independent of rhod if aerosol_independent_of_rhod=true
std::shared_ptr<unary_function<double>>, // n(ln(rd)) @ STP; alternatively it's n(ln(rd)) independent of rhod if aerosol_independent_of_rhod=true
std::pair<real_t, real_t>, // kappa range of CCN considered to belong to this distribution, ranges of different members of the map need to be exclusive (TODO: add a check of this)
std::pair<real_t, real_t> // range of altitudes at which this relaxation acts
>
Expand Down
8 changes: 4 additions & 4 deletions src/detail/eval_and_oper.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ namespace libcloudphxx
template <typename real_t>
struct eval_and_mul
{
const common::unary_function<real_t> &fun;
const common::unary_function<double> &fun;
const real_t &mul;

// ctor
eval_and_mul(
const common::unary_function<real_t> &fun,
const common::unary_function<double> &fun,
const real_t &mul
)
: fun(fun), mul(mul)
Expand All @@ -32,12 +32,12 @@ namespace libcloudphxx
template <typename real_t>
struct eval_and_add
{
const common::unary_function<real_t> &fun;
const common::unary_function<double> &fun;
const real_t &add;

// ctor
eval_and_add(
const common::unary_function<real_t> &fun,
const common::unary_function<double> &fun,
const real_t &add
)
: fun(fun), add(add)
Expand Down
18 changes: 9 additions & 9 deletions src/impl/particles_impl.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,9 +422,9 @@ namespace libcloudphxx

void sanity_checks();
void init_SD_with_distros();
void init_SD_with_distros_sd_conc(const common::unary_function<real_t> &, const real_t &);
void init_SD_with_distros_tail(const common::unary_function<real_t> &, const real_t);
void init_SD_with_distros_const_multi(const common::unary_function<real_t> &);
void init_SD_with_distros_sd_conc(const common::unary_function<double> &, const real_t &);
void init_SD_with_distros_tail(const common::unary_function<double> &, const real_t);
void init_SD_with_distros_const_multi(const common::unary_function<double> &);
void init_SD_with_distros_finalize(const real_t &, const bool unravel_ijk = true);
void init_SD_with_sizes();
void init_sanity_check(
Expand All @@ -436,32 +436,32 @@ namespace libcloudphxx

void init_dry_sd_conc();
void init_dry_const_multi(
const common::unary_function<real_t> &n_of_lnrd
const common::unary_function<double> &n_of_lnrd
);
void init_dry_dry_sizes(real_t);

void init_n_sd_conc(
const common::unary_function<real_t> &n_of_lnrd
const common::unary_function<double> &n_of_lnrd
);
void init_n_const_multi(const thrust_size_t &);
void init_n_dry_sizes(const real_t &conc, const thrust_size_t &sd_conc);

void dist_analysis_sd_conc(
const common::unary_function<real_t> &n_of_lnrd,
const common::unary_function<double> &n_of_lnrd,
const n_t sd_conc,
const real_t dt = 1.
);
void dist_analysis_const_multi(
const common::unary_function<real_t> &n_of_lnrd
const common::unary_function<double> &n_of_lnrd
);
void reserve_hskpng_npart();
void init_ijk();
void init_xyz();
void init_kappa(const real_t &);
void init_incloud_time();
void init_count_num_sd_conc(const real_t & = 1);
void init_count_num_const_multi(const common::unary_function<real_t> &);
void init_count_num_const_multi(const common::unary_function<real_t> &, const thrust_size_t &);
void init_count_num_const_multi(const common::unary_function<double> &);
void init_count_num_const_multi(const common::unary_function<double> &, const thrust_size_t &);
void init_count_num_dry_sizes(const std::pair<real_t, int> &);
void init_count_num_hlpr(const real_t &, const thrust_size_t &);
void init_count_num_src(const thrust_size_t &);
Expand Down
4 changes: 2 additions & 2 deletions src/impl/particles_impl_dist_analysis.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace libcloudphxx
// init
template <typename real_t, backend_t device>
void particles_t<real_t, device>::impl::dist_analysis_sd_conc(
const common::unary_function<real_t> &n_of_lnrd_stp,
const common::unary_function<double> &n_of_lnrd_stp,
const impl::n_t sd_conc,
const real_t dt
)
Expand Down Expand Up @@ -78,7 +78,7 @@ namespace libcloudphxx

template <typename real_t, backend_t device>
void particles_t<real_t, device>::impl::dist_analysis_const_multi(
const common::unary_function<real_t> &n_of_lnrd_stp
const common::unary_function<double> &n_of_lnrd_stp
)
{
if(opts_init.rd_min >= 0 && opts_init.rd_max >= 0) // user-defined bin edges
Expand Down
2 changes: 1 addition & 1 deletion src/impl/particles_impl_init_SD_with_distros_const_multi.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace libcloudphxx
namespace lgrngn
{
template <typename real_t, backend_t device>
void particles_t<real_t, device>::impl::init_SD_with_distros_const_multi(const common::unary_function<real_t> &fun)
void particles_t<real_t, device>::impl::init_SD_with_distros_const_multi(const common::unary_function<double> &fun)
{
// analyze the distribution, TODO: just did it
dist_analysis_const_multi(fun);
Expand Down
2 changes: 1 addition & 1 deletion src/impl/particles_impl_init_SD_with_distros_sd_conc.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace libcloudphxx
namespace lgrngn
{
template <typename real_t, backend_t device>
void particles_t<real_t, device>::impl::init_SD_with_distros_sd_conc(const common::unary_function<real_t> &fun, const real_t &tot_lnrd_rng)
void particles_t<real_t, device>::impl::init_SD_with_distros_sd_conc(const common::unary_function<double> &fun, const real_t &tot_lnrd_rng)
{
// analyze the distribution, TODO: just did it in init_SD_with_distros
dist_analysis_sd_conc(
Expand Down
2 changes: 1 addition & 1 deletion src/impl/particles_impl_init_SD_with_distros_tail.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace libcloudphxx
namespace lgrngn
{
template <typename real_t, backend_t device>
void particles_t<real_t, device>::impl::init_SD_with_distros_tail(const common::unary_function<real_t> &fun, const real_t log_rd_min_init)
void particles_t<real_t, device>::impl::init_SD_with_distros_tail(const common::unary_function<double> &fun, const real_t log_rd_min_init)
{
dist_analysis_const_multi(fun);

Expand Down
8 changes: 4 additions & 4 deletions src/impl/particles_impl_init_count_num.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ namespace libcloudphxx
// calculate numerical integral with the trapezoidal rule
// TODO: use thrust
template<typename real_t>
real_t integrate(const common::unary_function<real_t> &fun, const real_t &min, const real_t &max, const real_t &bin_size)
real_t integrate(const common::unary_function<double> &fun, const real_t &min, const real_t &max, const real_t &bin_size)
{
const int n = (max - min) / bin_size; //no of bins
real_t integral = (fun(min) + fun(max)) / 2.;
double integral = (fun(min) + fun(max)) / 2.;

for(int i=1; i<n; ++i)
integral += fun(min + i * bin_size);
Expand Down Expand Up @@ -86,7 +86,7 @@ namespace libcloudphxx

template <typename real_t, backend_t device>
void particles_t<real_t, device>::impl::init_count_num_const_multi(
const common::unary_function<real_t> &n_of_lnrd_stp
const common::unary_function<double> &n_of_lnrd_stp
)
{
const real_t integral = detail::integrate(n_of_lnrd_stp, log_rd_min, log_rd_max, config.bin_precision);
Expand All @@ -95,7 +95,7 @@ namespace libcloudphxx

template <typename real_t, backend_t device>
void particles_t<real_t, device>::impl::init_count_num_const_multi(
const common::unary_function<real_t> &n_of_lnrd_stp,
const common::unary_function<double> &n_of_lnrd_stp,
const thrust_size_t &const_multi
)
{
Expand Down
4 changes: 2 additions & 2 deletions src/impl/particles_impl_init_dry_const_multi.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ namespace libcloudphxx
{
// calculate cumulative distribution function
template<typename real_t, typename vec_t>
void calc_CDF(const common::unary_function<real_t> &fun, const real_t &min, const real_t &max, const real_t &bin_size, vec_t &vec)
void calc_CDF(const common::unary_function<double> &fun, const real_t &min, const real_t &max, const real_t &bin_size, vec_t &vec)
{
const thrust_size_t n = (max - min) / bin_size + 1; //no of points at which cdf will be calculated
vec.resize(n);
Expand All @@ -46,7 +46,7 @@ namespace libcloudphxx

template <typename real_t, backend_t device>
void particles_t<real_t, device>::impl::init_dry_const_multi(
const common::unary_function<real_t> &n_of_lnrd_stp
const common::unary_function<double> &n_of_lnrd_stp
)
{
// calculate cumulative distribution function
Expand Down
12 changes: 6 additions & 6 deletions src/impl/particles_impl_init_n.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ namespace libcloudphxx
namespace detail
{
template <typename real_t>
struct eval_and_multiply
struct eval_log_of_cubic_root_and_multiply
{
const common::unary_function<real_t> &fun;
const common::unary_function<double> &fun;
const real_t &mul;

// ctor
eval_and_multiply(
const common::unary_function<real_t> &fun,
eval_log_of_cubic_root_and_multiply(
const common::unary_function<double> &fun,
const real_t &mul
)
: fun(fun), mul(mul)
Expand All @@ -46,7 +46,7 @@ namespace libcloudphxx
// init
template <typename real_t, backend_t device>
void particles_t<real_t, device>::impl::init_n_sd_conc(
const common::unary_function<real_t> &n_of_lnrd_stp
const common::unary_function<double> &n_of_lnrd_stp
)
{
// temporary space on the host
Expand All @@ -72,7 +72,7 @@ namespace libcloudphxx
thrust::transform(
tmp_real.begin(), tmp_real.end(), // input
tmp_real.begin(), // output
detail::eval_and_multiply<real_t>(n_of_lnrd_stp, multiplier)
detail::eval_log_of_cubic_root_and_multiply<real_t>(n_of_lnrd_stp, multiplier)
);

{
Expand Down