Changeset 15707

Timestamp:

08/05/13 09:42:51 (12 years ago)

Author:

Mathieu Morlighem

Message:

BUG: Jacobian needs to be condensed as well

File:

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

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

@@ -729 +729 @@
         /*Add to global matrix*/
         if(Ke){
+                /*Condense if requested*/
+                if(this->element_type==MINIcondensedEnum){
+                        int indices[3]={18,19,20};
+                        Ke->StaticCondensation(3,&indices[0]);
+                }
+                else if(this->element_type==P1bubblecondensedEnum){
+                        int size   = nodes[6]->GetNumberOfDofs(NoneApproximationEnum,GsetEnum);
+                        int offset = 0;
+                        for(int i=0;i<6;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);
+                }
+
                 Ke->AddToGlobal(Jff);
                 delete Ke;