From 4847a457fb815ef78e057e59795d985b78ebe014 Mon Sep 17 00:00:00 2001 From: danieldouglas92 Date: Mon, 27 Oct 2025 22:40:32 -0600 Subject: [PATCH 1/2] create topography subdirectory --- source/postprocess/topography.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/source/postprocess/topography.cc b/source/postprocess/topography.cc index 59582fb7115..2bbabe93535 100644 --- a/source/postprocess/topography.cc +++ b/source/postprocess/topography.cc @@ -136,8 +136,13 @@ namespace aspect return std::pair ("Topography min/max:", output_stats.str()); + + Utilities::create_directory (this->get_output_directory() + "topography/", + this->get_mpi_communicator(), + false); + std::string filename = this->get_output_directory() + - "topography." + + "topography/topography." + Utilities::int_to_string(this->get_timestep_number(), 5); if (this->get_parameters().run_postprocessors_on_nonlinear_iterations) filename.append("." + Utilities::int_to_string (this->get_nonlinear_iteration(), 4)); From 2d5edeb5f9abcd8636779fad52b66b857eade1f2 Mon Sep 17 00:00:00 2001 From: danieldouglas92 Date: Wed, 29 Oct 2025 12:42:44 -0600 Subject: [PATCH 2/2] update tests --- source/postprocess/topography.cc | 2 +- .../{ => topography}/topography.00000 | 0 .../{ => topography}/topography.00001 | 0 .../{ => topography}/topography.00002 | 0 .../{ => topography}/topography.00000 | 0 .../{ => topography}/topography.00001 | 0 .../{ => topography}/topography.00002 | 0 tests/geoid_freesurface/{ => topography}/topography.00000 | 0 tests/geoid_freesurface/{ => topography}/topography.00001 | 0 .../{ => topography}/topography.00000 | 0 .../{ => topography}/topography.00001 | 0 .../{ => topography}/topography.00000 | 0 tests/sea_level_postprocessor/{ => topography}/topography.00000 | 0 tests/topo_box/{ => topography}/topography.00000 | 0 tests/topo_box/{ => topography}/topography.00001 | 0 tests/topo_chunk/{ => topography}/topography.00000 | 0 tests/topo_chunk/{ => topography}/topography.00001 | 0 tests/topo_shell/{ => topography}/topography.00000 | 0 tests/topo_shell/{ => topography}/topography.00001 | 0 19 files changed, 1 insertion(+), 1 deletion(-) rename tests/boundary_traction_function_cartesian_free_surface/{ => topography}/topography.00000 (100%) rename tests/boundary_traction_function_cartesian_free_surface/{ => topography}/topography.00001 (100%) rename tests/boundary_traction_function_cartesian_free_surface/{ => topography}/topography.00002 (100%) rename tests/boundary_traction_function_spherical_free_surface/{ => topography}/topography.00000 (100%) rename tests/boundary_traction_function_spherical_free_surface/{ => topography}/topography.00001 (100%) rename tests/boundary_traction_function_spherical_free_surface/{ => topography}/topography.00002 (100%) rename tests/geoid_freesurface/{ => topography}/topography.00000 (100%) rename tests/geoid_freesurface/{ => topography}/topography.00001 (100%) rename tests/kaus_rayleigh_taylor_instability/{ => topography}/topography.00000 (100%) rename tests/kaus_rayleigh_taylor_instability/{ => topography}/topography.00001 (100%) rename tests/mesh_deformation_gmg_2d_spherical_shell/{ => topography}/topography.00000 (100%) rename tests/sea_level_postprocessor/{ => topography}/topography.00000 (100%) rename tests/topo_box/{ => topography}/topography.00000 (100%) rename tests/topo_box/{ => topography}/topography.00001 (100%) rename tests/topo_chunk/{ => topography}/topography.00000 (100%) rename tests/topo_chunk/{ => topography}/topography.00001 (100%) rename tests/topo_shell/{ => topography}/topography.00000 (100%) rename tests/topo_shell/{ => topography}/topography.00001 (100%) diff --git a/source/postprocess/topography.cc b/source/postprocess/topography.cc index 2bbabe93535..f555a391dd3 100644 --- a/source/postprocess/topography.cc +++ b/source/postprocess/topography.cc @@ -139,7 +139,7 @@ namespace aspect Utilities::create_directory (this->get_output_directory() + "topography/", this->get_mpi_communicator(), - false); + /* silent=*/true); std::string filename = this->get_output_directory() + "topography/topography." + diff --git a/tests/boundary_traction_function_cartesian_free_surface/topography.00000 b/tests/boundary_traction_function_cartesian_free_surface/topography/topography.00000 similarity index 100% rename from tests/boundary_traction_function_cartesian_free_surface/topography.00000 rename to tests/boundary_traction_function_cartesian_free_surface/topography/topography.00000 diff --git a/tests/boundary_traction_function_cartesian_free_surface/topography.00001 b/tests/boundary_traction_function_cartesian_free_surface/topography/topography.00001 similarity index 100% rename from tests/boundary_traction_function_cartesian_free_surface/topography.00001 rename to tests/boundary_traction_function_cartesian_free_surface/topography/topography.00001 diff --git a/tests/boundary_traction_function_cartesian_free_surface/topography.00002 b/tests/boundary_traction_function_cartesian_free_surface/topography/topography.00002 similarity index 100% rename from tests/boundary_traction_function_cartesian_free_surface/topography.00002 rename to tests/boundary_traction_function_cartesian_free_surface/topography/topography.00002 diff --git a/tests/boundary_traction_function_spherical_free_surface/topography.00000 b/tests/boundary_traction_function_spherical_free_surface/topography/topography.00000 similarity index 100% rename from tests/boundary_traction_function_spherical_free_surface/topography.00000 rename to tests/boundary_traction_function_spherical_free_surface/topography/topography.00000 diff --git a/tests/boundary_traction_function_spherical_free_surface/topography.00001 b/tests/boundary_traction_function_spherical_free_surface/topography/topography.00001 similarity index 100% rename from tests/boundary_traction_function_spherical_free_surface/topography.00001 rename to tests/boundary_traction_function_spherical_free_surface/topography/topography.00001 diff --git a/tests/boundary_traction_function_spherical_free_surface/topography.00002 b/tests/boundary_traction_function_spherical_free_surface/topography/topography.00002 similarity index 100% rename from tests/boundary_traction_function_spherical_free_surface/topography.00002 rename to tests/boundary_traction_function_spherical_free_surface/topography/topography.00002 diff --git a/tests/geoid_freesurface/topography.00000 b/tests/geoid_freesurface/topography/topography.00000 similarity index 100% rename from tests/geoid_freesurface/topography.00000 rename to tests/geoid_freesurface/topography/topography.00000 diff --git a/tests/geoid_freesurface/topography.00001 b/tests/geoid_freesurface/topography/topography.00001 similarity index 100% rename from tests/geoid_freesurface/topography.00001 rename to tests/geoid_freesurface/topography/topography.00001 diff --git a/tests/kaus_rayleigh_taylor_instability/topography.00000 b/tests/kaus_rayleigh_taylor_instability/topography/topography.00000 similarity index 100% rename from tests/kaus_rayleigh_taylor_instability/topography.00000 rename to tests/kaus_rayleigh_taylor_instability/topography/topography.00000 diff --git a/tests/kaus_rayleigh_taylor_instability/topography.00001 b/tests/kaus_rayleigh_taylor_instability/topography/topography.00001 similarity index 100% rename from tests/kaus_rayleigh_taylor_instability/topography.00001 rename to tests/kaus_rayleigh_taylor_instability/topography/topography.00001 diff --git a/tests/mesh_deformation_gmg_2d_spherical_shell/topography.00000 b/tests/mesh_deformation_gmg_2d_spherical_shell/topography/topography.00000 similarity index 100% rename from tests/mesh_deformation_gmg_2d_spherical_shell/topography.00000 rename to tests/mesh_deformation_gmg_2d_spherical_shell/topography/topography.00000 diff --git a/tests/sea_level_postprocessor/topography.00000 b/tests/sea_level_postprocessor/topography/topography.00000 similarity index 100% rename from tests/sea_level_postprocessor/topography.00000 rename to tests/sea_level_postprocessor/topography/topography.00000 diff --git a/tests/topo_box/topography.00000 b/tests/topo_box/topography/topography.00000 similarity index 100% rename from tests/topo_box/topography.00000 rename to tests/topo_box/topography/topography.00000 diff --git a/tests/topo_box/topography.00001 b/tests/topo_box/topography/topography.00001 similarity index 100% rename from tests/topo_box/topography.00001 rename to tests/topo_box/topography/topography.00001 diff --git a/tests/topo_chunk/topography.00000 b/tests/topo_chunk/topography/topography.00000 similarity index 100% rename from tests/topo_chunk/topography.00000 rename to tests/topo_chunk/topography/topography.00000 diff --git a/tests/topo_chunk/topography.00001 b/tests/topo_chunk/topography/topography.00001 similarity index 100% rename from tests/topo_chunk/topography.00001 rename to tests/topo_chunk/topography/topography.00001 diff --git a/tests/topo_shell/topography.00000 b/tests/topo_shell/topography/topography.00000 similarity index 100% rename from tests/topo_shell/topography.00000 rename to tests/topo_shell/topography/topography.00000 diff --git a/tests/topo_shell/topography.00001 b/tests/topo_shell/topography/topography.00001 similarity index 100% rename from tests/topo_shell/topography.00001 rename to tests/topo_shell/topography/topography.00001