Index: /issm/trunk/src/c/Container/DataSet.cpp =================================================================== --- /issm/trunk/src/c/Container/DataSet.cpp (revision 5015) +++ /issm/trunk/src/c/Container/DataSet.cpp (revision 5016) @@ -398,4 +398,6 @@ } + return 1; + } /*}}}*/ @@ -416,5 +418,4 @@ } - return; } /*}}}*/ Index: /issm/trunk/src/c/modules/HoleFillerx/HoleFillerx.cpp =================================================================== --- /issm/trunk/src/c/modules/HoleFillerx/HoleFillerx.cpp (revision 5015) +++ /issm/trunk/src/c/modules/HoleFillerx/HoleFillerx.cpp (revision 5016) @@ -18,5 +18,5 @@ long i, j, k, l, ii, jj, bytes; long iii, jjj; - long count, test, prevlines, prevpix, test1, test2, thresh,counter; + long test, prevlines, prevpix, test1, test2, thresh,counter; long bell, cycles, leftovers; float howlong; @@ -68,5 +68,4 @@ memcpy(image3,image2,lines*samps*sizeof(double)); - count += 2; #ifdef _DEBUG2_ counter=0; @@ -86,6 +85,4 @@ again2: - - count += 2; #ifdef _DEBUG2_ Index: /issm/trunk/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp =================================================================== --- /issm/trunk/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp (revision 5015) +++ /issm/trunk/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp (revision 5016) @@ -17,5 +17,4 @@ /*Output*/ double* data_interp=NULL; - int noerr; /*Intermediary*/ @@ -113,5 +112,4 @@ /*No error return*/ - return noerr; - + return 1; } Index: /issm/trunk/src/c/objects/Bamg/Geometry.cpp =================================================================== --- /issm/trunk/src/c/objects/Bamg/Geometry.cpp (revision 5015) +++ /issm/trunk/src/c/objects/Bamg/Geometry.cpp (revision 5016) @@ -418,5 +418,5 @@ bamggeom->TangentAtEdges[4*i+1]=2; bamggeom->TangentAtEdges[4*i+2]=edges[i].tg[1].x; - bamggeom->TangentAtEdges[4*i+3]=edges[i].tg[2].y; + bamggeom->TangentAtEdges[4*i+3]=edges[i].tg[1].y; } count=count+1; Index: /issm/trunk/src/c/objects/Bamg/Metric.cpp =================================================================== --- /issm/trunk/src/c/objects/Bamg/Metric.cpp (revision 5015) +++ /issm/trunk/src/c/objects/Bamg/Metric.cpp (revision 5016) @@ -183,5 +183,5 @@ LastMetricInterpole.lab=l; LastMetricInterpole.opt=i; - if (i>200 && kkk++<10) printf("WARNING: LengthInterpole: ( i=%i l=%i sss=%i ) %g\n",i,l,sss,sstop); + if (i>200 && kkk++<10) printf("WARNING: LengthInterpole: ( i=%i l=%i sss=%g ) %g\n",i,l,sss,sstop); return l; } Index: /issm/trunk/src/c/objects/Bamg/Triangles.cpp =================================================================== --- /issm/trunk/src/c/objects/Bamg/Triangles.cpp (revision 5015) +++ /issm/trunk/src/c/objects/Bamg/Triangles.cpp (revision 5016) @@ -98,5 +98,5 @@ } printf(" number of vertices %i, remove = %i\n",k,Tho.nbv - k); - printf(" number of triangles %i, remove = \n",kt,nbInT-kt); + printf(" number of triangles %i, remove = %i\n",kt,nbInT-kt); printf(" number of New boundary edge %i\n",nbNewBedge); long inbvx =k; @@ -2018,5 +2018,5 @@ //skip constant field if (sdelta < 1.0e-10*Max(absmax,1e-20) ){ - if (verbosity>2) printf(" Solution %i is constant, skipping...\n"); + if (verbosity>2) printf(" Solution %i is constant, skipping...\n",nusol); continue; } @@ -4380,7 +4380,7 @@ printf("This edge is on geometrical edge number %i\n",Gh.Number(edges[i].onGeometry)+1); if (edges[i][j].onGeometry->OnGeomVertex()) - printf("the vertex number %i of this edge is a geometric MeshVertex number %i\n",Gh.Number(edges[i][j].onGeometry->gv)+1); + printf("the vertex number %i of this edge is a geometric MeshVertex number %i\n",Number(edges[i][j])+1,Gh.Number(edges[i][j].onGeometry->gv)+1); else if (edges[i][j].onGeometry->OnGeomEdge()) - printf("the vertex number %i of this edge is a geometric Edge number %i\n",Gh.Number(edges[i][j].onGeometry->ge)+1); + printf("the vertex number %i of this edge is a geometric Edge number %i\n",Number(edges[i][j])+1,Gh.Number(edges[i][j].onGeometry->ge)+1); else printf("Its pointer is %p\n",edges[i][j].onGeometry); @@ -4707,5 +4707,5 @@ else printf(" %10g",exp(lmin+(i+1)/delta)); printf("| %10g |\n",((long) ((10000.0 * histo[i])/ nbedges))/100.0); - printf(" %g\n",histo[i]); + printf(" %i\n",histo[i]); } printf(" --------------------+-------------+-------------\n"); @@ -5017,5 +5017,5 @@ || (bb=Area2( t[0].r , A.r , t[2].r )) < 0.0 || (cc=Area2( t[0].r , t[1].r , A.r )) < 0.0)){ - printf("%i not in triangle %i In= %i %i %i %i %i\n",ke + nbvold,i,!!t.link,aa,bb,cc,dd); + printf("%i not in triangle %i In= %i %g %g %g %g\n",ke + nbvold,i,!!t.link,aa,bb,cc,dd); ISSMERROR("Number of triangles with P2 interpolation Problem"); } @@ -5025,5 +5025,5 @@ || (bb=Area2( tt[0].r , A.r , tt[2].r )) < 0 || (cc=Area2( tt[0].r , tt[1].r , A.r )) < 0)){ - printf("%i not in triangle %i In= %i %i %i %i %i\n",ke + nbvold,ii,!!tt.link,aa,bb,cc,dd); + printf("%i not in triangle %i In= %i %g %g %g %g\n",ke + nbvold,ii,!!tt.link,aa,bb,cc,dd); ISSMERROR("Number of triangles with P2 interpolation Problem"); } Index: /issm/trunk/src/c/objects/Elements/Penta.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/Penta.cpp (revision 5015) +++ /issm/trunk/src/c/objects/Elements/Penta.cpp (revision 5016) @@ -968,5 +968,5 @@ GradjDrag(gradient); } - else if (control_type=RheologyBEnum){ + else if (control_type==RheologyBEnum){ GradjB(gradient); } Index: /issm/trunk/src/c/objects/Elements/Tria.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/Tria.cpp (revision 5015) +++ /issm/trunk/src/c/objects/Elements/Tria.cpp (revision 5016) @@ -1035,5 +1035,4 @@ VecSetValues(gradient,numgrids,doflist1,(const double*)grade_g,ADD_VALUES); - cleanup_and_return: xfree((void**)&first_gauss_area_coord); xfree((void**)&second_gauss_area_coord); @@ -1209,5 +1208,4 @@ VecSetValues(gradient,numgrids,doflist1,(const double*)grade_g,ADD_VALUES); - cleanup_and_return: xfree((void**)&first_gauss_area_coord); xfree((void**)&second_gauss_area_coord); @@ -2478,5 +2476,4 @@ MatSetValues(Kgg,numdof,doflist,numdof,doflist,(const double*)Ke_gg,ADD_VALUES); -cleanup_and_return: xfree((void**)&first_gauss_area_coord); xfree((void**)&second_gauss_area_coord); @@ -2582,5 +2579,4 @@ MatSetValues(Kgg,numdof,doflist,numdof,doflist,(const double*)Ke_gg,ADD_VALUES); -cleanup_and_return: xfree((void**)&first_gauss_area_coord); xfree((void**)&second_gauss_area_coord); @@ -2908,5 +2904,4 @@ } -cleanup_and_return: xfree((void**)&first_gauss_area_coord); xfree((void**)&second_gauss_area_coord); @@ -3049,5 +3044,4 @@ MatSetValues(Kgg,numdof,doflist,numdof,doflist,(const double*)Ke_gg,ADD_VALUES); - cleanup_and_return: xfree((void**)&first_gauss_area_coord); xfree((void**)&second_gauss_area_coord); @@ -3205,5 +3199,4 @@ MatSetValues(Kgg,numdof,doflist,numdof,doflist,(const double*)Ke_gg,ADD_VALUES); -cleanup_and_return: xfree((void**)&first_gauss_area_coord); xfree((void**)&second_gauss_area_coord); @@ -3288,5 +3281,4 @@ MatSetValues(Kgg,numdof,doflist,numdof,doflist,(const double*)K_terms,ADD_VALUES); -cleanup_and_return: xfree((void**)&first_gauss_area_coord); xfree((void**)&second_gauss_area_coord); @@ -3674,5 +3666,4 @@ MatSetValues(Kgg,numdof,doflist,numdof,doflist,(const double*)Ke_gg,ADD_VALUES); -cleanup_and_return: xfree((void**)&first_gauss_area_coord); xfree((void**)&second_gauss_area_coord); @@ -3769,5 +3760,4 @@ MatSetValues(Kgg,numdof,doflist,numdof,doflist,(const double*)K_terms,ADD_VALUES); - cleanup_and_return: xfree((void**)&first_gauss_area_coord); xfree((void**)&second_gauss_area_coord); @@ -4012,5 +4002,4 @@ VecSetValues(pg,numdof,doflist,(const double*)pe_g,ADD_VALUES); -cleanup_and_return: xfree((void**)&first_gauss_area_coord); xfree((void**)&second_gauss_area_coord); @@ -4121,5 +4110,4 @@ VecSetValues(pg,numdof,doflist,(const double*)pe_g,ADD_VALUES); -cleanup_and_return: xfree((void**)&first_gauss_area_coord); xfree((void**)&second_gauss_area_coord); @@ -4245,5 +4233,4 @@ VecSetValues(pg,numdof,doflist,(const double*)pe_g,ADD_VALUES); - cleanup_and_return: xfree((void**)&first_gauss_area_coord); xfree((void**)&second_gauss_area_coord); @@ -5058,5 +5045,4 @@ VecSetValues(pg,numdof,doflist,(const double*)pe_g,ADD_VALUES); - cleanup_and_return: xfree((void**)&first_gauss_area_coord); xfree((void**)&second_gauss_area_coord); @@ -5165,5 +5151,4 @@ VecSetValues(pg,numdof,doflist,(const double*)P_terms,ADD_VALUES); - cleanup_and_return: xfree((void**)&first_gauss_area_coord); xfree((void**)&second_gauss_area_coord); @@ -5299,5 +5284,4 @@ VecSetValues(pg,numdof,doflist,(const double*)P_terms,ADD_VALUES); - cleanup_and_return: xfree((void**)&first_gauss_area_coord); xfree((void**)&second_gauss_area_coord); @@ -5852,5 +5836,4 @@ this->inputs->AddInput(new TriaVertexInput(GradientEnum,&grade_g[0])); - cleanup_and_return: xfree((void**)&first_gauss_area_coord); xfree((void**)&second_gauss_area_coord); Index: /issm/trunk/src/c/objects/Inputs/IntInput.cpp =================================================================== --- /issm/trunk/src/c/objects/Inputs/IntInput.cpp (revision 5015) +++ /issm/trunk/src/c/objects/Inputs/IntInput.cpp (revision 5016) @@ -42,5 +42,5 @@ printf("IntInput:\n"); printf(" enum: %i (%s)\n",this->enum_type,EnumAsString(this->enum_type)); - printf(" value: %i\n",this->value); + printf(" value: %i\n",(int)this->value); } /*}}}*/ Index: /issm/trunk/src/c/objects/Loads/Riftfront.cpp =================================================================== --- /issm/trunk/src/c/objects/Loads/Riftfront.cpp (revision 5015) +++ /issm/trunk/src/c/objects/Loads/Riftfront.cpp (revision 5016) @@ -577,5 +577,5 @@ #define _ZIGZAGCOUNTER_ -int Riftfront::Constrain(int* punstable){ +int Riftfront::Constrain(int* punstable){ const int numgrids = 2; Index: /issm/trunk/src/c/objects/Params/StringArrayParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/StringArrayParam.cpp (revision 5015) +++ /issm/trunk/src/c/objects/Params/StringArrayParam.cpp (revision 5016) @@ -125,5 +125,5 @@ int i; - int marshallsize; + int marshallsize=0; int stringsize; char* string=NULL; Index: /issm/trunk/src/c/objects/Params/StringParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/StringParam.cpp (revision 5015) +++ /issm/trunk/src/c/objects/Params/StringParam.cpp (revision 5016) @@ -49,5 +49,4 @@ /*FUNCTION StringParam::DeepEcho{{{1*/ void StringParam::DeepEcho(void){ - printf("StringParam:\n"); printf(" enum: %i (%s)\n",this->enum_type,EnumAsString(this->enum_type)); Index: /issm/trunk/src/c/objects/Vertex.cpp =================================================================== --- /issm/trunk/src/c/objects/Vertex.cpp (revision 5015) +++ /issm/trunk/src/c/objects/Vertex.cpp (revision 5016) @@ -67,6 +67,6 @@ printf(" z: %g\n",z); printf(" sigma: %g\n",sigma); - printf(" dof: %g\n",dof); - printf(" clone: %g\n",clone); + printf(" dof: %i\n",dof); + printf(" clone: %i\n",clone); return; Index: /issm/trunk/src/c/shared/Exp/IsInPoly.cpp =================================================================== --- /issm/trunk/src/c/shared/Exp/IsInPoly.cpp (revision 5015) +++ /issm/trunk/src/c/shared/Exp/IsInPoly.cpp (revision 5016) @@ -38,4 +38,5 @@ VecSetValues(in,1,&i,&value,INSERT_VALUES); } + return 1; } @@ -59,4 +60,6 @@ VecSetValues(out,1,&i,&value,INSERT_VALUES); } + + return 1; } Index: /issm/trunk/src/c/shared/Exp/IsInPolySerial.cpp =================================================================== --- /issm/trunk/src/c/shared/Exp/IsInPolySerial.cpp (revision 5015) +++ /issm/trunk/src/c/shared/Exp/IsInPolySerial.cpp (revision 5016) @@ -30,3 +30,5 @@ } } + + return 1; } Index: /issm/trunk/src/c/shared/Matrix/MatrixUtils.cpp =================================================================== --- /issm/trunk/src/c/shared/Matrix/MatrixUtils.cpp (revision 5015) +++ /issm/trunk/src/c/shared/Matrix/MatrixUtils.cpp (revision 5016) @@ -95,4 +95,6 @@ xfree((void **)&dtemp); } + + return 1; }/*}}}*/ /*FUNCTION MatrixMuliply {{{1*/ Index: /issm/trunk/src/c/shared/TriMesh/SplitMeshForRifts.cpp =================================================================== --- /issm/trunk/src/c/shared/TriMesh/SplitMeshForRifts.cpp (revision 5015) +++ /issm/trunk/src/c/shared/TriMesh/SplitMeshForRifts.cpp (revision 5016) @@ -96,6 +96,4 @@ UpdateSegments(&segments,&segmentmarkerlist, &nsegs,index,x,y,riftsegments,nriftsegs); - cleanup_and_return: - /*Assign output pointers: */ *pnel=nel; Index: /issm/trunk/src/c/solutions/convergence.cpp =================================================================== --- /issm/trunk/src/c/solutions/convergence.cpp (revision 5015) +++ /issm/trunk/src/c/solutions/convergence.cpp (revision 5016) @@ -82,9 +82,9 @@ //print if(res ",eps_res*100," \%"); + if (verbose) _printf_("%-50s%g%s%g%s\n"," mechanical equilibrium convergence criterion",res*100," > ",eps_res*100," %"); converged=0; } @@ -105,12 +105,12 @@ if (!isnan(eps_rel)){ if((ndu/nu) ",eps_rel*100," \%"); + if (verbose) _printf_("%-50s%g%s%g%s\n"," Convergence criterion: norm(du)/norm(u)",ndu/nu*100," > ",eps_rel*100," %"); converged=0; } } - else _printf_("%-50s%g%s\n"," Convergence criterion: norm(du)/norm(u)",ndu/nu*100," \%"); + else _printf_("%-50s%g%s\n"," Convergence criterion: norm(du)/norm(u)",ndu/nu*100," %"); } Index: /issm/trunk/src/c/solutions/issm.cpp =================================================================== --- /issm/trunk/src/c/solutions/issm.cpp (revision 5015) +++ /issm/trunk/src/c/solutions/issm.cpp (revision 5016) @@ -4,5 +4,10 @@ #include "./issm.h" +#include "config.h" +#ifdef _HAVE_DAKOTA_ +#else +#error "No Dakota" +#endif int main(int argc,char* *argv){