Changeset 24983

Timestamp:

06/08/20 16:48:30 (5 years ago)

Author:

Eric.Larour

Message:

CHG: getting the BP part of RSL outside of the convergence loop.

File:

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

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

@@ -438 +438 @@
                 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: */
                 delete RSLgo;
@@ -466 +459 @@
         }
         if(VerboseConvergence()) _printf0_("\n              total number of iterations: " << count-1 << "\n");
+        
+        
+        /*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);
+        }
 
         delete RSLg_old;