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

fixup: remove duplicate heat transfer construction #164

Merged
merged 1 commit into from
Jan 3, 2025
Merged

fixup: remove duplicate heat transfer construction #164

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 2 additions & 10 deletions src/CabanaPD_Solver.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,15 +165,6 @@ class SolverElastic
typename force_model_type::thermal_type>::value )
force_model.update( particles->sliceTemperature() );

// Create heat transfer if needed.
if constexpr ( is_heat_transfer<
typename force_model_type::thermal_type>::value )
{
thermal_subcycle_steps = inputs["thermal_subcycle_steps"];
heat_transfer = std::make_shared<heat_transfer_type>(
inputs["half_neigh"], force->_neigh_list, force_model );
}

_neighbor_timer.start();
// This will either be PD or DEM forces.
force = std::make_shared<force_type>( inputs["half_neigh"], *particles,
Expand All @@ -185,7 +176,8 @@ class SolverElastic
unsigned long long total_neighbors;
force->getNeighborStatistics( max_neighbors, total_neighbors );

// Create heat transfer if needed.
// Create heat transfer if needed, using the same neighbor list as
// the mechanics.
if constexpr ( is_heat_transfer<
typename force_model_type::thermal_type>::value )
{
Expand Down
Loading