[cig-commits] commit 1945 by bangerth to /var/svn/dealii/aspect

[dealii.demon at gmail.com]

Revision 1945

Partial revert of r1941: we only need the definitions in the .cc file, but we can keep the initializers in the .h file.

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=1945&peg=1945

Diff:
Modified: trunk/aspect/include/aspect/introspection.h
===================================================================
--- trunk/aspect/include/aspect/introspection.h	2013-10-08 15:18:50 UTC (rev 1944)
+++ trunk/aspect/include/aspect/introspection.h	2013-10-08 20:40:42 UTC (rev 1945)
@@ -113,8 +113,8 @@
         ComponentIndices (const unsigned int n_compositional_fields);
 
         static const unsigned int       velocities[dim];
-        static const unsigned int       pressure;
-        static const unsigned int       temperature;
+        static const unsigned int       pressure    = dim;
+        static const unsigned int       temperature = dim+1;
         const std::vector<unsigned int> compositional_fields;
       };
       /**

Modified: trunk/aspect/source/simulator/introspection.cc
===================================================================
--- trunk/aspect/source/simulator/introspection.cc	2013-10-08 15:18:50 UTC (rev 1944)
+++ trunk/aspect/source/simulator/introspection.cc	2013-10-08 20:40:42 UTC (rev 1945)
@@ -35,11 +35,11 @@
 
   template <int dim>
   const unsigned int
-  Introspection<dim>::ComponentIndices::pressure = dim;
+  Introspection<dim>::ComponentIndices::pressure;
 
   template <int dim>
   const unsigned int
-  Introspection<dim>::ComponentIndices::temperature = dim+1;
+  Introspection<dim>::ComponentIndices::temperature;
 
 
   namespace