Changeset 14967 for issm/trunk-jpl/src/c/classes/FemModel.cpp

Timestamp:

05/08/13 13:48:23 (12 years ago)

Author:

bdef

Message:

BUG: Modification in the residual computation

File:

• issm/trunk-jpl/src/c/classes/FemModel.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -1459 +1459 @@
 #ifdef  _HAVE_DAKOTA_
 void FemModel::DakotaResponsesx(double* d_responses,char** responses_descriptors,int numresponsedescriptors,int d_numresponses){/*{{{*/
-
+        
         int        i,j;
         int        my_rank;
@@ -1562 +1562 @@
 void FemModel::Deflection(Vector<IssmDouble>* wg,Vector<IssmDouble>* dwgdt, IssmDouble* x, IssmDouble* y){ /*{{{*/
 
-        int      i;
-
+  int      i;
+        
         /*intermediary: */
         Element *element     = NULL;
-
+        
         /*Go through elements, and add contribution from each element to the deflection vector wg:*/
         for (i=0;i<elements->Size();i++){
@@ -1575 +1575 @@
 /*}}}*/
 #endif
+
+void FemModel::BasisIntegralsx(void){ /*{{{*/
+
+        Vector<IssmDouble>* basisg=NULL; 
+        
+        /*Vector allocation*/
+        basisg=new Vector<IssmDouble>(nodes->NumberOfNodes());
+        
+        for (int i=0;i<elements->Size();i++){
+                Element* element=dynamic_cast<Element*>(elements->GetObjectByOffset(i));
+                element->BasisIntegral(basisg);
+        }
+        /*Assemble*/
+        basisg->Assemble();
+        
+        /*Update Inputs*/
+        InputUpdateFromVectorx(elements,nodes,vertices,loads,materials,parameters,basisg,BasisIntegralEnum,NodesEnum);
+        
+}
+/*}}}*/