Rev | Line | |
---|
[25834] | 1 | Index: ../trunk-jpl/src/c/cores/sealevelrise_core.cpp
|
---|
| 2 | ===================================================================
|
---|
| 3 | --- ../trunk-jpl/src/c/cores/sealevelrise_core.cpp (revision 24982)
|
---|
| 4 | +++ ../trunk-jpl/src/c/cores/sealevelrise_core.cpp (revision 24983)
|
---|
| 5 | @@ -437,14 +437,7 @@
|
---|
| 6 | /*convergence criterion:*/
|
---|
| 7 | slrconvergence(&converged,RSLg,RSLg_old,eps_rel,eps_abs);
|
---|
| 8 |
|
---|
| 9 | - /*if we had bottom pressure loading, add dynamic sea level
|
---|
| 10 | - * to RSL:*/
|
---|
| 11 | - femmodel->parameters->FindParam(&bp_compute_fingerprints,DslComputeFingerprintsEnum);
|
---|
| 12 | - if(bp_compute_fingerprints){
|
---|
| 13 | - GetVectorFromInputsx(&BPg,femmodel,DslSeaWaterPressureChangeAtSeaFloor,VertexSIdEnum);
|
---|
| 14 | - RSLg->AXPY(BPg,1);
|
---|
| 15 | - }
|
---|
| 16 | -
|
---|
| 17 | +
|
---|
| 18 | /*free ressources: */
|
---|
| 19 | delete RSLgo;
|
---|
| 20 | delete RSLgo_rot;
|
---|
| 21 | @@ -465,6 +458,15 @@
|
---|
| 22 |
|
---|
| 23 | }
|
---|
| 24 | if(VerboseConvergence()) _printf0_("\n total number of iterations: " << count-1 << "\n");
|
---|
| 25 | +
|
---|
| 26 | +
|
---|
| 27 | + /*if we had bottom pressure loading, add dynamic sea level
|
---|
| 28 | + * to RSL:*/
|
---|
| 29 | + femmodel->parameters->FindParam(&bp_compute_fingerprints,DslComputeFingerprintsEnum);
|
---|
| 30 | + if(bp_compute_fingerprints){
|
---|
| 31 | + GetVectorFromInputsx(&BPg,femmodel,DslSeaWaterPressureChangeAtSeaFloor,VertexSIdEnum);
|
---|
| 32 | + RSLg->AXPY(BPg,1);
|
---|
| 33 | + }
|
---|
| 34 |
|
---|
| 35 | delete RSLg_old;
|
---|
| 36 | delete BPg;
|
---|
Note:
See
TracBrowser
for help on using the repository browser.