Skip to content

Commit

Permalink
Dem renamed restart application tests + parameter file generator (#1402)
Browse files Browse the repository at this point in the history
Description
While refactoring the DEM, I realized that many tests were using the prefix restart_ and other were using the suffix _restart, which is not coherent. Also, some test using restarts didn't have a parameter file generator and some generator weren't working correctly since the implementation of the double restart feature.

Solution
Some application tests were renamed following the restart_ prefix
All generator file were tested. Because of this, some file were renamed/modified and some results changed.
Missing generator files were created.

Co-authored-by: Bruno Blais <blais.bruno@gmail.com>
  • Loading branch information
OGaboriault and blaisb authored Jan 2, 2025
1 parent 885cdbc commit a31a90c
Show file tree
Hide file tree
Showing 63 changed files with 279 additions and 306 deletions.
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,17 @@
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-01-02

### Changed

- MINOR All lethe-particles tests that have a restart file now start with "restart_". This nomenclature change is made to ensure that restart tests are easier to identify. Furthermore, all restart file generators have been tested and missing generators have beem added. [#1402](https://github.com/chaos-polymtl/lethe/pull/1402)

## [Master] - 2024-01-01

### Changed

- MINOR All lethe-fluid-particles tests that have a restart file now start with "restart_". This nomenclature change is made to ensure that restart tests are easier to identify. Furthermore, all application_tests files now are seperated by underscores instead of a blend of hyphens and underscores. [#1400](https://github.com/chaos-polymtl/lethe/pull/14000)
- MINOR All lethe-fluid-particles tests that have a restart file now start with "restart_". This nomenclature change is made to ensure that restart tests are easier to identify. Furthermore, all application_tests files now are seperated by underscores instead of a blend of hyphens and underscores. [#1400](https://github.com/chaos-polymtl/lethe/pull/1400)

## [Master] - 2024-12-17

Expand Down
80 changes: 40 additions & 40 deletions applications_tests/lethe-particles/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,25 @@ set(TEST_TARGET lethe-particles)

string(TOLOWER ${CMAKE_BUILD_TYPE} _build_type)

file(COPY circle_restart_files/circle_restart.checkpoint_controller DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/circle_restart.${_build_type}/mpirun=1/")
file(COPY circle_restart_files/circle_restart_0.insertion_object DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/circle_restart.${_build_type}/mpirun=1/")
file(COPY circle_restart_files/circle_restart_0.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/circle_restart.${_build_type}/mpirun=1/")
file(COPY circle_restart_files/circle_restart_0.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/circle_restart.${_build_type}/mpirun=1/")
file(COPY circle_restart_files/circle_restart_0.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/circle_restart.${_build_type}/mpirun=1/")
file(COPY circle_restart_files/circle_restart_0.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/circle_restart.${_build_type}/mpirun=1/")
file(COPY circle_restart_files/circle_restart_0.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/circle_restart.${_build_type}/mpirun=1/")
file(COPY circle_restart_files/circle_restart_0.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/circle_restart.${_build_type}/mpirun=1/")
file(COPY circle_restart_files/circle_restart_0.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/circle_restart.${_build_type}/mpirun=1/")
file(COPY restart_circle_files/restart_circle.checkpoint_controller DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_circle.${_build_type}/mpirun=1/")
file(COPY restart_circle_files/restart_circle_0.insertion_object DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_circle.${_build_type}/mpirun=1/")
file(COPY restart_circle_files/restart_circle_0.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_circle.${_build_type}/mpirun=1/")
file(COPY restart_circle_files/restart_circle_0.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_circle.${_build_type}/mpirun=1/")
file(COPY restart_circle_files/restart_circle_0.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_circle.${_build_type}/mpirun=1/")
file(COPY restart_circle_files/restart_circle_0.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_circle.${_build_type}/mpirun=1/")
file(COPY restart_circle_files/restart_circle_0.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_circle.${_build_type}/mpirun=1/")
file(COPY restart_circle_files/restart_circle_0.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_circle.${_build_type}/mpirun=1/")
file(COPY restart_circle_files/restart_circle_0.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_circle.${_build_type}/mpirun=1/")

file(COPY sliding_restart_files/sliding_restart.checkpoint_controller DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/sliding_restart.${_build_type}/mpirun=1/")
file(COPY sliding_restart_files/sliding_restart_0.insertion_object DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/sliding_restart.${_build_type}/mpirun=1/")
file(COPY sliding_restart_files/sliding_restart_0.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/sliding_restart.${_build_type}/mpirun=1/")
file(COPY sliding_restart_files/sliding_restart_0.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/sliding_restart.${_build_type}/mpirun=1/")
file(COPY sliding_restart_files/sliding_restart_0.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/sliding_restart.${_build_type}/mpirun=1/")
file(COPY sliding_restart_files/sliding_restart_0.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/sliding_restart.${_build_type}/mpirun=1/")
file(COPY sliding_restart_files/sliding_restart_0.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/sliding_restart.${_build_type}/mpirun=1/")
file(COPY sliding_restart_files/sliding_restart_0.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/sliding_restart.${_build_type}/mpirun=1/")
file(COPY sliding_restart_files/sliding_restart_0.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/sliding_restart.${_build_type}/mpirun=1/")
file(COPY restart_sliding_files/restart_sliding.checkpoint_controller DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_sliding.${_build_type}/mpirun=1/")
file(COPY restart_sliding_files/restart_sliding_1.insertion_object DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_sliding.${_build_type}/mpirun=1/")
file(COPY restart_sliding_files/restart_sliding_1.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_sliding.${_build_type}/mpirun=1/")
file(COPY restart_sliding_files/restart_sliding_1.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_sliding.${_build_type}/mpirun=1/")
file(COPY restart_sliding_files/restart_sliding_1.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_sliding.${_build_type}/mpirun=1/")
file(COPY restart_sliding_files/restart_sliding_1.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_sliding.${_build_type}/mpirun=1/")
file(COPY restart_sliding_files/restart_sliding_1.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_sliding.${_build_type}/mpirun=1/")
file(COPY restart_sliding_files/restart_sliding_1.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_sliding.${_build_type}/mpirun=1/")
file(COPY restart_sliding_files/restart_sliding_1.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_sliding.${_build_type}/mpirun=1/")

file(COPY periodic_gmsh_files/pipe.msh DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/insert_periodic_boundary_gmsh.${_build_type}")
file(COPY load_balancing_solid_object_files/square.msh DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/load_balancing_solid_object.${_build_type}")
Expand All @@ -31,29 +31,29 @@ file(COPY moving_solid_surface_files/square.msh DESTINATION "${CMAKE_CURRENT_BIN
file(COPY insert_and_remove_with_files_files/particles_00.input DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/insert_and_remove_with_files.${_build_type}")
file(COPY insert_and_remove_with_files_files/particles_01.input DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/insert_and_remove_with_files.${_build_type}")

file(COPY moving_receptacle_files/restart.checkpoint_controller DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}/mpirun=1/")
file(COPY moving_receptacle_files/restart_0.insertion_object DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}/mpirun=1/")
file(COPY moving_receptacle_files/restart_0.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}/mpirun=1/")
file(COPY moving_receptacle_files/restart_0.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}/mpirun=1/")
file(COPY moving_receptacle_files/restart_0.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}/mpirun=1/")
file(COPY moving_receptacle_files/restart_0.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}/mpirun=1/")
file(COPY moving_receptacle_files/restart_0.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}/mpirun=1/")
file(COPY moving_receptacle_files/restart_0.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}/mpirun=1/")
file(COPY moving_receptacle_files/restart_0.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}/mpirun=1/")
file(COPY moving_receptacle_files/square.msh DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}/mpirun=1/")
file(COPY moving_receptacle_files/restart_0.solid_object.00.displacement DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}/mpirun=1/")
file(COPY moving_receptacle_files/restart_0.solid_object.00.dof DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}/mpirun=1/")
file(COPY moving_receptacle_files/restart_0.solid_object.00.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}/mpirun=1/")
file(COPY restart_moving_receptacle_files/restart.checkpoint_controller DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}/mpirun=1/")
file(COPY restart_moving_receptacle_files/restart_1.insertion_object DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}/mpirun=1/")
file(COPY restart_moving_receptacle_files/restart_1.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}/mpirun=1/")
file(COPY restart_moving_receptacle_files/restart_1.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}/mpirun=1/")
file(COPY restart_moving_receptacle_files/restart_1.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}/mpirun=1/")
file(COPY restart_moving_receptacle_files/restart_1.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}/mpirun=1/")
file(COPY restart_moving_receptacle_files/restart_1.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}/mpirun=1/")
file(COPY restart_moving_receptacle_files/restart_1.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}/mpirun=1/")
file(COPY restart_moving_receptacle_files/restart_1.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}/mpirun=1/")
file(COPY restart_moving_receptacle_files/square.msh DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}/mpirun=1/")
file(COPY restart_moving_receptacle_files/restart_1.solid_object.00.displacement DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}/mpirun=1/")
file(COPY restart_moving_receptacle_files/restart_1.solid_object.00.dof DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}/mpirun=1/")
file(COPY restart_moving_receptacle_files/restart_1.solid_object.00.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}/mpirun=1/")

file(COPY restart_file_insertion_files/insertion_file_restart.checkpoint_controller DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_file_insertion.${_build_type}/mpirun=1/")
file(COPY restart_file_insertion_files/insertion_file_restart_0.insertion_object DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_file_insertion.${_build_type}/mpirun=1/")
file(COPY restart_file_insertion_files/insertion_file_restart_0.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_file_insertion.${_build_type}/mpirun=1/")
file(COPY restart_file_insertion_files/insertion_file_restart_0.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_file_insertion.${_build_type}/mpirun=1/")
file(COPY restart_file_insertion_files/insertion_file_restart_0.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_file_insertion.${_build_type}/mpirun=1/")
file(COPY restart_file_insertion_files/insertion_file_restart_0.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_file_insertion.${_build_type}/mpirun=1/")
file(COPY restart_file_insertion_files/insertion_file_restart_0.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_file_insertion.${_build_type}/mpirun=1/")
file(COPY restart_file_insertion_files/insertion_file_restart_0.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_file_insertion.${_build_type}/mpirun=1/")
file(COPY restart_file_insertion_files/insertion_file_restart_0.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_file_insertion.${_build_type}/mpirun=1/")
file(COPY restart_file_insertion_files/restart_file_insertion.checkpoint_controller DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_file_insertion.${_build_type}/mpirun=1/")
file(COPY restart_file_insertion_files/restart_file_insertion_1.insertion_object DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_file_insertion.${_build_type}/mpirun=1/")
file(COPY restart_file_insertion_files/restart_file_insertion_1.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_file_insertion.${_build_type}/mpirun=1/")
file(COPY restart_file_insertion_files/restart_file_insertion_1.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_file_insertion.${_build_type}/mpirun=1/")
file(COPY restart_file_insertion_files/restart_file_insertion_1.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_file_insertion.${_build_type}/mpirun=1/")
file(COPY restart_file_insertion_files/restart_file_insertion_1.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_file_insertion.${_build_type}/mpirun=1/")
file(COPY restart_file_insertion_files/restart_file_insertion_1.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_file_insertion.${_build_type}/mpirun=1/")
file(COPY restart_file_insertion_files/restart_file_insertion_1.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_file_insertion.${_build_type}/mpirun=1/")
file(COPY restart_file_insertion_files/restart_file_insertion_1.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_file_insertion.${_build_type}/mpirun=1/")
file(COPY restart_file_insertion_files/particles_01.input DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_file_insertion.${_build_type}/mpirun=1/")

deal_ii_pickup_tests()
Expand Down

This file was deleted.

Binary file not shown.

This file was deleted.

This file was deleted.

Binary file not shown.
Loading

0 comments on commit a31a90c

Please sign in to comment.