Changeset 8814

Timestamp:

07/06/11 09:10:18 (14 years ago)

Author:

Mathieu Morlighem

Message:

Always use configuration_type when calling CreateNodalConstraints

Location:

issm/trunk/src/m/solvers

Files:

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

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

@@ -6 +6 @@
 
         %Get parameters
-        analysis_type=femmodel.parameters.AnalysisType;
+        configuration_type=femmodel.parameters.ConfigurationType;
 
         [K_ff,K_fs,p_f,df,kmax]=SystemMatrices(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters);
-        ys=CreateNodalConstraints(femmodel.nodes,analysis_type);
-        p_f = Reduceload( p_f, K_fs, ys,true);
+        ys =CreateNodalConstraints(femmodel.nodes,configuration_type);
+        p_f=Reduceload( p_f, K_fs, ys,true);
 
         issmprintf(VerboseSolver(),'%s%g','      condition number of stiffness matrix: ',condest(K_ff));
         u_f=Solver(K_ff,p_f,[],df,femmodel.parameters);
-        u_g= Mergesolutionfromftog( u_f, femmodel.ys, femmodel.nodes,femmodel.parameters,true); 
+        u_g=Mergesolutionfromftog( u_f, ys, femmodel.nodes,femmodel.parameters,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_linear.m

@@ -9 +9 @@
 
         [K_ff,K_fs,p_f,df,kmax]=SystemMatrices(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters);
-        ys=CreateNodalConstraints(femmodel.nodes,configuration_type);
-        p_f = Reduceload( p_f, K_fs, ys);
+        ys  =CreateNodalConstraints(femmodel.nodes,configuration_type);
+        p_f =Reduceload( p_f, K_fs, ys);
 
         issmprintf(VerboseSolver(),'%s%g','      condition number of stiffness matrix: ',condest(K_ff));

issm/trunk/src/m/solvers/solver_nonlinear.m

@@ -7 +7 @@
         %Branch on partitioning schema requested
         min_mechanical_constraints=femmodel.parameters.MinMechanicalConstraints;
-        analysis_type=femmodel.parameters.AnalysisType;
+        configuration_type=femmodel.parameters.ConfigurationType;
 
         %keep a copy of loads for now
@@ -29 +29 @@
 
                 [K_ff,K_fs,p_f,df,kmax]=SystemMatrices(femmodel.elements,femmodel.nodes,femmodel.vertices,loads,femmodel.materials,femmodel.parameters);
-                ys=CreateNodalConstraints(femmodel.nodes,analysis_type);
+                ys=CreateNodalConstraints(femmodel.nodes,configuration_type);
                 p_f = Reduceload( p_f, K_fs, ys);
 

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

@@ -17 +17 @@
                 %First compute the horizontal velocity
                 femmodel=SetCurrentConfiguration(femmodel,DiagnosticHorizAnalysisEnum);
-                analysis_type=femmodel.parameters.AnalysisType;
+                configuration_type=femmodel.parameters.ConfigurationType;
 
                 %Update the solution to make sure that vx and vxold are similar
@@ -27 +27 @@
 
                 [K_ff_horiz,K_fs_horiz,p_f_horiz,d_f_horiz,kmax_horiz]=SystemMatrices(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters);
-                ys=CreateNodalConstraints(femmodel.nodes,analysis_type);
+                ys=CreateNodalConstraints(femmodel.nodes,configuration_type);
                 p_f_horiz = Reduceload( p_f_horiz, K_fs_horiz, ys);
 
@@ -40 +40 @@
                 %Then compute vertical velocity
                 femmodel=SetCurrentConfiguration(femmodel,DiagnosticVertAnalysisEnum);
-                analysis_type=femmodel.parameters.AnalysisType;
+                configuration_type=femmodel.parameters.ConfigurationType;
 
                 [K_ff_vert,K_fs_vert,p_f_vert,d_f_vert,kmax_vert]=SystemMatrices(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters);
-                ys=CreateNodalConstraints(femmodel.nodes,analysis_type);
+                ys=CreateNodalConstraints(femmodel.nodes,configuration_type);
                 p_f_vert = Reduceload( p_f_vert, K_fs_vert, ys);
 

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

@@ -10 +10 @@
 
         %Get parameters
-        analysis_type=femmodel.parameters.AnalysisType;
+        configuration_type=femmodel.parameters.ConfigurationType;
 
         %stiffness and load generation only:
@@ -24 +24 @@
 
                 [K_ff,K_fs,p_f,d_f,melting_offset]=SystemMatrices(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters);
-                ys=CreateNodalConstraints(femmodel.nodes,analysis_type);
+                ys=CreateNodalConstraints(femmodel.nodes,configuration_type);
                 p_f = Reduceload( p_f, K_fs, ys);