Fastscape update pr composition masks

include/aspect/mesh_deformation/fastscape.h

@@ -112,12 +112,12 @@ namespace aspect
        */
       void parse_parameters (ParameterHandler &prm);
 
-        /**
-         * A function that fills the viscosity derivatives in the
-         * MaterialModelOutputs object that is handed over, if they exist.
-         * Does nothing otherwise.
-         */
-        void set_ghost_nodes(double *h, double *vx, double *vy, double *vz, int nx, int ny) const;
+      /**
+       * A function that fills the viscosity derivatives in the
+       * MaterialModelOutputs object that is handed over, if they exist.
+       * Does nothing otherwise.
+       */
+      void set_ghost_nodes(double *h, double *vx, double *vy, double *vz, int nx, int ny) const;
 
     private:
       // Number of FastScape steps per ASPECT timestep.
@@ -213,7 +213,7 @@ namespace aspect
       double kdd;
       // Sediment transport coefficient.
       double kdsed;
-      
+
       // Orographic parameters
       int mmax;
       int wb;
@@ -259,18 +259,18 @@ namespace aspect
       double precision;
 
 
-        /**
-         * Interval between the generation of graphical output. This parameter
-         * is read from the input file and consequently is not part of the
-         * state that needs to be saved and restored.
-         */
-        double output_interval;
+      /**
+       * Interval between the generation of graphical output. This parameter
+       * is read from the input file and consequently is not part of the
+       * state that needs to be saved and restored.
+       */
+      double output_interval;
 
-        /**
-         * A time (in seconds) at which the last graphical output was supposed
-         * to be produced. Used to check for the next necessary output time.
-         */
-        mutable double last_output_time;
+      /**
+       * A time (in seconds) at which the last graphical output was supposed
+       * to be produced. Used to check for the next necessary output time.
+       */
+      mutable double last_output_time;
   };
 }
 }

source/material_model/rheology/visco_plastic.cc

@@ -453,6 +453,20 @@ namespace aspect
               composition_mask.set(i,false);
           }
 
+        // These are the compositional fields used to track deposition depth and
+        // sediment age of the sediments deposited by the FastScape plugin.
+        // ToDo: insert check that these fields are only set as a mask when fastscape is used?
+        if (this->introspection().compositional_name_exists("sediment_age"))
+          {
+            const int sedi_age_position_tmp = this->introspection().compositional_index_for_name("sediment_age");
+            composition_mask.set(sedi_age_position_tmp,false);
+          }
+        if (this->introspection().compositional_name_exists("deposition_depth"))
+          {
+            const int depo_depth_position_tmp = this->introspection().compositional_index_for_name("deposition_depth");
+            composition_mask.set(depo_depth_position_tmp,false);
+          }
+
         return composition_mask;
       }