Skip to content

Commit

Permalink
Dem volume insertion initial velocities (chaos-polymtl#1080)
Browse files Browse the repository at this point in the history
Follow-up to PR chaos-polymtl#1078 ...

Former-commit-id: 13e9dcb
  • Loading branch information
OGaboriault authored Mar 29, 2024
1 parent 5ec8f67 commit b017a0f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion include/core/parameters_lagrangian.h
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ namespace Parameters
Point<3> insertion_box_point_1, insertion_box_point_2;

// Insertion initial velocity conditions
Tensor<1, 3> initial_vel, initial_ang_vel;
Tensor<1, 3> initial_vel, initial_omega;

// Insertion distance threshold
double distance_threshold;
Expand Down
2 changes: 1 addition & 1 deletion source/core/parameters_lagrangian.cc
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ namespace Parameters
seed_for_insertion = prm.get_integer("insertion prn seed");

initial_vel = entry_string_to_tensor3(prm, "initial velocity");
initial_ang_vel =
initial_omega =
entry_string_to_tensor3(prm, "initial angular velocity");

// Read x, y and z lists
Expand Down
6 changes: 3 additions & 3 deletions source/dem/insertion.cc
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ Insertion<dim>::assign_particle_properties(
double vel_x = dem_parameters.insertion_info.initial_vel[0];
double vel_y = dem_parameters.insertion_info.initial_vel[1];
double vel_z = dem_parameters.insertion_info.initial_vel[2];
double omega_x = dem_parameters.insertion_info.initial_ang_vel[0];
double omega_y = dem_parameters.insertion_info.initial_ang_vel[1];
double omega_z = dem_parameters.insertion_info.initial_ang_vel[2];
double omega_x = dem_parameters.insertion_info.initial_omega[0];
double omega_y = dem_parameters.insertion_info.initial_omega[1];
double omega_z = dem_parameters.insertion_info.initial_omega[2];
double fem_force_x = 0.;
double fem_force_y = 0.;
double fem_force_z = 0.;
Expand Down

0 comments on commit b017a0f

Please sign in to comment.