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

Param update #342

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

Param update #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
801b8d8
Minor improvements in the parameters header documentation
vasvav Jul 22, 2023
227db8b
Set to read two parameters from configuration file while read some ot…
vasvav Jul 23, 2023
0d9433c
Set default simulation time step value to unit
vasvav Jul 23, 2023
0fe22b7
Revised the max/min bounds of simulation domain and the max displacem…
vasvav Jul 23, 2023
ddcc3e0
Formatting
nicogno Jul 24, 2023
1315210
Fixed mechanical interaction test
nicogno Jul 24, 2023
9bb241a
Fixed neuron soma tests
nicogno Jul 24, 2023
3d94aeb
Fixed more tests
nicogno Jul 24, 2023
cb7c4d1
Fixed more tests
nicogno Jul 24, 2023
f6eda66
Addresses SonarCloud code smells
nicogno Jul 24, 2023
d6b4bb6
Reverted param name changes
nicogno Jul 25, 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
45 changes: 30 additions & 15 deletions src/core/param/param.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ void Param::Restore(Param&& other) {
other.groups_.clear();
}

// -----------------------------------------------------------------------------
Param::Param(const Param& other) {
*this = other;
for (auto el : other.groups_) {
Expand Down Expand Up @@ -223,9 +224,11 @@ void Param::AssignFromConfig(const std::shared_ptr<cpptoml::table>& config) {
el.second->AssignFromConfig(config);
}

// simulation group
// simulation parameters group
BDM_ASSIGN_CONFIG_VALUE(random_seed, "simulation.random_seed");
BDM_ASSIGN_CONFIG_VALUE(output_dir, "simulation.output_dir");
BDM_ASSIGN_CONFIG_VALUE(remove_output_dir_contents,
"simulation.remove_output_dir");
BDM_ASSIGN_CONFIG_VALUE(environment, "simulation.environment");
BDM_ASSIGN_CONFIG_VALUE(nanoflann_depth, "simulation.nanoflann_depth");
BDM_ASSIGN_CONFIG_VALUE(unibn_bucketsize, "simulation.unibn_bucketsize");
Expand All @@ -242,25 +245,30 @@ void Param::AssignFromConfig(const std::shared_ptr<cpptoml::table>& config) {
BDM_ASSIGN_CONFIG_VALUE(diffusion_method, "simulation.diffusion_method");
BDM_ASSIGN_CONFIG_VALUE(calculate_gradients,
"simulation.calculate_gradients");

AssignBoundSpaceMode(config, this);
AssignThreadSafetyMechanism(config, this);

// visualization group
// visualization parameters group
BDM_ASSIGN_CONFIG_VALUE(visualization_engine, "visualization.adaptor");
BDM_ASSIGN_CONFIG_VALUE(insitu_visualization, "visualization.insitu");
BDM_ASSIGN_CONFIG_VALUE(pv_insitu_pipeline,
"visualization.pv_insitu_pipeline");
BDM_ASSIGN_CONFIG_VALUE(pv_insitu_pipelinearguments,
"visualization.pv_insitu_pipelinearguments");
if ("paraview" == visualization_engine) {
BDM_ASSIGN_CONFIG_VALUE(pv_insitu_pipeline,
"visualization.pv_insitu_pipeline");
BDM_ASSIGN_CONFIG_VALUE(pv_insitu_pipelinearguments,
"visualization.pv_insitu_pipelinearguments");
}
BDM_ASSIGN_CONFIG_VALUE(root_visualization, "visualization.root");
BDM_ASSIGN_CONFIG_VALUE(export_visualization, "visualization.export");
BDM_ASSIGN_CONFIG_VALUE(visualization_interval, "visualization.interval");
BDM_ASSIGN_CONFIG_VALUE(visualization_export_generate_pvsm,
"visualization.export_generate_pvsm");
BDM_ASSIGN_CONFIG_VALUE(visualization_compress_pv_files,
"visualization.compress_pv_files");
if ("paraview" == visualization_engine) {
BDM_ASSIGN_CONFIG_VALUE(visualization_export_generate_pvsm,
"visualization.export_generate_pvsm");
BDM_ASSIGN_CONFIG_VALUE(visualization_compress_pv_files,
"visualization.compress_pv_files");
}

// visualize_agents
// visualization parameters group (for agents)
auto visualize_agentstarr = config->get_table_array("visualize_agent");
if (visualize_agentstarr) {
for (const auto& table : *visualize_agentstarr) {
Expand Down Expand Up @@ -292,7 +300,7 @@ void Param::AssignFromConfig(const std::shared_ptr<cpptoml::table>& config) {
}
}

// visualize_diffusion
// visualization parameters group (for diffusion grid)
auto visualize_diffusiontarr = config->get_table_array("visualize_diffusion");
if (visualize_diffusiontarr) {
for (const auto& table : *visualize_diffusiontarr) {
Expand Down Expand Up @@ -335,7 +343,7 @@ void Param::AssignFromConfig(const std::shared_ptr<cpptoml::table>& config) {
}
}

// performance group
// performance parameters group
BDM_ASSIGN_CONFIG_VALUE(scheduling_batch_size,
"performance.scheduling_batch_size");
BDM_ASSIGN_CONFIG_VALUE(detect_static_agents,
Expand All @@ -350,19 +358,26 @@ void Param::AssignFromConfig(const std::shared_ptr<cpptoml::table>& config) {
"performance.mem_mgr_max_mem_per_thread_factor");
BDM_ASSIGN_CONFIG_VALUE(minimize_memory_while_rebalancing,
"performance.minimize_memory_while_rebalancing");

AssignMappedDataArrayMode(config, this);

// development group
// development parameters group
BDM_ASSIGN_CONFIG_VALUE(statistics, "development.statistics");
BDM_ASSIGN_CONFIG_VALUE(debug_numa, "development.debug_numa");
BDM_ASSIGN_CONFIG_VALUE(show_simulation_step,
"development.show_simulation_step");
BDM_ASSIGN_CONFIG_VALUE(use_progress_bar, "development.use_progress_bar");
if (use_progress_bar) {
BDM_ASSIGN_CONFIG_VALUE(progress_bar_time_unit,
"development.progress_bar_time_unit");
}

// experimental group
// experimental parameters group
BDM_ASSIGN_CONFIG_VALUE(compute_target, "experimental.compute_target");
BDM_ASSIGN_CONFIG_VALUE(opencl_debug, "experimental.opencl_debug");
BDM_ASSIGN_CONFIG_VALUE(preferred_gpu, "experimental.preferred_gpu");
BDM_ASSIGN_CONFIG_VALUE(plot_memory_layout,
"experimental.plot_memory_layout");
}

} // namespace bdm
Loading