Remove gear3 integrator

chaos-polymtl · Aug 4, 2024 · 16202f6 · 16202f6
1 parent 75f686b
commit 16202f6
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 253 deletions.
diff --git a/include/core/parameters_lagrangian.h b/include/core/parameters_lagrangian.h
@@ -297,8 +297,7 @@ namespace Parameters
       enum class IntegrationMethod
       {
         velocity_verlet,
-        explicit_euler,
-        gear3
+        explicit_euler
       } integration_method;
 
       // Disable particle contacts to optimize performance

diff --git a/include/dem/gear3_integrator.h b/include/dem/gear3_integrator.h
diff --git a/source/core/parameters_lagrangian.cc b/source/core/parameters_lagrangian.cc
@@ -699,12 +699,11 @@ namespace Parameters
           "Choosing rolling resistance torque model"
           "Choices are <no_resistance|constant_resistance|viscous_resistance>.");
 
-        prm.declare_entry(
-          "integration method",
-          "velocity_verlet",
-          Patterns::Selection("velocity_verlet|explicit_euler|gear3"),
-          "Choosing integration method"
-          "Choices are <velocity_verlet|explicit_euler|gear3>.");
+        prm.declare_entry("integration method",
+                          "velocity_verlet",
+                          Patterns::Selection("velocity_verlet|explicit_euler"),
+                          "Choosing integration method"
+                          "Choices are <velocity_verlet|explicit_euler>.");
 
         prm.enter_subsection("adaptive sparse contacts");
         {
@@ -912,8 +911,6 @@ namespace Parameters
           integration_method = IntegrationMethod::velocity_verlet;
         else if (integration == "explicit_euler")
           integration_method = IntegrationMethod::explicit_euler;
-        else if (integration == "gear3")
-          integration_method = IntegrationMethod::gear3;
         else
           {
             throw(std::runtime_error("Invalid integration method "));

diff --git a/source/dem/CMakeLists.txt b/source/dem/CMakeLists.txt
@@ -12,7 +12,6 @@ add_library(lethe-dem
   find_cell_neighbors.cc
   find_contact_detection_step.cc
   force_chains_visualization.cc
-  gear3_integrator.cc
   grid_motion.cc
   input_parameter_inspection.cc
   insertion.cc
@@ -63,7 +62,6 @@ add_library(lethe-dem
   ../../include/dem/find_cell_neighbors.h
   ../../include/dem/find_contact_detection_step.h
   ../../include/dem/force_chains_visualization.h
-  ../../include/dem/gear3_integrator.h
   ../../include/dem/grid_motion.h
   ../../include/dem/input_parameter_inspection.h
   ../../include/dem/insertion.h

diff --git a/source/dem/dem.cc b/source/dem/dem.cc
@@ -6,7 +6,6 @@
 #include <dem/distributions.h>
 #include <dem/explicit_euler_integrator.h>
 #include <dem/find_contact_detection_step.h>
-#include <dem/gear3_integrator.h>
 #include <dem/input_parameter_inspection.h>
 #include <dem/insertion_file.h>
 #include <dem/insertion_list.h>
@@ -314,8 +313,6 @@ DEMSolver<dim>::set_integrator_type()
         return std::make_shared<VelocityVerletIntegrator<dim>>();
       case ModelParameters::IntegrationMethod::explicit_euler:
         return std::make_shared<ExplicitEulerIntegrator<dim>>();
-      case ModelParameters::IntegrationMethod::gear3:
-        return std::make_shared<Gear3Integrator<dim>>();
       default:
         throw(std::runtime_error("Invalid integration method."));
     }

diff --git a/source/dem/gear3_integrator.cc b/source/dem/gear3_integrator.cc
diff --git a/source/fem-dem/cfd_dem_coupling.cc b/source/fem-dem/cfd_dem_coupling.cc
@@ -2,7 +2,6 @@
 #include <core/solutions_output.h>
 
 #include <dem/explicit_euler_integrator.h>
-#include <dem/gear3_integrator.h>
 #include <dem/post_processing.h>
 #include <dem/set_particle_particle_contact_force_model.h>
 #include <dem/set_particle_wall_contact_force_model.h>
@@ -200,8 +199,6 @@ CFDDEMSolver<dim>::set_integrator_type()
         return std::make_shared<VelocityVerletIntegrator<dim>>();
       case ModelParameters::IntegrationMethod::explicit_euler:
         return std::make_shared<ExplicitEulerIntegrator<dim>>();
-      case ModelParameters::IntegrationMethod::gear3:
-        return std::make_shared<Gear3Integrator<dim>>();
       default:
         throw(std::runtime_error("Invalid integration method."));
     }