Changeset 27193

Timestamp:

08/04/22 07:25:53 (3 years ago)

Author:

bdef

Message:

BUG: better managment of vector sizes

File:

• issm/trunk-jpl/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp (modified) (6 diffs)

issm/trunk-jpl/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp

@@ -78 +78 @@
                 inefanalysis->ElementizeEplMask(femmodel);
                 effanalysis->InitZigZagCounter(femmodel);
-                Reducevectorgtofx(&uf_epl, ug_epl, femmodel->nodes,femmodel->parameters);
                 ug_epl_init=ug_epl->Duplicate();
                 ug_epl->Copy(ug_epl_init);
@@ -145 +144 @@
                                         if (sedcount>=hydro_maxiter){
                                                 delete ug_sed;delete uf_sed;delete inefanalysis; delete ug_sed_main_iter;
-                                                if(isefficientlayer)delete ug_epl;delete uf_epl;delete effanalysis; delete ug_epl_main_iter;
+                                                if(isefficientlayer)delete ug_epl;delete effanalysis; delete ug_epl_main_iter;
                                                 _error_("   maximum number of Sediment iterations (" << hydro_maxiter << ") exceeded");
 
@@ -197 +196 @@
                                 /*}}}*/
                                 femmodel->profiler->Stop(EPLMasking);
+                                Reducevectorgtofx(&uf_epl, ug_epl, femmodel->nodes,femmodel->parameters);
                                 if(VerboseSolution()) _printf0_("Building EPL Matrix...\n");
                                 uf_epl_sub_iter=uf_epl->Duplicate();_assert_(uf_epl_sub_iter);
@@ -220 +220 @@
                                         convergence(&eplconverged,Kff,pf,uf_epl,uf_epl_sub_iter,eps_res,eps_rel,eps_abs);
                                         delete Kff; delete pf;
-                                        /* if (ndu_epl==0.0 && nu_epl==0.0) nu_epl=1.0e-6; /\*Hacking the case where the EPL is used but empty*\/ */
                                 }
                                 else{
@@ -243 +242 @@
                                 }
                                 eplcount++;
-                                delete uf_epl_sub_iter;
+                                delete uf_epl_sub_iter; delete uf_epl;
                                 if(eplconverged){
                                         if(VerboseSolution()) _printf0_("eplconverged...\n");
@@ -320 +319 @@
         /*Free resources: */
         delete ug_epl;delete ug_sed;
-        delete uf_sed;  delete uf_epl;
+        delete uf_sed;
         delete inefanalysis;    delete effanalysis;
 }