Merge pull request #5468 from bangerth/remove

Remove a function that is never used.
geodynamics · Nov 1, 2023 · a6c0edd · a6c0edd
2 parents e022fb4 + a521949
commit a6c0edd
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 41 deletions.
diff --git a/include/aspect/geometry_model/chunk.h b/include/aspect/geometry_model/chunk.h
@@ -230,12 +230,6 @@ namespace aspect
          */
         void initialize () override;
 
-        /**
-         * This function calls the initialize function of the manifold
-         * with the given pointer to the initial topography model.
-         */
-        void set_topography_model (const InitialTopographyModel::Interface<dim> *topo_pointer);
-
         /**
          * Generate a coarse mesh for the geometry described by this class.
          */

diff --git a/include/aspect/geometry_model/two_merged_chunks.h b/include/aspect/geometry_model/two_merged_chunks.h
@@ -76,12 +76,6 @@ namespace aspect
          */
         void initialize () override;
 
-        /**
-         * This function calls the initialize function of the manifold
-         * with the given pointer to the initial topography model.
-         */
-        void set_topography_model (const InitialTopographyModel::Interface<dim> *topo_pointer);
-
         /**
          * Generate a coarse mesh for the geometry described by this class.
          */

diff --git a/source/geometry_model/chunk.cc b/source/geometry_model/chunk.cc
@@ -490,19 +490,6 @@ namespace aspect
     }
 
 
-    template <int dim>
-    void
-    Chunk<dim>::set_topography_model (const InitialTopographyModel::Interface<dim> *topo_pointer)
-    {
-      AssertThrow(dynamic_cast<const InitialTopographyModel::ZeroTopography<dim>*>(topo_pointer) != nullptr ||
-                  dynamic_cast<const InitialTopographyModel::AsciiData<dim>*>(topo_pointer) != nullptr,
-                  ExcMessage("At the moment, only the Zero or AsciiData initial topography model can be used with the Chunk geometry model."));
-
-      manifold.initialize(topo_pointer);
-    }
-
-
-
     template <int dim>
     void
     Chunk<dim>::

diff --git a/source/geometry_model/two_merged_chunks.cc b/source/geometry_model/two_merged_chunks.cc
@@ -47,18 +47,6 @@ namespace aspect
     }
 
 
-    template <int dim>
-    void
-    TwoMergedChunks<dim>::set_topography_model (const InitialTopographyModel::Interface<dim> *topo_pointer)
-    {
-      AssertThrow(dynamic_cast<const InitialTopographyModel::ZeroTopography<dim>*>(topo_pointer) != nullptr ||
-                  dynamic_cast<const InitialTopographyModel::AsciiData<dim>*>(topo_pointer) != nullptr,
-                  ExcMessage("At the moment, only the Zero or AsciiData initial topography model can be used with the TwoMergedChunks geometry model."));
-
-      manifold.initialize(topo_pointer);
-    }
-
-
 
     template <int dim>
     void

diff --git a/tests/natural_coordinates_conversion.cc b/tests/natural_coordinates_conversion.cc
@@ -91,7 +91,6 @@ int f()
   // Chunk 2d
   {
     GeometryModel::Chunk<2> chunk;
-    InitialTopographyModel::ZeroTopography<2> zero_topo;
     ParameterHandler prm_chunk;
     chunk.declare_parameters(prm_chunk);
     prm_chunk.enter_subsection("Geometry model");
@@ -101,7 +100,6 @@ int f()
     prm_chunk.leave_subsection();
     prm_chunk.leave_subsection();
     chunk.parse_parameters(prm_chunk);
-    chunk.set_topography_model(&zero_topo);
 
     inter_point_2d = chunk.cartesian_to_natural_coordinates(point_2d);
     new_point_2d = chunk.natural_to_cartesian_coordinates(inter_point_2d);
@@ -167,7 +165,6 @@ int f()
   // Chunk 3d
   {
     GeometryModel::Chunk<3> chunk;
-    InitialTopographyModel::ZeroTopography<3> zero_topo;
     ParameterHandler prm_chunk;
     chunk.declare_parameters(prm_chunk);
     prm_chunk.enter_subsection("Geometry model");
@@ -177,7 +174,6 @@ int f()
     prm_chunk.leave_subsection();
     prm_chunk.leave_subsection();
     chunk.parse_parameters(prm_chunk);
-    chunk.set_topography_model(&zero_topo);
 
     inter_point_3d = chunk.cartesian_to_natural_coordinates(point_3d);
     new_point_3d = chunk.natural_to_cartesian_coordinates(inter_point_3d);