Skip to content

[SPH][Setup] fix and add control over initial h factor for disc setup #879

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

Merged
tdavidcl merged 2 commits into from
Mar 24, 2025
Merged

[SPH][Setup] fix and add control over initial h factor for disc setup #879

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
9053284
[SPH][Setup] fix and add control over initial h factor for disc setup
tdavidcl Mar 24, 2025
ab68e19
Merge branch 'main' into hotfix/sph-setup
tdavidcl Mar 24, 2025
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
3 changes: 2 additions & 1 deletion src/shammodels/sph/include/shammodels/sph/modules/SPHSetup.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ namespace shammodels::sph::modules {
std::function<Tscal(Tscal)> H_profile,
std::function<Tscal(Tscal)> rot_profile,
std::function<Tscal(Tscal)> cs_profile,
std::mt19937 eng);
std::mt19937 eng,
Tscal init_h_factor);

std::shared_ptr<ISPHSetupNode>
make_combiner_add(SetupNodePtr parent1, SetupNodePtr parent2);
Expand Down
6 changes: 4 additions & 2 deletions src/shammodels/sph/include/shammodels/sph/modules/setup/GeneratorMCDisc.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ namespace shammodels::sph::modules {

class DiscIterator;
DiscIterator generator;
Tscal init_h_factor;

static DiscIterator make_generator(
Tscal part_mass,
Expand Down Expand Up @@ -80,7 +81,8 @@ namespace shammodels::sph::modules {
std::function<Tscal(Tscal)> H_profile,
std::function<Tscal(Tscal)> rot_profile,
std::function<Tscal(Tscal)> cs_profile,
std::mt19937 eng)
std::mt19937 eng,
Tscal init_h_factor)
: context(context), solver_config(solver_config), generator(make_generator(
part_mass,
disc_mass,
Expand All @@ -91,7 +93,7 @@ namespace shammodels::sph::modules {
rot_profile,
cs_profile,
eng)),
pmass(part_mass) {}
init_h_factor(init_h_factor), pmass(part_mass) {}

bool is_done();

Expand Down
6 changes: 4 additions & 2 deletions src/shammodels/sph/src/modules/SPHSetup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ shammodels::sph::modules::SPHSetup<Tvec, SPHKernel>::make_generator_disc_mc(
std::function<Tscal(Tscal)> H_profile,
std::function<Tscal(Tscal)> rot_profile,
std::function<Tscal(Tscal)> cs_profile,
std::mt19937 eng) {
std::mt19937 eng,
Tscal init_h_factor) {
return std::shared_ptr<ISPHSetupNode>(new GeneratorMCDisc<Tvec, SPHKernel>(
context,
solver_config,
Expand All @@ -53,7 +54,8 @@ shammodels::sph::modules::SPHSetup<Tvec, SPHKernel>::make_generator_disc_mc(
H_profile,
rot_profile,
cs_profile,
eng));
eng,
init_h_factor));
}

template<class Tvec, template<class> class SPHKernel>
Expand Down
2 changes: 1 addition & 1 deletion src/shammodels/sph/src/modules/setup/GeneratorMCDisc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ shammodels::sph::modules::GeneratorMCDisc<Tvec, SPHKernel>::next_n(u32 nmax) {
vec_pos.push_back(o.pos);
vec_vel.push_back(o.velocity);
// vec_u.push_back(o.cs * o.cs / (/*solver.eos_gamma * */ (eos_gamma - 1)));
Tscal h = shamrock::sph::h_rho(pmass, o.rho * 0.1, Kernel::hfactd);
Tscal h = shamrock::sph::h_rho(pmass, o.rho, Kernel::hfactd) * init_h_factor;
vec_h.push_back(h);
vec_cs.push_back(o.cs);
}
Expand Down
9 changes: 6 additions & 3 deletions src/shammodels/sph/src/pySPHModel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,8 @@ void add_instance(py::module &m, std::string name_config, std::string name_model
std::function<Tscal(Tscal)> H_profile,
std::function<Tscal(Tscal)> rot_profile,
std::function<Tscal(Tscal)> cs_profile,
u64 random_seed) {
u64 random_seed,
Tscal init_h_factor) {
return self.make_generator_disc_mc(
part_mass,
disc_mass,
Expand All @@ -224,7 +225,8 @@ void add_instance(py::module &m, std::string name_config, std::string name_model
H_profile,
rot_profile,
cs_profile,
std::mt19937(random_seed));
std::mt19937(random_seed),
init_h_factor);
},
py::kw_only(),
py::arg("part_mass"),
Expand All @@ -235,7 +237,8 @@ void add_instance(py::module &m, std::string name_config, std::string name_model
py::arg("H_profile"),
py::arg("rot_profile"),
py::arg("cs_profile"),
py::arg("random_seed"))
py::arg("random_seed"),
py::arg("init_h_factor") = 0.8)
.def(
"make_combiner_add",
[](TSPHSetup &self,
Expand Down
Loading