Changeset 24982

Timestamp:

06/08/20 16:34:18 (5 years ago)

Author:

Eric.Larour

Message:

CHG: bottom pressure modifications. Remove from geoid and add to RSL.

File:

• issm/trunk-jpl/src/c/cores/sealevelrise_core.cpp (modified) (8 diffs)

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

@@ -73 +73 @@
         /*variables:*/
         Vector<IssmDouble> *RSLg    = NULL;
+        Vector<IssmDouble> *BPg    = NULL;
         Vector<IssmDouble> *RSLg_rate    = NULL;
         Vector<IssmDouble> *RSLg_eustatic  = NULL; 
@@ -95 +96 @@
         int  horiz;
         int  geodetic=0;
-        IssmDouble          dt;
-        IssmDouble          oceanarea;
+        IssmDouble dt;
+        IssmDouble oceanarea;
+        int        bp_compute_fingerprints=0;
 
         /*Should we even be here?:*/
@@ -169 +171 @@
                 /*recover N_esa  = U_esa + RSLg:*/
                 N_esa=U_esa->Duplicate(); U_esa->Copy(N_esa); N_esa->AXPY(RSLg,1);
+
+                /*if we had bottom pressure loading, remove dynamic sea level from geoid: */
+                femmodel->parameters->FindParam(&bp_compute_fingerprints,DslComputeFingerprintsEnum);
+                if(bp_compute_fingerprints){
+                        GetVectorFromInputsx(&BPg,femmodel,DslSeaWaterPressureChangeAtSeaFloor,VertexSIdEnum);
+                        N_esa->AXPY(BPg,-1);
+                }
 
                 /*transform these values into rates (as we only run this once each frequency turn:*/
@@ -218 +227 @@
         delete N_esa;
         delete N_esa_rate;
+        delete BPg;
 
         if(horiz){
@@ -343 +353 @@
         Vector<IssmDouble> *RSLg    = NULL;
         Vector<IssmDouble> *RSLg_old    = NULL;
+        Vector<IssmDouble> *BPg    = NULL;
 
         Vector<IssmDouble> *RSLgo    = NULL; //ocean convolution of the perturbation to gravity potential.
@@ -360 +371 @@
         IssmDouble           eustatic;
         IssmDouble                      Ixz, Iyz, Izz; 
+        int bp_compute_fingerprints= 0;
         
         if(VerboseSolution()) _printf0_("         converging on ocean components\n");
@@ -425 +437 @@
                 /*convergence criterion:*/
                 slrconvergence(&converged,RSLg,RSLg_old,eps_rel,eps_abs);
+                
+                /*if we had bottom pressure loading, add dynamic sea level 
+                 * to RSL:*/
+                femmodel->parameters->FindParam(&bp_compute_fingerprints,DslComputeFingerprintsEnum);
+                if(bp_compute_fingerprints){
+                        GetVectorFromInputsx(&BPg,femmodel,DslSeaWaterPressureChangeAtSeaFloor,VertexSIdEnum);
+                        RSLg->AXPY(BPg,1);
+                }
 
                 /*free ressources: */
@@ -448 +468 @@
 
         delete RSLg_old;
+        delete BPg;
 
         return RSLg;