Changeset 16789 for issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

Timestamp:

11/15/13 15:41:42 (11 years ago)

Author:

Mathieu Morlighem

Message:

NEW: AddToGlobal and condensation now done by SystemMatrices

File:

• issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

@@ -2349 +2349 @@
         /*clean-up*/
         delete gauss;
+}
+/*}}}*/
+/*FUNCTION Tria::ReduceMatrices {{{*/
+void Tria::ReduceMatrices(ElementMatrix* Ke,ElementVector* pe){
+
+        /*Static condensation if requested*/
+        if(pe){
+                if(this->element_type==MINIcondensedEnum){
+                        int indices[2]={6,7};
+                        pe->StaticCondensation(Ke,2,&indices[0]);
+                }
+                else if(this->element_type==P1bubblecondensedEnum){
+                        int size   = nodes[3]->GetNumberOfDofs(NoneApproximationEnum,GsetEnum);
+                        int offset = 0;
+                        for(int i=0;i<3;i++) offset+=nodes[i]->GetNumberOfDofs(NoneApproximationEnum,GsetEnum);
+                        int* indices=xNew<int>(size);
+                        for(int i=0;i<size;i++) indices[i] = offset+i;
+                        pe->StaticCondensation(Ke,size,indices);
+                        xDelete<int>(indices);
+                }
+        }
+
+        if(Ke){
+                if(this->element_type==MINIcondensedEnum){
+                        int indices[2]={6,7};
+                        Ke->StaticCondensation(2,&indices[0]);
+                }
+                else if(this->element_type==P1bubblecondensedEnum){
+                        int size   = nodes[3]->GetNumberOfDofs(NoneApproximationEnum,GsetEnum);
+                        int offset = 0;
+                        for(int i=0;i<3;i++) offset+=nodes[i]->GetNumberOfDofs(NoneApproximationEnum,GsetEnum);
+                        int* indices=xNew<int>(size);
+                        for(int i=0;i<size;i++) indices[i] = offset+i;
+                        Ke->StaticCondensation(size,indices);
+                        xDelete<int>(indices);
+                }
+        }
+
+
 }
 /*}}}*/