Merge pull request #6526 from Djneu/fastscape-fix-duplicates

Merge duplicate update functions in fastscape-fortran

Author: bangerth

include/aspect/mesh_deformation/fastscape.h

@@ -117,12 +117,6 @@ namespace aspect
          */
         void load (const std::map<std::string, std::string> &status_strings) override;
 
-        /**
-         * Update time-dependent input parameters for the FastScape plugin.
-         */
-        void update() override;
-
-
       private:
         /**
          * Function used to set the FastScape ghost nodes. FastScape boundaries are

source/mesh_deformation/fastscape.cc

@@ -1625,6 +1625,14 @@ namespace aspect
           const double scaled_time = this->convert_output_to_years() ? time / year_in_seconds : time;
           kf_distribution_function.set_time(scaled_time);
         }
+
+      if (use_sea_level_function)
+        {
+          if (this->convert_output_to_years())
+            sea_level_function.set_time(this->get_time() / year_in_seconds);
+          else
+            sea_level_function.set_time(this->get_time());
+        }
     }
 
 
@@ -1636,18 +1644,6 @@ namespace aspect
       return true;
     }
 
-    template <int dim>
-    void
-    FastScape<dim>::update()
-    {
-      if (use_sea_level_function)
-        {
-          if (this->convert_output_to_years())
-            sea_level_function.set_time(this->get_time() / year_in_seconds);
-          else
-            sea_level_function.set_time(this->get_time());
-        }
-    }
 
 
     template <int dim>