From c36b18abcc64a86bf2e46961f424024ae3052919 Mon Sep 17 00:00:00 2001 From: Bruno Blais Date: Sun, 28 Jan 2024 16:29:27 -0500 Subject: [PATCH 01/13] force mpirun core tests --- tests/core/CMakeLists.txt | 2 +- ... => shape_opencascade.with_opencascade=true.mpirun=1.output} | 0 tests/core/table_read.cc | 2 +- tests/core/{table_read.output => table_read.mpirun=1.output} | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename tests/core/{shape_opencascade.with_opencascade=true.output => shape_opencascade.with_opencascade=true.mpirun=1.output} (100%) rename tests/core/{table_read.output => table_read.mpirun=1.output} (100%) diff --git a/tests/core/CMakeLists.txt b/tests/core/CMakeLists.txt index 17367aea4c..43999f836a 100644 --- a/tests/core/CMakeLists.txt +++ b/tests/core/CMakeLists.txt @@ -2,6 +2,6 @@ set(TEST_LIBRARIES lethe-core) string(TOLOWER ${CMAKE_BUILD_TYPE} _build_type) file(COPY table_read_input.dat DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/table_read.${_build_type}") -file(COPY hex_extrusion_cad.step DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/shape_opencascade.${_build_type}") +file(COPY hex_extrusion_cad.step DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/shape_opencascade.${_build_type}/mpirun=1") deal_ii_pickup_tests() diff --git a/tests/core/shape_opencascade.with_opencascade=true.output b/tests/core/shape_opencascade.with_opencascade=true.mpirun=1.output similarity index 100% rename from tests/core/shape_opencascade.with_opencascade=true.output rename to tests/core/shape_opencascade.with_opencascade=true.mpirun=1.output diff --git a/tests/core/table_read.cc b/tests/core/table_read.cc index 28846f32a2..d28e7c81b9 100644 --- a/tests/core/table_read.cc +++ b/tests/core/table_read.cc @@ -45,7 +45,7 @@ void test() { - std::string table_file_name = "table_read_input.dat"; + std::string table_file_name = "../table_read_input.dat"; TableHandler table; fill_table_from_file(table, table_file_name); diff --git a/tests/core/table_read.output b/tests/core/table_read.mpirun=1.output similarity index 100% rename from tests/core/table_read.output rename to tests/core/table_read.mpirun=1.output From a4382e56ffb248acebeee21a67030c81e89ea588 Mon Sep 17 00:00:00 2001 From: Bruno Blais Date: Sun, 28 Jan 2024 16:41:17 -0500 Subject: [PATCH 02/13] Fix lethe-fluid by specifyign mpirun=1 --- applications_tests/lethe-fluid/CMakeLists.txt | 78 +++++++++---------- ..._average_velocity_restart.mpirun=1.output} | 0 ...d_heat_transfer_two_boxes.mpirun=1.output} | 0 .../conjuguated_heat_transfer_two_boxes.prm | 2 +- ...> cylinder-rigid-body_gls.mpirun=1.output} | 0 .../lethe-fluid/cylinder-rigid-body_gls.prm | 2 +- ...ls.output => cylinder_gls.mpirun=1.output} | 0 .../lethe-fluid/cylinder_gls.prm | 2 +- ...nt-conduction-restart_gls.mpirun=1.output} | 0 ...=> mms2d-unstructured_gls.mpirun=1.output} | 0 .../lethe-fluid/mms2d-unstructured_gls.prm | 2 +- ....output => poiseuille_gls.mpirun=1.output} | 0 .../lethe-fluid/poiseuille_gls.prm | 2 +- ...put => poiseuille_restart.mpirun=1.output} | 0 ...n-vortex-restart_gls_bdf1.mpirun=1.output} | 0 ...rcouette-unstructured_gls.mpirun=1.output} | 0 .../taylorcouette-unstructured_gls.prm | 2 +- 17 files changed, 45 insertions(+), 45 deletions(-) rename applications_tests/lethe-fluid/{cavity_ht_average_velocity_restart.output => cavity_ht_average_velocity_restart.mpirun=1.output} (100%) rename applications_tests/lethe-fluid/{conjuguated_heat_transfer_two_boxes.output => conjuguated_heat_transfer_two_boxes.mpirun=1.output} (100%) rename applications_tests/lethe-fluid/{cylinder-rigid-body_gls.output => cylinder-rigid-body_gls.mpirun=1.output} (100%) rename applications_tests/lethe-fluid/{cylinder_gls.output => cylinder_gls.mpirun=1.output} (100%) rename applications_tests/lethe-fluid/{mms-transient-conduction-restart_gls.output => mms-transient-conduction-restart_gls.mpirun=1.output} (100%) rename applications_tests/lethe-fluid/{mms2d-unstructured_gls.output => mms2d-unstructured_gls.mpirun=1.output} (100%) rename applications_tests/lethe-fluid/{poiseuille_gls.output => poiseuille_gls.mpirun=1.output} (100%) rename applications_tests/lethe-fluid/{poiseuille_restart.output => poiseuille_restart.mpirun=1.output} (100%) rename applications_tests/lethe-fluid/{taylor-green-vortex-restart_gls_bdf1.output => taylor-green-vortex-restart_gls_bdf1.mpirun=1.output} (100%) rename applications_tests/lethe-fluid/{taylorcouette-unstructured_gls.output => taylorcouette-unstructured_gls.mpirun=1.output} (100%) diff --git a/applications_tests/lethe-fluid/CMakeLists.txt b/applications_tests/lethe-fluid/CMakeLists.txt index 1b501d3d84..a1780c59c3 100644 --- a/applications_tests/lethe-fluid/CMakeLists.txt +++ b/applications_tests/lethe-fluid/CMakeLists.txt @@ -8,48 +8,48 @@ file(COPY cylinder_structured.msh DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") file(COPY taylorCouette.msh DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") file(COPY box.msh DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") -file(COPY cavity_ht_average_velocity_restart_files/restart.averagevelocities DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/cavity_ht_average_velocity_restart.${_build_type}") -file(COPY cavity_ht_average_velocity_restart_files/restart.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/cavity_ht_average_velocity_restart.${_build_type}") -file(COPY cavity_ht_average_velocity_restart_files/restart.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/cavity_ht_average_velocity_restart.${_build_type}") -file(COPY cavity_ht_average_velocity_restart_files/restart.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/cavity_ht_average_velocity_restart.${_build_type}") -file(COPY cavity_ht_average_velocity_restart_files/restart.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/cavity_ht_average_velocity_restart.${_build_type}") -file(COPY cavity_ht_average_velocity_restart_files/restart.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/cavity_ht_average_velocity_restart.${_build_type}") -file(COPY cavity_ht_average_velocity_restart_files/temperature_statistics.checkpoint DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/cavity_ht_average_velocity_restart.${_build_type}") - -file(COPY mms-transient-conduction-restart_files/restart.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/mms-transient-conduction-restart_gls.${_build_type}") -file(COPY mms-transient-conduction-restart_files/restart.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/mms-transient-conduction-restart_gls.${_build_type}") -file(COPY mms-transient-conduction-restart_files/restart.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/mms-transient-conduction-restart_gls.${_build_type}") -file(COPY mms-transient-conduction-restart_files/restart.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/mms-transient-conduction-restart_gls.${_build_type}") -file(COPY mms-transient-conduction-restart_files/restart.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/mms-transient-conduction-restart_gls.${_build_type}") -file(COPY mms-transient-conduction-restart_files/L2Error_FD.checkpoint DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/mms-transient-conduction-restart_gls.${_build_type}") -file(COPY mms-transient-conduction-restart_files/L2Error_HT.checkpoint DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/mms-transient-conduction-restart_gls.${_build_type}") - -file(COPY taylor-green-vortex-restart_gls_bdf1/restart.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/taylor-green-vortex-restart_gls_bdf1.${_build_type}") -file(COPY taylor-green-vortex-restart_gls_bdf1/restart.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/taylor-green-vortex-restart_gls_bdf1.${_build_type}") -file(COPY taylor-green-vortex-restart_gls_bdf1/restart.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/taylor-green-vortex-restart_gls_bdf1.${_build_type}") -file(COPY taylor-green-vortex-restart_gls_bdf1/restart.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/taylor-green-vortex-restart_gls_bdf1.${_build_type}") -file(COPY taylor-green-vortex-restart_gls_bdf1/restart.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/taylor-green-vortex-restart_gls_bdf1.${_build_type}") -file(COPY taylor-green-vortex-restart_gls_bdf1/enstrophy.checkpoint DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/taylor-green-vortex-restart_gls_bdf1.${_build_type}") -file(COPY taylor-green-vortex-restart_gls_bdf1/kinetic_energy.checkpoint DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/taylor-green-vortex-restart_gls_bdf1.${_build_type}") -file(COPY taylor-green-vortex-restart_gls_bdf1/L2Error_FD.checkpoint DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/taylor-green-vortex-restart_gls_bdf1.${_build_type}") +file(COPY cavity_ht_average_velocity_restart_files/restart.averagevelocities DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/cavity_ht_average_velocity_restart.${_build_type}/mpirun=1/") +file(COPY cavity_ht_average_velocity_restart_files/restart.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/cavity_ht_average_velocity_restart.${_build_type}/mpirun=1/") +file(COPY cavity_ht_average_velocity_restart_files/restart.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/cavity_ht_average_velocity_restart.${_build_type}/mpirun=1/") +file(COPY cavity_ht_average_velocity_restart_files/restart.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/cavity_ht_average_velocity_restart.${_build_type}/mpirun=1/") +file(COPY cavity_ht_average_velocity_restart_files/restart.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/cavity_ht_average_velocity_restart.${_build_type}/mpirun=1/") +file(COPY cavity_ht_average_velocity_restart_files/restart.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/cavity_ht_average_velocity_restart.${_build_type}/mpirun=1/") +file(COPY cavity_ht_average_velocity_restart_files/temperature_statistics.checkpoint DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/cavity_ht_average_velocity_restart.${_build_type}/mpirun=1/") + +file(COPY mms-transient-conduction-restart_files/restart.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/mms-transient-conduction-restart_gls.${_build_type}/mpirun=1/") +file(COPY mms-transient-conduction-restart_files/restart.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/mms-transient-conduction-restart_gls.${_build_type}/mpirun=1/") +file(COPY mms-transient-conduction-restart_files/restart.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/mms-transient-conduction-restart_gls.${_build_type}/mpirun=1/") +file(COPY mms-transient-conduction-restart_files/restart.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/mms-transient-conduction-restart_gls.${_build_type}/mpirun=1/") +file(COPY mms-transient-conduction-restart_files/restart.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/mms-transient-conduction-restart_gls.${_build_type}/mpirun=1/") +file(COPY mms-transient-conduction-restart_files/L2Error_FD.checkpoint DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/mms-transient-conduction-restart_gls.${_build_type}/mpirun=1/") +file(COPY mms-transient-conduction-restart_files/L2Error_HT.checkpoint DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/mms-transient-conduction-restart_gls.${_build_type}/mpirun=1/") + +file(COPY taylor-green-vortex-restart_gls_bdf1/restart.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/taylor-green-vortex-restart_gls_bdf1.${_build_type}/mpirun=1/") +file(COPY taylor-green-vortex-restart_gls_bdf1/restart.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/taylor-green-vortex-restart_gls_bdf1.${_build_type}/mpirun=1/") +file(COPY taylor-green-vortex-restart_gls_bdf1/restart.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/taylor-green-vortex-restart_gls_bdf1.${_build_type}/mpirun=1/") +file(COPY taylor-green-vortex-restart_gls_bdf1/restart.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/taylor-green-vortex-restart_gls_bdf1.${_build_type}/mpirun=1/") +file(COPY taylor-green-vortex-restart_gls_bdf1/restart.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/taylor-green-vortex-restart_gls_bdf1.${_build_type}/mpirun=1/") +file(COPY taylor-green-vortex-restart_gls_bdf1/enstrophy.checkpoint DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/taylor-green-vortex-restart_gls_bdf1.${_build_type}/mpirun=1/") +file(COPY taylor-green-vortex-restart_gls_bdf1/kinetic_energy.checkpoint DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/taylor-green-vortex-restart_gls_bdf1.${_build_type}/mpirun=1/") +file(COPY taylor-green-vortex-restart_gls_bdf1/L2Error_FD.checkpoint DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/taylor-green-vortex-restart_gls_bdf1.${_build_type}/mpirun=1/") file(COPY cylinder_unstructured.msh DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") -file(COPY poiseuille_restart_files/poiseuille_restart.averagevelocities DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/poiseuille_restart.${_build_type}") -file(COPY poiseuille_restart_files/poiseuille_restart.flowcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/poiseuille_restart.${_build_type}") -file(COPY poiseuille_restart_files/poiseuille_restart.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/poiseuille_restart.${_build_type}") -file(COPY poiseuille_restart_files/poiseuille_restart.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/poiseuille_restart.${_build_type}") -file(COPY poiseuille_restart_files/poiseuille_restart.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/poiseuille_restart.${_build_type}") -file(COPY poiseuille_restart_files/poiseuille_restart.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/poiseuille_restart.${_build_type}") -file(COPY poiseuille_restart_files/poiseuille_restart.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/poiseuille_restart.${_build_type}") -file(COPY poiseuille_restart_files/poiseuille_restart-output.0000.pvtu DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/poiseuille_restart.${_build_type}") -file(COPY poiseuille_restart_files/poiseuille_restart-output.0005.pvtu DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/poiseuille_restart.${_build_type}") -file(COPY poiseuille_restart_files/poiseuille_restart-output.0010.pvtu DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/poiseuille_restart.${_build_type}") -file(COPY poiseuille_restart_files/poiseuille_restart-output.0015.pvtu DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/poiseuille_restart.${_build_type}") -file(COPY poiseuille_restart_files/poiseuille_restart-output.0000.0000.vtu DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/poiseuille_restart.${_build_type}") -file(COPY poiseuille_restart_files/poiseuille_restart-output.0005.0000.vtu DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/poiseuille_restart.${_build_type}") -file(COPY poiseuille_restart_files/poiseuille_restart-output.0010.0000.vtu DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/poiseuille_restart.${_build_type}") -file(COPY poiseuille_restart_files/poiseuille_restart-output.0015.0000.vtu DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/poiseuille_restart.${_build_type}") +file(COPY poiseuille_restart_files/poiseuille_restart.averagevelocities DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/poiseuille_restart.${_build_type}/mpirun=1/") +file(COPY poiseuille_restart_files/poiseuille_restart.flowcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/poiseuille_restart.${_build_type}/mpirun=1/") +file(COPY poiseuille_restart_files/poiseuille_restart.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/poiseuille_restart.${_build_type}/mpirun=1/") +file(COPY poiseuille_restart_files/poiseuille_restart.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/poiseuille_restart.${_build_type}/mpirun=1/") +file(COPY poiseuille_restart_files/poiseuille_restart.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/poiseuille_restart.${_build_type}/mpirun=1/") +file(COPY poiseuille_restart_files/poiseuille_restart.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/poiseuille_restart.${_build_type}/mpirun=1/") +file(COPY poiseuille_restart_files/poiseuille_restart.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/poiseuille_restart.${_build_type}/mpirun=1/") +file(COPY poiseuille_restart_files/poiseuille_restart-output.0000.pvtu DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/poiseuille_restart.${_build_type}/mpirun=1/") +file(COPY poiseuille_restart_files/poiseuille_restart-output.0005.pvtu DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/poiseuille_restart.${_build_type}/mpirun=1/") +file(COPY poiseuille_restart_files/poiseuille_restart-output.0010.pvtu DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/poiseuille_restart.${_build_type}/mpirun=1/") +file(COPY poiseuille_restart_files/poiseuille_restart-output.0015.pvtu DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/poiseuille_restart.${_build_type}/mpirun=1/") +file(COPY poiseuille_restart_files/poiseuille_restart-output.0000.0000.vtu DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/poiseuille_restart.${_build_type}/mpirun=1/") +file(COPY poiseuille_restart_files/poiseuille_restart-output.0005.0000.vtu DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/poiseuille_restart.${_build_type}/mpirun=1/") +file(COPY poiseuille_restart_files/poiseuille_restart-output.0010.0000.vtu DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/poiseuille_restart.${_build_type}/mpirun=1/") +file(COPY poiseuille_restart_files/poiseuille_restart-output.0015.0000.vtu DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/poiseuille_restart.${_build_type}/mpirun=1/") deal_ii_pickup_tests() diff --git a/applications_tests/lethe-fluid/cavity_ht_average_velocity_restart.output b/applications_tests/lethe-fluid/cavity_ht_average_velocity_restart.mpirun=1.output similarity index 100% rename from applications_tests/lethe-fluid/cavity_ht_average_velocity_restart.output rename to applications_tests/lethe-fluid/cavity_ht_average_velocity_restart.mpirun=1.output diff --git a/applications_tests/lethe-fluid/conjuguated_heat_transfer_two_boxes.output b/applications_tests/lethe-fluid/conjuguated_heat_transfer_two_boxes.mpirun=1.output similarity index 100% rename from applications_tests/lethe-fluid/conjuguated_heat_transfer_two_boxes.output rename to applications_tests/lethe-fluid/conjuguated_heat_transfer_two_boxes.mpirun=1.output diff --git a/applications_tests/lethe-fluid/conjuguated_heat_transfer_two_boxes.prm b/applications_tests/lethe-fluid/conjuguated_heat_transfer_two_boxes.prm index 4b0df582f2..d469748d0a 100644 --- a/applications_tests/lethe-fluid/conjuguated_heat_transfer_two_boxes.prm +++ b/applications_tests/lethe-fluid/conjuguated_heat_transfer_two_boxes.prm @@ -39,7 +39,7 @@ end subsection mesh set type = gmsh - set file name = ../box.msh + set file name = ../../box.msh set simplex = true end diff --git a/applications_tests/lethe-fluid/cylinder-rigid-body_gls.output b/applications_tests/lethe-fluid/cylinder-rigid-body_gls.mpirun=1.output similarity index 100% rename from applications_tests/lethe-fluid/cylinder-rigid-body_gls.output rename to applications_tests/lethe-fluid/cylinder-rigid-body_gls.mpirun=1.output diff --git a/applications_tests/lethe-fluid/cylinder-rigid-body_gls.prm b/applications_tests/lethe-fluid/cylinder-rigid-body_gls.prm index a70b83d667..32aecd94a1 100644 --- a/applications_tests/lethe-fluid/cylinder-rigid-body_gls.prm +++ b/applications_tests/lethe-fluid/cylinder-rigid-body_gls.prm @@ -92,7 +92,7 @@ end subsection mesh set type = gmsh - set file name = ../cylinder_unstructured.msh + set file name = ../../cylinder_unstructured.msh set initial refinement = 0 end diff --git a/applications_tests/lethe-fluid/cylinder_gls.output b/applications_tests/lethe-fluid/cylinder_gls.mpirun=1.output similarity index 100% rename from applications_tests/lethe-fluid/cylinder_gls.output rename to applications_tests/lethe-fluid/cylinder_gls.mpirun=1.output diff --git a/applications_tests/lethe-fluid/cylinder_gls.prm b/applications_tests/lethe-fluid/cylinder_gls.prm index 1ad11ad954..d282e95dd4 100644 --- a/applications_tests/lethe-fluid/cylinder_gls.prm +++ b/applications_tests/lethe-fluid/cylinder_gls.prm @@ -80,7 +80,7 @@ end subsection mesh set type = gmsh - set file name = ../cylinder_structured.msh + set file name = ../../cylinder_structured.msh end #--------------------------------------------------- diff --git a/applications_tests/lethe-fluid/mms-transient-conduction-restart_gls.output b/applications_tests/lethe-fluid/mms-transient-conduction-restart_gls.mpirun=1.output similarity index 100% rename from applications_tests/lethe-fluid/mms-transient-conduction-restart_gls.output rename to applications_tests/lethe-fluid/mms-transient-conduction-restart_gls.mpirun=1.output diff --git a/applications_tests/lethe-fluid/mms2d-unstructured_gls.output b/applications_tests/lethe-fluid/mms2d-unstructured_gls.mpirun=1.output similarity index 100% rename from applications_tests/lethe-fluid/mms2d-unstructured_gls.output rename to applications_tests/lethe-fluid/mms2d-unstructured_gls.mpirun=1.output diff --git a/applications_tests/lethe-fluid/mms2d-unstructured_gls.prm b/applications_tests/lethe-fluid/mms2d-unstructured_gls.prm index a461c5839f..9b8d70f428 100644 --- a/applications_tests/lethe-fluid/mms2d-unstructured_gls.prm +++ b/applications_tests/lethe-fluid/mms2d-unstructured_gls.prm @@ -38,7 +38,7 @@ end subsection mesh set type = gmsh - set file name = ../square.msh + set file name = ../../square.msh end #--------------------------------------------------- diff --git a/applications_tests/lethe-fluid/poiseuille_gls.output b/applications_tests/lethe-fluid/poiseuille_gls.mpirun=1.output similarity index 100% rename from applications_tests/lethe-fluid/poiseuille_gls.output rename to applications_tests/lethe-fluid/poiseuille_gls.mpirun=1.output diff --git a/applications_tests/lethe-fluid/poiseuille_gls.prm b/applications_tests/lethe-fluid/poiseuille_gls.prm index b1b645fcde..cdec7de3d2 100644 --- a/applications_tests/lethe-fluid/poiseuille_gls.prm +++ b/applications_tests/lethe-fluid/poiseuille_gls.prm @@ -73,7 +73,7 @@ end subsection mesh set type = gmsh - set file name = ../2d_channel.msh + set file name = ../../2d_channel.msh end #--------------------------------------------------- diff --git a/applications_tests/lethe-fluid/poiseuille_restart.output b/applications_tests/lethe-fluid/poiseuille_restart.mpirun=1.output similarity index 100% rename from applications_tests/lethe-fluid/poiseuille_restart.output rename to applications_tests/lethe-fluid/poiseuille_restart.mpirun=1.output diff --git a/applications_tests/lethe-fluid/taylor-green-vortex-restart_gls_bdf1.output b/applications_tests/lethe-fluid/taylor-green-vortex-restart_gls_bdf1.mpirun=1.output similarity index 100% rename from applications_tests/lethe-fluid/taylor-green-vortex-restart_gls_bdf1.output rename to applications_tests/lethe-fluid/taylor-green-vortex-restart_gls_bdf1.mpirun=1.output diff --git a/applications_tests/lethe-fluid/taylorcouette-unstructured_gls.output b/applications_tests/lethe-fluid/taylorcouette-unstructured_gls.mpirun=1.output similarity index 100% rename from applications_tests/lethe-fluid/taylorcouette-unstructured_gls.output rename to applications_tests/lethe-fluid/taylorcouette-unstructured_gls.mpirun=1.output diff --git a/applications_tests/lethe-fluid/taylorcouette-unstructured_gls.prm b/applications_tests/lethe-fluid/taylorcouette-unstructured_gls.prm index d852e97b23..76132e9805 100644 --- a/applications_tests/lethe-fluid/taylorcouette-unstructured_gls.prm +++ b/applications_tests/lethe-fluid/taylorcouette-unstructured_gls.prm @@ -55,7 +55,7 @@ end subsection mesh set type = gmsh - set file name = ../taylorCouette.msh + set file name = ../../taylorCouette.msh set initial refinement = 0 end From b8c9b01ab31aa55474e2ea91e95cf7c10d6194aa Mon Sep 17 00:00:00 2001 From: Bruno Blais Date: Sun, 28 Jan 2024 16:44:48 -0500 Subject: [PATCH 03/13] Fix lethe-fluid-particles cases --- .../lethe-fluid-particles/CMakeLists.txt | 94 +++++++++---------- ...=> dynamic_contact_search.mpirun=1.output} | 0 ...t => liquid_fluidized_bed.mpirun=1.output} | 0 ...=> particle_sedimentation.mpirun=1.output} | 0 ...=> periodic_particles_qcm.mpirun=1.output} | 0 ...rt_particle_sedimentation.mpirun=1.output} | 0 6 files changed, 47 insertions(+), 47 deletions(-) rename applications_tests/lethe-fluid-particles/{dynamic_contact_search.output => dynamic_contact_search.mpirun=1.output} (100%) rename applications_tests/lethe-fluid-particles/{liquid_fluidized_bed.output => liquid_fluidized_bed.mpirun=1.output} (100%) rename applications_tests/lethe-fluid-particles/{particle_sedimentation.output => particle_sedimentation.mpirun=1.output} (100%) rename applications_tests/lethe-fluid-particles/{periodic_particles_qcm.output => periodic_particles_qcm.mpirun=1.output} (100%) rename applications_tests/lethe-fluid-particles/{restart_particle_sedimentation.output => restart_particle_sedimentation.mpirun=1.output} (100%) diff --git a/applications_tests/lethe-fluid-particles/CMakeLists.txt b/applications_tests/lethe-fluid-particles/CMakeLists.txt index 962fddb09a..2553bb0d3f 100644 --- a/applications_tests/lethe-fluid-particles/CMakeLists.txt +++ b/applications_tests/lethe-fluid-particles/CMakeLists.txt @@ -2,53 +2,53 @@ set(TEST_TARGET lethe-fluid-particles) string(TOLOWER ${CMAKE_BUILD_TYPE} _build_type) -file(COPY particle_sedimentation_files/dem.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/particle_sedimentation.${_build_type}") -file(COPY particle_sedimentation_files/dem.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/particle_sedimentation.${_build_type}") -file(COPY particle_sedimentation_files/dem.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/particle_sedimentation.${_build_type}") -file(COPY particle_sedimentation_files/dem.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/particle_sedimentation.${_build_type}") -file(COPY particle_sedimentation_files/dem.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/particle_sedimentation.${_build_type}") -file(COPY particle_sedimentation_files/dem.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/particle_sedimentation.${_build_type}") -file(COPY particle_sedimentation_files/dem.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/particle_sedimentation.${_build_type}") - -file(COPY restart_particle_sedimentation_files/dem.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_particle_sedimentation.${_build_type}") -file(COPY restart_particle_sedimentation_files/dem.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_particle_sedimentation.${_build_type}") -file(COPY restart_particle_sedimentation_files/dem.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_particle_sedimentation.${_build_type}") -file(COPY restart_particle_sedimentation_files/dem.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_particle_sedimentation.${_build_type}") -file(COPY restart_particle_sedimentation_files/dem.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_particle_sedimentation.${_build_type}") -file(COPY restart_particle_sedimentation_files/dem.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_particle_sedimentation.${_build_type}") -file(COPY restart_particle_sedimentation_files/dem.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_particle_sedimentation.${_build_type}") -file(COPY restart_particle_sedimentation_files/case.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_particle_sedimentation.${_build_type}") -file(COPY restart_particle_sedimentation_files/case.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_particle_sedimentation.${_build_type}") -file(COPY restart_particle_sedimentation_files/case_particles.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_particle_sedimentation.${_build_type}") -file(COPY restart_particle_sedimentation_files/case.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_particle_sedimentation.${_build_type}") -file(COPY restart_particle_sedimentation_files/case.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_particle_sedimentation.${_build_type}") -file(COPY restart_particle_sedimentation_files/case.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_particle_sedimentation.${_build_type}") -file(COPY restart_particle_sedimentation_files/case.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_particle_sedimentation.${_build_type}") -file(COPY restart_particle_sedimentation_files/case.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_particle_sedimentation.${_build_type}") - -file(COPY dynamic_contact_search_files/dem.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/dynamic_contact_search.${_build_type}") -file(COPY dynamic_contact_search_files/dem.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/dynamic_contact_search.${_build_type}") -file(COPY dynamic_contact_search_files/dem.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/dynamic_contact_search.${_build_type}") -file(COPY dynamic_contact_search_files/dem.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/dynamic_contact_search.${_build_type}") -file(COPY dynamic_contact_search_files/dem.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/dynamic_contact_search.${_build_type}") -file(COPY dynamic_contact_search_files/dem.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/dynamic_contact_search.${_build_type}") -file(COPY dynamic_contact_search_files/dem.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/dynamic_contact_search.${_build_type}") - -file(COPY liquid_fluidized_bed_files/dem.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/liquid_fluidized_bed.${_build_type}") -file(COPY liquid_fluidized_bed_files/dem.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/liquid_fluidized_bed.${_build_type}") -file(COPY liquid_fluidized_bed_files/dem.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/liquid_fluidized_bed.${_build_type}") -file(COPY liquid_fluidized_bed_files/dem.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/liquid_fluidized_bed.${_build_type}") -file(COPY liquid_fluidized_bed_files/dem.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/liquid_fluidized_bed.${_build_type}") -file(COPY liquid_fluidized_bed_files/dem.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/liquid_fluidized_bed.${_build_type}") -file(COPY liquid_fluidized_bed_files/dem.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/liquid_fluidized_bed.${_build_type}") - -file(COPY periodic_particles_qcm_files/dem.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/periodic_particles_qcm.${_build_type}") -file(COPY periodic_particles_qcm_files/dem.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/periodic_particles_qcm.${_build_type}") -file(COPY periodic_particles_qcm_files/dem.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/periodic_particles_qcm.${_build_type}") -file(COPY periodic_particles_qcm_files/dem.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/periodic_particles_qcm.${_build_type}") -file(COPY periodic_particles_qcm_files/dem.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/periodic_particles_qcm.${_build_type}") -file(COPY periodic_particles_qcm_files/dem.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/periodic_particles_qcm.${_build_type}") -file(COPY periodic_particles_qcm_files/dem.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/periodic_particles_qcm.${_build_type}") +file(COPY particle_sedimentation_files/dem.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/particle_sedimentation.${_build_type}/mpirun=1/") +file(COPY particle_sedimentation_files/dem.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/particle_sedimentation.${_build_type}/mpirun=1/") +file(COPY particle_sedimentation_files/dem.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/particle_sedimentation.${_build_type}/mpirun=1/") +file(COPY particle_sedimentation_files/dem.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/particle_sedimentation.${_build_type}/mpirun=1/") +file(COPY particle_sedimentation_files/dem.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/particle_sedimentation.${_build_type}/mpirun=1/") +file(COPY particle_sedimentation_files/dem.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/particle_sedimentation.${_build_type}/mpirun=1/") +file(COPY particle_sedimentation_files/dem.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/particle_sedimentation.${_build_type}/mpirun=1/") + +file(COPY restart_particle_sedimentation_files/dem.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_particle_sedimentation.${_build_type}/mpirun=1/") +file(COPY restart_particle_sedimentation_files/dem.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_particle_sedimentation.${_build_type}/mpirun=1/") +file(COPY restart_particle_sedimentation_files/dem.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_particle_sedimentation.${_build_type}/mpirun=1/") +file(COPY restart_particle_sedimentation_files/dem.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_particle_sedimentation.${_build_type}/mpirun=1/") +file(COPY restart_particle_sedimentation_files/dem.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_particle_sedimentation.${_build_type}/mpirun=1/") +file(COPY restart_particle_sedimentation_files/dem.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_particle_sedimentation.${_build_type}/mpirun=1/") +file(COPY restart_particle_sedimentation_files/dem.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_particle_sedimentation.${_build_type}/mpirun=1/") +file(COPY restart_particle_sedimentation_files/case.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_particle_sedimentation.${_build_type}/mpirun=1/") +file(COPY restart_particle_sedimentation_files/case.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_particle_sedimentation.${_build_type}/mpirun=1/") +file(COPY restart_particle_sedimentation_files/case_particles.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_particle_sedimentation.${_build_type}/mpirun=1/") +file(COPY restart_particle_sedimentation_files/case.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_particle_sedimentation.${_build_type}/mpirun=1/") +file(COPY restart_particle_sedimentation_files/case.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_particle_sedimentation.${_build_type}/mpirun=1/") +file(COPY restart_particle_sedimentation_files/case.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_particle_sedimentation.${_build_type}/mpirun=1/") +file(COPY restart_particle_sedimentation_files/case.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_particle_sedimentation.${_build_type}/mpirun=1/") +file(COPY restart_particle_sedimentation_files/case.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_particle_sedimentation.${_build_type}/mpirun=1/") + +file(COPY dynamic_contact_search_files/dem.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/dynamic_contact_search.${_build_type}/mpirun=1/") +file(COPY dynamic_contact_search_files/dem.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/dynamic_contact_search.${_build_type}/mpirun=1/") +file(COPY dynamic_contact_search_files/dem.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/dynamic_contact_search.${_build_type}/mpirun=1/") +file(COPY dynamic_contact_search_files/dem.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/dynamic_contact_search.${_build_type}/mpirun=1/") +file(COPY dynamic_contact_search_files/dem.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/dynamic_contact_search.${_build_type}/mpirun=1/") +file(COPY dynamic_contact_search_files/dem.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/dynamic_contact_search.${_build_type}/mpirun=1/") +file(COPY dynamic_contact_search_files/dem.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/dynamic_contact_search.${_build_type}/mpirun=1/") + +file(COPY liquid_fluidized_bed_files/dem.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/liquid_fluidized_bed.${_build_type}/mpirun=1/") +file(COPY liquid_fluidized_bed_files/dem.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/liquid_fluidized_bed.${_build_type}/mpirun=1/") +file(COPY liquid_fluidized_bed_files/dem.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/liquid_fluidized_bed.${_build_type}/mpirun=1/") +file(COPY liquid_fluidized_bed_files/dem.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/liquid_fluidized_bed.${_build_type}/mpirun=1/") +file(COPY liquid_fluidized_bed_files/dem.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/liquid_fluidized_bed.${_build_type}/mpirun=1/") +file(COPY liquid_fluidized_bed_files/dem.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/liquid_fluidized_bed.${_build_type}/mpirun=1/") +file(COPY liquid_fluidized_bed_files/dem.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/liquid_fluidized_bed.${_build_type}/mpirun=1/") + +file(COPY periodic_particles_qcm_files/dem.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/periodic_particles_qcm.${_build_type}/mpirun=1/") +file(COPY periodic_particles_qcm_files/dem.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/periodic_particles_qcm.${_build_type}/mpirun=1/") +file(COPY periodic_particles_qcm_files/dem.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/periodic_particles_qcm.${_build_type}/mpirun=1/") +file(COPY periodic_particles_qcm_files/dem.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/periodic_particles_qcm.${_build_type}/mpirun=1/") +file(COPY periodic_particles_qcm_files/dem.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/periodic_particles_qcm.${_build_type}/mpirun=1/") +file(COPY periodic_particles_qcm_files/dem.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/periodic_particles_qcm.${_build_type}/mpirun=1/") +file(COPY periodic_particles_qcm_files/dem.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/periodic_particles_qcm.${_build_type}/mpirun=1/") deal_ii_pickup_tests() diff --git a/applications_tests/lethe-fluid-particles/dynamic_contact_search.output b/applications_tests/lethe-fluid-particles/dynamic_contact_search.mpirun=1.output similarity index 100% rename from applications_tests/lethe-fluid-particles/dynamic_contact_search.output rename to applications_tests/lethe-fluid-particles/dynamic_contact_search.mpirun=1.output diff --git a/applications_tests/lethe-fluid-particles/liquid_fluidized_bed.output b/applications_tests/lethe-fluid-particles/liquid_fluidized_bed.mpirun=1.output similarity index 100% rename from applications_tests/lethe-fluid-particles/liquid_fluidized_bed.output rename to applications_tests/lethe-fluid-particles/liquid_fluidized_bed.mpirun=1.output diff --git a/applications_tests/lethe-fluid-particles/particle_sedimentation.output b/applications_tests/lethe-fluid-particles/particle_sedimentation.mpirun=1.output similarity index 100% rename from applications_tests/lethe-fluid-particles/particle_sedimentation.output rename to applications_tests/lethe-fluid-particles/particle_sedimentation.mpirun=1.output diff --git a/applications_tests/lethe-fluid-particles/periodic_particles_qcm.output b/applications_tests/lethe-fluid-particles/periodic_particles_qcm.mpirun=1.output similarity index 100% rename from applications_tests/lethe-fluid-particles/periodic_particles_qcm.output rename to applications_tests/lethe-fluid-particles/periodic_particles_qcm.mpirun=1.output diff --git a/applications_tests/lethe-fluid-particles/restart_particle_sedimentation.output b/applications_tests/lethe-fluid-particles/restart_particle_sedimentation.mpirun=1.output similarity index 100% rename from applications_tests/lethe-fluid-particles/restart_particle_sedimentation.output rename to applications_tests/lethe-fluid-particles/restart_particle_sedimentation.mpirun=1.output From cf72673422b3654d6a36f6d4157ee4c533110e0c Mon Sep 17 00:00:00 2001 From: Bruno Blais Date: Sun, 28 Jan 2024 16:52:31 -0500 Subject: [PATCH 04/13] Fix Lethe-particles --- .../lethe-particles/CMakeLists.txt | 68 +++++++++---------- ....output => circle_restart.mpirun=1.output} | 0 ...rt_periodic_boundary_gmsh.mpirun=1.output} | 0 ...at.output => moving_float.mpirun=1.output} | 0 ...restart_moving_receptacle.mpirun=1.output} | 0 ...output => sliding_restart.mpirun=1.output} | 0 6 files changed, 34 insertions(+), 34 deletions(-) rename applications_tests/lethe-particles/{circle_restart.output => circle_restart.mpirun=1.output} (100%) rename applications_tests/lethe-particles/{insert_periodic_boundary_gmsh.output => insert_periodic_boundary_gmsh.mpirun=1.output} (100%) rename applications_tests/lethe-particles/{moving_float.output => moving_float.mpirun=1.output} (100%) rename applications_tests/lethe-particles/{restart_moving_receptacle.output => restart_moving_receptacle.mpirun=1.output} (100%) rename applications_tests/lethe-particles/{sliding_restart.output => sliding_restart.mpirun=1.output} (100%) diff --git a/applications_tests/lethe-particles/CMakeLists.txt b/applications_tests/lethe-particles/CMakeLists.txt index 1260b13714..e5b8b04edd 100644 --- a/applications_tests/lethe-particles/CMakeLists.txt +++ b/applications_tests/lethe-particles/CMakeLists.txt @@ -2,40 +2,40 @@ set(TEST_TARGET lethe-particles) string(TOLOWER ${CMAKE_BUILD_TYPE} _build_type) -file(COPY circle_restart_files/circle_restart.insertion_object DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/circle_restart.${_build_type}") -file(COPY circle_restart_files/circle_restart.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/circle_restart.${_build_type}") -file(COPY circle_restart_files/circle_restart.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/circle_restart.${_build_type}") -file(COPY circle_restart_files/circle_restart.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/circle_restart.${_build_type}") -file(COPY circle_restart_files/circle_restart.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/circle_restart.${_build_type}") -file(COPY circle_restart_files/circle_restart.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/circle_restart.${_build_type}") -file(COPY circle_restart_files/circle_restart.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/circle_restart.${_build_type}") -file(COPY circle_restart_files/circle_restart.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/circle_restart.${_build_type}") - -file(COPY sliding_restart_files/sliding_restart.insertion_object DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/sliding_restart.${_build_type}") -file(COPY sliding_restart_files/sliding_restart.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/sliding_restart.${_build_type}") -file(COPY sliding_restart_files/sliding_restart.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/sliding_restart.${_build_type}") -file(COPY sliding_restart_files/sliding_restart.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/sliding_restart.${_build_type}") -file(COPY sliding_restart_files/sliding_restart.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/sliding_restart.${_build_type}") -file(COPY sliding_restart_files/sliding_restart.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/sliding_restart.${_build_type}") -file(COPY sliding_restart_files/sliding_restart.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/sliding_restart.${_build_type}") -file(COPY sliding_restart_files/sliding_restart.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/sliding_restart.${_build_type}") - -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}") -file(COPY moving_float_files/square.msh DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/moving_float.${_build_type}") - -file(COPY moving_receptacle_files/restart.insertion_object DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}") -file(COPY moving_receptacle_files/restart.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}") -file(COPY moving_receptacle_files/restart.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}") -file(COPY moving_receptacle_files/restart.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}") -file(COPY moving_receptacle_files/restart.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}") -file(COPY moving_receptacle_files/restart.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}") -file(COPY moving_receptacle_files/restart.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}") -file(COPY moving_receptacle_files/restart.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}") -file(COPY moving_receptacle_files/square.msh DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}") -file(COPY moving_receptacle_files/restart.solid_object.00.displacement DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}") -file(COPY moving_receptacle_files/restart.solid_object.00.dof DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}") -file(COPY moving_receptacle_files/restart.solid_object.00.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}") +file(COPY circle_restart_files/circle_restart.insertion_object DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/circle_restart.${_build_type}/mpirun=1/") +file(COPY circle_restart_files/circle_restart.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/circle_restart.${_build_type}/mpirun=1/") +file(COPY circle_restart_files/circle_restart.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/circle_restart.${_build_type}/mpirun=1/") +file(COPY circle_restart_files/circle_restart.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/circle_restart.${_build_type}/mpirun=1/") +file(COPY circle_restart_files/circle_restart.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/circle_restart.${_build_type}/mpirun=1/") +file(COPY circle_restart_files/circle_restart.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/circle_restart.${_build_type}/mpirun=1/") +file(COPY circle_restart_files/circle_restart.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/circle_restart.${_build_type}/mpirun=1/") +file(COPY circle_restart_files/circle_restart.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/circle_restart.${_build_type}/mpirun=1/") + +file(COPY sliding_restart_files/sliding_restart.insertion_object DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/sliding_restart.${_build_type}/mpirun=1/") +file(COPY sliding_restart_files/sliding_restart.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/sliding_restart.${_build_type}/mpirun=1/") +file(COPY sliding_restart_files/sliding_restart.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/sliding_restart.${_build_type}/mpirun=1/") +file(COPY sliding_restart_files/sliding_restart.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/sliding_restart.${_build_type}/mpirun=1/") +file(COPY sliding_restart_files/sliding_restart.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/sliding_restart.${_build_type}/mpirun=1/") +file(COPY sliding_restart_files/sliding_restart.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/sliding_restart.${_build_type}/mpirun=1/") +file(COPY sliding_restart_files/sliding_restart.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/sliding_restart.${_build_type}/mpirun=1/") +file(COPY sliding_restart_files/sliding_restart.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/sliding_restart.${_build_type}/mpirun=1/") + +file(COPY periodic_gmsh_files/pipe.msh DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/insert_periodic_boundary_gmsh.${_build_type}/mpirun=1/") +file(COPY load_balancing_solid_object_files/square.msh DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/load_balancing_solid_object.${_build_type}/mpirun=1/") +file(COPY moving_float_files/square.msh DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/moving_float.${_build_type}/mpirun=1/") + +file(COPY moving_receptacle_files/restart.insertion_object DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}/mpirun=1/") +file(COPY moving_receptacle_files/restart.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}/mpirun=1/") +file(COPY moving_receptacle_files/restart.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}/mpirun=1/") +file(COPY moving_receptacle_files/restart.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}/mpirun=1/") +file(COPY moving_receptacle_files/restart.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}/mpirun=1/") +file(COPY moving_receptacle_files/restart.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}/mpirun=1/") +file(COPY moving_receptacle_files/restart.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}/mpirun=1/") +file(COPY moving_receptacle_files/restart.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.solid_object.00.displacement DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}/mpirun=1/") +file(COPY moving_receptacle_files/restart.solid_object.00.dof DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}/mpirun=1/") +file(COPY moving_receptacle_files/restart.solid_object.00.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}/mpirun=1/") deal_ii_pickup_tests() diff --git a/applications_tests/lethe-particles/circle_restart.output b/applications_tests/lethe-particles/circle_restart.mpirun=1.output similarity index 100% rename from applications_tests/lethe-particles/circle_restart.output rename to applications_tests/lethe-particles/circle_restart.mpirun=1.output diff --git a/applications_tests/lethe-particles/insert_periodic_boundary_gmsh.output b/applications_tests/lethe-particles/insert_periodic_boundary_gmsh.mpirun=1.output similarity index 100% rename from applications_tests/lethe-particles/insert_periodic_boundary_gmsh.output rename to applications_tests/lethe-particles/insert_periodic_boundary_gmsh.mpirun=1.output diff --git a/applications_tests/lethe-particles/moving_float.output b/applications_tests/lethe-particles/moving_float.mpirun=1.output similarity index 100% rename from applications_tests/lethe-particles/moving_float.output rename to applications_tests/lethe-particles/moving_float.mpirun=1.output diff --git a/applications_tests/lethe-particles/restart_moving_receptacle.output b/applications_tests/lethe-particles/restart_moving_receptacle.mpirun=1.output similarity index 100% rename from applications_tests/lethe-particles/restart_moving_receptacle.output rename to applications_tests/lethe-particles/restart_moving_receptacle.mpirun=1.output diff --git a/applications_tests/lethe-particles/sliding_restart.output b/applications_tests/lethe-particles/sliding_restart.mpirun=1.output similarity index 100% rename from applications_tests/lethe-particles/sliding_restart.output rename to applications_tests/lethe-particles/sliding_restart.mpirun=1.output From cc2a9a41369a8a81d9f26a0173b092359c694886 Mon Sep 17 00:00:00 2001 From: Bruno Blais Date: Sun, 28 Jan 2024 16:53:31 -0500 Subject: [PATCH 05/13] Fix fluid-block solver --- applications_tests/lethe-fluid-block/cylinder_carreau_gd.prm | 2 +- applications_tests/lethe-fluid-block/mms2d-unstructured_gd.prm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/applications_tests/lethe-fluid-block/cylinder_carreau_gd.prm b/applications_tests/lethe-fluid-block/cylinder_carreau_gd.prm index d3cd76fda4..30a11bfe80 100644 --- a/applications_tests/lethe-fluid-block/cylinder_carreau_gd.prm +++ b/applications_tests/lethe-fluid-block/cylinder_carreau_gd.prm @@ -83,7 +83,7 @@ end subsection mesh set type = gmsh - set file name = ../cylinder_structured.msh + set file name = ../../cylinder_structured.msh end #--------------------------------------------------- diff --git a/applications_tests/lethe-fluid-block/mms2d-unstructured_gd.prm b/applications_tests/lethe-fluid-block/mms2d-unstructured_gd.prm index 6957d4b819..25ed131d59 100644 --- a/applications_tests/lethe-fluid-block/mms2d-unstructured_gd.prm +++ b/applications_tests/lethe-fluid-block/mms2d-unstructured_gd.prm @@ -53,7 +53,7 @@ end subsection mesh set type = gmsh - set file name = ../square.msh + set file name = ../../square.msh end #--------------------------------------------------- From e267c5d6dc7318a345c2052b6effe58b4988bef1 Mon Sep 17 00:00:00 2001 From: Bruno Blais Date: Sun, 28 Jan 2024 16:56:19 -0500 Subject: [PATCH 06/13] Fix lethe-fluid-particles --- .../lethe-fluid-vans/CMakeLists.txt | 126 +++++++++--------- ...ut => beetstra_packed_bed.mpirun=1.output} | 0 ... => dallavalle_packed_bed.mpirun=1.output} | 0 ...ut => difelice_packed_bed.mpirun=1.output} | 0 ...ut => gidaspow_packed_bed.mpirun=1.output} | 0 ...ut => kochhill_packed_bed.mpirun=1.output} | 0 ....output => pcm_packed_bed.mpirun=1.output} | 0 ....output => qcm_packed_bed.mpirun=1.output} | 0 ...output => rong_packed_bed.mpirun=1.output} | 0 ....output => spm_packed_bed.mpirun=1.output} | 0 10 files changed, 63 insertions(+), 63 deletions(-) rename applications_tests/lethe-fluid-vans/{beetstra_packed_bed.output => beetstra_packed_bed.mpirun=1.output} (100%) rename applications_tests/lethe-fluid-vans/{dallavalle_packed_bed.output => dallavalle_packed_bed.mpirun=1.output} (100%) rename applications_tests/lethe-fluid-vans/{difelice_packed_bed.output => difelice_packed_bed.mpirun=1.output} (100%) rename applications_tests/lethe-fluid-vans/{gidaspow_packed_bed.output => gidaspow_packed_bed.mpirun=1.output} (100%) rename applications_tests/lethe-fluid-vans/{kochhill_packed_bed.output => kochhill_packed_bed.mpirun=1.output} (100%) rename applications_tests/lethe-fluid-vans/{pcm_packed_bed.output => pcm_packed_bed.mpirun=1.output} (100%) rename applications_tests/lethe-fluid-vans/{qcm_packed_bed.output => qcm_packed_bed.mpirun=1.output} (100%) rename applications_tests/lethe-fluid-vans/{rong_packed_bed.output => rong_packed_bed.mpirun=1.output} (100%) rename applications_tests/lethe-fluid-vans/{spm_packed_bed.output => spm_packed_bed.mpirun=1.output} (100%) diff --git a/applications_tests/lethe-fluid-vans/CMakeLists.txt b/applications_tests/lethe-fluid-vans/CMakeLists.txt index 690b062e5a..ee4c1a0858 100644 --- a/applications_tests/lethe-fluid-vans/CMakeLists.txt +++ b/applications_tests/lethe-fluid-vans/CMakeLists.txt @@ -2,77 +2,77 @@ set(TEST_TARGET lethe-fluid-vans) string(TOLOWER ${CMAKE_BUILD_TYPE} _build_type) -file(COPY pcm_packed_bed_files/dem.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/pcm_packed_bed.${_build_type}") -file(COPY pcm_packed_bed_files/dem.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/pcm_packed_bed.${_build_type}") -file(COPY pcm_packed_bed_files/dem.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/pcm_packed_bed.${_build_type}") -file(COPY pcm_packed_bed_files/dem.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/pcm_packed_bed.${_build_type}") -file(COPY pcm_packed_bed_files/dem.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/pcm_packed_bed.${_build_type}") -file(COPY pcm_packed_bed_files/dem.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/pcm_packed_bed.${_build_type}") -file(COPY pcm_packed_bed_files/dem.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/pcm_packed_bed.${_build_type}") +file(COPY pcm_packed_bed_files/dem.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/pcm_packed_bed.${_build_type}/mpirun=1/") +file(COPY pcm_packed_bed_files/dem.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/pcm_packed_bed.${_build_type}/mpirun=1/") +file(COPY pcm_packed_bed_files/dem.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/pcm_packed_bed.${_build_type}/mpirun=1/") +file(COPY pcm_packed_bed_files/dem.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/pcm_packed_bed.${_build_type}/mpirun=1/") +file(COPY pcm_packed_bed_files/dem.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/pcm_packed_bed.${_build_type}/mpirun=1/") +file(COPY pcm_packed_bed_files/dem.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/pcm_packed_bed.${_build_type}/mpirun=1/") +file(COPY pcm_packed_bed_files/dem.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/pcm_packed_bed.${_build_type}/mpirun=1/") -file(COPY spm_packed_bed_files/dem.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/spm_packed_bed.${_build_type}") -file(COPY spm_packed_bed_files/dem.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/spm_packed_bed.${_build_type}") -file(COPY spm_packed_bed_files/dem.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/spm_packed_bed.${_build_type}") -file(COPY spm_packed_bed_files/dem.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/spm_packed_bed.${_build_type}") -file(COPY spm_packed_bed_files/dem.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/spm_packed_bed.${_build_type}") -file(COPY spm_packed_bed_files/dem.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/spm_packed_bed.${_build_type}") -file(COPY spm_packed_bed_files/dem.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/spm_packed_bed.${_build_type}") +file(COPY spm_packed_bed_files/dem.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/spm_packed_bed.${_build_type}/mpirun=1/") +file(COPY spm_packed_bed_files/dem.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/spm_packed_bed.${_build_type}/mpirun=1/") +file(COPY spm_packed_bed_files/dem.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/spm_packed_bed.${_build_type}/mpirun=1/") +file(COPY spm_packed_bed_files/dem.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/spm_packed_bed.${_build_type}/mpirun=1/") +file(COPY spm_packed_bed_files/dem.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/spm_packed_bed.${_build_type}/mpirun=1/") +file(COPY spm_packed_bed_files/dem.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/spm_packed_bed.${_build_type}/mpirun=1/") +file(COPY spm_packed_bed_files/dem.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/spm_packed_bed.${_build_type}/mpirun=1/") -file(COPY qcm_packed_bed_files/dem.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/qcm_packed_bed.${_build_type}") -file(COPY qcm_packed_bed_files/dem.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/qcm_packed_bed.${_build_type}") -file(COPY qcm_packed_bed_files/dem.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/qcm_packed_bed.${_build_type}") -file(COPY qcm_packed_bed_files/dem.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/qcm_packed_bed.${_build_type}") -file(COPY qcm_packed_bed_files/dem.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/qcm_packed_bed.${_build_type}") -file(COPY qcm_packed_bed_files/dem.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/qcm_packed_bed.${_build_type}") -file(COPY qcm_packed_bed_files/dem.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/qcm_packed_bed.${_build_type}") +file(COPY qcm_packed_bed_files/dem.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/qcm_packed_bed.${_build_type}/mpirun=1/") +file(COPY qcm_packed_bed_files/dem.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/qcm_packed_bed.${_build_type}/mpirun=1/") +file(COPY qcm_packed_bed_files/dem.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/qcm_packed_bed.${_build_type}/mpirun=1/") +file(COPY qcm_packed_bed_files/dem.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/qcm_packed_bed.${_build_type}/mpirun=1/") +file(COPY qcm_packed_bed_files/dem.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/qcm_packed_bed.${_build_type}/mpirun=1/") +file(COPY qcm_packed_bed_files/dem.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/qcm_packed_bed.${_build_type}/mpirun=1/") +file(COPY qcm_packed_bed_files/dem.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/qcm_packed_bed.${_build_type}/mpirun=1/") -file(COPY difelice_packed_bed_files/dem.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/difelice_packed_bed.${_build_type}") -file(COPY difelice_packed_bed_files/dem.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/difelice_packed_bed.${_build_type}") -file(COPY difelice_packed_bed_files/dem.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/difelice_packed_bed.${_build_type}") -file(COPY difelice_packed_bed_files/dem.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/difelice_packed_bed.${_build_type}") -file(COPY difelice_packed_bed_files/dem.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/difelice_packed_bed.${_build_type}") -file(COPY difelice_packed_bed_files/dem.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/difelice_packed_bed.${_build_type}") -file(COPY difelice_packed_bed_files/dem.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/difelice_packed_bed.${_build_type}") +file(COPY difelice_packed_bed_files/dem.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/difelice_packed_bed.${_build_type}/mpirun=1/") +file(COPY difelice_packed_bed_files/dem.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/difelice_packed_bed.${_build_type}/mpirun=1/") +file(COPY difelice_packed_bed_files/dem.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/difelice_packed_bed.${_build_type}/mpirun=1/") +file(COPY difelice_packed_bed_files/dem.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/difelice_packed_bed.${_build_type}/mpirun=1/") +file(COPY difelice_packed_bed_files/dem.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/difelice_packed_bed.${_build_type}/mpirun=1/") +file(COPY difelice_packed_bed_files/dem.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/difelice_packed_bed.${_build_type}/mpirun=1/") +file(COPY difelice_packed_bed_files/dem.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/difelice_packed_bed.${_build_type}/mpirun=1/") -file(COPY rong_packed_bed_files/dem.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/rong_packed_bed.${_build_type}") -file(COPY rong_packed_bed_files/dem.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/rong_packed_bed.${_build_type}") -file(COPY rong_packed_bed_files/dem.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/rong_packed_bed.${_build_type}") -file(COPY rong_packed_bed_files/dem.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/rong_packed_bed.${_build_type}") -file(COPY rong_packed_bed_files/dem.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/rong_packed_bed.${_build_type}") -file(COPY rong_packed_bed_files/dem.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/rong_packed_bed.${_build_type}") -file(COPY rong_packed_bed_files/dem.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/rong_packed_bed.${_build_type}") +file(COPY rong_packed_bed_files/dem.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/rong_packed_bed.${_build_type}/mpirun=1/") +file(COPY rong_packed_bed_files/dem.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/rong_packed_bed.${_build_type}/mpirun=1/") +file(COPY rong_packed_bed_files/dem.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/rong_packed_bed.${_build_type}/mpirun=1/") +file(COPY rong_packed_bed_files/dem.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/rong_packed_bed.${_build_type}/mpirun=1/") +file(COPY rong_packed_bed_files/dem.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/rong_packed_bed.${_build_type}/mpirun=1/") +file(COPY rong_packed_bed_files/dem.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/rong_packed_bed.${_build_type}/mpirun=1/") +file(COPY rong_packed_bed_files/dem.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/rong_packed_bed.${_build_type}/mpirun=1/") -file(COPY dallavalle_packed_bed_files/dem.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/dallavalle_packed_bed.${_build_type}") -file(COPY dallavalle_packed_bed_files/dem.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/dallavalle_packed_bed.${_build_type}") -file(COPY dallavalle_packed_bed_files/dem.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/dallavalle_packed_bed.${_build_type}") -file(COPY dallavalle_packed_bed_files/dem.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/dallavalle_packed_bed.${_build_type}") -file(COPY dallavalle_packed_bed_files/dem.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/dallavalle_packed_bed.${_build_type}") -file(COPY dallavalle_packed_bed_files/dem.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/dallavalle_packed_bed.${_build_type}") -file(COPY dallavalle_packed_bed_files/dem.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/dallavalle_packed_bed.${_build_type}") +file(COPY dallavalle_packed_bed_files/dem.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/dallavalle_packed_bed.${_build_type}/mpirun=1/") +file(COPY dallavalle_packed_bed_files/dem.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/dallavalle_packed_bed.${_build_type}/mpirun=1/") +file(COPY dallavalle_packed_bed_files/dem.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/dallavalle_packed_bed.${_build_type}/mpirun=1/") +file(COPY dallavalle_packed_bed_files/dem.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/dallavalle_packed_bed.${_build_type}/mpirun=1/") +file(COPY dallavalle_packed_bed_files/dem.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/dallavalle_packed_bed.${_build_type}/mpirun=1/") +file(COPY dallavalle_packed_bed_files/dem.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/dallavalle_packed_bed.${_build_type}/mpirun=1/") +file(COPY dallavalle_packed_bed_files/dem.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/dallavalle_packed_bed.${_build_type}/mpirun=1/") -file(COPY kochhill_packed_bed_files/dem.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/kochhill_packed_bed.${_build_type}") -file(COPY kochhill_packed_bed_files/dem.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/kochhill_packed_bed.${_build_type}") -file(COPY kochhill_packed_bed_files/dem.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/kochhill_packed_bed.${_build_type}") -file(COPY kochhill_packed_bed_files/dem.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/kochhill_packed_bed.${_build_type}") -file(COPY kochhill_packed_bed_files/dem.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/kochhill_packed_bed.${_build_type}") -file(COPY kochhill_packed_bed_files/dem.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/kochhill_packed_bed.${_build_type}") -file(COPY kochhill_packed_bed_files/dem.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/kochhill_packed_bed.${_build_type}") +file(COPY kochhill_packed_bed_files/dem.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/kochhill_packed_bed.${_build_type}/mpirun=1/") +file(COPY kochhill_packed_bed_files/dem.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/kochhill_packed_bed.${_build_type}/mpirun=1/") +file(COPY kochhill_packed_bed_files/dem.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/kochhill_packed_bed.${_build_type}/mpirun=1/") +file(COPY kochhill_packed_bed_files/dem.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/kochhill_packed_bed.${_build_type}/mpirun=1/") +file(COPY kochhill_packed_bed_files/dem.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/kochhill_packed_bed.${_build_type}/mpirun=1/") +file(COPY kochhill_packed_bed_files/dem.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/kochhill_packed_bed.${_build_type}/mpirun=1/") +file(COPY kochhill_packed_bed_files/dem.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/kochhill_packed_bed.${_build_type}/mpirun=1/") -file(COPY beetstra_packed_bed_files/dem.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/beetstra_packed_bed.${_build_type}") -file(COPY beetstra_packed_bed_files/dem.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/beetstra_packed_bed.${_build_type}") -file(COPY beetstra_packed_bed_files/dem.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/beetstra_packed_bed.${_build_type}") -file(COPY beetstra_packed_bed_files/dem.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/beetstra_packed_bed.${_build_type}") -file(COPY beetstra_packed_bed_files/dem.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/beetstra_packed_bed.${_build_type}") -file(COPY beetstra_packed_bed_files/dem.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/beetstra_packed_bed.${_build_type}") -file(COPY beetstra_packed_bed_files/dem.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/beetstra_packed_bed.${_build_type}") +file(COPY beetstra_packed_bed_files/dem.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/beetstra_packed_bed.${_build_type}/mpirun=1/") +file(COPY beetstra_packed_bed_files/dem.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/beetstra_packed_bed.${_build_type}/mpirun=1/") +file(COPY beetstra_packed_bed_files/dem.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/beetstra_packed_bed.${_build_type}/mpirun=1/") +file(COPY beetstra_packed_bed_files/dem.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/beetstra_packed_bed.${_build_type}/mpirun=1/") +file(COPY beetstra_packed_bed_files/dem.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/beetstra_packed_bed.${_build_type}/mpirun=1/") +file(COPY beetstra_packed_bed_files/dem.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/beetstra_packed_bed.${_build_type}/mpirun=1/") +file(COPY beetstra_packed_bed_files/dem.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/beetstra_packed_bed.${_build_type}/mpirun=1/") -file(COPY gidaspow_packed_bed_files/dem.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/gidaspow_packed_bed.${_build_type}") -file(COPY gidaspow_packed_bed_files/dem.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/gidaspow_packed_bed.${_build_type}") -file(COPY gidaspow_packed_bed_files/dem.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/gidaspow_packed_bed.${_build_type}") -file(COPY gidaspow_packed_bed_files/dem.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/gidaspow_packed_bed.${_build_type}") -file(COPY gidaspow_packed_bed_files/dem.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/gidaspow_packed_bed.${_build_type}") -file(COPY gidaspow_packed_bed_files/dem.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/gidaspow_packed_bed.${_build_type}") -file(COPY gidaspow_packed_bed_files/dem.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/gidaspow_packed_bed.${_build_type}") +file(COPY gidaspow_packed_bed_files/dem.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/gidaspow_packed_bed.${_build_type}/mpirun=1/") +file(COPY gidaspow_packed_bed_files/dem.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/gidaspow_packed_bed.${_build_type}/mpirun=1/") +file(COPY gidaspow_packed_bed_files/dem.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/gidaspow_packed_bed.${_build_type}/mpirun=1/") +file(COPY gidaspow_packed_bed_files/dem.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/gidaspow_packed_bed.${_build_type}/mpirun=1/") +file(COPY gidaspow_packed_bed_files/dem.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/gidaspow_packed_bed.${_build_type}/mpirun=1/") +file(COPY gidaspow_packed_bed_files/dem.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/gidaspow_packed_bed.${_build_type}/mpirun=1/") +file(COPY gidaspow_packed_bed_files/dem.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/gidaspow_packed_bed.${_build_type}/mpirun=1/") deal_ii_pickup_tests() diff --git a/applications_tests/lethe-fluid-vans/beetstra_packed_bed.output b/applications_tests/lethe-fluid-vans/beetstra_packed_bed.mpirun=1.output similarity index 100% rename from applications_tests/lethe-fluid-vans/beetstra_packed_bed.output rename to applications_tests/lethe-fluid-vans/beetstra_packed_bed.mpirun=1.output diff --git a/applications_tests/lethe-fluid-vans/dallavalle_packed_bed.output b/applications_tests/lethe-fluid-vans/dallavalle_packed_bed.mpirun=1.output similarity index 100% rename from applications_tests/lethe-fluid-vans/dallavalle_packed_bed.output rename to applications_tests/lethe-fluid-vans/dallavalle_packed_bed.mpirun=1.output diff --git a/applications_tests/lethe-fluid-vans/difelice_packed_bed.output b/applications_tests/lethe-fluid-vans/difelice_packed_bed.mpirun=1.output similarity index 100% rename from applications_tests/lethe-fluid-vans/difelice_packed_bed.output rename to applications_tests/lethe-fluid-vans/difelice_packed_bed.mpirun=1.output diff --git a/applications_tests/lethe-fluid-vans/gidaspow_packed_bed.output b/applications_tests/lethe-fluid-vans/gidaspow_packed_bed.mpirun=1.output similarity index 100% rename from applications_tests/lethe-fluid-vans/gidaspow_packed_bed.output rename to applications_tests/lethe-fluid-vans/gidaspow_packed_bed.mpirun=1.output diff --git a/applications_tests/lethe-fluid-vans/kochhill_packed_bed.output b/applications_tests/lethe-fluid-vans/kochhill_packed_bed.mpirun=1.output similarity index 100% rename from applications_tests/lethe-fluid-vans/kochhill_packed_bed.output rename to applications_tests/lethe-fluid-vans/kochhill_packed_bed.mpirun=1.output diff --git a/applications_tests/lethe-fluid-vans/pcm_packed_bed.output b/applications_tests/lethe-fluid-vans/pcm_packed_bed.mpirun=1.output similarity index 100% rename from applications_tests/lethe-fluid-vans/pcm_packed_bed.output rename to applications_tests/lethe-fluid-vans/pcm_packed_bed.mpirun=1.output diff --git a/applications_tests/lethe-fluid-vans/qcm_packed_bed.output b/applications_tests/lethe-fluid-vans/qcm_packed_bed.mpirun=1.output similarity index 100% rename from applications_tests/lethe-fluid-vans/qcm_packed_bed.output rename to applications_tests/lethe-fluid-vans/qcm_packed_bed.mpirun=1.output diff --git a/applications_tests/lethe-fluid-vans/rong_packed_bed.output b/applications_tests/lethe-fluid-vans/rong_packed_bed.mpirun=1.output similarity index 100% rename from applications_tests/lethe-fluid-vans/rong_packed_bed.output rename to applications_tests/lethe-fluid-vans/rong_packed_bed.mpirun=1.output diff --git a/applications_tests/lethe-fluid-vans/spm_packed_bed.output b/applications_tests/lethe-fluid-vans/spm_packed_bed.mpirun=1.output similarity index 100% rename from applications_tests/lethe-fluid-vans/spm_packed_bed.output rename to applications_tests/lethe-fluid-vans/spm_packed_bed.mpirun=1.output From 6880d24d5fb79853e4930a0872d3dcb0ee00b0ed Mon Sep 17 00:00:00 2001 From: Bruno Blais Date: Sun, 28 Jan 2024 17:03:00 -0500 Subject: [PATCH 07/13] Fix rpt test --- .../lethe-fluid-nitsche/CMakeLists.txt | 32 +++++++++---------- ... => two-bar-mixer-restart.mpirun=1.output} | 0 .../CMakeLists.txt | 4 +-- ...tput => unknown_positions.mpirun=1.output} | 0 .../unknown_positions.prm | 4 +-- .../CMakeLists.txt | 4 +-- ...=> rpt_fem_reconstruction.mpirun=1.output} | 0 .../lethe-rpt-l2-projection-3d/CMakeLists.txt | 2 +- ...tput => rpt_l2_projection.mpirun=1.output} | 0 9 files changed, 23 insertions(+), 23 deletions(-) rename applications_tests/lethe-fluid-nitsche/{two-bar-mixer-restart.output => two-bar-mixer-restart.mpirun=1.output} (100%) rename applications_tests/lethe-rpt-cell-reconstruction-3d/{unknown_positions.output => unknown_positions.mpirun=1.output} (100%) rename applications_tests/lethe-rpt-fem-reconstruction-3d/{rpt_fem_reconstruction.output => rpt_fem_reconstruction.mpirun=1.output} (100%) rename applications_tests/lethe-rpt-l2-projection-3d/{rpt_l2_projection.output => rpt_l2_projection.mpirun=1.output} (100%) diff --git a/applications_tests/lethe-fluid-nitsche/CMakeLists.txt b/applications_tests/lethe-fluid-nitsche/CMakeLists.txt index 737248843b..49e586467c 100644 --- a/applications_tests/lethe-fluid-nitsche/CMakeLists.txt +++ b/applications_tests/lethe-fluid-nitsche/CMakeLists.txt @@ -5,22 +5,22 @@ string(TOLOWER ${CMAKE_BUILD_TYPE} _build_type) file(COPY sphere.msh DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") -file(COPY two-bar-mixer-restart/restart.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/two-bar-mixer-restart.${_build_type}") -file(COPY two-bar-mixer-restart/restart.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/two-bar-mixer-restart.${_build_type}") -file(COPY two-bar-mixer-restart/restart.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/two-bar-mixer-restart.${_build_type}") -file(COPY two-bar-mixer-restart/restart.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/two-bar-mixer-restart.${_build_type}") -file(COPY two-bar-mixer-restart/restart.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/two-bar-mixer-restart.${_build_type}") -file(COPY two-bar-mixer-restart/restart.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/two-bar-mixer-restart.${_build_type}") -file(COPY two-bar-mixer-restart/restart_solid_particles_00.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/two-bar-mixer-restart.${_build_type}") -file(COPY two-bar-mixer-restart/restart_solid_particles_01.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/two-bar-mixer-restart.${_build_type}") -file(COPY two-bar-mixer-restart/restart_solid_00.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/two-bar-mixer-restart.${_build_type}") -file(COPY two-bar-mixer-restart/restart_solid_00.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/two-bar-mixer-restart.${_build_type}") -file(COPY two-bar-mixer-restart/restart_solid_00.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/two-bar-mixer-restart.${_build_type}") -file(COPY two-bar-mixer-restart/restart_solid_01.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/two-bar-mixer-restart.${_build_type}") -file(COPY two-bar-mixer-restart/restart_solid_01.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/two-bar-mixer-restart.${_build_type}") -file(COPY two-bar-mixer-restart/restart_solid_01.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/two-bar-mixer-restart.${_build_type}") -file(COPY two-bar-mixer-restart/restart_solid_triangulation_00.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/two-bar-mixer-restart.${_build_type}") -file(COPY two-bar-mixer-restart/restart_solid_triangulation_01.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/two-bar-mixer-restart.${_build_type}") +file(COPY two-bar-mixer-restart/restart.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/two-bar-mixer-restart.${_build_type}/mpirun=1/") +file(COPY two-bar-mixer-restart/restart.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/two-bar-mixer-restart.${_build_type}/mpirun=1/") +file(COPY two-bar-mixer-restart/restart.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/two-bar-mixer-restart.${_build_type}/mpirun=1/") +file(COPY two-bar-mixer-restart/restart.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/two-bar-mixer-restart.${_build_type}/mpirun=1/") +file(COPY two-bar-mixer-restart/restart.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/two-bar-mixer-restart.${_build_type}/mpirun=1/") +file(COPY two-bar-mixer-restart/restart.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/two-bar-mixer-restart.${_build_type}/mpirun=1/") +file(COPY two-bar-mixer-restart/restart_solid_particles_00.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/two-bar-mixer-restart.${_build_type}/mpirun=1/") +file(COPY two-bar-mixer-restart/restart_solid_particles_01.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/two-bar-mixer-restart.${_build_type}/mpirun=1/") +file(COPY two-bar-mixer-restart/restart_solid_00.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/two-bar-mixer-restart.${_build_type}/mpirun=1/") +file(COPY two-bar-mixer-restart/restart_solid_00.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/two-bar-mixer-restart.${_build_type}/mpirun=1/") +file(COPY two-bar-mixer-restart/restart_solid_00.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/two-bar-mixer-restart.${_build_type}/mpirun=1/") +file(COPY two-bar-mixer-restart/restart_solid_01.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/two-bar-mixer-restart.${_build_type}/mpirun=1/") +file(COPY two-bar-mixer-restart/restart_solid_01.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/two-bar-mixer-restart.${_build_type}/mpirun=1/") +file(COPY two-bar-mixer-restart/restart_solid_01.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/two-bar-mixer-restart.${_build_type}/mpirun=1/") +file(COPY two-bar-mixer-restart/restart_solid_triangulation_00.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/two-bar-mixer-restart.${_build_type}/mpirun=1/") +file(COPY two-bar-mixer-restart/restart_solid_triangulation_01.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/two-bar-mixer-restart.${_build_type}/mpirun=1/") deal_ii_pickup_tests() diff --git a/applications_tests/lethe-fluid-nitsche/two-bar-mixer-restart.output b/applications_tests/lethe-fluid-nitsche/two-bar-mixer-restart.mpirun=1.output similarity index 100% rename from applications_tests/lethe-fluid-nitsche/two-bar-mixer-restart.output rename to applications_tests/lethe-fluid-nitsche/two-bar-mixer-restart.mpirun=1.output diff --git a/applications_tests/lethe-rpt-cell-reconstruction-3d/CMakeLists.txt b/applications_tests/lethe-rpt-cell-reconstruction-3d/CMakeLists.txt index 118bc63ae7..8b3802d31a 100644 --- a/applications_tests/lethe-rpt-cell-reconstruction-3d/CMakeLists.txt +++ b/applications_tests/lethe-rpt-cell-reconstruction-3d/CMakeLists.txt @@ -2,8 +2,8 @@ set(TEST_TARGET lethe-rpt-cell-reconstruction-3d) string(TOLOWER ${CMAKE_BUILD_TYPE} _build_type) -file(COPY unknown_positions_files/counts.reconstruction DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/unknown_positions.${_build_type}") -file(COPY unknown_positions_files/positions.detector DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/unknown_positions.${_build_type}") +file(COPY unknown_positions_files/counts.reconstruction DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/unknown_positions.${_build_type}/mpirun=1/") +file(COPY unknown_positions_files/positions.detector DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/unknown_positions.${_build_type}/mpirun=1/") deal_ii_pickup_tests() diff --git a/applications_tests/lethe-rpt-cell-reconstruction-3d/unknown_positions.output b/applications_tests/lethe-rpt-cell-reconstruction-3d/unknown_positions.mpirun=1.output similarity index 100% rename from applications_tests/lethe-rpt-cell-reconstruction-3d/unknown_positions.output rename to applications_tests/lethe-rpt-cell-reconstruction-3d/unknown_positions.mpirun=1.output diff --git a/applications_tests/lethe-rpt-cell-reconstruction-3d/unknown_positions.prm b/applications_tests/lethe-rpt-cell-reconstruction-3d/unknown_positions.prm index bb30db3746..2a9ffb87f9 100644 --- a/applications_tests/lethe-rpt-cell-reconstruction-3d/unknown_positions.prm +++ b/applications_tests/lethe-rpt-cell-reconstruction-3d/unknown_positions.prm @@ -23,8 +23,8 @@ end subsection reconstruction set refinement = 5 - set reconstruction counts file = counts.reconstruction - set export reconstruction positions file = testing.csv + set reconstruction counts file = ../counts.reconstruction + set export reconstruction positions file = ../testing.csv end #--------------------------------------------------- diff --git a/applications_tests/lethe-rpt-fem-reconstruction-3d/CMakeLists.txt b/applications_tests/lethe-rpt-fem-reconstruction-3d/CMakeLists.txt index 79afb882c9..35f3228ccd 100644 --- a/applications_tests/lethe-rpt-fem-reconstruction-3d/CMakeLists.txt +++ b/applications_tests/lethe-rpt-fem-reconstruction-3d/CMakeLists.txt @@ -3,8 +3,8 @@ SET(TEST_TARGET lethe-rpt-fem-reconstruction-3d) string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_LOWER_BUILD_TYPE) -file(COPY rpt_fem_reconstruction_files/positions.detector DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/rpt_fem_reconstruction.${CMAKE_LOWER_BUILD_TYPE}) -file(COPY rpt_fem_reconstruction_files/flower_trajectory.txt DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/rpt_fem_reconstruction.${CMAKE_LOWER_BUILD_TYPE}) +file(COPY rpt_fem_reconstruction_files/positions.detector DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/rpt_fem_reconstruction.${CMAKE_LOWER_BUILD_TYPE}/mpirun=1/) +file(COPY rpt_fem_reconstruction_files/flower_trajectory.txt DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/rpt_fem_reconstruction.${CMAKE_LOWER_BUILD_TYPE}/mpirun=1/) DEAL_II_PICKUP_TESTS() diff --git a/applications_tests/lethe-rpt-fem-reconstruction-3d/rpt_fem_reconstruction.output b/applications_tests/lethe-rpt-fem-reconstruction-3d/rpt_fem_reconstruction.mpirun=1.output similarity index 100% rename from applications_tests/lethe-rpt-fem-reconstruction-3d/rpt_fem_reconstruction.output rename to applications_tests/lethe-rpt-fem-reconstruction-3d/rpt_fem_reconstruction.mpirun=1.output diff --git a/applications_tests/lethe-rpt-l2-projection-3d/CMakeLists.txt b/applications_tests/lethe-rpt-l2-projection-3d/CMakeLists.txt index 4872f99458..344c2cd834 100644 --- a/applications_tests/lethe-rpt-l2-projection-3d/CMakeLists.txt +++ b/applications_tests/lethe-rpt-l2-projection-3d/CMakeLists.txt @@ -3,7 +3,7 @@ SET(TEST_TARGET lethe-rpt-l2-projection-3d) string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_LOWER_BUILD_TYPE) -file(COPY rpt_l2_projection_files/positions.detector DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/rpt_l2_projection.${CMAKE_LOWER_BUILD_TYPE}) +file(COPY rpt_l2_projection_files/positions.detector DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/rpt_l2_projection.${CMAKE_LOWER_BUILD_TYPE}/mpirun=1/) DEAL_II_PICKUP_TESTS() diff --git a/applications_tests/lethe-rpt-l2-projection-3d/rpt_l2_projection.output b/applications_tests/lethe-rpt-l2-projection-3d/rpt_l2_projection.mpirun=1.output similarity index 100% rename from applications_tests/lethe-rpt-l2-projection-3d/rpt_l2_projection.output rename to applications_tests/lethe-rpt-l2-projection-3d/rpt_l2_projection.mpirun=1.output From caa98c2a25d793a387d84b8f9d8d9040f60894c9 Mon Sep 17 00:00:00 2001 From: Bruno Blais Date: Sun, 28 Jan 2024 17:05:20 -0500 Subject: [PATCH 08/13] Fix sharp tests --- .../lethe-fluid-sharp/CMakeLists.txt | 28 +++++++++---------- ... cavatappi_composite_test.mpirun=1.output} | 0 ...int.output => check_point.mpirun=1.output} | 0 ...output => flow_around_rbf.mpirun=1.output} | 0 ..._particles_from_file_test.mpirun=1.output} | 0 .../opencascade/CMakeLists.txt | 2 +- ...put => static_stokes_step.mpirun=1.output} | 0 ....output => rbf_sphere_mms.mpirun=1.output} | 0 ...> rbf_sphere_mms_adaptive.mpirun=1.output} | 0 ... => spooky_composite_test.mpirun=1.output} | 0 10 files changed, 15 insertions(+), 15 deletions(-) rename applications_tests/lethe-fluid-sharp/{cavatappi_composite_test.output => cavatappi_composite_test.mpirun=1.output} (100%) rename applications_tests/lethe-fluid-sharp/{check_point.output => check_point.mpirun=1.output} (100%) rename applications_tests/lethe-fluid-sharp/{flow_around_rbf.output => flow_around_rbf.mpirun=1.output} (100%) rename applications_tests/lethe-fluid-sharp/{load_particles_from_file_test.output => load_particles_from_file_test.mpirun=1.output} (100%) rename applications_tests/lethe-fluid-sharp/opencascade/{static_stokes_step.output => static_stokes_step.mpirun=1.output} (100%) rename applications_tests/lethe-fluid-sharp/{rbf_sphere_mms.output => rbf_sphere_mms.mpirun=1.output} (100%) rename applications_tests/lethe-fluid-sharp/{rbf_sphere_mms_adaptive.output => rbf_sphere_mms_adaptive.mpirun=1.output} (100%) rename applications_tests/lethe-fluid-sharp/{spooky_composite_test.output => spooky_composite_test.mpirun=1.output} (100%) diff --git a/applications_tests/lethe-fluid-sharp/CMakeLists.txt b/applications_tests/lethe-fluid-sharp/CMakeLists.txt index 4542436493..81029247a9 100644 --- a/applications_tests/lethe-fluid-sharp/CMakeLists.txt +++ b/applications_tests/lethe-fluid-sharp/CMakeLists.txt @@ -5,20 +5,20 @@ set(TEST_TARGET lethe-fluid-sharp) string(TOLOWER ${CMAKE_BUILD_TYPE} _build_type) -file(COPY check_point.ib_particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/check_point.${_build_type}") -file(COPY check_point.ib_particles.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/check_point.${_build_type}") -file(COPY check_point.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/check_point.${_build_type}") -file(COPY check_point.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/check_point.${_build_type}") -file(COPY check_point.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/check_point.${_build_type}") -file(COPY check_point.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/check_point.${_build_type}") -file(COPY check_point.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/check_point.${_build_type}") -file(COPY ib_force.00.dat DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/check_point.${_build_type}") -file(COPY particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/load_particles_from_file_test.${_build_type}") -file(COPY rbf_test_shape.input DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/flow_around_rbf.${_build_type}") -file(COPY helix_composite_shape DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/cavatappi_composite_test.${_build_type}") -file(COPY spooky_composite_shape DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/spooky_composite_test.${_build_type}") -file(COPY rbf_sphere.input DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/rbf_sphere_mms.${_build_type}") -file(COPY rbf_sphere_adaptive.input DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/rbf_sphere_mms_adaptive.${_build_type}") +file(COPY check_point.ib_particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/check_point.${_build_type}/mpirun=1/") +file(COPY check_point.ib_particles.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/check_point.${_build_type}/mpirun=1/") +file(COPY check_point.pvdhandler DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/check_point.${_build_type}/mpirun=1/") +file(COPY check_point.simulationcontrol DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/check_point.${_build_type}/mpirun=1/") +file(COPY check_point.triangulation DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/check_point.${_build_type}/mpirun=1/") +file(COPY check_point.triangulation.info DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/check_point.${_build_type}/mpirun=1/") +file(COPY check_point.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/check_point.${_build_type}/mpirun=1/") +file(COPY ib_force.00.dat DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/check_point.${_build_type}/mpirun=1/") +file(COPY particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/load_particles_from_file_test.${_build_type}/mpirun=1/") +file(COPY rbf_test_shape.input DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/flow_around_rbf.${_build_type}/mpirun=1/") +file(COPY helix_composite_shape DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/cavatappi_composite_test.${_build_type}/mpirun=1/") +file(COPY spooky_composite_shape DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/spooky_composite_test.${_build_type}/mpirun=1/") +file(COPY rbf_sphere.input DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/rbf_sphere_mms.${_build_type}/mpirun=1/") +file(COPY rbf_sphere_adaptive.input DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/rbf_sphere_mms_adaptive.${_build_type}/mpirun=1/") deal_ii_pickup_tests() diff --git a/applications_tests/lethe-fluid-sharp/cavatappi_composite_test.output b/applications_tests/lethe-fluid-sharp/cavatappi_composite_test.mpirun=1.output similarity index 100% rename from applications_tests/lethe-fluid-sharp/cavatappi_composite_test.output rename to applications_tests/lethe-fluid-sharp/cavatappi_composite_test.mpirun=1.output diff --git a/applications_tests/lethe-fluid-sharp/check_point.output b/applications_tests/lethe-fluid-sharp/check_point.mpirun=1.output similarity index 100% rename from applications_tests/lethe-fluid-sharp/check_point.output rename to applications_tests/lethe-fluid-sharp/check_point.mpirun=1.output diff --git a/applications_tests/lethe-fluid-sharp/flow_around_rbf.output b/applications_tests/lethe-fluid-sharp/flow_around_rbf.mpirun=1.output similarity index 100% rename from applications_tests/lethe-fluid-sharp/flow_around_rbf.output rename to applications_tests/lethe-fluid-sharp/flow_around_rbf.mpirun=1.output diff --git a/applications_tests/lethe-fluid-sharp/load_particles_from_file_test.output b/applications_tests/lethe-fluid-sharp/load_particles_from_file_test.mpirun=1.output similarity index 100% rename from applications_tests/lethe-fluid-sharp/load_particles_from_file_test.output rename to applications_tests/lethe-fluid-sharp/load_particles_from_file_test.mpirun=1.output diff --git a/applications_tests/lethe-fluid-sharp/opencascade/CMakeLists.txt b/applications_tests/lethe-fluid-sharp/opencascade/CMakeLists.txt index ee284fcdc9..bd85c305f8 100644 --- a/applications_tests/lethe-fluid-sharp/opencascade/CMakeLists.txt +++ b/applications_tests/lethe-fluid-sharp/opencascade/CMakeLists.txt @@ -3,7 +3,7 @@ set(TEST_TARGET lethe-fluid-sharp) string(TOLOWER ${CMAKE_BUILD_TYPE} _build_type) -file(COPY sphere_cad.step DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/static_stokes_step.${_build_type}") +file(COPY sphere_cad.step DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/static_stokes_step.${_build_type}/mpirun=1/") deal_ii_pickup_tests() ENDIF() diff --git a/applications_tests/lethe-fluid-sharp/opencascade/static_stokes_step.output b/applications_tests/lethe-fluid-sharp/opencascade/static_stokes_step.mpirun=1.output similarity index 100% rename from applications_tests/lethe-fluid-sharp/opencascade/static_stokes_step.output rename to applications_tests/lethe-fluid-sharp/opencascade/static_stokes_step.mpirun=1.output diff --git a/applications_tests/lethe-fluid-sharp/rbf_sphere_mms.output b/applications_tests/lethe-fluid-sharp/rbf_sphere_mms.mpirun=1.output similarity index 100% rename from applications_tests/lethe-fluid-sharp/rbf_sphere_mms.output rename to applications_tests/lethe-fluid-sharp/rbf_sphere_mms.mpirun=1.output diff --git a/applications_tests/lethe-fluid-sharp/rbf_sphere_mms_adaptive.output b/applications_tests/lethe-fluid-sharp/rbf_sphere_mms_adaptive.mpirun=1.output similarity index 100% rename from applications_tests/lethe-fluid-sharp/rbf_sphere_mms_adaptive.output rename to applications_tests/lethe-fluid-sharp/rbf_sphere_mms_adaptive.mpirun=1.output diff --git a/applications_tests/lethe-fluid-sharp/spooky_composite_test.output b/applications_tests/lethe-fluid-sharp/spooky_composite_test.mpirun=1.output similarity index 100% rename from applications_tests/lethe-fluid-sharp/spooky_composite_test.output rename to applications_tests/lethe-fluid-sharp/spooky_composite_test.mpirun=1.output From 10e7d42ba360c11362452b86e14d11c03aaeee1e Mon Sep 17 00:00:00 2001 From: Bruno Blais Date: Sun, 28 Jan 2024 17:09:36 -0500 Subject: [PATCH 09/13] Add changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f4d5d2da4..05f9f41ccd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,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] - 2023-01-28 + +### Fixed + +- MAJOR All application_tests that use files have now mpirun=1 in their output to ensure that they are run from an mpirun=1 folder. Since https://github.com/dealii/dealii/pull/16551 deal.II 9.6 uses a serial folder for serial tests. However, deal.II 9.5 does not. To maintain portability between the two versions, we manually force a folder called mpirun=1 when running tests and adapt the copy of the files to this folder. This is a temporary fix that can be reverted once we drop support for deal.II 9.5 + ## [Master] - 2023-12-27 ### Changed From 0030e1f3e5d787e8d309d8a415cb65ff3684fdb4 Mon Sep 17 00:00:00 2001 From: Bruno Blais Date: Sun, 28 Jan 2024 17:21:51 -0500 Subject: [PATCH 10/13] Fix timeouts --- .../lethe-fluid-particles/CMakeLists.txt | 8 ++++---- .../lethe-fluid-sharp/CMakeLists.txt | 2 +- .../lethe-fluid-vans/CMakeLists.txt | 18 +++++++++--------- .../CMakeLists.txt | 2 +- .../CMakeLists.txt | 2 +- .../lethe-rpt-l2-projection-3d/CMakeLists.txt | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/applications_tests/lethe-fluid-particles/CMakeLists.txt b/applications_tests/lethe-fluid-particles/CMakeLists.txt index 2553bb0d3f..278d7b6337 100644 --- a/applications_tests/lethe-fluid-particles/CMakeLists.txt +++ b/applications_tests/lethe-fluid-particles/CMakeLists.txt @@ -53,8 +53,8 @@ file(COPY periodic_particles_qcm_files/dem.triangulation_variable.data DESTINATI deal_ii_pickup_tests() if(CMAKE_BUILD_TYPE STREQUAL "Debug") - set_tests_properties(lethe-fluid-particles/particle_sedimentation.debug PROPERTIES TIMEOUT 1200) - set_tests_properties(lethe-fluid-particles/restart_particle_sedimentation.debug PROPERTIES TIMEOUT 1200) - set_tests_properties(lethe-fluid-particles/dynamic_contact_search.debug PROPERTIES TIMEOUT 1200) - set_tests_properties(lethe-fluid-particles/liquid_fluidized_bed.debug PROPERTIES TIMEOUT 5000) + set_tests_properties(lethe-fluid-particles/particle_sedimentation.mpirun=1.debug PROPERTIES TIMEOUT 1200) + set_tests_properties(lethe-fluid-particles/restart_particle_sedimentation.mpirun=1.debug PROPERTIES TIMEOUT 1200) + set_tests_properties(lethe-fluid-particles/dynamic_contact_search.mpirun=1.debug PROPERTIES TIMEOUT 1200) + set_tests_properties(lethe-fluid-particles/liquid_fluidized_bed.mpirun=1.debug PROPERTIES TIMEOUT 5000) endif() diff --git a/applications_tests/lethe-fluid-sharp/CMakeLists.txt b/applications_tests/lethe-fluid-sharp/CMakeLists.txt index 81029247a9..865407b9ed 100644 --- a/applications_tests/lethe-fluid-sharp/CMakeLists.txt +++ b/applications_tests/lethe-fluid-sharp/CMakeLists.txt @@ -24,7 +24,7 @@ deal_ii_pickup_tests() if(CMAKE_BUILD_TYPE STREQUAL "Debug") set_tests_properties(lethe-fluid-sharp/steady_couette_sphere.debug PROPERTIES TIMEOUT 2000) - set_tests_properties(lethe-fluid-sharp/check_point.debug PROPERTIES TIMEOUT 2000) + set_tests_properties(lethe-fluid-sharp/check_point.mpirun=1.debug PROPERTIES TIMEOUT 2000) set_tests_properties(lethe-fluid-sharp/pp_contact_test.debug PROPERTIES TIMEOUT 2000) set_tests_properties(lethe-fluid-sharp/pp_lubrication_test.debug PROPERTIES TIMEOUT 2000) set_tests_properties(lethe-fluid-sharp/coupled_moving_stokes.mpirun=2.debug PROPERTIES TIMEOUT 2000) diff --git a/applications_tests/lethe-fluid-vans/CMakeLists.txt b/applications_tests/lethe-fluid-vans/CMakeLists.txt index ee4c1a0858..dc1dc0d5bb 100644 --- a/applications_tests/lethe-fluid-vans/CMakeLists.txt +++ b/applications_tests/lethe-fluid-vans/CMakeLists.txt @@ -77,13 +77,13 @@ file(COPY gidaspow_packed_bed_files/dem.triangulation_variable.data DESTINATION deal_ii_pickup_tests() if(CMAKE_BUILD_TYPE STREQUAL "Debug") - set_tests_properties(lethe-fluid-vans/pcm_packed_bed.debug PROPERTIES TIMEOUT 1200) - set_tests_properties(lethe-fluid-vans/spm_packed_bed.debug PROPERTIES TIMEOUT 1200) - set_tests_properties(lethe-fluid-vans/qcm_packed_bed.debug PROPERTIES TIMEOUT 1600) - set_tests_properties(lethe-fluid-vans/difelice_packed_bed.debug PROPERTIES TIMEOUT 1200) - set_tests_properties(lethe-fluid-vans/rong_packed_bed.debug PROPERTIES TIMEOUT 1200) - set_tests_properties(lethe-fluid-vans/dallavalle_packed_bed.debug PROPERTIES TIMEOUT 1200) - set_tests_properties(lethe-fluid-vans/kochhill_packed_bed.debug PROPERTIES TIMEOUT 1200) - set_tests_properties(lethe-fluid-vans/beetstra_packed_bed.debug PROPERTIES TIMEOUT 1200) - set_tests_properties(lethe-fluid-vans/gidaspow_packed_bed.debug PROPERTIES TIMEOUT 1200) + set_tests_properties(lethe-fluid-vans/pcm_packed_bed.mpirun=1.debug PROPERTIES TIMEOUT 1200) + set_tests_properties(lethe-fluid-vans/spm_packed_bed.mpirun=1.debug PROPERTIES TIMEOUT 1200) + set_tests_properties(lethe-fluid-vans/qcm_packed_bed.mpirun=1.debug PROPERTIES TIMEOUT 1600) + set_tests_properties(lethe-fluid-vans/difelice_packed_bed.mpirun=1.debug PROPERTIES TIMEOUT 1200) + set_tests_properties(lethe-fluid-vans/rong_packed_bed.mpirun=1.debug PROPERTIES TIMEOUT 1200) + set_tests_properties(lethe-fluid-vans/dallavalle_packed_bed.mpirun=1.debug PROPERTIES TIMEOUT 1200) + set_tests_properties(lethe-fluid-vans/kochhill_packed_bed.mpirun=1.debug PROPERTIES TIMEOUT 1200) + set_tests_properties(lethe-fluid-vans/beetstra_packed_bed.mpirun=1.debug PROPERTIES TIMEOUT 1200) + set_tests_properties(lethe-fluid-vans/gidaspow_packed_bed.mpirun=1.debug PROPERTIES TIMEOUT 1200) endif() diff --git a/applications_tests/lethe-rpt-cell-reconstruction-3d/CMakeLists.txt b/applications_tests/lethe-rpt-cell-reconstruction-3d/CMakeLists.txt index 8b3802d31a..6a1b10532a 100644 --- a/applications_tests/lethe-rpt-cell-reconstruction-3d/CMakeLists.txt +++ b/applications_tests/lethe-rpt-cell-reconstruction-3d/CMakeLists.txt @@ -8,5 +8,5 @@ file(COPY unknown_positions_files/positions.detector DESTINATION "${CMAKE_CURREN deal_ii_pickup_tests() if(CMAKE_BUILD_TYPE STREQUAL "Debug") - set_tests_properties(lethe-rpt-cell-reconstruction-3d/unknown_positions.debug PROPERTIES TIMEOUT 1200) + set_tests_properties(lethe-rpt-cell-reconstruction-3d/unknown_positions.mpirun=1.debug PROPERTIES TIMEOUT 1200) endif() diff --git a/applications_tests/lethe-rpt-fem-reconstruction-3d/CMakeLists.txt b/applications_tests/lethe-rpt-fem-reconstruction-3d/CMakeLists.txt index 35f3228ccd..2e8850af08 100644 --- a/applications_tests/lethe-rpt-fem-reconstruction-3d/CMakeLists.txt +++ b/applications_tests/lethe-rpt-fem-reconstruction-3d/CMakeLists.txt @@ -10,5 +10,5 @@ DEAL_II_PICKUP_TESTS() if (CMAKE_BUILD_TYPE STREQUAL "Debug" ) - set_tests_properties(lethe-rpt-fem-reconstruction-3d/rpt_fem_reconstruction.debug PROPERTIES TIMEOUT 1800) + set_tests_properties(lethe-rpt-fem-reconstruction-3d/rpt_fem_reconstruction.mpirun=1.debug PROPERTIES TIMEOUT 1800) ENDIF() \ No newline at end of file diff --git a/applications_tests/lethe-rpt-l2-projection-3d/CMakeLists.txt b/applications_tests/lethe-rpt-l2-projection-3d/CMakeLists.txt index 344c2cd834..4ce824531b 100644 --- a/applications_tests/lethe-rpt-l2-projection-3d/CMakeLists.txt +++ b/applications_tests/lethe-rpt-l2-projection-3d/CMakeLists.txt @@ -9,5 +9,5 @@ DEAL_II_PICKUP_TESTS() if (CMAKE_BUILD_TYPE STREQUAL "Debug" ) - set_tests_properties(lethe-rpt-l2-projection-3d/rpt_l2_projection.debug PROPERTIES TIMEOUT 1500) + set_tests_properties(lethe-rpt-l2-projection-3d/rpt_l2_projection.mpirun=1.debug PROPERTIES TIMEOUT 1500) ENDIF() \ No newline at end of file From 482613d5cbbaec505c104d62d3cc5b140296ce74 Mon Sep 17 00:00:00 2001 From: Bruno Blais Date: Sun, 28 Jan 2024 18:34:49 -0500 Subject: [PATCH 11/13] Fix rpt and other cases --- applications_tests/lethe-particles/CMakeLists.txt | 4 ++-- .../lethe-particles/insert_periodic_boundary_gmsh.prm | 2 +- applications_tests/lethe-particles/moving_float.prm | 2 +- .../lethe-rpt-cell-reconstruction-3d/unknown_positions.prm | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/applications_tests/lethe-particles/CMakeLists.txt b/applications_tests/lethe-particles/CMakeLists.txt index e5b8b04edd..d26fb2a0d9 100644 --- a/applications_tests/lethe-particles/CMakeLists.txt +++ b/applications_tests/lethe-particles/CMakeLists.txt @@ -20,8 +20,8 @@ file(COPY sliding_restart_files/sliding_restart.triangulation.info DESTINATION " file(COPY sliding_restart_files/sliding_restart.triangulation_fixed.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/sliding_restart.${_build_type}/mpirun=1/") file(COPY sliding_restart_files/sliding_restart.triangulation_variable.data DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/sliding_restart.${_build_type}/mpirun=1/") -file(COPY periodic_gmsh_files/pipe.msh DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/insert_periodic_boundary_gmsh.${_build_type}/mpirun=1/") -file(COPY load_balancing_solid_object_files/square.msh DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/load_balancing_solid_object.${_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}") file(COPY moving_float_files/square.msh DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/moving_float.${_build_type}/mpirun=1/") file(COPY moving_receptacle_files/restart.insertion_object DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}/mpirun=1/") diff --git a/applications_tests/lethe-particles/insert_periodic_boundary_gmsh.prm b/applications_tests/lethe-particles/insert_periodic_boundary_gmsh.prm index 183a926821..a94654d5d6 100644 --- a/applications_tests/lethe-particles/insert_periodic_boundary_gmsh.prm +++ b/applications_tests/lethe-particles/insert_periodic_boundary_gmsh.prm @@ -88,7 +88,7 @@ end subsection mesh set expand particle-wall contact search = false set type = gmsh - set file name = ./pipe.msh + set file name = ../pipe.msh end #--------------------------------------------------- diff --git a/applications_tests/lethe-particles/moving_float.prm b/applications_tests/lethe-particles/moving_float.prm index 2e7ff526da..2b68043c2d 100644 --- a/applications_tests/lethe-particles/moving_float.prm +++ b/applications_tests/lethe-particles/moving_float.prm @@ -117,7 +117,7 @@ subsection solid objects subsection solid object 0 subsection mesh set type = gmsh - set file name = ./square.msh + set file name = ../square.msh set simplex = true set initial refinement = 0 end diff --git a/applications_tests/lethe-rpt-cell-reconstruction-3d/unknown_positions.prm b/applications_tests/lethe-rpt-cell-reconstruction-3d/unknown_positions.prm index 2a9ffb87f9..bb30db3746 100644 --- a/applications_tests/lethe-rpt-cell-reconstruction-3d/unknown_positions.prm +++ b/applications_tests/lethe-rpt-cell-reconstruction-3d/unknown_positions.prm @@ -23,8 +23,8 @@ end subsection reconstruction set refinement = 5 - set reconstruction counts file = ../counts.reconstruction - set export reconstruction positions file = ../testing.csv + set reconstruction counts file = counts.reconstruction + set export reconstruction positions file = testing.csv end #--------------------------------------------------- From 0a865b43cc1efa7a8f6e4e5fb792f7fa6e1d4fc7 Mon Sep 17 00:00:00 2001 From: Bruno Blais Date: Sun, 28 Jan 2024 19:25:03 -0500 Subject: [PATCH 12/13] Fix another test --- applications_tests/lethe-particles/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications_tests/lethe-particles/CMakeLists.txt b/applications_tests/lethe-particles/CMakeLists.txt index d26fb2a0d9..33b563e5aa 100644 --- a/applications_tests/lethe-particles/CMakeLists.txt +++ b/applications_tests/lethe-particles/CMakeLists.txt @@ -22,7 +22,7 @@ file(COPY sliding_restart_files/sliding_restart.triangulation_variable.data DEST 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}") -file(COPY moving_float_files/square.msh DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/moving_float.${_build_type}/mpirun=1/") +file(COPY moving_float_files/square.msh DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/moving_float.${_build_type}") file(COPY moving_receptacle_files/restart.insertion_object DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}/mpirun=1/") file(COPY moving_receptacle_files/restart.particles DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/restart_moving_receptacle.${_build_type}/mpirun=1/") From cc03a4427cf01079afa2b9688de4cf5d9842878a Mon Sep 17 00:00:00 2001 From: Bruno Blais Date: Sun, 28 Jan 2024 20:05:20 -0500 Subject: [PATCH 13/13] Fix two tests for 9.5 --- ...nder_carreau_gd.output => cylinder_carreau_gd.mpirun=1.output} | 0 ...structured_gd.output => mms2d-unstructured_gd.mpirun=1.output} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename applications_tests/lethe-fluid-block/{cylinder_carreau_gd.output => cylinder_carreau_gd.mpirun=1.output} (100%) rename applications_tests/lethe-fluid-block/{mms2d-unstructured_gd.output => mms2d-unstructured_gd.mpirun=1.output} (100%) diff --git a/applications_tests/lethe-fluid-block/cylinder_carreau_gd.output b/applications_tests/lethe-fluid-block/cylinder_carreau_gd.mpirun=1.output similarity index 100% rename from applications_tests/lethe-fluid-block/cylinder_carreau_gd.output rename to applications_tests/lethe-fluid-block/cylinder_carreau_gd.mpirun=1.output diff --git a/applications_tests/lethe-fluid-block/mms2d-unstructured_gd.output b/applications_tests/lethe-fluid-block/mms2d-unstructured_gd.mpirun=1.output similarity index 100% rename from applications_tests/lethe-fluid-block/mms2d-unstructured_gd.output rename to applications_tests/lethe-fluid-block/mms2d-unstructured_gd.mpirun=1.output