Changeset 71

Timestamp:

04/27/09 16:51:25 (16 years ago)

Author:

seroussi

Message:

count start at 1 even in ice

File:

• issm/trunk/src/m/solutions/ice/diagnostic_core_nonlinear.m (modified) (5 diffs)

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

@@ -42 +42 @@
                 soln(1).u_g=velocity_param;
                 soln(1).u_g(4:6:gridset.gsize)=0; %no pressure in the velocity
-                soln(2).u_g=velocity_param;
-                soln(2).u_g(4:6:gridset.gsize)=0; %no pressure in the velocity
         else    
                 soln(1).u_g={};
-                soln(2).u_g={};
         end
 else
@@ -52 +49 @@
         inputs=struct();
         soln(1).u_g={};
-        soln(2).u_g={};
 end
 
 
 %Initialization
-count=2;
+count=1;
 converged=0;
         
@@ -73 +69 @@
                 pflag=1;
         else
-                if count==2, pflag=1; else pflag=0; end
+                if count==1, pflag=1; else pflag=0; end
         end
 
         %add velocity to inputs
         inputs.velocity=soln(count).u_g;
-        inputs.oldvelocity=soln(count-1).u_g;
+        if count>1,
+                inputs.oldvelocity=soln(count-1).u_g;
+        end
         
         %generate stiffness and loads
@@ -85 +83 @@
 
         %Save loads 
-        if count==2, 
+        if count==1, 
                 p_g_old=p_g;
         else
@@ -117 +115 @@
 
         %Figure out if convergence is reached.
-        if((count>=4)| velocity_is_present), %make sure we already iterated at least once.
+        if((count>=3)| velocity_is_present), %make sure we already iterated at least once.
 
                 %compute relative velocity difference for this step.