Changeset 6013

Timestamp:

09/24/10 09:32:48 (14 years ago)

Author:

Mathieu Morlighem

Message:

Added parameters to ReduceLoad

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,true);
+                p_f = Reduceload( p_f, K_fs, femmodel.ys,femmodel.parameters,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);

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);
+                        p_f = Reduceload( p_f, K_fs, femmodel.ys,femmodel.parameters);
                 else
                         [K_gg,K_ff,K_fs,p_g,p_f,kmax]=SystemMatrices(femmodel.elements,femmodel.nodes,femmodel.vertices,loads,femmodel.materials,femmodel.parameters);

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);
+                p_f = Reduceload( p_f, K_fs, femmodel.ys,femmodel.parameters);
         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);

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

@@ -36 +36 @@
                 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);
+                        p_f = Reduceload( p_f, K_fs, femmodel.ys,femmodel.parameters);
                 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);
@@ -56 +56 @@
 %       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);
+%               p_f = Reduceload( p_f, K_fs, femmodel.ys,femmodel.parameters);
 %       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);

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);
+                        p_f = Reduceload( p_f, K_fs, femmodel.ys,femmodel.parameters);
                 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);