From 22ddcd0be77686c16678bfcc4a55e55d7ce12f74 Mon Sep 17 00:00:00 2001 From: Sam Reeve <6740307+streeve@users.noreply.github.com> Date: Thu, 2 Jan 2025 16:43:14 -0500 Subject: [PATCH] fixup: remove duplicate heat transfer construction --- src/CabanaPD_Solver.hpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/CabanaPD_Solver.hpp b/src/CabanaPD_Solver.hpp index af642f53..b83f2ced 100644 --- a/src/CabanaPD_Solver.hpp +++ b/src/CabanaPD_Solver.hpp @@ -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( - inputs["half_neigh"], force->_neigh_list, force_model ); - } - _neighbor_timer.start(); // This will either be PD or DEM forces. force = std::make_shared( inputs["half_neigh"], *particles, @@ -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 ) {