Changeset 24976

Timestamp:

06/06/20 13:26:11 (5 years ago)

Author:

Eric.Larour

Message:

CHG: reverse the order, because otherwise, we are generating
uplift under ice shelves from ice loads!

File:

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

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

@@ -6010 +6010 @@
         }
 
-        if (masks->isiceonly[this->lid]){
+
+        if(masks->isoceanin[this->lid]){
+                /*From Sg, recover water sea level rise:*/
+                S=0; for(int i=0;i<NUMVERTICES;i++) S+=Sg[this->vertices[i]->Sid()]/NUMVERTICES;
+
+                /*convert to kg/m^2:*/
+                S=rho_water*S;
+
+                for(int i=0;i<gsize;i++){
+                        Up[i]+=S*GU[i];
+                        if(horiz){
+                                North[i]+=S*GN[i];
+                                East[i]+=S*GE[i];
+                        }
+                }
+        }
+        else if (masks->isiceonly[this->lid]){
 
                 /*Compute ice thickness change: */
@@ -6025 +6041 @@
                                 North[i]+=I*GN[i];
                                 East[i]+=I*GE[i];
-                        }
-                }
-        }
-        else if(masks->isoceanin[this->lid]){
-                /*From Sg, recover water sea level rise:*/
-                S=0; for(int i=0;i<NUMVERTICES;i++) S+=Sg[this->vertices[i]->Sid()]/NUMVERTICES;
-
-                /*convert to kg/m^2:*/
-                S=rho_water*S;
-
-                for(int i=0;i<gsize;i++){
-                        Up[i]+=S*GU[i];
-                        if(horiz){
-                                North[i]+=S*GN[i];
-                                East[i]+=S*GE[i];
                         }
                 }