[cig-commits] commit 1905 by buerg to /var/svn/dealii/aspect

[dealii.demon at gmail.com]

Revision 1905

Insert r1615.

U   trunk/aspire/cantera.prm
U   trunk/aspire/include/aspect/simulator.h
U   trunk/aspire/source/simulator/solver.cc


http://www.dealii.org/websvn/revision.php?repname=Aspect+Repository&path=%2F&rev=1905&peg=1905

Diff:
Modified: trunk/aspire/cantera.prm
===================================================================
--- trunk/aspire/cantera.prm	2013-09-23 14:25:18 UTC (rev 1904)
+++ trunk/aspire/cantera.prm	2013-09-23 15:38:26 UTC (rev 1905)
@@ -5,7 +5,7 @@
 
 subsection Discretization
  subsection Stabilization parameters
-     set grad div = 0.5
+     set grad div = 2e-4
   end
 end
 

Modified: trunk/aspire/include/aspect/simulator.h
===================================================================
--- trunk/aspire/include/aspect/simulator.h	2013-09-23 14:25:18 UTC (rev 1904)
+++ trunk/aspire/include/aspect/simulator.h	2013-09-23 15:38:26 UTC (rev 1905)
@@ -167,7 +167,7 @@
         std::string                    output_directory;
         double                         surface_pressure;
         unsigned int                   timing_output_frequency;
-        double                         linear_solver_tolerance;
+        double                         linear_stokes_solver_tolerance;
         unsigned int                   n_cheap_stokes_solver_steps;
         double                         temperature_solver_tolerance;
         double                         composition_solver_tolerance;
@@ -210,7 +210,7 @@
          * @{
          */
         double                         stabilization_graddiv;
-        double                         stabilization_alpha;
+        unsigned int                   stabilization_alpha;
         double                         stabilization_c_R;
         double                         stabilization_beta;
         /**

Modified: trunk/aspire/source/simulator/solver.cc
===================================================================
--- trunk/aspire/source/simulator/solver.cc	2013-09-23 14:25:18 UTC (rev 1904)
+++ trunk/aspire/source/simulator/solver.cc	2013-09-23 15:38:26 UTC (rev 1905)
@@ -38,7 +38,7 @@
     /**
      * Implement multiplication with Stokes part of system matrix
      */
-    class StokesBlock : public PointerMatrixBase<LinearAlgebra::BlockVector>
+    class StokesBlock
     {
       public:
         /**
@@ -47,10 +47,12 @@
          * @param S The entire system matrix
          */
         StokesBlock (const LinearAlgebra::BlockSparseMatrix  &S)
-          : system_matrix(S) {};
+          : system_matrix(S) {}
 
         /**
-         * Matrix vector product with Stokes block.
+         * Matrix vector product with Stokes block in various forms. Note that
+         * the vectors may have more components than just the two we touch here
+         * but we don't care.
          */
         void vmult (LinearAlgebra::BlockVector       &dst,
                     const LinearAlgebra::BlockVector &src) const;
@@ -74,17 +76,10 @@
                          const TrilinosWrappers::MPI::BlockVector &x,
                          const TrilinosWrappers::MPI::BlockVector &b) const;
 
-        virtual void clear() {};
-
       private:
 
-        virtual const void *get () const
-        {
-          return &system_matrix;
-        };
-
         /**
-         * References to the system matrix object.
+         * Reference to the system matrix object.
          */
         const LinearAlgebra::BlockSparseMatrix &system_matrix;
     };