Changeset 17491

Timestamp:

03/20/14 05:28:30 (11 years ago)

Author:

Mathieu Morlighem

Message:

NEW: done with Tetra P1bubblecondensed

File:

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

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

@@ -580 +580 @@
 void Tetra::ReduceMatrices(ElementMatrix* Ke,ElementVector* pe){
 
-        int analysis_type;
-        parameters->FindParam(&analysis_type,AnalysisTypeEnum);
-
         if(pe){
-                if(analysis_type==StressbalanceAnalysisEnum){
-                        if(this->element_type==MINIcondensedEnum){
-                                int approximation;
-                                inputs->GetInputValue(&approximation,ApproximationEnum);
-                                if(approximation==HOFSApproximationEnum || approximation==SSAFSApproximationEnum){
-                                        //Do nothing, condensation already done in PVectorCoupling
-                                }
-                                else{
-                                        _error_("Not implemented");
-                                }
-                        }
-                        else if(this->element_type==P1bubblecondensedEnum){
-                                _error_("Not implemented");
-                        }
+                if(this->element_type==MINIcondensedEnum){
+                        _error_("Not implemented");
+                }
+                else if(this->element_type==P1bubblecondensedEnum){
+                        int size   = nodes[4]->GetNumberOfDofs(NoneApproximationEnum,GsetEnum);
+                        int offset = 0;
+                        for(int i=0;i<4;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(analysis_type==StressbalanceAnalysisEnum){
-                        int approximation;
-                        inputs->GetInputValue(&approximation,ApproximationEnum);
-                        if(approximation==HOFSApproximationEnum || approximation==SSAFSApproximationEnum){
-                                //Do nothing condensatino already done for Stokes part
-                        }
-                        else{
-                                if(this->element_type==MINIcondensedEnum){
-                                        _error_("Not implemented");
-                                }
-                                else if(this->element_type==P1bubblecondensedEnum){
-                                        _error_("Not implemented");
-                                }
-                        }
+                if(this->element_type==MINIcondensedEnum){
+                        _error_("Not implemented");
+                }
+                else if(this->element_type==P1bubblecondensedEnum){
+                        int size   = nodes[4]->GetNumberOfDofs(NoneApproximationEnum,GsetEnum);
+                        int offset = 0;
+                        for(int i=0;i<4;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);
                 }
         }