Changeset 20153

Timestamp:

02/12/16 17:14:40 (9 years ago)

Author:

Eric.Larour

Message:

CHG: return absolute sea level rise instead of just deltaS.

Location:

issm/trunk-jpl/src/c

Files:

• analyses/SealevelriseAnalysis.cpp (modified) (1 diff)
• cores/sealevelrise_core.cpp (modified) (1 diff)

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

@@ -179 +179 @@
 }/*}}}*/
 void           SealevelriseAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/
-        _error_("not implemented yet");
+        
+        IssmDouble *deltaS  = NULL;
+        IssmDouble *S  = NULL;
+        int*        sidlist = NULL;
+        int         numvertices;
+        
+        numvertices= element->GetNumberOfVertices();
+        sidlist=xNew<int>(numvertices);
+        
+        element->GetVerticesSidList(sidlist);
+
+        deltaS = xNew<IssmDouble>(numvertices);
+        for(int i=0;i<numvertices;i++){
+                deltaS[i]=solution[sidlist[i]];
+        }
+
+        S = xNew<IssmDouble>(numvertices);
+        element->GetInputListOnVertices(S,SealevelriseSEnum,0);
+
+        /*Add deltaS to S:*/
+        for (int i=0;i<numvertices;i++)S[i]+=deltaS[i];
+
+        /*Add S back into inputs: */
+        element->AddInput(SealevelriseSEnum,S,P1Enum);
+
+        /*Free ressources:*/
+        xDelete<int>(sidlist);
+        xDelete<IssmDouble>(deltaS);
+        xDelete<IssmDouble>(S);
+
 }/*}}}*/
 void           SealevelriseAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/

issm/trunk-jpl/src/c/cores/sealevelrise_core.cpp

@@ -59 +59 @@
 
                 /*get results into elements:*/
-                InputUpdateFromVectorx(femmodel,Sg,SealevelriseSEnum,VertexSIdEnum);
+                InputUpdateFromSolutionx(femmodel,Sg);
 
                 if(save_results){