Changeset 20123 for issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp

Timestamp:

02/11/16 19:26:22 (9 years ago)

Author:

Eric.Larour

Message:

CHG: InputUpateFromSolution now computes delta thickness and inputs it as SealevelriseDeltathickness. This is used
to force the sea level rise core if it is run.

File:

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

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

@@ -670 +670 @@
         /*Fetch dof list and allocate solution vector*/
         basalelement->GetDofList(&doflist,NoneApproximationEnum,GsetEnum);
-        IssmDouble* newthickness = xNew<IssmDouble>(numnodes);
-        IssmDouble* newbed       = xNew<IssmDouble>(numnodes);
-        IssmDouble* newsurface   = xNew<IssmDouble>(numnodes);
-        IssmDouble* oldthickness = xNew<IssmDouble>(numnodes);
-        IssmDouble* oldbed       = xNew<IssmDouble>(numnodes);
-        IssmDouble* oldsurface   = xNew<IssmDouble>(numnodes);
-        IssmDouble* phi          = xNew<IssmDouble>(numnodes);
+        IssmDouble* newthickness   = xNew<IssmDouble>(numnodes);
+        IssmDouble* deltathickness = xNew<IssmDouble>(numnodes);
+        IssmDouble* newbed         = xNew<IssmDouble>(numnodes);
+        IssmDouble* newsurface     = xNew<IssmDouble>(numnodes);
+        IssmDouble* oldthickness   = xNew<IssmDouble>(numnodes);
+        IssmDouble* oldbed         = xNew<IssmDouble>(numnodes);
+        IssmDouble* oldsurface     = xNew<IssmDouble>(numnodes);
+        IssmDouble* phi            = xNew<IssmDouble>(numnodes);
 
         /*Use the dof list to index into the solution vector: */
@@ -692 +693 @@
         basalelement->GetInputListOnNodes(&oldthickness[0],ThicknessEnum);
         basalelement->GetInputListOnNodes(&phi[0],MaskGroundediceLevelsetEnum);
+
+        
+        /*What is the delta thickness, useful for Sea-level rise:*/
+        for(i=0;i<numnodes;i++) deltathickness[i]=newthickness[i]-oldthickness[i];
 
         /*Find MasstransportHydrostaticAdjustment to figure out how to update the geometry:*/
@@ -719 +724 @@
         /*Add input to the element: */
         element->AddBasalInput(ThicknessEnum,newthickness,P1Enum);
+        element->AddBasalInput(SealevelriseDeltathicknessEnum,deltathickness,P1Enum);
         element->AddBasalInput(SurfaceEnum,newsurface,P1Enum);
         element->AddBasalInput(BaseEnum,newbed,P1Enum);
@@ -727 +733 @@
         xDelete<IssmDouble>(newsurface);
         xDelete<IssmDouble>(oldthickness);
+        xDelete<IssmDouble>(deltathickness);
         xDelete<IssmDouble>(oldbed);
         xDelete<IssmDouble>(oldsurface);