Changeset 24973

Timestamp:

06/05/20 17:34:18 (5 years ago)

Author:

Eric.Larour

Message:

CHG: fixed issue with masks in geodetic + better computation of bottom
pressure fingerprints.

File:

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

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

@@ -5758 +5758 @@
 
         /*Compute eustatic ice contribution to sea level rise: */
-        this->SealevelriseEustaticIce(Sgi,peustatic,masks, oceanarea);
+        //this->SealevelriseEustaticIce(Sgi,peustatic,masks, oceanarea);
 
 }
@@ -5931 +5931 @@
         /*diverse:*/
         int gsize,dummy;
-        IssmDouble S,BP, Stotal;  //change in water water level(Farrel and Clarke, Equ. 4)
+        IssmDouble S;  //change in water water level(Farrel and Clarke, Equ. 4)
         IssmDouble constant=0;
         IssmDouble rho_water;
@@ -5963 +5963 @@
         S=0; for(int i=0;i<NUMVERTICES;i++) S+=Sg_old[this->vertices[i]->Sid()]/NUMVERTICES;
 
-        /*If we have bottom pressure fingerprinting requested, retrieve BP: */
-        if(bp_compute_fingerprints){
-                Input2* bottompressure_change_input=this->GetInput2(DslSeaWaterPressureChangeAtSeaFloor);
-                if (!bottompressure_change_input)_error_("bottom pressure input needed to compute sea level rise fingerprint!");
-                bottompressure_change_input->GetInputAverage(&BP);
-
-        } else BP=0;
-
         /*convert to kg/m^2: */
         S=S*rho_water;
-        BP=BP*rho_water;
-
-        Stotal=S+BP;
-
-        for(int i=0;i<gsize;i++) Sgo[i]+=G[i]*Stotal;
+
+        for(int i=0;i<gsize;i++) Sgo[i]+=G[i]*S;
 
         return;
@@ -5986 +5975 @@
         /*diverse:*/
         int gsize;
-        IssmDouble I, S, BP, Stotal;            //change in relative ice thickness and sea level
+        IssmDouble I, S;                //change in relative ice thickness and sea level
         IssmDouble rho_ice,rho_water;
         int horiz;
@@ -6002 +5991 @@
         if(!masks->isiceonly[this->lid] && !masks->isoceanin[this->lid]) return;
 
-        /*early return if we are fully floating: */
-        if(masks->isfullyfloating[this->lid])return;
-
         /*recover parameters:*/
         this->parameters->FindParam(&computeelastic,SealevelriseElasticEnum);
@@ -6020 +6006 @@
         this->inputs2->GetArrayPtr(SealevelriseGUEnum,this->lid,&GU,&gsize); 
         if(horiz){
-                this->inputs2->GetArrayPtr(SealevelriseGUEnum,this->lid,&GU,&gsize); 
-                this->inputs2->GetArrayPtr(SealevelriseGUEnum,this->lid,&GU,&gsize); 
+                this->inputs2->GetArrayPtr(SealevelriseGEEnum,this->lid,&GE,&gsize); 
+                this->inputs2->GetArrayPtr(SealevelriseGNEnum,this->lid,&GN,&gsize); 
         }
 
@@ -6046 +6032 @@
                 S=0; for(int i=0;i<NUMVERTICES;i++) S+=Sg[this->vertices[i]->Sid()]/NUMVERTICES;
 
-                /*If we have bottom pressure fingerprinting requested, retrieve BP: */
-                if(bp_compute_fingerprints){
-                        Input2* bottompressure_change_input=this->GetInput2(DslSeaWaterPressureChangeAtSeaFloor);
-                        if (!bottompressure_change_input)_error_("bottom pressure input needed to compute sea level rise fingerprint!");
-                        bottompressure_change_input->GetInputAverage(&BP);
-                } else BP=0;
-
                 /*convert to kg/m^2:*/
                 S=rho_water*S;
-                BP=rho_water*BP;
-                Stotal=S+BP;
 
                 for(int i=0;i<gsize;i++){
-                        Up[i]+=Stotal*GU[i];
+                        Up[i]+=S*GU[i];
                         if(horiz){
-                                North[i]+=Stotal*GN[i];
-                                East[i]+=Stotal*GE[i];
+                                North[i]+=S*GN[i];
+                                East[i]+=S*GE[i];
                         }
                 }