[cig-commits] commit 1941 by heister to /var/svn/dealii/aspect

dealii.demon at gmail.com dealii.demon at gmail.com
Sun Oct 6 08:21:13 PDT 2013


Revision 1941

fix compiler error from r1931 (suddenly stopped compiling here, don't understand why)

U   trunk/aspect/include/aspect/introspection.h
U   trunk/aspect/source/simulator/introspection.cc


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

Diff:
Modified: trunk/aspect/include/aspect/introspection.h
===================================================================
--- trunk/aspect/include/aspect/introspection.h	2013-10-06 14:47:40 UTC (rev 1940)
+++ trunk/aspect/include/aspect/introspection.h	2013-10-06 15:20:29 UTC (rev 1941)
@@ -113,8 +113,8 @@
         ComponentIndices (const unsigned int n_compositional_fields);
 
         static const unsigned int       velocities[dim];
-        static const unsigned int       pressure    = dim;
-        static const unsigned int       temperature = dim+1;
+        static const unsigned int       pressure;
+        static const unsigned int       temperature;
         const std::vector<unsigned int> compositional_fields;
       };
       /**

Modified: trunk/aspect/source/simulator/introspection.cc
===================================================================
--- trunk/aspect/source/simulator/introspection.cc	2013-10-06 14:47:40 UTC (rev 1940)
+++ trunk/aspect/source/simulator/introspection.cc	2013-10-06 15:20:29 UTC (rev 1941)
@@ -33,6 +33,15 @@
   const unsigned int
   Introspection<3>::ComponentIndices::velocities[3] = { 0, 1, 2 };
 
+  template <int dim>
+  const unsigned int
+  Introspection<dim>::ComponentIndices::pressure = dim;
+
+  template <int dim>
+  const unsigned int
+  Introspection<dim>::ComponentIndices::temperature = dim+1;
+
+
   namespace
   {
     template <int dim>


More information about the CIG-COMMITS mailing list