Changeset 10532

Timestamp:

11/08/11 16:03:28 (13 years ago)

Author:

Mathieu Morlighem

Message:

Fixed rotation problem x^{z=[0 0 1]}

Location:

issm/trunk/src/c

Files:

• modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp (modified) (2 diffs)
• shared/Elements/CoordinateSystemTransform.cpp (modified) (2 diffs)

issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp

@@ -297 +297 @@
                                         }
 
-                                        /*Constraint at the bedrock interface (v.n = vz = 0) (Coordinates will be updated according to the bed slope)*/
-                                        if(nodeonbed[i] && nodeonicesheet[i] && nodeonstokes[i]){
-                                                constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,3,0.,DiagnosticHorizAnalysisEnum));
-                                                count++;
-                                        }
                                 }
                                 if ((int)vertices_type[i]==NoneApproximationEnum){
@@ -308 +303 @@
                                 }
 
+                        }
+
+                        /*Constraint at the bedrock interface (v.n = vz = 0) (Coordinates will be updated according to the bed slope)*/
+                        if(nodeonbed[i] && nodeonicesheet[i] && nodeonstokes[i]){
+                                constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,3,0.,DiagnosticHorizAnalysisEnum));
+                                count++;
                         }
                 }

issm/trunk/src/c/shared/Elements/CoordinateSystemTransform.cpp

@@ -9 +9 @@
         int     i,counter;
         int     numdofs           = 0;
-        double  x_norm,y_norm;
+        double  norm;
         double *transform         = NULL;
         double *values            = NULL;
@@ -44 +44 @@
                 switch(cs_array[i]){
                         case XYEnum:
-                                /*We remove the z component, we need to renormalize x and y*/
-                                x_norm = sqrt( coord_system[0][0]*coord_system[0][0] + coord_system[1][0]*coord_system[1][0]); _assert_(x_norm>1.e-5);
-                                y_norm = sqrt( coord_system[0][1]*coord_system[0][1] + coord_system[1][1]*coord_system[1][1]); _assert_(y_norm>1.e-5);
-                                transform[(numdofs)*(counter+0) + counter+0] = coord_system[0][0]/x_norm;
-                                transform[(numdofs)*(counter+0) + counter+1] = coord_system[0][1]/y_norm;
-                                transform[(numdofs)*(counter+1) + counter+0] = coord_system[1][0]/x_norm;
-                                transform[(numdofs)*(counter+1) + counter+1] = coord_system[1][1]/y_norm;
+                                /*We remove the z component, we need to renormalize x and y: x=[x1 x2 0] y=[-x2 x1 0]*/
+                                norm = sqrt( coord_system[0][0]*coord_system[0][0] + coord_system[1][0]*coord_system[1][0]); _assert_(norm>1.e-4);
+                                transform[(numdofs)*(counter+0) + counter+0] =   coord_system[0][0]/norm;
+                                transform[(numdofs)*(counter+0) + counter+1] = - coord_system[1][0]/norm;
+                                transform[(numdofs)*(counter+1) + counter+0] =   coord_system[1][0]/norm;
+                                transform[(numdofs)*(counter+1) + counter+1] =   coord_system[0][0]/norm;
                                 counter+=2;
                                 break;