Skip to content

Commit

Permalink
fixup: remove duplicate heat transfer construction
Browse files Browse the repository at this point in the history
  • Loading branch information
streeve committed Jan 2, 2025
1 parent 0b93148 commit 22ddcd0
Showing 1 changed file with 2 additions and 10 deletions.
12 changes: 2 additions & 10 deletions src/CabanaPD_Solver.hpp
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

0 comments on commit 22ddcd0

Please sign in to comment.