Changeset 7391 for issm/trunk/src/c/solvers/solver_linear.cpp

Timestamp:

02/08/11 21:10:57 (14 years ago)

Author:

Eric.Larour

Message:

Added support for Stokes solvers

File:

• issm/trunk/src/c/solvers/solver_linear.cpp (modified) (2 diffs)

issm/trunk/src/c/solvers/solver_linear.cpp

@@ -14 +14 @@
         Vec  ug  = NULL, uf  = NULL;
         Vec  pg  = NULL, pf  = NULL;
+        Vec dg  = NULL, df  = NULL;
         bool kffpartitioning;
 
@@ -20 +21 @@
 
         if(kffpartitioning){
-                SystemMatricesx(NULL,&Kff, &Kfs, NULL,&pf, NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
+                SystemMatricesx(NULL,&Kff, &Kfs, NULL,&pf, NULL, &df, NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
                 Reduceloadx(pf, Kfs, femmodel->ys); MatFree(&Kfs);
         }
         else{
-                SystemMatricesx(&Kgg, NULL, NULL, &pg,NULL, NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
+                SystemMatricesx(&Kgg, NULL, NULL, &pg,NULL, &dg, NULL, NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
                 Reducematrixfromgtofx(&Kff,&Kfs,Kgg,femmodel->nodesets); MatFree(&Kgg);
                 Reduceloadfromgtofx(&pf, pg, Kfs, femmodel->ys, femmodel->nodesets);VecFree(&pg); MatFree(&Kfs);
+                Reducevectorgtofx(&df, dg, femmodel->nodesets,femmodel->parameters); VecFree(&dg);
         }
 
-        Solverx(&uf, Kff, pf, NULL, femmodel->parameters); MatFree(&Kff); VecFree(&pf);
+        Solverx(&uf, Kff, pf, NULL, df, femmodel->parameters); MatFree(&Kff); VecFree(&pf); VecFree(&df);
         Mergesolutionfromftogx(&ug, uf,femmodel->ys,femmodel->nodesets);VecFree(&uf);
         InputUpdateFromSolutionx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug); VecFree(&ug); VecFree(&uf);