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

Timestamp:

12/03/13 14:23:49 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: moving DVector to analysis

File:

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

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

@@ -377 +377 @@
         /*get inputs configured too: */
         this->inputs->Configure(parameters);
-}
-/*}}}*/
-/*FUNCTION Penta::CreateDVector {{{*/
-void  Penta::CreateDVector(Vector<IssmDouble>* df){
-
-        /*retrieve parameters: */
-        ElementVector* De=NULL;
-        int analysis_type;
-        parameters->FindParam(&analysis_type,AnalysisTypeEnum);
-
-        /*Checks in debugging*/
-        _assert_(this->nodes && this->material && this->matpar && this->verticalneighbors && this->parameters && this->inputs);
-
-        switch(analysis_type){
-                #ifdef _HAVE_STRESSBALANCE_
-                case StressbalanceAnalysisEnum:
-                        De=CreateDVectorStressbalanceHoriz();
-                        break;
-                #endif
-        }
-
-        /*Add to global Vector*/
-        if(De){
-                De->InsertIntoGlobal(df);
-                delete De;
-        }
 }
 /*}}}*/
@@ -4476 +4450 @@
 #endif
 
-#ifdef _HAVE_STRESSBALANCE_
-/*FUNCTION Penta::CreateDVectorStressbalanceHoriz {{{*/
-ElementVector* Penta::CreateDVectorStressbalanceHoriz(void){
-
-        int approximation;
-        inputs->GetInputValue(&approximation,ApproximationEnum);
-
-        switch(approximation){
-                case FSApproximationEnum:
-                        return CreateDVectorStressbalanceFS();
-                default:
-                        return NULL; //no need for doftypes outside of FS approximation
-        }
-}
-/*}}}*/
-/*FUNCTION Penta::CreateDVectorStressbalanceFS{{{*/
-ElementVector* Penta::CreateDVectorStressbalanceFS(void){
-
-        /*output: */
-        ElementVector* De=NULL;
-
-        /*Initialize Element vector and return if necessary*/
-        int approximation;
-        inputs->GetInputValue(&approximation,ApproximationEnum);
-        if(approximation!=FSApproximationEnum) return NULL;
-
-        /*Fetch number of nodes and dof for this finite element*/
-        int vnumnodes = this->NumberofNodesVelocity();
-        int pnumnodes = this->NumberofNodesPressure();
-
-        De=new ElementVector(nodes,vnumnodes+pnumnodes,this->parameters,FSvelocityEnum);
-
-        for(int i=0;i<vnumnodes;i++){
-                De->values[i*3+0]=VelocityEnum;
-                De->values[i*3+1]=VelocityEnum;
-                De->values[i*3+2]=VelocityEnum;
-        }
-        for(int i=0;i<pnumnodes;i++){
-                De->values[vnumnodes*3+i]=PressureEnum;
-        }
-
-        return De;
-}
-/*}}}*/
-#endif
-
 #ifdef _HAVE_HYDROLOGY_
 /*FUNCTION Penta::CreateEPLDomainMassMatrix {{{*/