Changeset 3636

Timestamp:

04/28/10 09:36:23 (15 years ago)

Author:

Mathieu Morlighem

Message:

fixed Stokes with ice front

Location:

issm/trunk/src/c

Files:

• Bamgx/objects/Triangles.cpp (modified) (1 diff)
• ModelProcessorx/DiagnosticStokes/CreateLoadsDiagnosticStokes.cpp (modified) (1 diff)
• objects/Tria.cpp (modified) (1 diff)

issm/trunk/src/c/Bamgx/objects/Triangles.cpp

@@ -2362 +2362 @@
                                 if (nbswp) nbfe++;
                                 if ( nbswp < 0 && k < 5){
-                                        for (int j = 0; j < nbe; j++){
-                                                printf("Edge %i: %i %i\n",j,Number(edges[j][0]),Number(edges[j][1]));
-                                        }
                                         ISSMERROR("Missing Edge %i, v0=%i,v1=%i",i,Number(edges[i][0]),Number(edges[i][1]));
                                 }

issm/trunk/src/c/ModelProcessorx/DiagnosticStokes/CreateLoadsDiagnosticStokes.cpp

@@ -48 +48 @@
         
                 /*Do not create ice front if it is not a Stokes element*/
-                if (!(int)*(iomodel->elements_type+2*element+1)==StokesFormulationEnum){ 
+                if ((int)*(iomodel->elements_type+2*element+1)!=StokesFormulationEnum){ 
                         continue;
                 }

issm/trunk/src/c/objects/Tria.cpp

@@ -4686 +4686 @@
                 inputs->GetParameterValue(&vz, &gauss_l1l2l3[0],VzEnum);
 
-                /*Get normal vecyor to the bed */
+                /*Get normal vector to the bed */
                 SurfaceNormal(&surface_normal[0],xyz_list);