Changeset 20344

Timestamp:

03/24/16 14:43:24 (9 years ago)

Author:

Eric.Larour

Message:

CHG: simplified the solution by removing the Eustatic choice (which is now default). Also
modified the condition on which the eustatic level contribution is added for ice loading
elements, so as to better conserver mass!

File:

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

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

@@ -3610 +3610 @@
         bool computerigid = true;
         bool computeelastic= true;
-        bool computeeustatic = true;
-
         
         /*early return if we are not on an ice cap:*/
-        if(IsWaterInElement() | !IsIceInElement()){
+        if(!(this->inputs->Max(MaskIceLevelsetEnum)<0)){
                 *peustatic=0; //do not forget to assign this pointer, otherwise, global eustatic will be garbage!
                 return;
@@ -3627 +3625 @@
         this->parameters->FindParam(&computerigid,SealevelriseRigidEnum);
         this->parameters->FindParam(&computeelastic,SealevelriseElasticEnum);
-        this->parameters->FindParam(&computeeustatic,SealevelriseEustaticEnum);
 
         /*recover elastic green function:*/
@@ -3639 +3636 @@
         this->parameters->FindParam(&gsize,MeshNumberofverticesEnum);
 
+        /* Where is the centroid of this element?:{{{*/
+        
         /*retrieve coordinates: */
         ::GetVerticesCoordinates(&llr_list[0][0],this->vertices,NUMVERTICES,spherical);
         
-        /* Where is the centroid of this element?:*/
         IssmDouble minlong=400;
         IssmDouble maxlong=-20;
@@ -3675 +3673 @@
         late=late/180*PI;
         longe=longe/180*PI;
+        /*}}}*/
 
         /*Compute area of element:*/
@@ -3685 +3684 @@
 
         /*Compute eustatic compoent:*/
-        if(computeeustatic) eustatic += rho_ice*area*I/(oceanarea*rho_water); 
+        eustatic += rho_ice*area*I/(oceanarea*rho_water); 
 
         if(computeelastic | computerigid){
@@ -3758 +3757 @@
         bool computerigid = true;
         bool computeelastic= true;
-        bool computeeustatic = true;
 
         /*early return if we are not on the ocean:*/
@@ -3766 +3764 @@
         this->parameters->FindParam(&computerigid,SealevelriseRigidEnum);
         this->parameters->FindParam(&computeelastic,SealevelriseElasticEnum);
-        this->parameters->FindParam(&computeeustatic,SealevelriseEustaticEnum);
         
         /*early return if rigid or elastic not requested:*/
@@ -3858 +3855 @@
                 }
 
-                /*Add all components to the pSgi or pSgo solution vectors:*/
+                /*Add all components to the pSgo solution vectors:*/
                 if(computerigid)values[i]+=3*rho_water/rho_earth*area/eartharea*I*G_rigid[i];
                 if(computeelastic)values[i]+=3*rho_water/rho_earth*area/eartharea*I*G_elastic[i];