chaos-polymtl · blaisb · Nov 2, 2024 · Nov 1, 2024 · Nov 1, 2024 · Nov 2, 2024
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to the Lethe project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## [Master] - 2024-11-02
+
+### Fix
+
+- MINOR The checkpoint files generated from the lethe-particles solver were now incompatible with the CFD-DEM solvers (lethe-fluid-particles and lethe-fluid-vans) since the prefix are now ending with a "_0" or "_1". The "read_dem" function now reads the ".checkpoint_controller" file at first.
+
 ## [Master] - 2024-10-31
 
 ### Changed

diff --git a/applications_tests/lethe-fluid-particles/CMakeLists.txt b/applications_tests/lethe-fluid-particles/CMakeLists.txt
diff --git a/...ions_tests/lethe-fluid-particles/adaptive_sparse_contacts_files/dem.checkpoint_controller b/...ions_tests/lethe-fluid-particles/adaptive_sparse_contacts_files/dem.checkpoint_controller
@@ -0,0 +1 @@
+0
diff --git a/...parse_contacts_files/dem.insertion_object → ...rse_contacts_files/dem_0.insertion_object b/...parse_contacts_files/dem.insertion_object → ...rse_contacts_files/dem_0.insertion_object
diff --git a/...ptive_sparse_contacts_files/dem.particles → ...ive_sparse_contacts_files/dem_0.particles b/...ptive_sparse_contacts_files/dem.particles → ...ive_sparse_contacts_files/dem_0.particles
diff --git a/...tive_sparse_contacts_files/dem.pvdhandler → ...ve_sparse_contacts_files/dem_0.pvdhandler b/...tive_sparse_contacts_files/dem.pvdhandler → ...ve_sparse_contacts_files/dem_0.pvdhandler
diff --git a/...arse_contacts_files/dem.simulationcontrol → ...se_contacts_files/dem_0.simulationcontrol b/...arse_contacts_files/dem.simulationcontrol → ...se_contacts_files/dem_0.simulationcontrol
diff --git a/...e_sparse_contacts_files/dem.triangulation → ...sparse_contacts_files/dem_0.triangulation b/...e_sparse_contacts_files/dem.triangulation → ...sparse_contacts_files/dem_0.triangulation
diff --git a/...rse_contacts_files/dem.triangulation.info → ...e_contacts_files/dem_0.triangulation.info b/...rse_contacts_files/dem.triangulation.info → ...e_contacts_files/dem_0.triangulation.info
diff --git a/...ntacts_files/dem.triangulation_fixed.data → ...acts_files/dem_0.triangulation_fixed.data b/...ntacts_files/dem.triangulation_fixed.data → ...acts_files/dem_0.triangulation_fixed.data
diff --git a/...cts_files/dem.triangulation_variable.data → ...s_files/dem_0.triangulation_variable.data b/...cts_files/dem.triangulation_variable.data → ...s_files/dem_0.triangulation_variable.data
diff --git a/...ations_tests/lethe-fluid-particles/conserve_phase_volumes_files/dem.checkpoint_controller b/...ations_tests/lethe-fluid-particles/conserve_phase_volumes_files/dem.checkpoint_controller
@@ -0,0 +1 @@
+0
diff --git a/...onserve_phase_volumes_files/dem.particles → ...serve_phase_volumes_files/dem_0.particles b/...onserve_phase_volumes_files/dem.particles → ...serve_phase_volumes_files/dem_0.particles
diff --git a/...nserve_phase_volumes_files/dem.pvdhandler → ...erve_phase_volumes_files/dem_0.pvdhandler b/...nserve_phase_volumes_files/dem.pvdhandler → ...erve_phase_volumes_files/dem_0.pvdhandler
diff --git a/...phase_volumes_files/dem.simulationcontrol → ...ase_volumes_files/dem_0.simulationcontrol b/...phase_volumes_files/dem.simulationcontrol → ...ase_volumes_files/dem_0.simulationcontrol
diff --git a/...rve_phase_volumes_files/dem.triangulation → ...e_phase_volumes_files/dem_0.triangulation b/...rve_phase_volumes_files/dem.triangulation → ...e_phase_volumes_files/dem_0.triangulation
diff --git a/...hase_volumes_files/dem.triangulation.info → ...se_volumes_files/dem_0.triangulation.info b/...hase_volumes_files/dem.triangulation.info → ...se_volumes_files/dem_0.triangulation.info
diff --git a/...olumes_files/dem.triangulation_fixed.data → ...umes_files/dem_0.triangulation_fixed.data b/...olumes_files/dem.triangulation_fixed.data → ...umes_files/dem_0.triangulation_fixed.data
diff --git a/...mes_files/dem.triangulation_variable.data → ...s_files/dem_0.triangulation_variable.data b/...mes_files/dem.triangulation_variable.data → ...s_files/dem_0.triangulation_variable.data
diff --git a/...ations_tests/lethe-fluid-particles/dynamic_contact_search_files/dem.checkpoint_controller b/...ations_tests/lethe-fluid-particles/dynamic_contact_search_files/dem.checkpoint_controller
@@ -0,0 +1 @@
+0
diff --git a/...contact_search_files/dem.insertion_object → ...ntact_search_files/dem_0.insertion_object b/...contact_search_files/dem.insertion_object → ...ntact_search_files/dem_0.insertion_object
diff --git a/...ynamic_contact_search_files/dem.particles → ...amic_contact_search_files/dem_0.particles b/...ynamic_contact_search_files/dem.particles → ...amic_contact_search_files/dem_0.particles
diff --git a/...namic_contact_search_files/dem.pvdhandler → ...mic_contact_search_files/dem_0.pvdhandler b/...namic_contact_search_files/dem.pvdhandler → ...mic_contact_search_files/dem_0.pvdhandler
diff --git a/...ontact_search_files/dem.simulationcontrol → ...tact_search_files/dem_0.simulationcontrol b/...ontact_search_files/dem.simulationcontrol → ...tact_search_files/dem_0.simulationcontrol
diff --git a/...ic_contact_search_files/dem.triangulation → ..._contact_search_files/dem_0.triangulation b/...ic_contact_search_files/dem.triangulation → ..._contact_search_files/dem_0.triangulation
diff --git a/...ntact_search_files/dem.triangulation.info → ...act_search_files/dem_0.triangulation.info b/...ntact_search_files/dem.triangulation.info → ...act_search_files/dem_0.triangulation.info
diff --git a/...search_files/dem.triangulation_fixed.data → ...arch_files/dem_0.triangulation_fixed.data b/...search_files/dem.triangulation_fixed.data → ...arch_files/dem_0.triangulation_fixed.data
diff --git a/...rch_files/dem.triangulation_variable.data → ...h_files/dem_0.triangulation_variable.data b/...rch_files/dem.triangulation_variable.data → ...h_files/dem_0.triangulation_variable.data
diff --git a/...ications_tests/lethe-fluid-particles/liquid_fluidized_bed_files/dem.checkpoint_controller b/...ications_tests/lethe-fluid-particles/liquid_fluidized_bed_files/dem.checkpoint_controller
@@ -0,0 +1 @@
+0
diff --git a/..._fluidized_bed_files/dem.insertion_object → ...luidized_bed_files/dem_0.insertion_object b/..._fluidized_bed_files/dem.insertion_object → ...luidized_bed_files/dem_0.insertion_object
diff --git a/.../liquid_fluidized_bed_files/dem.particles → ...iquid_fluidized_bed_files/dem_0.particles b/.../liquid_fluidized_bed_files/dem.particles → ...iquid_fluidized_bed_files/dem_0.particles
diff --git a/...liquid_fluidized_bed_files/dem.pvdhandler → ...quid_fluidized_bed_files/dem_0.pvdhandler b/...liquid_fluidized_bed_files/dem.pvdhandler → ...quid_fluidized_bed_files/dem_0.pvdhandler
diff --git a/...fluidized_bed_files/dem.simulationcontrol → ...uidized_bed_files/dem_0.simulationcontrol b/...fluidized_bed_files/dem.simulationcontrol → ...uidized_bed_files/dem_0.simulationcontrol
diff --git a/...uid_fluidized_bed_files/dem.triangulation → ...d_fluidized_bed_files/dem_0.triangulation b/...uid_fluidized_bed_files/dem.triangulation → ...d_fluidized_bed_files/dem_0.triangulation
diff --git a/...luidized_bed_files/dem.triangulation.info → ...idized_bed_files/dem_0.triangulation.info b/...luidized_bed_files/dem.triangulation.info → ...idized_bed_files/dem_0.triangulation.info
diff --git a/...ed_bed_files/dem.triangulation_fixed.data → ..._bed_files/dem_0.triangulation_fixed.data b/...ed_bed_files/dem.triangulation_fixed.data → ..._bed_files/dem_0.triangulation_fixed.data
diff --git a/...bed_files/dem.triangulation_variable.data → ...d_files/dem_0.triangulation_variable.data b/...bed_files/dem.triangulation_variable.data → ...d_files/dem_0.triangulation_variable.data
diff --git a/...ations_tests/lethe-fluid-particles/particle_sedimentation_files/dem.checkpoint_controller b/...ations_tests/lethe-fluid-particles/particle_sedimentation_files/dem.checkpoint_controller
@@ -0,0 +1 @@
+0
diff --git a/..._sedimentation_files/dem.insertion_object → ...edimentation_files/dem_0.insertion_object b/..._sedimentation_files/dem.insertion_object → ...edimentation_files/dem_0.insertion_object
diff --git a/...article_sedimentation_files/dem.particles → ...ticle_sedimentation_files/dem_0.particles b/...article_sedimentation_files/dem.particles → ...ticle_sedimentation_files/dem_0.particles
diff --git a/...rticle_sedimentation_files/dem.pvdhandler → ...icle_sedimentation_files/dem_0.pvdhandler b/...rticle_sedimentation_files/dem.pvdhandler → ...icle_sedimentation_files/dem_0.pvdhandler
diff --git a/...sedimentation_files/dem.simulationcontrol → ...dimentation_files/dem_0.simulationcontrol b/...sedimentation_files/dem.simulationcontrol → ...dimentation_files/dem_0.simulationcontrol
diff --git a/...cle_sedimentation_files/dem.triangulation → ...e_sedimentation_files/dem_0.triangulation b/...cle_sedimentation_files/dem.triangulation → ...e_sedimentation_files/dem_0.triangulation
diff --git a/...edimentation_files/dem.triangulation.info → ...imentation_files/dem_0.triangulation.info b/...edimentation_files/dem.triangulation.info → ...imentation_files/dem_0.triangulation.info
diff --git a/...tation_files/dem.triangulation_fixed.data → ...tion_files/dem_0.triangulation_fixed.data b/...tation_files/dem.triangulation_fixed.data → ...tion_files/dem_0.triangulation_fixed.data
diff --git a/...ion_files/dem.triangulation_variable.data → ...n_files/dem_0.triangulation_variable.data b/...ion_files/dem.triangulation_variable.data → ...n_files/dem_0.triangulation_variable.data
diff --git a/...ations_tests/lethe-fluid-particles/periodic_particles_qcm_files/dem.checkpoint_controller b/...ations_tests/lethe-fluid-particles/periodic_particles_qcm_files/dem.checkpoint_controller
@@ -0,0 +1 @@
+0
diff --git a/..._particles_qcm_files/dem.insertion_object → ...articles_qcm_files/dem_0.insertion_object b/..._particles_qcm_files/dem.insertion_object → ...articles_qcm_files/dem_0.insertion_object
diff --git a/...eriodic_particles_qcm_files/dem.particles → ...iodic_particles_qcm_files/dem_0.particles b/...eriodic_particles_qcm_files/dem.particles → ...iodic_particles_qcm_files/dem_0.particles
diff --git a/...riodic_particles_qcm_files/dem.pvdhandler → ...odic_particles_qcm_files/dem_0.pvdhandler b/...riodic_particles_qcm_files/dem.pvdhandler → ...odic_particles_qcm_files/dem_0.pvdhandler
diff --git a/...particles_qcm_files/dem.simulationcontrol → ...rticles_qcm_files/dem_0.simulationcontrol b/...particles_qcm_files/dem.simulationcontrol → ...rticles_qcm_files/dem_0.simulationcontrol
diff --git a/...dic_particles_qcm_files/dem.triangulation → ...c_particles_qcm_files/dem_0.triangulation b/...dic_particles_qcm_files/dem.triangulation → ...c_particles_qcm_files/dem_0.triangulation
diff --git a/...articles_qcm_files/dem.triangulation.info → ...ticles_qcm_files/dem_0.triangulation.info b/...articles_qcm_files/dem.triangulation.info → ...ticles_qcm_files/dem_0.triangulation.info
diff --git a/...es_qcm_files/dem.triangulation_fixed.data → ..._qcm_files/dem_0.triangulation_fixed.data b/...es_qcm_files/dem.triangulation_fixed.data → ..._qcm_files/dem_0.triangulation_fixed.data
diff --git a/...qcm_files/dem.triangulation_variable.data → ...m_files/dem_0.triangulation_variable.data b/...qcm_files/dem.triangulation_variable.data → ...m_files/dem_0.triangulation_variable.data
diff --git a/...ethe-fluid-particles/periodic_particles_qcm_opposite_flow_files/dem.checkpoint_controller b/...ethe-fluid-particles/periodic_particles_qcm_opposite_flow_files/dem.checkpoint_controller
@@ -0,0 +1 @@
+0
diff --git a/..._opposite_flow_files/dem.insertion_object → ...pposite_flow_files/dem_0.insertion_object b/..._opposite_flow_files/dem.insertion_object → ...pposite_flow_files/dem_0.insertion_object
diff --git a/...les_qcm_opposite_flow_files/dem.particles → ...s_qcm_opposite_flow_files/dem_0.particles b/...les_qcm_opposite_flow_files/dem.particles → ...s_qcm_opposite_flow_files/dem_0.particles
diff --git a/...es_qcm_opposite_flow_files/dem.pvdhandler → ..._qcm_opposite_flow_files/dem_0.pvdhandler b/...es_qcm_opposite_flow_files/dem.pvdhandler → ..._qcm_opposite_flow_files/dem_0.pvdhandler
diff --git a/...opposite_flow_files/dem.simulationcontrol → ...posite_flow_files/dem_0.simulationcontrol b/...opposite_flow_files/dem.simulationcontrol → ...posite_flow_files/dem_0.simulationcontrol
diff --git a/...qcm_opposite_flow_files/dem.triangulation → ...m_opposite_flow_files/dem_0.triangulation b/...qcm_opposite_flow_files/dem.triangulation → ...m_opposite_flow_files/dem_0.triangulation
diff --git a/...pposite_flow_files/dem.triangulation.info → ...osite_flow_files/dem_0.triangulation.info b/...pposite_flow_files/dem.triangulation.info → ...osite_flow_files/dem_0.triangulation.info
diff --git a/...e_flow_files/dem.triangulation_fixed.data → ...flow_files/dem_0.triangulation_fixed.data b/...e_flow_files/dem.triangulation_fixed.data → ...flow_files/dem_0.triangulation_fixed.data
diff --git a/...low_files/dem.triangulation_variable.data → ...w_files/dem_0.triangulation_variable.data b/...low_files/dem.triangulation_variable.data → ...w_files/dem_0.triangulation_variable.data
diff --git a/...ns_tests/lethe-fluid-particles/spouted_bed_load_balancing_files/dem.checkpoint_controller b/...ns_tests/lethe-fluid-particles/spouted_bed_load_balancing_files/dem.checkpoint_controller
@@ -0,0 +1 @@
+0
diff --git a/...load_balancing_files/dem.insertion_object → ...ad_balancing_files/dem_0.insertion_object b/...load_balancing_files/dem.insertion_object → ...ad_balancing_files/dem_0.insertion_object
diff --git a/...ed_bed_load_balancing_files/dem.particles → ..._bed_load_balancing_files/dem_0.particles b/...ed_bed_load_balancing_files/dem.particles → ..._bed_load_balancing_files/dem_0.particles
diff --git a/...d_bed_load_balancing_files/dem.pvdhandler → ...bed_load_balancing_files/dem_0.pvdhandler b/...d_bed_load_balancing_files/dem.pvdhandler → ...bed_load_balancing_files/dem_0.pvdhandler
diff --git a/...oad_balancing_files/dem.simulationcontrol → ...d_balancing_files/dem_0.simulationcontrol b/...oad_balancing_files/dem.simulationcontrol → ...d_balancing_files/dem_0.simulationcontrol
diff --git a/...ed_load_balancing_files/dem.triangulation → ..._load_balancing_files/dem_0.triangulation b/...ed_load_balancing_files/dem.triangulation → ..._load_balancing_files/dem_0.triangulation
diff --git a/...ad_balancing_files/dem.triangulation.info → ..._balancing_files/dem_0.triangulation.info b/...ad_balancing_files/dem.triangulation.info → ..._balancing_files/dem_0.triangulation.info
diff --git a/...ancing_files/dem.triangulation_fixed.data → ...cing_files/dem_0.triangulation_fixed.data b/...ancing_files/dem.triangulation_fixed.data → ...cing_files/dem_0.triangulation_fixed.data
diff --git a/...ing_files/dem.triangulation_variable.data → ...g_files/dem_0.triangulation_variable.data b/...ing_files/dem.triangulation_variable.data → ...g_files/dem_0.triangulation_variable.data
diff --git a/applications_tests/lethe-fluid-vans/CMakeLists.txt b/applications_tests/lethe-fluid-vans/CMakeLists.txt
diff --git a/applications_tests/lethe-fluid-vans/packed_bed_files/dem.checkpoint_controller b/applications_tests/lethe-fluid-vans/packed_bed_files/dem.checkpoint_controller
@@ -0,0 +1 @@
+0
diff --git a/...ans/packed_bed_files/dem.insertion_object → ...s/packed_bed_files/dem_0.insertion_object b/...ans/packed_bed_files/dem.insertion_object → ...s/packed_bed_files/dem_0.insertion_object
diff --git a/...fluid-vans/packed_bed_files/dem.particles → ...uid-vans/packed_bed_files/dem_0.particles b/...fluid-vans/packed_bed_files/dem.particles → ...uid-vans/packed_bed_files/dem_0.particles
diff --git a/...luid-vans/packed_bed_files/dem.pvdhandler → ...id-vans/packed_bed_files/dem_0.pvdhandler b/...luid-vans/packed_bed_files/dem.pvdhandler → ...id-vans/packed_bed_files/dem_0.pvdhandler
diff --git a/...ns/packed_bed_files/dem.simulationcontrol → .../packed_bed_files/dem_0.simulationcontrol b/...ns/packed_bed_files/dem.simulationcontrol → .../packed_bed_files/dem_0.simulationcontrol
diff --git a/...d-vans/packed_bed_files/dem.triangulation → ...vans/packed_bed_files/dem_0.triangulation b/...d-vans/packed_bed_files/dem.triangulation → ...vans/packed_bed_files/dem_0.triangulation
diff --git a/...s/packed_bed_files/dem.triangulation.info → ...packed_bed_files/dem_0.triangulation.info b/...s/packed_bed_files/dem.triangulation.info → ...packed_bed_files/dem_0.triangulation.info
diff --git a/...ed_bed_files/dem.triangulation_fixed.data → ..._bed_files/dem_0.triangulation_fixed.data b/...ed_bed_files/dem.triangulation_fixed.data → ..._bed_files/dem_0.triangulation_fixed.data
diff --git a/...bed_files/dem.triangulation_variable.data → ...d_files/dem_0.triangulation_variable.data b/...bed_files/dem.triangulation_variable.data → ...d_files/dem_0.triangulation_variable.data
diff --git a/source/fem-dem/cfd_dem_coupling.cc b/source/fem-dem/cfd_dem_coupling.cc
@@ -283,6 +283,20 @@ CFDDEMSolver<dim>::read_dem()
   std::string prefix =
     this->cfd_dem_simulation_parameters.void_fraction->dem_file_name;
 
+  // Load checkpoint controller
+  std::string checkpoint_controller_object_filename =
+    prefix + ".checkpoint_controller";
+  std::ifstream iss_checkpoint_controller_obj(
+    checkpoint_controller_object_filename);
+  boost::archive::text_iarchive ia_checkpoint_controller_obj(
+    iss_checkpoint_controller_obj, boost::archive::no_header);
+
+  unsigned int checkpoint_id;
+  ia_checkpoint_controller_obj >> checkpoint_id;
+
+  // New prefix for the remaining files
+  prefix = prefix + "_" + Utilities::int_to_string(checkpoint_id);
+
   // Gather particle serialization information
   std::string   particle_filename = prefix + ".particles";
   std::ifstream input(particle_filename.c_str());

diff --git a/source/fem-dem/fluid_dynamics_vans.cc b/source/fem-dem/fluid_dynamics_vans.cc
@@ -179,6 +179,20 @@ FluidDynamicsVANS<dim>::read_dem()
   std::string prefix =
     this->cfd_dem_simulation_parameters.void_fraction->dem_file_name;
 
+  // Load checkpoint controller
+  std::string checkpoint_controller_object_filename =
+    prefix + ".checkpoint_controller";
+  std::ifstream iss_checkpoint_controller_obj(
+    checkpoint_controller_object_filename);
+  boost::archive::text_iarchive ia_checkpoint_controller_obj(
+    iss_checkpoint_controller_obj, boost::archive::no_header);
+
+  unsigned int checkpoint_id;
+  ia_checkpoint_controller_obj >> checkpoint_id;
+
+  // New prefix for the remaining files
+  prefix = prefix + "_" + Utilities::int_to_string(checkpoint_id);
+
   // Gather particle serialization information
   std::string   particle_filename = prefix + ".particles";
   std::ifstream input(particle_filename.c_str());