Changeset 5927

Timestamp:

09/21/10 16:10:27 (14 years ago)

Author:

seroussi

Message:

try to debug coupling stokes

Location:

issm/trunk/src/m

Files:

• solutions/diagnostic_core.m (modified) (1 diff)
• solvers/solver_stokescoupling_nonlinear.m (modified) (1 diff)

issm/trunk/src/m/solutions/diagnostic_core.m

@@ -61 +61 @@
         end
 
-        if dim==3 & (ismacayealpattyn | ishutter),
+        if dim==3 & (ismacayealpattyn | ishutter) & ~isstokes,
         
                 displaystring(verbose,'\n%s',['computing vertical velocities...']);

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

@@ -44 +44 @@
                 %Figure out if convergence have been reached
                 converged=convergence(K_ff,p_f,uf_horiz,old_uf_horiz,femmodel.parameters);
+                converged=1;
 
-                %Then compute vertical velocity
-                femmodel=SetCurrentConfiguration(femmodel,DiagnosticVertAnalysisEnum);
-                [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);
-
-                displaystring(femmodel.parameters.Verbose>1,'%s%g','      condition number of stiffness matrix: ',condest(K_ff));
-                uf_vert=Solver(K_ff,p_f,[],femmodel.parameters);
-
-                ug_vert= Mergesolutionfromftog( uf_vert, femmodel.ys, femmodel.nodesets,femmodel.parameters); 
-
-                [femmodel.elements,femmodel.materials]=InputUpdateFromSolution(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,ug_vert);
+%               %Then compute vertical velocity
+%               femmodel=SetCurrentConfiguration(femmodel,DiagnosticVertAnalysisEnum);
+%               [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);
+%
+%               displaystring(femmodel.parameters.Verbose>1,'%s%g','      condition number of stiffness matrix: ',condest(K_ff));
+%               uf_vert=Solver(K_ff,p_f,[],femmodel.parameters);
+%
+%               ug_vert= Mergesolutionfromftog( uf_vert, femmodel.ys, femmodel.nodesets,femmodel.parameters); 
+%
+%               [femmodel.elements,femmodel.materials]=InputUpdateFromSolution(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,ug_vert);
 
         end