update files in data + doc

Collab4exaNBody · Jun 28, 2024 · ac61c68 · ac61c68
1 parent 7a7a0e3
commit ac61c68
Show file tree

Hide file tree

Showing 12 changed files with 125 additions and 214 deletions.
diff --git a/data/config/config_classifier_sphere.msp b/data/config/config_classifier_sphere.msp
diff --git a/data/config/config_polyhedra.msp b/data/config/config_polyhedra.msp
@@ -16,15 +16,11 @@ trigger_move_particles:
   body:
     - vertex_displ_over
 
-#+dump_data_paraview:
-#  - write_paraview_polyhedra:
-#     basename: polyhedra
-
-
-
-+chunk_neighbors_impl:
+chunk_neighbors_impl:
+  - chunk_neighbors_contact
+  - unclassify_interactions
   - nbh_polyhedron
-  - update_mutexes
+  - classify_interactions
   - resize_particle_locks
 
 migrate_particles:
@@ -38,7 +34,9 @@ move_particles_extra_data: move_particles_interaction
 
 compute_new_vertices: polyhedra_compute_vertices
 
-compress_data: compress_interaction
+compress_data: 
+  - unclassify_interactions
+  - compress_interaction
 
 reorder_extra_data: nop
 
@@ -49,6 +47,7 @@ dump_data_particles:
       rebind: { mesg: filename }
       body:
         - message: { endl: true }
+  - unclassify_interactions
   - compress_interaction
   - stats_interactions
   - write_dump_particle_interaction

diff --git a/data/config/config_polyhedron_interaction.msp b/data/config/config_polyhedron_interaction.msp
diff --git a/data/config/config_sphere_interaction.msp b/data/config/config_sphere_interaction.msp
diff --git a/data/config/config_spheres.msp b/data/config/config_spheres.msp
@@ -1,23 +1,37 @@
-######### SPHERES mode ####################
+######### SPHERE mode ####################
 
-################## trigger stl mesh update ########################
+######## STL Mesh ##########################
 
 trigger_update_stl_mesh:
   condition: enable_stl_mesh AND trigger_load_balance
   body:
-    - build_grid_stl_mesh
+    - update_grid_stl_mesh
 
 update_stl_mesh: trigger_update_stl_mesh
 
-################# Move spheres ####################################
+######### Move Particles ###################
+
+chunk_neighbors_impl:
+  - chunk_neighbors_contact
+  - unclassify_interactions
+  - nbh_sphere:
+     symetric: true
+  - classify_interactions
+  - update_mutexes
+  - resize_particle_locks
+
 migrate_particles:
-    - migrate_cell_particles_friction
-    - rebuild_amr
-    - backup_r
+  - migrate_cell_particles_interaction
+  - rebuild_amr
+  - backup_r
+
+cost_model: dem_cost_model
 
-move_particles_extra_data: move_particles_friction
+move_particles_extra_data: move_particles_interaction
 
-reorder_extra_data: reorder_neighbor_friction
+compress_data: compress_interaction
+
+reorder_extra_data: nop
 
 dump_data_particles:
   - timestep_file: "exaDEM_%09d.dump"
@@ -26,6 +40,12 @@ dump_data_particles:
       rebind: { mesg: filename }
       body:
         - message: { endl: true }
-  - compact_neighbor_friction
-  - write_dump_particles
-  - reorder_neighbor_friction
+  - unclassify_interactions
+  - compress_interaction
+  - stats_interactions
+  - write_dump_particle_interaction
+  - chunk_neighbors_impl #redbuild interactions
+
+compress_data: 
+  - unclassify_interactions
+  - compress_interaction
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -26,7 +26,6 @@ add_subdirectory(friction)
 add_subdirectory(forcefield)
 add_subdirectory(io)
 add_subdirectory(driver)
-add_subdirectory(meshset)
 add_subdirectory(interaction)
 add_subdirectory(sphere)
 add_subdirectory(polyhedron)

diff --git a/src/driver/CMakeLists.txt b/src/driver/CMakeLists.txt
@@ -14,5 +14,5 @@
 # kind, either express or implied.  see the license for the
 # specific language governing permissions and limitations
 # under the license.
-set(exadem_driver_LINK_LIBRARIES exanbIO exanbDefBox exanbParticleNeighbors exadem_numerical_scheme exadem_friction exadem_force_field exadem_io exadem_mesh_set exadem_interaction)
+set(exadem_driver_LINK_LIBRARIES exanbIO exanbDefBox exanbParticleNeighbors exadem_numerical_scheme exadem_friction exadem_force_field exadem_io exadem_interaction)
 xstamp_add_plugin(exadem_driver ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/src/driver/add_stl_mesh.cpp b/src/driver/add_stl_mesh.cpp
@@ -30,7 +30,6 @@ under the License.
 #include <exaDEM/driver_base.h>
 #include <exaDEM/drivers.h>
 #include <exaDEM/driver_stl_mesh.h>
-#include <exaDEM/stl_mesh.h>
 #include <exaDEM/shape/shape.hpp>
 #include <exaDEM/stl_mesh_to_driver.h>
 

diff --git a/src/interaction/CMakeLists.txt b/src/interaction/CMakeLists.txt
@@ -14,5 +14,5 @@
 # kind, either express or implied.  see the license for the
 # specific language governing permissions and limitations
 # under the license.
-set(exadem_interaction_LINK_LIBRARIES exanbDefBox exanbCompute exanbIO exanbMPI exanbParticleNeighbors exanbGridCellParticles exanbExtraStorage exadem_driver exadem_mesh_set exadem_force_field exadem_grid)
+set(exadem_interaction_LINK_LIBRARIES exanbDefBox exanbCompute exanbIO exanbMPI exanbParticleNeighbors exanbGridCellParticles exanbExtraStorage exadem_driver exadem_force_field exadem_grid)
 xstamp_add_plugin(exadem_interaction ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/src/interaction/include/exaDEM/interaction/classifier.hpp b/src/interaction/include/exaDEM/interaction/classifier.hpp
@@ -165,7 +165,7 @@ namespace exaDEM
       Vec3d null = {0,0,0};
       auto& ces = ges.m_data; // Reference to cells containing interactions
                               // Iterate through each wave
-      for(int w = 0 ; w < types ; w++)i
+      for(int w = 0 ; w < types ; w++)
       {
         auto& wave = waves[w];
         const unsigned int n1 = wave.size();