Changeset 3597

Timestamp:

04/21/10 16:12:34 (15 years ago)

Author:

Mathieu Morlighem

Message:

removed useless ISSM_DEBUG outputs

Location:

issm/trunk/src/c/objects

Files:

• Icefront.cpp (modified) (3 diffs)
• Penta.cpp (modified) (4 diffs)

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

@@ -426 +426 @@
         SegmentPressureLoad(pe_g,matpar->GetRhoWater(),matpar->GetRhoIce(),matpar->GetG(),thickness_list,bed_list,normal,length);
                 
-        #ifdef _DEBUGELEMENTS_
-        if(my_rank==RANK && this->icefront.eid==ELID){ 
-                printf("\nicefront load\n");
-                printf("grids %i %i\n",grid1,grid2);
-                printf("rho_water %g\n",rho_water);
-                printf("rho_ice %g\n",rho_ice);
-                printf("gravity %g\n",gravity);
-                printf("thickness_list (%g,%g)\n",thickness_list[0],thickness_list[1]);
-                printf("bed_list (%g,%g)\n",bed_list[0],bed_list[1]);
-                printf("normal (%g,%g)\n",normal[0],normal[1]);
-                printf("length %g\n",length);
-                printf("pe_g->terms\n");
-                for(i=0;i<numgrids*NDOF2;i++){
-                        printf("%g ",*(pe_g->terms+i));
-                }
-        }
-        #endif
-
         /*Plug pe_g into vector: */
         VecSetValues(pg,numdofs,doflist,pe_g,ADD_VALUES);
@@ -580 +562 @@
         QuadPressureLoad(pe_g,matpar->GetRhoWater(),matpar->GetRhoIce(),matpar->GetG(),thickness_list_quad,bed_list_quad,normal1,normal2,normal3,normal4,&xyz_list_quad[0][0]);
 
-
-        #ifdef _DEBUGELEMENTS_
-        if(my_rank==RANK && eid==ELID){ 
-                printf("\nicefront load\n");
-                printf("grids %i %i %i %i\n",grid1,grid2,grid3,grid4);
-                printf("rho_water %g\n",rho_water);
-                printf("rho_ice %g\n",rho_ice);
-                printf("gravity %g\n",gravity);
-                printf("thickness_list (%g,%g,%g,%g)\n",thickness_list[0],thickness_list[1],thickness_list[2],thickness_list[3]);
-                printf("bed_list (%g,%g,%g,%g)\n",bed_list[0],bed_list[1],bed_list[2],bed_list[3]);
-                printf("normal1 (%g,%g,%g)\n",normal1[0],normal1[1],normal1[2]);
-                printf("normal2 (%g,%g,%g)\n",normal2[0],normal2[1],normal2[2]);
-                printf("normal3 (%g,%g,%g)\n",normal3[0],normal3[1],normal3[2]);
-                printf("normal4 (%g,%g,%g)\n",normal4[0],normal4[1],normal4[2]);
-                printf("pe_g->terms\n");
-                for(i=0;i<numgridsload*NDOF2;i++){
-                        printf("%g ",*(pe_g->terms+i));
-                }
-        }
-        #endif
-
         /*Plug pe_g into vector: */
         VecSetValues(pg,numdofs,doflist,pe_g,ADD_VALUES);
@@ -736 +697 @@
         //Compute load contribution for this quad:
         QuadPressureLoadStokes(pe_g,matpar->GetRhoWater(),matpar->GetRhoIce(),matpar->GetG(),thickness_list_quad,bed_list_quad,normal1,normal2,normal3,normal4,&xyz_list_quad[0][0]);
-
-        #ifdef _DEBUGELEMENTS_
-        if(my_rank==RANK && eid==ELID){ 
-                printf("\nicefront load\n");
-                printf("grids %i %i %i %i\n",grid1,grid2,grid3,grid4);
-                printf("rho_water %g\n",rho_water);
-                printf("rho_ice %g\n",rho_ice);
-                printf("gravity %g\n",gravity);
-                printf("thickness_list (%g,%g,%g,%g)\n",thickness_list[0],thickness_list[1],thickness_list[2],thickness_list[3]);
-                printf("bed_list (%g,%g,%g,%g)\n",bed_list[0],bed_list[1],bed_list[2],bed_list[3]);
-                printf("normal1 (%g,%g,%g)\n",normal1[0],normal1[1],normal1[2]);
-                printf("normal2 (%g,%g,%g)\n",normal2[0],normal2[1],normal2[2]);
-                printf("normal3 (%g,%g,%g)\n",normal3[0],normal3[1],normal3[2]);
-                printf("normal4 (%g,%g,%g)\n",normal4[0],normal4[1],normal4[2]);
-                printf("pe_g->terms\n");
-                for(i=0;i<numdofloads*NDOF4;i++){
-                        printf("%g ",*(pe_g->terms+i));
-                }
-        }
-        #endif
 
         /*Plug pe_g into vector: */

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

@@ -738 +738 @@
                 }
 
-#ifdef _DEBUGELEMENTS_
-                if(my_rank==RANK && id==ELID){ 
-                        printf("El id %i Rank %i PentaElement input list before gaussian loop: \n",ELID,RANK); 
-                        printf("   rho_ice: %g\n",matice->GetRhoIce());
-                        printf("   rho_water:%g \n",matice->GetRhoWater());
-                        printf("   gravity: %g\n",matpar->GetG());
-                        printf("   Velocity: \n");
-                        for (i=0;i<numgrids;i++){
-                                printf("      grid %i  [%g,%g,%g]\n",i,vxvy_list[i][0],vxvy_list[i][1],vxvy_list[i][2]);
-                        }
-                        printf("   B [%g %g %g %g %g %g]\n",B_list[0],B_list[1],B_list[2],B_list[3],B_list[4],B_list[5]);
-                        printf("   K [%g %g %g %g %g %g]\n",K_list[0],K_list[1],K_list[2],K_list[3],K_list[4],K_list[5]);
-                        printf("   thickness [%g %g %g %g %g %g]\n",thickness_list[0],thickness_list[1],thickness_list[2],thickness_list[3],thickness_list[4],thickness_list[5]);
-                        printf("   surface [%g %g %g %g %g %g]\n",surface_list[0],surface_list[1],surface_list[2],surface_list[3],surface_list[4],surface_list[5]);
-                        printf("   bed [%g %g %g %g %g %g]\n",bed_list[0],bed_list[1],bed_list[2],bed_list[3],bed_list[4],bed_list[5]);
-                        printf("   temperature_average [%g %g %g %g %g %g]\n",temperature_average_list[0],temperature_average_list[1],temperature_average_list[2],temperature_average_list[3],temperature_average_list[4],temperature_average_list[5]);
-                }
-#endif
-
                 /*Get gaussian points and weights. Penta is an extrusion of a Tria, we therefore 
                   get tria gaussian points as well as segment gaussian points. For tria gaussian 
@@ -768 +749 @@
                 GaussPenta( &num_area_gauss, &first_gauss_area_coord, &second_gauss_area_coord, &third_gauss_area_coord, &area_gauss_weights, &fourth_gauss_vert_coord,&vert_gauss_weights,order_area_gauss,num_vert_gauss);
 
-#ifdef _DEBUGGAUSS_
-                if(my_rank==RANK && id==ELID){ 
-                        printf("El id %i Rank %i PentaElement gauss points\n",ELID,RANK); 
-                        for (i=0;i<num_area_gauss;i++){
-                                printf("   Area Gauss coord %i: %lf %lf %lf Weight: %lf\n",i,*(first_gauss_area_coord+i),*(second_gauss_area_coord+i),*(third_gauss_area_coord+i),*(area_gauss_weights+i));
-                        }
-                        for (i=0;i<num_vert_gauss;i++){
-                                printf("   Vert Gauss coord %i: %lf Weight: %lf\n",i,*(fourth_gauss_vert_coord+i),*(vert_gauss_weights+i));
-                        }       
-                }
-#endif
                 /* Start  looping on the number of gaussian points: */
                 for (ig1=0; ig1<num_area_gauss; ig1++){
@@ -3225 +3195 @@
         l1l2l3[1]=gauss_coord_tria[1];
         l1l2l3[2]=gauss_coord_tria[2];
-
-
-#ifdef _DELUG_ 
-        for (i=0;i<3;i++){
-                printf("Node %i  h=%lf \n",i,l1l2l3[i]);
-        }
-#endif
 
         /*Build LStokes: */
@@ -3334 +3297 @@
         GetNodalFunctionsDerivatives(&dh1dh6[0][0],xyz_list,gauss_coord);
 
-#ifdef _DELUG_ 
-        for (i=0;i<3;i++){
-                printf("Node %i  h=%lf \n",i,l1l2l3[i]);
-        }
-#endif
-
         /*Build LprimeStokes: */
         for (i=0;i<3;i++){