Index: /issm/trunk-jpl/src/c/Container/DataSet.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/DataSet.cpp (revision 12518) +++ /issm/trunk-jpl/src/c/Container/DataSet.cpp (revision 12519) @@ -135,5 +135,5 @@ if(this==NULL)_error2_("trying to echo a NULL dataset"); - if(true) _pprintLine_("DataSet echo: " << objects.size() << " objects"); + _pprintLine_("DataSet echo: " << objects.size() << " objects"); for ( object=objects.begin() ; object < objects.end(); object++ ){ @@ -152,5 +152,5 @@ if(this==NULL)_error2_("trying to echo a NULL dataset"); - if(true) _pprintLine_("DataSet echo: " << objects.size() << " objects"); + _pprintLine_("DataSet echo: " << objects.size() << " objects"); for ( object=objects.begin() ; object < objects.end(); object++ ){ Index: /issm/trunk-jpl/src/c/Container/Observations.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Observations.cpp (revision 12518) +++ /issm/trunk-jpl/src/c/Container/Observations.cpp (revision 12519) @@ -73,5 +73,5 @@ /*Initialize Quadtree*/ - if(true) _pprintString_("Generating quadtree with a maximum box size " << minlength << " (depth=" << maxdepth << ")... "); + _pprintString_("Generating quadtree with a maximum box size " << minlength << " (depth=" << maxdepth << ")... "); this->quadtree = new Quadtree(xmin,xmax,ymin,ymax,maxdepth); @@ -103,7 +103,7 @@ } } - if(true) _pprintLine_("done"); - if(true) _pprintLine_("Initial number of observations: " << n); - if(true) _pprintLine_(" Final number of observations: " << this->quadtree->NbObs); + _pprintLine_("done"); + _pprintLine_("Initial number of observations: " << n); + _pprintLine_(" Final number of observations: " << this->quadtree->NbObs); } /*}}}*/ Index: /issm/trunk-jpl/src/c/matlab/io/OptionParse.cpp =================================================================== --- /issm/trunk-jpl/src/c/matlab/io/OptionParse.cpp (revision 12518) +++ /issm/trunk-jpl/src/c/matlab/io/OptionParse.cpp (revision 12519) @@ -176,5 +176,5 @@ else if(mxIsClass(prhs[0],"cell")) option=(Option*)OptionCellParse(name,prhs); else { - if(true) _pprintLine_(" Converting value of option \"" << name << "\" from unrecognized class \"" << mxGetClassName(prhs[0]) << "\" to class \"" << "struct" << "\"."); + _pprintLine_(" Converting value of option \"" << name << "\" from unrecognized class \"" << mxGetClassName(prhs[0]) << "\" to class \"" << "struct" << "\"."); if (!mexCallMATLAB(1,lhs,1,(mxArray**)prhs,"struct")) { option=(Option*)OptionStructParse(name,(const mxArray**)lhs); Index: /issm/trunk-jpl/src/c/modules/Exp2Kmlx/Exp2Kmlx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Exp2Kmlx/Exp2Kmlx.cpp (revision 12518) +++ /issm/trunk-jpl/src/c/modules/Exp2Kmlx/Exp2Kmlx.cpp (revision 12519) @@ -50,5 +50,5 @@ clock0=clock(); time0 =time(NULL); - if(true) _pprintString_("\nExp2Kmlx Module -- " << ctime(&time0)); + _pprintString_("\nExp2Kmlx Module -- " << ctime(&time0)); /*read exp file */ @@ -56,5 +56,5 @@ if (!DomainOutlineRead(&nprof,&pnvert,&pprofx,&pprofy,&closed,filexp)) _error2_("Error reading exp file."); - if(true) _pprintLine_("Exp2Kmlx -- Reading " << nprof << " exp profiles from file \"" << filexp << "\"."); + _pprintLine_("Exp2Kmlx -- Reading " << nprof << " exp profiles from file \"" << filexp << "\"."); // for (i=0; i\n"); Index: /issm/trunk-jpl/src/c/modules/KMLFileReadx/KMLFileReadx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/KMLFileReadx/KMLFileReadx.cpp (revision 12518) +++ /issm/trunk-jpl/src/c/modules/KMLFileReadx/KMLFileReadx.cpp (revision 12519) @@ -21,5 +21,5 @@ clock0=clock(); time0 =time(NULL); - if(true) _pprintString_("\nKMLFileReadx Module -- " << ctime(&time0)); + _pprintString_("\nKMLFileReadx Module -- " << ctime(&time0)); /* read kml file */ @@ -43,15 +43,15 @@ } -// if(true) _pprintLine_("" << kstr); +// _pprintLine_("" << kstr); xDelete(kstr); } if (kxml) { - if(true) _pprintLine_("XML declaration:"); + _pprintLine_("XML declaration:"); kxml->DeepEcho(" "); delete kxml; } if (kdtd) { - if(true) _pprintLine_("DTD declaration (not yet implemented):"); + _pprintLine_("DTD declaration (not yet implemented):"); kdtd->DeepEcho(" "); delete kdtd; Index: /issm/trunk-jpl/src/c/modules/KMLMeshWritex/KMLMeshWritex.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/KMLMeshWritex/KMLMeshWritex.cpp (revision 12518) +++ /issm/trunk-jpl/src/c/modules/KMLMeshWritex/KMLMeshWritex.cpp (revision 12519) @@ -29,5 +29,5 @@ clock0=clock(); time0 =time(NULL); - if(true) _pprintString_("\nKMLMeshWritex Module -- " << ctime(&time0)); + _pprintString_("\nKMLMeshWritex Module -- " << ctime(&time0)); /* construct kml document */ @@ -83,5 +83,5 @@ if (cmap) { - if(true) _pprintLine_("Writing " << mcmap << " Matlab colors as KML style templates."); + _pprintLine_("Writing " << mcmap << " Matlab colors as KML style templates."); ipt=0; for (i=0; i(mncon*nncon); @@ -149,5 +149,5 @@ else if (mdata == mncon) { - if(true) _pprintLine_("Averaging nodal data to element data."); + _pprintLine_("Averaging nodal data to element data."); edata=xNewZeroInit(melem*ndata); edfree=true; @@ -193,5 +193,5 @@ /* write kml file */ - if(true) _pprintLine_("Writing kml document to file."); + _pprintLine_("Writing kml document to file."); fprintf(fid,"\n"); fprintf(fid,"\n"); @@ -203,5 +203,5 @@ ((double)(clock0b-clock0a))/CLOCKS_PER_SEC,difftime(time0b,time0a)); - if(true) _pprintLine_("Deleting kml document."); + _pprintLine_("Deleting kml document."); delete kdoc; clock0c=clock(); @@ -304,5 +304,5 @@ /* write each element as a polygon placemark */ - if(true) _pprintLine_("Writing " << melem << " tria elements as KML polygons."); + _pprintLine_("Writing " << melem << " tria elements as KML polygons."); for (i=0; i\n"); kfile->Write(fid,indent); Index: /issm/trunk-jpl/src/c/modules/Kml2Expx/Kml2Expx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Kml2Expx/Kml2Expx.cpp (revision 12518) +++ /issm/trunk-jpl/src/c/modules/Kml2Expx/Kml2Expx.cpp (revision 12519) @@ -38,5 +38,5 @@ clock0=clock(); time0 =time(NULL); - if(true) _pprintString_("\nKml2Expx Module -- " << ctime(&time0)); + _pprintString_("\nKml2Expx Module -- " << ctime(&time0)); /* read kml file */ @@ -49,5 +49,5 @@ /* open exp file */ - if(true) _pprintLine_("Writing exp profiles to file."); + _pprintLine_("Writing exp profiles to file."); fido=fopen(filexp,"w"); Index: /issm/trunk-jpl/src/c/modules/Shp2Kmlx/Shp2Kmlx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Shp2Kmlx/Shp2Kmlx.cpp (revision 12518) +++ /issm/trunk-jpl/src/c/modules/Shp2Kmlx/Shp2Kmlx.cpp (revision 12519) @@ -68,5 +68,5 @@ clock0=clock(); time0 =time(NULL); - if(true) _pprintString_("\nShp2Kmlx Module -- " << ctime(&time0)); + _pprintString_("\nShp2Kmlx Module -- " << ctime(&time0)); /* note that much of the following code is taken from shpdump.c in shapelib. */ @@ -573,5 +573,5 @@ /* write kml file */ - if(true) _pprintLine_("Writing kml document to file."); + _pprintLine_("Writing kml document to file."); fid=fopen(filkml,"w"); fprintf(fid,"\n"); Index: /issm/trunk-jpl/src/c/objects/IoModel.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/IoModel.cpp (revision 12518) +++ /issm/trunk-jpl/src/c/objects/IoModel.cpp (revision 12519) @@ -78,5 +78,5 @@ for(int i=0;idata[i]){ - if(true) _pprintLine_("Info: previous pointer of " << EnumToStringx(i) << " has not been freed (DeleteData has not been called)"); + _pprintLine_("Info: previous pointer of " << EnumToStringx(i) << " has not been freed (DeleteData has not been called)"); } } Index: /issm/trunk-jpl/src/c/objects/KML/KMLFileReadUtils.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KMLFileReadUtils.cpp (revision 12518) +++ /issm/trunk-jpl/src/c/objects/KML/KMLFileReadUtils.cpp (revision 12519) @@ -127,8 +127,8 @@ // if (itag) -// if(true) _pprintLine_("tag buffer (length=" << ibuf << "):"); +// _pprintLine_("tag buffer (length=" << ibuf << "):"); // else if (ifield) -// if(true) _pprintLine_("field buffer (length=" << ibuf << "):"); -// if(true) _pprintLine_("" << buffer); +// _pprintLine_("field buffer (length=" << ibuf << "):"); +// _pprintLine_("" << buffer); if (!ibuf) @@ -193,6 +193,6 @@ } -// if(true) _pprintLine_("comment buffer (length=" << ibuf << "):"); -// if(true) _pprintLine_("" << buffer); +// _pprintLine_("comment buffer (length=" << ibuf << "):"); +// _pprintLine_("" << buffer); if (!ibuf) @@ -254,5 +254,5 @@ ktokn=strtok(ktagi,"< >"); -// if(true) _pprintLine_("KMLFileTagName -- initial token=\"" << ktokn << "\"."); +// _pprintLine_("KMLFileTagName -- initial token=\"" << ktokn << "\"."); if (!pname) { @@ -264,6 +264,6 @@ if (maxlen && (maxlen < strlen(ktokn))) { - if(true) _pprintLine_("KMLFileTagName -- string field too short for " << ktag << "."); - if(true) _pprintLine_("KMLFileTagName -- \"" << ktokn << "\" truncated to " << maxlen << " characters."); + _pprintLine_("KMLFileTagName -- string field too short for " << ktag << "."); + _pprintLine_("KMLFileTagName -- \"" << ktokn << "\" truncated to " << maxlen << " characters."); strncpy(pname,ktokn,maxlen); } @@ -300,5 +300,5 @@ /* return first non blank and move past subsequent blank */ ktokn=strtok(ktagi," "); -// if(true) _pprintLine_("KMLFileTagAttrib -- initial token=\"" << ktokn << "\"."); +// _pprintLine_("KMLFileTagAttrib -- initial token=\"" << ktokn << "\"."); /* return next non " =?/>" and move past subsequent " =?/>" */ @@ -307,5 +307,5 @@ /* return next non quote and move past subsequent quote */ ktokv=strtok(NULL,quote); -// if(true) _pprintLine_("KMLFileTagAttrib -- attribute " << ktokn << "=\"" << ktokv << "\"."); +// _pprintLine_("KMLFileTagAttrib -- attribute " << ktokn << "=\"" << ktokv << "\"."); /* add the attribute to the dataset */ @@ -323,5 +323,5 @@ (!strncmp(&ktag[0],"<" ,1) && !strncmp(&ktag[strlen(ktag)-2],"/>",2))) isolo=1; -// if(true) _pprintLine_("KMLFileTagAttrib -- isolo=" << isolo << "."); +// _pprintLine_("KMLFileTagAttrib -- isolo=" << isolo << "."); return(isolo); @@ -357,5 +357,5 @@ xfree((void**)&kstr); -// if(true) _pprintLine_("KMLFileTokenParse -- " << ktag << "=" << *pival << "."); +// _pprintLine_("KMLFileTokenParse -- " << ktag << "=" << *pival << "."); return(0); @@ -391,5 +391,5 @@ xfree((void**)&kstr); -// if(true) _pprintLine_("KMLFileTokenParse -- " << ktag << "=" << (*pbval ? "true" : "false") << "."); +// _pprintLine_("KMLFileTokenParse -- " << ktag << "=" << (*pbval ? "true" : "false") << "."); return(0); @@ -428,6 +428,6 @@ if (maxlen && (maxlen < strlen(kstr))) { - if(true) _pprintLine_("KMLFileTokenParse -- string field too short for " << ktag << "."); - if(true) _pprintLine_("KMLFileTokenParse -- \"" << kstr << "\" truncated to " << maxlen << " characters."); + _pprintLine_("KMLFileTokenParse -- string field too short for " << ktag << "."); + _pprintLine_("KMLFileTokenParse -- \"" << kstr << "\" truncated to " << maxlen << " characters."); strncpy(pstr,kstr,maxlen); } @@ -452,5 +452,5 @@ xfree((void**)&kstr); -// if(true) _pprintLine_("KMLFileTokenParse -- " << ktag << "=\"" << pstr << "\"."); +// _pprintLine_("KMLFileTokenParse -- " << ktag << "=\"" << pstr << "\"."); return(pstr); @@ -486,5 +486,5 @@ xfree((void**)&kstr); -// if(true) _pprintLine_("KMLFileTokenParse -- " << ktag << "=" << *pfval << "."); +// _pprintLine_("KMLFileTokenParse -- " << ktag << "=" << *pfval << "."); return(0); @@ -520,5 +520,5 @@ xfree((void**)&kstr); -// if(true) _pprintLine_("KMLFileTokenParse -- " << ktag << "=" << *pdval << "."); +// _pprintLine_("KMLFileTokenParse -- " << ktag << "=" << *pdval << "."); return(0); @@ -578,7 +578,7 @@ xfree((void**)&kstr); -// if(true) _pprintLine_("KMLFileTokenParse -- " << ktag << "=..."); +// _pprintLine_("KMLFileTokenParse -- " << ktag << "=..."); // for (j=0; j<=i; j++) -// if(true) _pprintLine_(" [" << j << "]: " << (*pdval)[j] << "g"); +// _pprintLine_(" [" << j << "]: " << (*pdval)[j] << "g"); return(0); @@ -631,5 +631,5 @@ if (j != 2) - if(true) _pprintLine_("KMLFileTokenParse -- Double [m x 3] field for " << ktag << " does not have multiple of 3 values."); + _pprintLine_("KMLFileTokenParse -- Double [m x 3] field for " << ktag << " does not have multiple of 3 values."); /* get additional token and compare to closing tag */ @@ -645,7 +645,7 @@ xfree((void**)&kstr); -// if(true) _pprintLine_("KMLFileTokenParse -- " << ktag << "=..."); +// _pprintLine_("KMLFileTokenParse -- " << ktag << "=..."); // for (j=0; j<=i; j++) -// if(true) _pprintLine_(" [" << j << "][0-2]: " << (*pdval3)[j][0] << "g," << (*pdval3)[j][1] << "g," << (*pdval3)[j][2] << "g"); +// _pprintLine_(" [" << j << "][0-2]: " << (*pdval3)[j][0] << "g," << (*pdval3)[j][1] << "g," << (*pdval3)[j][2] << "g"); return(0); @@ -661,5 +661,5 @@ opening tag, must find corresponding closing tag */ - if(true) _pprintLine_("KMLFileTagSkip -- input tag " << ktag << "."); + _pprintLine_("KMLFileTagSkip -- input tag " << ktag << "."); /* if next token is a closing tag, compare to input */ @@ -670,5 +670,5 @@ (kstr[1] == '/') && (!strncmp(&(kstr[2]),&(ktag[1]),(strcspn(ktag," >")-1)/sizeof(char)))) { - if(true) _pprintLine_("KMLFileTagSkip -- closing tag " << kstr << "."); + _pprintLine_("KMLFileTagSkip -- closing tag " << kstr << "."); xfree((void**)&kstr); return(0); @@ -679,5 +679,5 @@ else if ((kstr[0] == '<') && (kstr[1] != '/')) { - if(true) _pprintLine_("KMLFileTagSkip -- opening tag " << kstr << "."); + _pprintLine_("KMLFileTagSkip -- opening tag " << kstr << "."); KMLFileTagSkip(kstr, fid); Index: /issm/trunk-jpl/src/c/objects/KML/KML_Object.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Object.cpp (revision 12518) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Object.cpp (revision 12519) @@ -253,5 +253,5 @@ else if (!strncmp(kstr,"<",1)) { - if(true) _pprintLine_("KML_Object::Read -- Unrecognized opening tag " << kstr << "."); + _pprintLine_("KML_Object::Read -- Unrecognized opening tag " << kstr << "."); // KMLFileTagSkip(kstr, // fid); Index: /issm/trunk-jpl/src/c/objects/KML/KML_Unknown.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Unknown.cpp (revision 12518) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Unknown.cpp (revision 12519) @@ -139,5 +139,5 @@ name=KMLFileTagName(NULL, kstr); -// if(true) _pprintLine_("KML_Unknown::Read -- opening name=" << name << "."); +// _pprintLine_("KML_Unknown::Read -- opening name=" << name << "."); /* get object attributes and check for solo tag */ @@ -151,8 +151,8 @@ while (kstri=KMLFileToken(fid, &ncom,&pcom)) { -// if(true) _pprintLine_("KML_Unknown::Read -- kstri=" << kstri << "."); +// _pprintLine_("KML_Unknown::Read -- kstri=" << kstri << "."); if (!strncmp(&kstri[0],"(ngaus); *pxwgt =xNew(ngaus); @@ -1139,5 +1139,5 @@ sizeof(wgt20)/sizeof(IssmPDouble)}; - // if(true) _pprintLine_("GaussLegendreTria: iord=" << iord); + // _pprintLine_("GaussLegendreTria: iord=" << iord); /* check to see if Gauss points need to be calculated */ @@ -1199,5 +1199,5 @@ } - // if(true) _pprintLine_("GaussLegendreTria - ngaus=" << *pngaus); + // _pprintLine_("GaussLegendreTria - ngaus=" << *pngaus); // for (i=0; i<*pngaus; i++) // _printf_(true,"i=%d: l1gaus=%f,l2gaus=%f,l3gaus=%f,wgt=%f\n", @@ -1398,5 +1398,5 @@ sizeof(wgt6 )/sizeof(IssmPDouble)}; - // if(true) _pprintLine_("GaussLegendreTetra: iord=" << iord); + // _pprintLine_("GaussLegendreTetra: iord=" << iord); /* check to see if Gauss points need to be calculated */ @@ -1521,5 +1521,5 @@ sizeof(wgt5 )/sizeof(IssmPDouble)}; - // if(true) _pprintLine_("Gauss-Lobatto recurrence coefficients ngaus=" << ngaus); + // _pprintLine_("Gauss-Lobatto recurrence coefficients ngaus=" << ngaus); *pxgaus =xNew(ngaus); *pxwgt =xNew(ngaus); Index: /issm/trunk-jpl/src/c/solutions/controltao_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/controltao_core.cpp (revision 12518) +++ /issm/trunk-jpl/src/c/solutions/controltao_core.cpp (revision 12519) @@ -163,6 +163,6 @@ TaoGetSolutionStatus(tao, &its, &f, &gnorm, &cnorm, &xdiff, NULL); - if(its==0) if(true) _pprintLine_("Iter Function Residual | List of contributions"); - if(its==0) if(true) _pprintLine_("-----------------------------------+-----------------------"); + if(its==0) _pprintLine_("Iter Function Residual | List of contributions"); + if(its==0) _pprintLine_("-----------------------------------+-----------------------"); _pprintString_(setw(4)<Norm(NORM_TWO); solver_residue=nKUF/nF; - if(true) _pprintLine_("\n" << " solver residue: norm(KU-F)/norm(F)=" << solver_residue); + _pprintLine_("\n" << " solver residue: norm(KU-F)/norm(F)=" << solver_residue); //clean up @@ -71,5 +71,5 @@ res=nKUoldF/nF; if (isnan(res)){ - if(true) _pprintLine_("norm nf = " << nF << "f and norm kuold = " << nKUoldF << "f"); + _pprintLine_("norm nf = " << nF << "f and norm kuold = " << nKUoldF << "f"); _error2_("mechanical equilibrium convergence criterion is NaN!"); } @@ -111,5 +111,5 @@ } } - else if(true) _pprintLine_("" << " Convergence criterion: norm(du)/norm(u)" << "50s" << ndu/nu*100 << " %"); + else _pprintLine_("" << " Convergence criterion: norm(du)/norm(u)" << "50s" << ndu/nu*100 << " %"); } @@ -136,5 +136,5 @@ } } - else if(true) _pprintLine_("" << " Convergence criterion: max(du)" << "50s" << nduinf*yts << " m/yr"); + else _pprintLine_("" << " Convergence criterion: max(du)" << "50s" << nduinf*yts << " m/yr"); } Index: /issm/trunk-jpl/src/c/solutions/issm.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/issm.cpp (revision 12518) +++ /issm/trunk-jpl/src/c/solutions/issm.cpp (revision 12519) @@ -60,8 +60,8 @@ /*First process inputs*/ - if(true) _pprintLine_(""); - if(true) _pprintLine_("Ice Sheet System Model (" << PACKAGE_NAME << ") version " << PACKAGE_VERSION); - if(true) _pprintLine_("(website: " << PACKAGE_URL << " contact: " << PACKAGE_BUGREPORT << ")"); - if(true) _pprintLine_(""); + _pprintLine_(""); + _pprintLine_("Ice Sheet System Model (" << PACKAGE_NAME << ") version " << PACKAGE_VERSION); + _pprintLine_("(website: " << PACKAGE_URL << " contact: " << PACKAGE_BUGREPORT << ")"); + _pprintLine_(""); ProcessArguments(&solution_type,&binfilename,&outbinfilename,&petscfilename,&lockfilename,argc,argv); @@ -100,5 +100,5 @@ #endif - if(true) _pprintLine_("call computational core:"); + _pprintLine_("call computational core:"); #ifdef _HAVE_MPI_ MPI_Barrier(MPI_COMM_WORLD); start_core=MPI_Wtime( ); @@ -133,5 +133,5 @@ #endif - if(true) _pprintLine_("write results to disk:"); + _pprintLine_("write results to disk:"); OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,femmodel->results); @@ -139,5 +139,5 @@ pfclose(output_fid,lockfilename); if (waitonlock>0){ - if(true) _pprintLine_("write lock file:"); + _pprintLine_("write lock file:"); WriteLockFile(lockfilename); } @@ -174,9 +174,9 @@ #ifdef _HAVE_PETSC_ - if(true) _pprintLine_("closing MPI and Petsc"); + _pprintLine_("closing MPI and Petsc"); PetscFinalize(); #else #ifdef _HAVE_MPI_ - if(true) _pprintLine_("closing MPI and Petsc"); + _pprintLine_("closing MPI and Petsc"); MPI_Finalize(); #endif Index: /issm/trunk-jpl/src/c/solutions/kriging.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/kriging.cpp (revision 12518) +++ /issm/trunk-jpl/src/c/solutions/kriging.cpp (revision 12519) @@ -54,8 +54,8 @@ /*First process inputs*/ - if(true) _pprintLine_(""); - if(true) _pprintLine_("Ice Sheet System Model (" << PACKAGE_NAME << ") version " << PACKAGE_VERSION); - if(true) _pprintLine_("(website: " << PACKAGE_URL << " contact: " << PACKAGE_BUGREPORT << ")"); - if(true) _pprintLine_(""); + _pprintLine_(""); + _pprintLine_("Ice Sheet System Model (" << PACKAGE_NAME << ") version " << PACKAGE_VERSION); + _pprintLine_("(website: " << PACKAGE_URL << " contact: " << PACKAGE_BUGREPORT << ")"); + _pprintLine_(""); ProcessArguments2(&binfilename,&outbinfilename,&lockfilename,argc,argv); @@ -65,8 +65,8 @@ pfclose(input_fid,binfilename); - if(true) _pprintLine_("call computational core:"); + _pprintLine_("call computational core:"); pKrigingx(&predictions,&error,x,y,data,nobs,x_interp,y_interp,ninterp,options); - if(true) _pprintLine_("write results to disk:"); + _pprintLine_("write results to disk:"); Results *results = new Results(); if(my_rank==0){ @@ -82,5 +82,5 @@ /*Close output and petsc options file and write lock file if requested*/ - if(true) _pprintLine_("write lock file:"); + _pprintLine_("write lock file:"); WriteLockFile(lockfilename); @@ -100,9 +100,9 @@ #ifdef _HAVE_PETSC_ - if(true) _pprintLine_("closing MPI and Petsc"); + _pprintLine_("closing MPI and Petsc"); PetscFinalize(); #else #ifdef _HAVE_MPI_ - if(true) _pprintLine_("closing MPI and Petsc"); + _pprintLine_("closing MPI and Petsc"); MPI_Finalize(); #endif Index: /issm/trunk-jpl/src/c/solvers/solver_newton.cpp =================================================================== --- /issm/trunk-jpl/src/c/solvers/solver_newton.cpp (revision 12518) +++ /issm/trunk-jpl/src/c/solvers/solver_newton.cpp (revision 12519) @@ -75,5 +75,5 @@ } if(count>=max_nonlinear_iterations){ - if(true) _pprintLine_(" maximum number of Newton iterations (" << max_nonlinear_iterations << ") exceeded"); + _pprintLine_(" maximum number of Newton iterations (" << max_nonlinear_iterations << ") exceeded"); bool max_iteration_state=true; int tempStep=1; Index: /issm/trunk-jpl/src/c/solvers/solver_nonlinear.cpp =================================================================== --- /issm/trunk-jpl/src/c/solvers/solver_nonlinear.cpp (revision 12518) +++ /issm/trunk-jpl/src/c/solvers/solver_nonlinear.cpp (revision 12519) @@ -93,5 +93,5 @@ } if(count>=max_nonlinear_iterations){ - if(true) _pprintLine_(" maximum number of nonlinear iterations (" << max_nonlinear_iterations << ") exceeded"); + _pprintLine_(" maximum number of nonlinear iterations (" << max_nonlinear_iterations << ") exceeded"); converged=true; InputUpdateFromConstantx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,converged,ConvergedEnum); Index: /issm/trunk-jpl/src/c/solvers/solver_stokescoupling_nonlinear.cpp =================================================================== --- /issm/trunk-jpl/src/c/solvers/solver_stokescoupling_nonlinear.cpp (revision 12518) +++ /issm/trunk-jpl/src/c/solvers/solver_stokescoupling_nonlinear.cpp (revision 12519) @@ -91,5 +91,5 @@ if(converged==true)break; if(count>=max_nonlinear_iterations){ - if(true) _pprintLine_(" maximum number of iterations (" << max_nonlinear_iterations << ") exceeded"); + _pprintLine_(" maximum number of iterations (" << max_nonlinear_iterations << ") exceeded"); break; } Index: /issm/trunk-jpl/src/c/solvers/solver_thermal_nonlinear.cpp =================================================================== --- /issm/trunk-jpl/src/c/solvers/solver_thermal_nonlinear.cpp (revision 12518) +++ /issm/trunk-jpl/src/c/solvers/solver_thermal_nonlinear.cpp (revision 12519) @@ -70,5 +70,5 @@ if (count>=thermal_maxiter){ converged=true; - if(true) _pprintLine_(" maximum number of iterations (" << thermal_maxiter << ") exceeded"); + _pprintLine_(" maximum number of iterations (" << thermal_maxiter << ") exceeded"); } }