Changeset 6581

Timestamp:

11/15/10 13:55:35 (14 years ago)

Author:

Mathieu Morlighem

Message:

Some cleaning: parameters not needed for verbose

Location:

issm/trunk/src/m/solvers

Files:

• solver_adjoint_linear.m (modified) (1 diff)
• solver_diagnostic_nonlinear.m (modified) (1 diff)
• solver_linear.m (modified) (1 diff)
• solver_stokescoupling_nonlinear.m (modified) (2 diffs)
• solver_thermal_nonlinear.m (modified) (1 diff)

issm/trunk/src/m/solvers/solver_adjoint_linear.m

@@ -10 +10 @@
         if kffpartitioning,
                 [K_gg,K_ff,K_fs,p_g,p_f,kmax]=SystemMatrices(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters);
-                p_f = Reduceload( p_f, K_fs, femmodel.ys,femmodel.parameters,true);
+                p_f = Reduceload( p_f, K_fs, femmodel.ys,true);
         else
                 [K_gg,K_ff,K_fs,p_g,p_f,kmax]=SystemMatrices(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters);
-                [K_ff, K_fs] = Reducematrixfromgtof( K_gg, femmodel.nodesets,femmodel.parameters); 
-                p_f = Reduceloadfromgtof( p_g, K_fs, femmodel.ys, femmodel.nodesets,femmodel.parameters,true);
+                [K_ff, K_fs] = Reducematrixfromgtof( K_gg, femmodel.nodesets); 
+                p_f = Reduceloadfromgtof( p_g, K_fs, femmodel.ys, femmodel.nodesets,true);
         end
 
         issmprintf(VerboseSolver(),'%s%g','      condition number of stiffness matrix: ',condest(K_ff));
         u_f=Solver(K_ff,p_f,[],femmodel.parameters);
-        u_g= Mergesolutionfromftog( u_f, femmodel.ys, femmodel.nodesets,femmodel.parameters,true); 
+        u_g= Mergesolutionfromftog( u_f, femmodel.ys, femmodel.nodesets,true); 
 
         [femmodel.elements,femmodel.materials]=InputUpdateFromSolution(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,u_g);

issm/trunk/src/m/solvers/solver_diagnostic_nonlinear.m

@@ -30 +30 @@
                 if kffpartitioning,
                         [K_gg,K_ff,K_fs,p_g,p_f,kmax]=SystemMatrices(femmodel.elements,femmodel.nodes,femmodel.vertices,loads,femmodel.materials,femmodel.parameters);
-                        p_f = Reduceload( p_f, K_fs, femmodel.ys,femmodel.parameters);
+                        p_f = Reduceload( p_f, K_fs, femmodel.ys);
                 else
                         [K_gg,K_ff,K_fs,p_g,p_f,kmax]=SystemMatrices(femmodel.elements,femmodel.nodes,femmodel.vertices,loads,femmodel.materials,femmodel.parameters);
-                        [K_ff, K_fs] = Reducematrixfromgtof( K_gg, femmodel.nodesets,femmodel.parameters); 
-                        p_f = Reduceloadfromgtof( p_g, K_fs, femmodel.ys, femmodel.nodesets,femmodel.parameters);
+                        [K_ff, K_fs] = Reducematrixfromgtof( K_gg, femmodel.nodesets); 
+                        p_f = Reduceloadfromgtof( p_g, K_fs, femmodel.ys, femmodel.nodesets);
                 end
 
                 uf=Solver(K_ff,p_f,old_uf,femmodel.parameters);
-                ug= Mergesolutionfromftog( uf, femmodel.ys, femmodel.nodesets,femmodel.parameters); 
+                ug= Mergesolutionfromftog( uf, femmodel.ys, femmodel.nodesets); 
 
                 [femmodel.elements,femmodel.materials]=InputUpdateFromSolution(femmodel.elements,femmodel.nodes,femmodel.vertices,loads,femmodel.materials,femmodel.parameters,ug);

issm/trunk/src/m/solvers/solver_linear.m

@@ -10 +10 @@
         if kffpartitioning,
                 [K_gg,K_ff,K_fs,p_g,p_f,kmax]=SystemMatrices(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters);
-                p_f = Reduceload( p_f, K_fs, femmodel.ys,femmodel.parameters);
+                p_f = Reduceload( p_f, K_fs, femmodel.ys);
         else
                 [K_gg,K_ff,K_fs,p_g,p_f,kmax]=SystemMatrices(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters);
-                [K_ff, K_fs] = Reducematrixfromgtof( K_gg, femmodel.nodesets,femmodel.parameters); 
-                p_f = Reduceloadfromgtof( p_g, K_fs, femmodel.ys, femmodel.nodesets,femmodel.parameters);
+                [K_ff, K_fs] = Reducematrixfromgtof( K_gg, femmodel.nodesets); 
+                p_f = Reduceloadfromgtof( p_g, K_fs, femmodel.ys, femmodel.nodesets);
         end
 
         issmprintf(VerboseSolver(),'%s%g','      condition number of stiffness matrix: ',condest(K_ff));
         u_f=Solver(K_ff,p_f,[],femmodel.parameters);
-        u_g= Mergesolutionfromftog( u_f, femmodel.ys, femmodel.nodesets,femmodel.parameters); 
+        u_g= Mergesolutionfromftog( u_f, femmodel.ys, femmodel.nodesets); 
 
         [femmodel.elements,femmodel.materials]=InputUpdateFromSolution(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,u_g);

issm/trunk/src/m/solvers/solver_stokescoupling_nonlinear.m

@@ -30 +30 @@
                 if kffpartitioning,
                         [K_gg_horiz,K_ff_horiz,K_fs_horiz,p_g_horiz,p_f_horiz,kmax_horiz]=SystemMatrices(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters);
-                        p_f_horiz = Reduceload( p_f_horiz, K_fs_horiz, femmodel.ys,femmodel.parameters);
+                        p_f_horiz = Reduceload( p_f_horiz, K_fs_horiz, femmodel.ys);
                 else
                         [K_gg_horiz,K_ff_horiz,K_fs_horiz,p_g_horiz,p_f_horiz,kmax]=SystemMatrices(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters);
-                        [K_ff_horiz, K_fs_horiz] = Reducematrixfromgtof( K_gg_horiz, femmodel.nodesets,femmodel.parameters); 
-                        p_f_horiz = Reduceloadfromgtof( p_g_horiz, K_fs_horiz, femmodel.ys, femmodel.nodesets,femmodel.parameters);
+                        [K_ff_horiz, K_fs_horiz] = Reducematrixfromgtof( K_gg_horiz, femmodel.nodesets); 
+                        p_f_horiz = Reduceloadfromgtof( p_g_horiz, K_fs_horiz, femmodel.ys, femmodel.nodesets);
                 end
 
@@ -50 +50 @@
                 if kffpartitioning,
                         [K_gg_vert,K_ff_vert,K_fs_vert,p_g_vert,p_f_vert,kmax_vert]=SystemMatrices(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters);
-                        p_f_vert = Reduceload( p_f_vert, K_fs_vert, femmodel.ys,femmodel.parameters);
+                        p_f_vert = Reduceload( p_f_vert, K_fs_vert, femmodel.ys);
                 else
                         [K_gg_vert,K_ff_vert,K_fs_vert,p_g_vert,p_f_vert,kmax_vert]=SystemMatrices(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters);
-                        [K_ff_vert, K_fs_vert] = Reducematrixfromgtof( K_gg_vert, femmodel.nodesets,femmodel.parameters); 
-                        p_f_vert = Reduceloadfromgtof( p_g_vert, K_fs_vert, femmodel.ys, femmodel.nodesets,femmodel.parameters);
+                        [K_ff_vert, K_fs_vert] = Reducematrixfromgtof( K_gg_vert, femmodel.nodesets); 
+                        p_f_vert = Reduceloadfromgtof( p_g_vert, K_fs_vert, femmodel.ys, femmodel.nodesets);
                 end
 
                 uf_vert=Solver(K_ff_vert,p_f_vert,[],femmodel.parameters);
-
-                ug_vert= Mergesolutionfromftog( uf_vert, femmodel.ys, femmodel.nodesets,femmodel.parameters); 
+                ug_vert= Mergesolutionfromftog( uf_vert, femmodel.ys, femmodel.nodesets); 
 
                 [femmodel.elements,femmodel.materials]=InputUpdateFromSolution(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,ug_vert);

issm/trunk/src/m/solvers/solver_thermal_nonlinear.m

@@ -25 +25 @@
                 if kffpartitioning,
                         [K_gg,K_ff,K_fs,p_g,p_f,melting_offset]=SystemMatrices(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters);
-                        p_f = Reduceload( p_f, K_fs, femmodel.ys,femmodel.parameters);
+                        p_f = Reduceload( p_f, K_fs, femmodel.ys);
                 else
                         [K_gg,K_ff,K_fs,p_g,p_f,melting_offset]=SystemMatrices(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters);
-                        [K_ff, K_fs] = Reducematrixfromgtof( K_gg, femmodel.nodesets,femmodel.parameters); 
-                        p_f = Reduceloadfromgtof( p_g, K_fs, femmodel.ys, femmodel.nodesets,femmodel.parameters);
+                        [K_ff, K_fs] = Reducematrixfromgtof( K_gg, femmodel.nodesets); 
+                        p_f = Reduceloadfromgtof( p_g, K_fs, femmodel.ys, femmodel.nodesets);
                 end
 
                 issmprintf(VerboseSolver(),'%s%g','   condition number of stiffness matrix: ',condest(K_ff));
                 t_f=Solver(K_ff,p_f,[],femmodel.parameters);
-                t_g= Mergesolutionfromftog( t_f, femmodel.ys, femmodel.nodesets,femmodel.parameters); 
+                t_g= Mergesolutionfromftog( t_f, femmodel.ys, femmodel.nodesets); 
 
                 [femmodel.elements,femmodel.materials]=InputUpdateFromSolution(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,t_g);