Changeset 3850

Timestamp:

05/19/10 14:40:23 (15 years ago)

Author:

seroussi

Message:

diagnostic2d ok in serial

Location:

issm/trunk/src/m/solutions/jpl

Files:

• convergence.m (modified) (1 diff)
• diagnostic_core_nonlinear.m (modified) (3 diffs)

issm/trunk/src/m/solutions/jpl/convergence.m

@@ -1 @@
-function converged=convergence(K_ff,p_f,u_f,u_f_old,params)
+function converged=convergence(K_ff,p_f,u_f,u_f_old,parameters)
 
 %Get convergence options
-verbose=params.verbose;
-yts=params.yts;
-eps_res=params.eps_res;
-eps_rel=params.eps_rel;
-eps_abs=params.eps_abs;
+verbose=parameters.Verbose;
+yts=parameters.Yts;
+eps_res=parameters.EpsRes;
+eps_rel=parameters.EpsRel;
+eps_abs=parameters.EpsAbs;
 
 %initialization

issm/trunk/src/m/solutions/jpl/diagnostic_core_nonlinear.m

@@ -18 +18 @@
         converged=0; count=1;
 
-        ug=GetSolutionFromInputs(m.elements, m.nodes, m.vertices, m.loads, m.materials, m.parameters, analysis_type, sub_analysis_type);
-        uf=Reducevectorgtof( ug, m.nodesets);
+        soln(count).u_g=GetSolutionFromInputs(m.elements, m.nodes, m.vertices, m.loads, m.materials, m.parameters, analysis_type, sub_analysis_type);
+        soln(count).u_f=Reducevectorgtof( soln(count).u_g, m.nodesets);
 
         displaystring(m.parameters.Verbose,'\n%s',['   starting direct shooting method']);
         while(~converged),
-                
-                old_ug=ug;
-                old_uf=uf;
                 
                 %system matrices 
@@ -49 +46 @@
 
                 %Update elements with new solution
-                m=UpdateInputsFromSolution(m,soln(count).u_g,analysis_type,sub_analysis_type);
+                m.elements=UpdateInputsFromSolution(m.elements,m.nodes,m.vertices,loads,m.materials,m.parameters,soln(count).u_g,analysis_type,sub_analysis_type);
                 
                 %penalty constraints
                 [loads,constraints_converged,num_unstable_constraints] =PenaltyConstraints( m.elements,m.nodes,m.vertices,loads, m.materials,m.parameters,analysis_type,sub_analysis_type);
-                error;
                 
                 displaystring(m.parameters.Verbose,'%s%i','      number of unstable constraints: ',num_unstable_constraints);
@@ -61 +57 @@
                         
                 %add convergence status into 
-                inputs=add(inputs,'converged',converged,'double');
+                m.elements=UpdateInputsFromConstant(m.elements,m.nodes,m.vertices,loads,m.materials,m.parameters,converged,analysis_type,sub_analysis_type);
 
                 %rift convergence criterion