Changeset 24680

Timestamp:

04/01/20 09:40:15 (5 years ago)

Author:

Mathieu Morlighem

Message:

BUG: problem with rifts activating penalties, they need to reallocate every time

File:

• issm/trunk-jpl/src/c/solutionsequences/solutionsequence_nonlinear.cpp (modified) (2 diffs)

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

@@ -54 +54 @@
         Reducevectorgtofx(&uf, ug, femmodel->nodes,femmodel->parameters);
 
-        //Update once again the solution to make sure that vx and vxold are similar (for next step in transient or steadystate)
+        /*Update once again the solution to make sure that vx and vxold are similar (for next step in transient or steadystate)*/
         InputUpdateFromConstantx(femmodel,converged,ConvergedEnum);
         InputUpdateFromSolutionx(femmodel,ug);
 
-        // allocate the matrices once and reuce them per iteration
-        AllocateSystemMatricesx(&Kff,&Kfs,&df,&pf,femmodel);
+        /*allocate the matrices once and reuse them per iteration*/
+        if(femmodel->loads->numrifts == 0){
+                AllocateSystemMatricesx(&Kff,&Kfs,&df,&pf,femmodel);
+        }
 
         for(;;){
@@ -67 +69 @@
                 delete ug;
 
+                if(femmodel->loads->numrifts){
+                        AllocateSystemMatricesx(&Kff,&Kfs,&df,&pf,femmodel);
+                }
                 SystemMatricesx(&Kff,&Kfs,&pf,&df,NULL,femmodel, true);
                 CreateNodalConstraintsx(&ys,femmodel->nodes);