Changeset 630

Timestamp:

05/28/09 14:59:46 (16 years ago)

Author:

Mathieu Morlighem

Message:

cosmetics

Location:

issm/trunk/src/m/solutions/ice

Files:

• StrainRateCompute.m (modified) (2 diffs)
• StressCompute.m (modified) (2 diffs)
• parameters.m (modified) (1 diff)

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

@@ -32 +32 @@
 
                         strainratematrix=[strainratevector(1) strainratevector(3) 
-                                                                        strainratevector(3)  strainratevector(2)];
+                        strainratevector(3)  strainratevector(2)];
 
                         %eigen values and vectors
@@ -72 +72 @@
 
                         strainratematrix=[strainratevector(1) strainratevector(4) strainratevector(5)
-                                      strainratevector(4)  strainratevector(2)  strainratevector(6)
-                                      strainratevector(5)  strainratevector(6)  strainratevector(3)];
+                        strainratevector(4)  strainratevector(2)  strainratevector(6)
+                        strainratevector(5)  strainratevector(6)  strainratevector(3)];
 
                         %eigen values and vectors
                         [directions,value]=eig(strainratematrix);
 
-                        %Plug into global vectors
+                        %Plug into global vectors
                         strainrate1(n,:)=strainratevector;
-                        A1(n,1)=value(1,1); A2(n,1)=value(2,2); A3(n,1)=value(3,3);
-                        Vx1(n,1)=directions(1,1); Vx2(n,1)=directions(1,2); Vx3(n,1)=directions(1,3);
-                        Vy1(n,1)=directions(2,1); Vy2(n,1)=directions(2,2); Vy3(n,1)=directions(2,3);
-                        Vz1(n,1)=directions(3,1); Vz2(n,1)=directions(3,2); Vz3(n,1)=directions(3,3);
+                        A1(n,1)=value(1,1); A2(n,1)=value(2,2); A3(n,1)=value(3,3);
+                        Vx1(n,1)=directions(1,1); Vx2(n,1)=directions(1,2); Vx3(n,1)=directions(1,3);
+                        Vy1(n,1)=directions(2,1); Vy2(n,1)=directions(2,2); Vy3(n,1)=directions(2,3);
+                        Vz1(n,1)=directions(3,1); Vz2(n,1)=directions(3,2); Vz3(n,1)=directions(3,3);
                 end
         end

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

@@ -33 +33 @@
 
                         stressmatrix=[stressvector(1) stressvector(3)
-                                      stressvector(3)  stressvector(2)];
+                        stressvector(3)  stressvector(2)];
 
                         %eigen values and vectors
                         [directions,value]=eig(stressmatrix);
 
-                        %Plug into global vectors
+                        %Plug into global vectors
                         stress1(n,:)=stressvector;
-                        A1(n,1)=value(1,1); A2(n,1)=value(2,2);
-                        Vx1(n,1)=directions(1,1); Vx2(n,1)=directions(1,2);
-                        Vy1(n,1)=directions(2,1); Vy2(n,1)=directions(2,2);
+                        A1(n,1)=value(1,1); A2(n,1)=value(2,2);
+                        Vx1(n,1)=directions(1,1); Vx2(n,1)=directions(1,2);
+                        Vy1(n,1)=directions(2,1); Vy2(n,1)=directions(2,2);
                 end
         end
@@ -74 +74 @@
 
                         stressmatrix=[stressvector(1) stressvector(4) stressvector(5)
-                                      stressvector(4)  stressvector(2)  stressvector(6)
-                                      stressvector(5)  stressvector(6)  stressvector(3)];
+                        stressvector(4)  stressvector(2)  stressvector(6)
+                        stressvector(5)  stressvector(6)  stressvector(3)];
 
                         %eigen values and vectors
                         [directions,value]=eig(stressmatrix);
 
-                        %Plug into global vectors
+                        %Plug into global vectors
                         stress1(n,:)=stressvector;
-                        A1(n,1)=value(1,1); A2(n,1)=value(2,2); A3(n,1)=value(3,3);
-                        Vx1(n,1)=directions(1,1); Vx2(n,1)=directions(1,2); Vx3(n,1)=directions(1,3);
-                        Vy1(n,1)=directions(2,1); Vy2(n,1)=directions(2,2); Vy3(n,1)=directions(2,3);
-                        Vz1(n,1)=directions(3,1); Vz2(n,1)=directions(3,2); Vz3(n,1)=directions(3,3);
+                        A1(n,1)=value(1,1); A2(n,1)=value(2,2); A3(n,1)=value(3,3);
+                        Vx1(n,1)=directions(1,1); Vx2(n,1)=directions(1,2); Vx3(n,1)=directions(1,3);
+                        Vy1(n,1)=directions(2,1); Vy2(n,1)=directions(2,2); Vy3(n,1)=directions(2,3);
+                        Vz1(n,1)=directions(3,1); Vz2(n,1)=directions(3,2); Vz3(n,1)=directions(3,3);
                 end
         end

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

@@ -2 +2 @@
 %PARAMETERS - compute parameters
 %
-%   This routine is caled by the solver to compute the parameters
+%   This routine is called by the solver to compute the parameters
 %   that are given in md.outputparameters (stress, strain rate,...)
 %