]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Remove some fields that seem to have been left-over from copy-paste times.
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Sun, 28 Sep 2003 14:29:11 +0000 (14:29 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Sun, 28 Sep 2003 14:29:11 +0000 (14:29 +0000)
git-svn-id: https://svn.dealii.org/trunk@8044 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/deal.II/include/fe/mapping_cartesian.h
deal.II/deal.II/source/fe/mapping_cartesian.cc

index f6aef565d8bf36e0d289a657efb5d0e7357a79fd..832fcec8686cb7dd06a1fb55b4a9811702d16c90 100644 (file)
@@ -227,21 +227,6 @@ class MappingCartesian : public Mapping<dim>
                                          * points of all faces.
                                          */
        std::vector<Point<dim> > quadrature_points;
-       
-                                        /**
-                                         * Unit tangential vectors. Used
-                                         * for the computation of
-                                         * boundary forms and normal
-                                         * vectors.
-                                         *
-                                         * Filled once.
-                                         */
-        Table<2,Tensor<1,dim> > unit_tangentials;
-       
-                                        /**
-                                         * Auxiliary vectors for internal use.
-                                         */
-        Table<2,Tensor<1,dim> > aux;
     };
     
                                     /**
index 5214b53ae3cb04b90e9de0e89c3832de9e72717c..fcfc88ae3ab35711bd78cd4e401340451b5e0bfc 100644 (file)
@@ -46,9 +46,7 @@ MappingCartesian<dim>::InternalData::memory_consumption () const
 {
   return (Mapping<dim>::InternalDataBase::memory_consumption() +
          MemoryConsumption::memory_consumption (length) +
-         MemoryConsumption::memory_consumption (quadrature_points) +
-         MemoryConsumption::memory_consumption (unit_tangentials) +
-         MemoryConsumption::memory_consumption (aux));
+         MemoryConsumption::memory_consumption (quadrature_points));
 }
 
 
@@ -81,8 +79,6 @@ typename Mapping<dim>::InternalDataBase *
 MappingCartesian<dim>::get_data (const UpdateFlags      update_flags,
                                 const Quadrature<dim> &q) const
 {
-                                  //  Assert (flags & update_normal_vectors == 0, ExcNotImplemented());
-
   InternalData* data = new InternalData (q);
 
   data->update_once = update_once(update_flags);
@@ -227,43 +223,62 @@ MappingCartesian<dim>::compute_fill (const typename DoFHandler<dim>::cell_iterat
       Assert (normal_vectors.size() == npts,
              ExcDimensionMismatch(normal_vectors.size(), npts));
       Point<dim> n;
-      switch (100*dim+face_no)
-       {
-                                          // 2D
-         case 200:
-           n (1) = -1.;
-           break;
-         case 201:
-           n (0) = 1.;
-           break;
-         case 202:
-           n (1) = 1.;
-           break;
-         case 203:
-           n (0) = -1.;
-           break;
-                                            // 3D
-         case 300:
-           n (1) = -1.;
-           break;
-         case 301:
-           n (1) = 1.;
-           break;
-         case 302:
-           n (2) = -1.;
-           break;
-         case 303:
-           n (0) = 1.;
-           break;
-         case 304:
-           n (2) = 1.;
-           break;
-         case 305:
-           n (0) = -1.;
-           break;
-         default:
-           Assert (false, ExcInternalError());
-       }
+      switch (dim)
+        {
+          case 2:
+          {
+            switch (face_no)
+              {
+                case 0:
+                      n (1) = -1.;
+                      break;
+                case 1:
+                      n (0) = 1.;
+                      break;
+                case 2:
+                      n (1) = 1.;
+                      break;
+                case 3:
+                      n (0) = -1.;
+                      break;
+                default:
+                      Assert (false, ExcInternalError());
+              }
+            break;
+          }
+
+          case 3:
+          {
+            switch (face_no)
+              {
+                case 0:
+                      n (1) = -1.;
+                      break;
+                case 1:
+                      n (1) = 1.;
+                      break;
+                case 2:
+                      n (2) = -1.;
+                      break;
+                case 3:
+                      n (0) = 1.;
+                      break;
+                case 4:
+                      n (2) = 1.;
+                      break;
+                case 5:
+                      n (0) = -1.;
+                      break;
+                default:
+                      Assert (false, ExcInternalError());
+              }
+            break;
+          }
+
+          default:
+                Assert (false, ExcNotImplemented());
+        }
+      
                                       // furthermore, all normal
                                       // vectors on a face are equal
       std::fill (normal_vectors.begin(), normal_vectors.end(), n);

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.