]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Do the same as in hp_dof_levels.cc: move all the functions to the .all_dimensions...
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 4 Dec 2006 16:29:21 +0000 (16:29 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 4 Dec 2006 16:29:21 +0000 (16:29 +0000)
git-svn-id: https://svn.dealii.org/trunk@14219 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/deal.II/source/dofs/dof_levels.all_dimensions.cc
deal.II/deal.II/source/dofs/dof_levels.cc [deleted file]

index 1767ec8ba8c0e176fdf9c4abb41b09ae0b7d5cdb..6f30abf737319e69b162eeb20e8ee88b54df517f 100644 (file)
@@ -12,7 +12,6 @@
 //---------------------------------------------------------------------------
 
 
-#include <base/exceptions.h>
 #include <base/memory_consumption.h>
 #include <dofs/dof_levels.h>
 
@@ -29,6 +28,33 @@ namespace internal
       return MemoryConsumption::memory_consumption (cell_dof_indices_cache);
     }
 
+
+    
+    unsigned int
+    DoFLevel<1>::memory_consumption () const
+    {
+      return (DoFLevel<0>::memory_consumption () +
+              MemoryConsumption::memory_consumption (lines));
+    }
+
+    
+    
+    unsigned int
+    DoFLevel<2>::memory_consumption () const
+    {
+      return (DoFLevel<0>::memory_consumption () +
+              MemoryConsumption::memory_consumption (quads));
+    }
+
+    
+
+    unsigned int
+    DoFLevel<3>::memory_consumption () const
+    {
+      return (DoFLevel<0>::memory_consumption () +
+              MemoryConsumption::memory_consumption (hexes));
+    }
+    
   }
   
 }
diff --git a/deal.II/deal.II/source/dofs/dof_levels.cc b/deal.II/deal.II/source/dofs/dof_levels.cc
deleted file mode 100644 (file)
index 3e273cc..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-#include <base/exceptions.h>
-#include <base/memory_consumption.h>
-#include <dofs/dof_levels.h>
-
-DEAL_II_NAMESPACE_OPEN
-
-
-namespace internal
-{
-  namespace DoFHandler
-  {
-
-#if deal_II_dimension == 1
-
-    unsigned int
-    DoFLevel<1>::memory_consumption () const
-    {
-      return (DoFLevel<0>::memory_consumption () +
-              MemoryConsumption::memory_consumption (lines));
-    }
-
-#endif
-
-#if deal_II_dimension == 2
-    
-    unsigned int
-    DoFLevel<2>::memory_consumption () const
-    {
-      return (DoFLevel<0>::memory_consumption () +
-              MemoryConsumption::memory_consumption (quads));
-    }
-
-#endif
-
-#if deal_II_dimension == 3
-
-    unsigned int
-    DoFLevel<3>::memory_consumption () const
-    {
-      return (DoFLevel<0>::memory_consumption () +
-              MemoryConsumption::memory_consumption (hexes));
-    }
-
-#endif
-    
-  }
-  
-}
-
-DEAL_II_NAMESPACE_CLOSE

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.