Changeset 16981

Timestamp:

11/29/13 19:31:15 (11 years ago)

Author:

Mathieu Morlighem

Message:

BUG: missing term in PVector Efficient

File:

• issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp (modified) (4 diffs)

issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp

@@ -162 +162 @@
                         basalelement->NodalFunctions(basis,gauss);
                         D_scalar=epl_specificstoring*epl_thickness*gauss->weight*Jdet;
-
                         TripleMultiply(basis,numnodes,1,0,
                                                 &D_scalar,1,1,0,
@@ -198 +197 @@
 
         /*Check that all nodes are active, else return empty matrix*/
-        if(basalelement->AllActive()) return NULL;
+        if(!basalelement->AllActive()) return NULL;
 
         /*Intermediaries */
-        IssmDouble dt,scalar,water_head;
+        IssmDouble dt,scalar,water_head,connectivity;
         IssmDouble transfer,residual,epl_thickness;
         IssmDouble Jdet;
@@ -208 +207 @@
 
         /*Fetch number of nodes and dof for this finite element*/
-        int numnodes = basalelement->GetNumberOfNodes();
+        int numnodes    = basalelement->GetNumberOfNodes();
+        int numvertices = basalelement->GetNumberOfVertices();
 
         /*Initialize Element vector*/
@@ -244 +244 @@
                         for(int i=0;i<numnodes;i++) pe->values[i]+=scalar*basis[i];
                 }
+        }
+        delete gauss;
+
+        /*      Add residual if necessary*/
+        gauss=basalelement->NewGauss();
+        for(int iv=0;iv<numvertices;iv++){
+                gauss->GaussVertex(iv);
+
+                connectivity = IssmDouble(basalelement->VertexConnectivity(iv));
+                residual_input->GetInputValue(&residual,gauss);
+                pe->values[iv]+=residual/connectivity;
         }