Changeset 6011

Timestamp:

09/24/10 09:32:27 (15 years ago)

Author:

Mathieu Morlighem

Message:

Added parameters to ReduceLoad

Location:

issm/trunk/src/c

Files:

• modules/Reduceloadx/Reduceloadx.cpp (modified) (1 diff)
• modules/Reduceloadx/Reduceloadx.h (modified) (1 diff)
• solvers/solver_adjoint_linear.cpp (modified) (1 diff)
• solvers/solver_diagnostic_nonlinear.cpp (modified) (1 diff)
• solvers/solver_linear.cpp (modified) (1 diff)
• solvers/solver_thermal_nonlinear.cpp (modified) (1 diff)

issm/trunk/src/c/modules/Reduceloadx/Reduceloadx.cpp

@@ -11 +11 @@
 #include "./Reduceloadx.h"
 
-void    Reduceloadx( Vec pf, Mat Kfs, Vec y_s, bool flag_ys0){
+void    Reduceloadx( Vec pf, Mat Kfs, Vec y_s,Parameters* parameters,bool flag_ys0){
 
         /*intermediary*/
-        Vec y_s0=NULL;
-        Vec Kfsy_s=NULL;
-        int Kfsm,Kfsn;
+        Vec         y_s0   = NULL;
+        Vec         Kfsy_s = NULL;
+        int         Kfsm,Kfsn;
         PetscScalar a;
-        bool fromlocalsize=true;
-        int  verbose=1;
+        bool        fromlocalsize = true;
+        int         verbose;
 
-        //parameters->FindParam(&verbose,VerboseEnum);
+        parameters->FindParam(&verbose,VerboseEnum);
         if (verbose) _printf_("   Dirichlet lifting applied to load vector\n");
         

issm/trunk/src/c/modules/Reduceloadx/Reduceloadx.h

@@ -9 +9 @@
 
 /* local prototypes: */
-void    Reduceloadx( Vec pf, Mat Kfs, Vec ys, bool flag_ys0=false);
+void    Reduceloadx( Vec pf, Mat Kfs, Vec ys,Parameters* parameters, bool flag_ys0=false);
 
 #endif  /* _REDUCELOADX_H */

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

@@ -23 +23 @@
         if(kffpartitioning){
                 SystemMatricesx(NULL,&Kff, &Kfs, NULL,&pf, NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
-                Reduceloadx(pf, Kfs, femmodel->ys,true); MatFree(&Kfs); //true means spc = 0
+                Reduceloadx(pf, Kfs, femmodel->ys,femmodel->parameters,true); MatFree(&Kfs); //true means spc = 0
         }
         else{

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

@@ -56 +56 @@
                 if(kffpartitioning){
                         SystemMatricesx(NULL,&Kff, &Kfs, NULL,&pf, NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,loads,femmodel->materials,femmodel->parameters);
-                        Reduceloadx(pf, Kfs, femmodel->ys); MatFree(&Kfs);
+                        Reduceloadx(pf, Kfs, femmodel->ys,femmodel->parameters); MatFree(&Kfs);
                 }
                 else{

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

@@ -21 +21 @@
         if(kffpartitioning){
                 SystemMatricesx(NULL,&Kff, &Kfs, NULL,&pf, NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
-                Reduceloadx(pf, Kfs, femmodel->ys); MatFree(&Kfs);
+                Reduceloadx(pf, Kfs, femmodel->ys,femmodel->parameters); MatFree(&Kfs);
         }
         else{

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

@@ -53 +53 @@
                 if(kffpartitioning){
                         SystemMatricesx(NULL,&Kff, &Kfs, NULL,&pf,&melting_offset,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
-                        Reduceloadx(pf, Kfs, femmodel->ys); MatFree(&Kfs);
+                        Reduceloadx(pf, Kfs, femmodel->ys,femmodel->parameters); MatFree(&Kfs);
                 }
                 else{