Changeset 12519


Ignore:
Timestamp:
06/22/12 17:27:12 (13 years ago)
Author:
Mathieu Morlighem
Message:

cosmetics

Location:
issm/trunk-jpl/src/c
Files:
22 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/Container/DataSet.cpp

    r12515 r12519  
    135135        if(this==NULL)_error2_("trying to echo a NULL dataset");
    136136
    137         if(true) _pprintLine_("DataSet echo: " << objects.size() << " objects");
     137        _pprintLine_("DataSet echo: " << objects.size() << " objects");
    138138
    139139        for ( object=objects.begin() ; object < objects.end(); object++ ){
    … …  
    152152        if(this==NULL)_error2_("trying to echo a NULL dataset");
    153153
    154         if(true) _pprintLine_("DataSet echo: " << objects.size() << " objects");
     154        _pprintLine_("DataSet echo: " << objects.size() << " objects");
    155155
    156156        for ( object=objects.begin() ; object < objects.end(); object++ ){

  • issm/trunk-jpl/src/c/Container/Observations.cpp

    r12515 r12519  
    7373
    7474        /*Initialize Quadtree*/
    75         if(true) _pprintString_("Generating quadtree with a maximum box size " << minlength << " (depth=" << maxdepth << ")... ");
     75        _pprintString_("Generating quadtree with a maximum box size " << minlength << " (depth=" << maxdepth << ")... ");
    7676        this->quadtree = new Quadtree(xmin,xmax,ymin,ymax,maxdepth);
    7777
    … …  
    103103                }
    104104        }
    105         if(true) _pprintLine_("done");
    106         if(true) _pprintLine_("Initial number of observations: " << n);
    107         if(true) _pprintLine_("  Final number of observations: " << this->quadtree->NbObs);
     105        _pprintLine_("done");
     106        _pprintLine_("Initial number of observations: " << n);
     107        _pprintLine_("  Final number of observations: " << this->quadtree->NbObs);
    108108}
    109109/*}}}*/

  • issm/trunk-jpl/src/c/matlab/io/OptionParse.cpp

    r12515 r12519  
    176176        else if(mxIsClass(prhs[0],"cell"))    option=(Option*)OptionCellParse(name,prhs);
    177177        else {
    178                 if(true) _pprintLine_("  Converting value of option \"" << name << "\" from unrecognized class \"" << mxGetClassName(prhs[0]) << "\" to class \"" << "struct" << "\".");
     178                _pprintLine_("  Converting value of option \"" << name << "\" from unrecognized class \"" << mxGetClassName(prhs[0]) << "\" to class \"" << "struct" << "\".");
    179179                if (!mexCallMATLAB(1,lhs,1,(mxArray**)prhs,"struct")) {
    180180                        option=(Option*)OptionStructParse(name,(const mxArray**)lhs);

  • issm/trunk-jpl/src/c/modules/Exp2Kmlx/Exp2Kmlx.cpp

    r12515 r12519  
    5050        clock0=clock();
    5151        time0 =time(NULL);
    52         if(true) _pprintString_("\nExp2Kmlx Module -- " << ctime(&time0));
     52        _pprintString_("\nExp2Kmlx Module -- " << ctime(&time0));
    5353
    5454        /*read exp file  */
    … …  
    5656        if (!DomainOutlineRead(&nprof,&pnvert,&pprofx,&pprofy,&closed,filexp))
    5757                _error2_("Error reading exp file.");
    58         if(true) _pprintLine_("Exp2Kmlx -- Reading " << nprof << " exp profiles from file \"" << filexp << "\".");
     58        _pprintLine_("Exp2Kmlx -- Reading " << nprof << " exp profiles from file \"" << filexp << "\".");
    5959//      for (i=0; i<nprof; i++)
    6060//              _printLine_("i=" << i << "; nvert=" << pnvert[i] << ", closed=" << closed[i]);
    … …  
    121121
    122122        if (holes && nprof && (pnvert[0] <= 1 || pprofx[0][pnvert[0]-1] != pprofx[0][0] || pprofy[0][pnvert[0]-1] != pprofy[0][0])) {
    123                 if(true) _pprintLine_("Warning -- Outer profile is not closed, so \"holes\" option will be ignored.");
     123                _pprintLine_("Warning -- Outer profile is not closed, so \"holes\" option will be ignored.");
    124124                holes=false;
    125125        }
    … …  
    153153                for (i=1; i<nprof; i++) {
    154154                        if (pnvert[i] <= 1 || pprofx[i][pnvert[i]-1] != pprofx[i][0] || pprofy[i][pnvert[i]-1] != pprofy[i][0]) {
    155                                 if(true) _pprintLine_("Warning -- Inner profile " << i+1 << " is not closed with \"holes\" specified, so it will be ignored.");
     155                                _pprintLine_("Warning -- Inner profile " << i+1 << " is not closed with \"holes\" specified, so it will be ignored.");
    156156                                continue;
    157157                        }
    … …  
    275275/*  write kml file  */
    276276
    277         if(true) _pprintLine_("Exp2Kmlx -- Writing kml document to file \"" << filkml << "\".");
     277        _pprintLine_("Exp2Kmlx -- Writing kml document to file \"" << filkml << "\".");
    278278        fid=fopen(filkml,"w");
    279279        fprintf(fid,"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");

  • issm/trunk-jpl/src/c/modules/KMLFileReadx/KMLFileReadx.cpp

    r12515 r12519  
    2121        clock0=clock();
    2222        time0 =time(NULL);
    23         if(true) _pprintString_("\nKMLFileReadx Module -- " << ctime(&time0));
     23        _pprintString_("\nKMLFileReadx Module -- " << ctime(&time0));
    2424
    2525/*  read kml file  */
    … …  
    4343                }
    4444
    45 //              if(true) _pprintLine_("" << kstr);
     45//              _pprintLine_("" << kstr);
    4646                xDelete<char>(kstr);
    4747        }
    4848
    4949        if (kxml) {
    50                 if(true) _pprintLine_("XML declaration:");
     50                _pprintLine_("XML declaration:");
    5151                kxml->DeepEcho("  ");
    5252                delete kxml;
    5353        }
    5454        if (kdtd) {
    55                 if(true) _pprintLine_("DTD declaration (not yet implemented):");
     55                _pprintLine_("DTD declaration (not yet implemented):");
    5656                kdtd->DeepEcho("  ");
    5757                delete kdtd;

  • issm/trunk-jpl/src/c/modules/KMLMeshWritex/KMLMeshWritex.cpp

    r12515 r12519  
    2929        clock0=clock();
    3030        time0 =time(NULL);
    31         if(true) _pprintString_("\nKMLMeshWritex Module -- " << ctime(&time0));
     31        _pprintString_("\nKMLMeshWritex Module -- " << ctime(&time0));
    3232
    3333/*  construct kml document  */
    … …  
    8383
    8484        if (cmap) {
    85                 if(true) _pprintLine_("Writing " << mcmap << " Matlab colors as KML style templates.");
     85                _pprintLine_("Writing " << mcmap << " Matlab colors as KML style templates.");
    8686                ipt=0;
    8787                for (i=0; i<mcmap; i++) {
    … …  
    118118
    119119        if (!nodecon) {
    120                 if(true) _pprintLine_("Creating the node connectivity table.");
     120                _pprintLine_("Creating the node connectivity table.");
    121121                nncon=mxepg+1;
    122122                nodecon=xNewZeroInit<int>(mncon*nncon);
    … …  
    149149
    150150                else if (mdata == mncon) {
    151                         if(true) _pprintLine_("Averaging nodal data to element data.");
     151                        _pprintLine_("Averaging nodal data to element data.");
    152152                        edata=xNewZeroInit<double>(melem*ndata);
    153153                        edfree=true;
    … …  
    193193/*  write kml file  */
    194194
    195         if(true) _pprintLine_("Writing kml document to file.");
     195        _pprintLine_("Writing kml document to file.");
    196196        fprintf(fid,"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
    197197        fprintf(fid,"<kml xmlns=\"http://www.opengis.net/kml/2.2\">\n");
    … …  
    203203                         ((double)(clock0b-clock0a))/CLOCKS_PER_SEC,difftime(time0b,time0a));
    204204
    205         if(true) _pprintLine_("Deleting kml document.");
     205        _pprintLine_("Deleting kml document.");
    206206        delete kdoc;
    207207        clock0c=clock();
    … …  
    304304/*  write each element as a polygon placemark  */
    305305
    306         if(true) _pprintLine_("Writing " << melem << " tria elements as KML polygons.");
     306        _pprintLine_("Writing " << melem << " tria elements as KML polygons.");
    307307
    308308        for (i=0; i<melem; i++) {
    … …  
    356356
    357357//              if (!(int)fmod((double)(i+1),1000))
    358 //                      if(true) _pprintLine_("  " << (i+1) << " tria elements written.");
     358//                      _pprintLine_("  " << (i+1) << " tria elements written.");
    359359        }
    360         if(true) _pprintLine_("  " << melem << " tria elements written.");
     360        _pprintLine_("  " << melem << " tria elements written.");
    361361
    362362        return(kfold);

  • issm/trunk-jpl/src/c/modules/KMLOverlayx/KMLOverlayx.cpp

    r12515 r12519  
    2828        clock0=clock();
    2929        time0 =time(NULL);
    30         if(true) _pprintString_("\nKMLOverlayx Module -- " << ctime(&time0));
     30        _pprintString_("\nKMLOverlayx Module -- " << ctime(&time0));
    3131
    3232/*  construct kml file  */
    … …  
    8282/*  write kml file  */
    8383
    84         if(true) _pprintLine_("Writing kml document to file.");
     84        _pprintLine_("Writing kml document to file.");
    8585        fprintf(fid,"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
    8686        kfile->Write(fid,indent);

  • issm/trunk-jpl/src/c/modules/Kml2Expx/Kml2Expx.cpp

    r12515 r12519  
    3838        clock0=clock();
    3939        time0 =time(NULL);
    40         if(true) _pprintString_("\nKml2Expx Module -- " << ctime(&time0));
     40        _pprintString_("\nKml2Expx Module -- " << ctime(&time0));
    4141
    4242/*  read kml file  */
    … …  
    4949/*  open exp file  */
    5050
    51         if(true) _pprintLine_("Writing exp profiles to file.");
     51        _pprintLine_("Writing exp profiles to file.");
    5252        fido=fopen(filexp,"w");
    5353

  • issm/trunk-jpl/src/c/modules/Shp2Kmlx/Shp2Kmlx.cpp

    r12515 r12519  
    6868        clock0=clock();
    6969        time0 =time(NULL);
    70         if(true) _pprintString_("\nShp2Kmlx Module -- " << ctime(&time0));
     70        _pprintString_("\nShp2Kmlx Module -- " << ctime(&time0));
    7171
    7272/*  note that much of the following code is taken from shpdump.c in shapelib.  */
    … …  
    573573/*  write kml file  */
    574574
    575         if(true) _pprintLine_("Writing kml document to file.");
     575        _pprintLine_("Writing kml document to file.");
    576576        fid=fopen(filkml,"w");
    577577        fprintf(fid,"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");

  • issm/trunk-jpl/src/c/objects/IoModel.cpp

    r12515 r12519  
    7878                for(int i=0;i<MaximumNumberOfEnums;i++){
    7979                        if(this->data[i]){
    80                                 if(true) _pprintLine_("Info: previous pointer of " << EnumToStringx(i) << " has not been freed (DeleteData has not been called)");
     80                                _pprintLine_("Info: previous pointer of " << EnumToStringx(i) << " has not been freed (DeleteData has not been called)");
    8181                        }
    8282                }

  • issm/trunk-jpl/src/c/objects/KML/KMLFileReadUtils.cpp

    r12515 r12519  
    127127
    128128//      if      (itag)
    129 //              if(true) _pprintLine_("tag buffer (length=" << ibuf << "):");
     129//              _pprintLine_("tag buffer (length=" << ibuf << "):");
    130130//      else if (ifield)
    131 //              if(true) _pprintLine_("field buffer (length=" << ibuf << "):");
    132 //      if(true) _pprintLine_("" << buffer);
     131//              _pprintLine_("field buffer (length=" << ibuf << "):");
     132//      _pprintLine_("" << buffer);
    133133
    134134        if (!ibuf)
    … …  
    193193                }
    194194
    195 //      if(true) _pprintLine_("comment buffer (length=" << ibuf << "):");
    196 //      if(true) _pprintLine_("" << buffer);
     195//      _pprintLine_("comment buffer (length=" << ibuf << "):");
     196//      _pprintLine_("" << buffer);
    197197
    198198        if (!ibuf)
    … …  
    254254
    255255        ktokn=strtok(ktagi,"< >");
    256 //      if(true) _pprintLine_("KMLFileTagName -- initial token=\"" << ktokn << "\".");
     256//      _pprintLine_("KMLFileTagName -- initial token=\"" << ktokn << "\".");
    257257
    258258        if (!pname) {
    … …  
    264264
    265265        if (maxlen && (maxlen < strlen(ktokn))) {
    266                 if(true) _pprintLine_("KMLFileTagName -- string field too short for " << ktag << ".");
    267                 if(true) _pprintLine_("KMLFileTagName -- \"" << ktokn << "\" truncated to " << maxlen << " characters.");
     266                _pprintLine_("KMLFileTagName -- string field too short for " << ktag << ".");
     267                _pprintLine_("KMLFileTagName -- \"" << ktokn << "\" truncated to " << maxlen << " characters.");
    268268                strncpy(pname,ktokn,maxlen);
    269269        }
    … …  
    300300        /*  return first non blank and move past subsequent blank  */
    301301        ktokn=strtok(ktagi," ");
    302 //      if(true) _pprintLine_("KMLFileTagAttrib -- initial token=\"" << ktokn << "\".");
     302//      _pprintLine_("KMLFileTagAttrib -- initial token=\"" << ktokn << "\".");
    303303
    304304        /*  return next non " =?/>" and move past subsequent " =?/>"  */
    … …  
    307307                /*  return next non quote and move past subsequent quote  */
    308308                ktokv=strtok(NULL,quote);
    309 //              if(true) _pprintLine_("KMLFileTagAttrib -- attribute " << ktokn << "=\"" << ktokv << "\".");
     309//              _pprintLine_("KMLFileTagAttrib -- attribute " << ktokn << "=\"" << ktokv << "\".");
    310310
    311311/*  add the attribute to the dataset  */
    … …  
    323323                (!strncmp(&ktag[0],"<"        ,1) && !strncmp(&ktag[strlen(ktag)-2],"/>",2)))
    324324                isolo=1;
    325 //      if(true) _pprintLine_("KMLFileTagAttrib -- isolo=" << isolo << ".");
     325//      _pprintLine_("KMLFileTagAttrib -- isolo=" << isolo << ".");
    326326
    327327        return(isolo);
    … …  
    357357                        xfree((void**)&kstr);
    358358
    359 //      if(true) _pprintLine_("KMLFileTokenParse -- " << ktag << "=" << *pival << ".");
     359//      _pprintLine_("KMLFileTokenParse -- " << ktag << "=" << *pival << ".");
    360360
    361361        return(0);
    … …  
    391391                        xfree((void**)&kstr);
    392392
    393 //      if(true) _pprintLine_("KMLFileTokenParse -- " << ktag << "=" << (*pbval ? "true" : "false") << ".");
     393//      _pprintLine_("KMLFileTokenParse -- " << ktag << "=" << (*pbval ? "true" : "false") << ".");
    394394
    395395        return(0);
    … …  
    428428
    429429        if (maxlen && (maxlen < strlen(kstr))) {
    430                 if(true) _pprintLine_("KMLFileTokenParse -- string field too short for " << ktag << ".");
    431                 if(true) _pprintLine_("KMLFileTokenParse -- \"" << kstr << "\" truncated to " << maxlen << " characters.");
     430                _pprintLine_("KMLFileTokenParse -- string field too short for " << ktag << ".");
     431                _pprintLine_("KMLFileTokenParse -- \"" << kstr << "\" truncated to " << maxlen << " characters.");
    432432                strncpy(pstr,kstr,maxlen);
    433433        }
    … …  
    452452                        xfree((void**)&kstr);
    453453
    454 //      if(true) _pprintLine_("KMLFileTokenParse -- " << ktag << "=\"" << pstr << "\".");
     454//      _pprintLine_("KMLFileTokenParse -- " << ktag << "=\"" << pstr << "\".");
    455455
    456456        return(pstr);
    … …  
    486486                        xfree((void**)&kstr);
    487487
    488 //      if(true) _pprintLine_("KMLFileTokenParse -- " << ktag << "=" << *pfval << ".");
     488//      _pprintLine_("KMLFileTokenParse -- " << ktag << "=" << *pfval << ".");
    489489
    490490        return(0);
    … …  
    520520                        xfree((void**)&kstr);
    521521
    522 //      if(true) _pprintLine_("KMLFileTokenParse -- " << ktag << "=" << *pdval << ".");
     522//      _pprintLine_("KMLFileTokenParse -- " << ktag << "=" << *pdval << ".");
    523523
    524524        return(0);
    … …  
    578578                        xfree((void**)&kstr);
    579579
    580 //      if(true) _pprintLine_("KMLFileTokenParse -- " << ktag << "=...");
     580//      _pprintLine_("KMLFileTokenParse -- " << ktag << "=...");
    581581//      for (j=0; j<=i; j++)
    582 //              if(true) _pprintLine_("   [" << j << "]: " << (*pdval)[j] << "g");
     582//              _pprintLine_("   [" << j << "]: " << (*pdval)[j] << "g");
    583583
    584584        return(0);
    … …  
    631631
    632632        if (j != 2)
    633                 if(true) _pprintLine_("KMLFileTokenParse -- Double [m x 3] field for " << ktag << " does not have multiple of 3 values.");
     633                _pprintLine_("KMLFileTokenParse -- Double [m x 3] field for " << ktag << " does not have multiple of 3 values.");
    634634
    635635/*  get additional token and compare to closing tag  */
    … …  
    645645                        xfree((void**)&kstr);
    646646
    647 //      if(true) _pprintLine_("KMLFileTokenParse -- " << ktag << "=...");
     647//      _pprintLine_("KMLFileTokenParse -- " << ktag << "=...");
    648648//      for (j=0; j<=i; j++)
    649 //              if(true) _pprintLine_("   [" << j << "][0-2]: " << (*pdval3)[j][0] << "g," << (*pdval3)[j][1] << "g," << (*pdval3)[j][2] << "g");
     649//              _pprintLine_("   [" << j << "][0-2]: " << (*pdval3)[j][0] << "g," << (*pdval3)[j][1] << "g," << (*pdval3)[j][2] << "g");
    650650
    651651        return(0);
    … …  
    661661        opening tag, must find corresponding closing tag  */
    662662
    663         if(true) _pprintLine_("KMLFileTagSkip -- input tag " << ktag << ".");
     663        _pprintLine_("KMLFileTagSkip -- input tag " << ktag << ".");
    664664
    665665/*  if next token is a closing tag, compare to input  */
    … …  
    670670                                 (kstr[1] == '/') &&
    671671                                 (!strncmp(&(kstr[2]),&(ktag[1]),(strcspn(ktag," >")-1)/sizeof(char)))) {
    672                         if(true) _pprintLine_("KMLFileTagSkip -- closing tag " << kstr << ".");
     672                        _pprintLine_("KMLFileTagSkip -- closing tag " << kstr << ".");
    673673                        xfree((void**)&kstr);
    674674                        return(0);
    … …  
    679679                else if ((kstr[0] == '<') &&
    680680                                 (kstr[1] != '/')) {
    681                         if(true) _pprintLine_("KMLFileTagSkip -- opening tag " << kstr << ".");
     681                        _pprintLine_("KMLFileTagSkip -- opening tag " << kstr << ".");
    682682                        KMLFileTagSkip(kstr,
    683683                                                   fid);

  • issm/trunk-jpl/src/c/objects/KML/KML_Object.cpp

    r12515 r12519  
    253253
    254254        else if (!strncmp(kstr,"<",1)) {
    255                 if(true) _pprintLine_("KML_Object::Read -- Unrecognized opening tag " << kstr << ".");
     255                _pprintLine_("KML_Object::Read -- Unrecognized opening tag " << kstr << ".");
    256256//              KMLFileTagSkip(kstr,
    257257//                                         fid);

  • issm/trunk-jpl/src/c/objects/KML/KML_Unknown.cpp

    r12515 r12519  
    139139        name=KMLFileTagName(NULL,
    140140                                                kstr);
    141 //      if(true) _pprintLine_("KML_Unknown::Read -- opening name=" << name << ".");
     141//      _pprintLine_("KML_Unknown::Read -- opening name=" << name << ".");
    142142
    143143/*  get object attributes and check for solo tag  */
    … …  
    151151        while (kstri=KMLFileToken(fid,
    152152                                                          &ncom,&pcom)) {
    153 //              if(true) _pprintLine_("KML_Unknown::Read -- kstri=" << kstri << ".");
     153//              _pprintLine_("KML_Unknown::Read -- kstri=" << kstri << ".");
    154154                if      (!strncmp(&kstri[0],"</", 2) &&
    155155                                 !strncmp(&kstri[2],name,strlen(name))) {
    156 //                      if(true) _pprintLine_("KML_Unknown::Read -- closing name=" << name << ".");
     156//                      _pprintLine_("KML_Unknown::Read -- closing name=" << name << ".");
    157157                        xfree((void**)&kstri);
    158158                        break;

  • issm/trunk-jpl/src/c/shared/Numerics/GaussPoints.cpp

    r12515 r12519  
    5151                sizeof(wgt4 )/sizeof(IssmPDouble)};
    5252
    53         //      if(true) _pprintLine_("Gauss-Legendre recurrence coefficients ngaus=" << ngaus);
     53        //      _pprintLine_("Gauss-Legendre recurrence coefficients ngaus=" << ngaus);
    5454        *pxgaus =xNew<IssmPDouble>(ngaus);
    5555        *pxwgt  =xNew<IssmPDouble>(ngaus);
    … …  
    11391139                sizeof(wgt20)/sizeof(IssmPDouble)};
    11401140
    1141         //      if(true) _pprintLine_("GaussLegendreTria: iord=" << iord);
     1141        //      _pprintLine_("GaussLegendreTria: iord=" << iord);
    11421142
    11431143        /*  check to see if Gauss points need to be calculated  */
    … …  
    11991199        }
    12001200
    1201         //      if(true) _pprintLine_("GaussLegendreTria - ngaus=" << *pngaus);
     1201        //      _pprintLine_("GaussLegendreTria - ngaus=" << *pngaus);
    12021202        //      for (i=0; i<*pngaus; i++)
    12031203        //              _printf_(true,"i=%d: l1gaus=%f,l2gaus=%f,l3gaus=%f,wgt=%f\n",
    … …  
    13981398                sizeof(wgt6 )/sizeof(IssmPDouble)};
    13991399
    1400         //      if(true) _pprintLine_("GaussLegendreTetra: iord=" << iord);
     1400        //      _pprintLine_("GaussLegendreTetra: iord=" << iord);
    14011401
    14021402        /*  check to see if Gauss points need to be calculated  */
    … …  
    15211521                sizeof(wgt5 )/sizeof(IssmPDouble)};
    15221522
    1523         //      if(true) _pprintLine_("Gauss-Lobatto recurrence coefficients ngaus=" << ngaus);
     1523        //      _pprintLine_("Gauss-Lobatto recurrence coefficients ngaus=" << ngaus);
    15241524        *pxgaus =xNew<IssmPDouble>(ngaus);
    15251525        *pxwgt  =xNew<IssmPDouble>(ngaus);

  • issm/trunk-jpl/src/c/solutions/controltao_core.cpp

    r12515 r12519  
    163163
    164164        TaoGetSolutionStatus(tao, &its, &f, &gnorm, &cnorm, &xdiff, NULL);
    165         if(its==0) if(true) _pprintLine_("Iter       Function      Residual  |  List of contributions");
    166         if(its==0) if(true) _pprintLine_("-----------------------------------+-----------------------");
     165        if(its==0) _pprintLine_("Iter       Function      Residual  |  List of contributions");
     166        if(its==0) _pprintLine_("-----------------------------------+-----------------------");
    167167        _pprintString_(setw(4)<<its<<"   "<<setw(12)<<setprecision(7)<<f<<"  "<<setw(12)<<setprecision(7)<<gnorm<<"  | ");
    168168

  • issm/trunk-jpl/src/c/solutions/convergence.cpp

    r12515 r12519  
    5555                nF=pf->Norm(NORM_TWO);
    5656                solver_residue=nKUF/nF;
    57                 if(true) _pprintLine_("\n" << "   solver residue: norm(KU-F)/norm(F)=" << solver_residue);
     57                _pprintLine_("\n" << "   solver residue: norm(KU-F)/norm(F)=" << solver_residue);
    5858
    5959                //clean up
    … …  
    7171        res=nKUoldF/nF;
    7272        if (isnan(res)){
    73                 if(true) _pprintLine_("norm nf = " << nF << "f and norm kuold = " << nKUoldF << "f");
     73                _pprintLine_("norm nf = " << nF << "f and norm kuold = " << nKUoldF << "f");
    7474                _error2_("mechanical equilibrium convergence criterion is NaN!");
    7575        }
    … …  
    111111                        }
    112112                }
    113                 else if(true) _pprintLine_("" << "   Convergence criterion: norm(du)/norm(u)" << "50s" << ndu/nu*100 << " %");
     113                else _pprintLine_("" << "   Convergence criterion: norm(du)/norm(u)" << "50s" << ndu/nu*100 << " %");
    114114
    115115        }
    … …  
    136136                        }
    137137                }
    138                 else  if(true) _pprintLine_("" << "   Convergence criterion: max(du)" << "50s" << nduinf*yts << " m/yr");
     138                else  _pprintLine_("" << "   Convergence criterion: max(du)" << "50s" << nduinf*yts << " m/yr");
    139139
    140140        }

  • issm/trunk-jpl/src/c/solutions/issm.cpp

    r12515 r12519  
    6060
    6161        /*First process inputs*/
    62         if(true) _pprintLine_("");
    63         if(true) _pprintLine_("Ice Sheet System Model (" << PACKAGE_NAME << ") version " << PACKAGE_VERSION);
    64         if(true) _pprintLine_("(website: " << PACKAGE_URL << " contact: " << PACKAGE_BUGREPORT << ")");
    65         if(true) _pprintLine_("");
     62        _pprintLine_("");
     63        _pprintLine_("Ice Sheet System Model (" << PACKAGE_NAME << ") version " << PACKAGE_VERSION);
     64        _pprintLine_("(website: " << PACKAGE_URL << " contact: " << PACKAGE_BUGREPORT << ")");
     65        _pprintLine_("");
    6666        ProcessArguments(&solution_type,&binfilename,&outbinfilename,&petscfilename,&lockfilename,argc,argv);
    6767
    … …  
    100100        #endif
    101101
    102         if(true) _pprintLine_("call computational core:");
     102        _pprintLine_("call computational core:");
    103103        #ifdef _HAVE_MPI_
    104104        MPI_Barrier(MPI_COMM_WORLD); start_core=MPI_Wtime( );
    … …  
    133133        #endif
    134134       
    135         if(true) _pprintLine_("write results to disk:");
     135        _pprintLine_("write results to disk:");
    136136        OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,femmodel->results);
    137137
    … …  
    139139        pfclose(output_fid,lockfilename);
    140140        if (waitonlock>0){
    141                 if(true) _pprintLine_("write lock file:");
     141                _pprintLine_("write lock file:");
    142142                WriteLockFile(lockfilename);
    143143        }
    … …  
    174174       
    175175        #ifdef _HAVE_PETSC_
    176         if(true) _pprintLine_("closing MPI and Petsc");
     176        _pprintLine_("closing MPI and Petsc");
    177177        PetscFinalize();
    178178        #else
    179179        #ifdef _HAVE_MPI_
    180         if(true) _pprintLine_("closing MPI and Petsc");
     180        _pprintLine_("closing MPI and Petsc");
    181181        MPI_Finalize();
    182182        #endif

  • issm/trunk-jpl/src/c/solutions/kriging.cpp

    r12515 r12519  
    5454
    5555        /*First process inputs*/
    56         if(true) _pprintLine_("");
    57         if(true) _pprintLine_("Ice Sheet System Model (" << PACKAGE_NAME << ") version " << PACKAGE_VERSION);
    58         if(true) _pprintLine_("(website: " << PACKAGE_URL << " contact: " << PACKAGE_BUGREPORT << ")");
    59         if(true) _pprintLine_("");
     56        _pprintLine_("");
     57        _pprintLine_("Ice Sheet System Model (" << PACKAGE_NAME << ") version " << PACKAGE_VERSION);
     58        _pprintLine_("(website: " << PACKAGE_URL << " contact: " << PACKAGE_BUGREPORT << ")");
     59        _pprintLine_("");
    6060        ProcessArguments2(&binfilename,&outbinfilename,&lockfilename,argc,argv);
    6161
    … …  
    6565        pfclose(input_fid,binfilename);
    6666
    67         if(true) _pprintLine_("call computational core:");
     67        _pprintLine_("call computational core:");
    6868        pKrigingx(&predictions,&error,x,y,data,nobs,x_interp,y_interp,ninterp,options);
    6969
    70         if(true) _pprintLine_("write results to disk:");
     70        _pprintLine_("write results to disk:");
    7171        Results *results = new Results();
    7272        if(my_rank==0){
    … …  
    8282
    8383        /*Close output and petsc options file and write lock file if requested*/
    84         if(true) _pprintLine_("write lock file:");
     84        _pprintLine_("write lock file:");
    8585        WriteLockFile(lockfilename);
    8686
    … …  
    100100
    101101#ifdef _HAVE_PETSC_
    102         if(true) _pprintLine_("closing MPI and Petsc");
     102        _pprintLine_("closing MPI and Petsc");
    103103        PetscFinalize();
    104104#else
    105105#ifdef _HAVE_MPI_
    106         if(true) _pprintLine_("closing MPI and Petsc");
     106        _pprintLine_("closing MPI and Petsc");
    107107        MPI_Finalize();
    108108#endif

  • issm/trunk-jpl/src/c/solvers/solver_newton.cpp

    r12515 r12519  
    7575                }
    7676                if(count>=max_nonlinear_iterations){
    77                         if(true) _pprintLine_("   maximum number of Newton iterations (" << max_nonlinear_iterations << ") exceeded");
     77                        _pprintLine_("   maximum number of Newton iterations (" << max_nonlinear_iterations << ") exceeded");
    7878                        bool max_iteration_state=true;
    7979                        int tempStep=1;

  • issm/trunk-jpl/src/c/solvers/solver_nonlinear.cpp

    r12515 r12519  
    9393                }
    9494                if(count>=max_nonlinear_iterations){
    95                         if(true) _pprintLine_("   maximum number of nonlinear iterations (" << max_nonlinear_iterations << ") exceeded");
     95                        _pprintLine_("   maximum number of nonlinear iterations (" << max_nonlinear_iterations << ") exceeded");
    9696                        converged=true;
    9797                        InputUpdateFromConstantx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,converged,ConvergedEnum);

  • issm/trunk-jpl/src/c/solvers/solver_stokescoupling_nonlinear.cpp

    r12515 r12519  
    9191                if(converged==true)break;
    9292                if(count>=max_nonlinear_iterations){
    93                         if(true) _pprintLine_("   maximum number of iterations (" << max_nonlinear_iterations << ") exceeded");
     93                        _pprintLine_("   maximum number of iterations (" << max_nonlinear_iterations << ") exceeded");
    9494                        break;
    9595                }

  • issm/trunk-jpl/src/c/solvers/solver_thermal_nonlinear.cpp

    r12515 r12519  
    7070                        if (count>=thermal_maxiter){
    7171                                converged=true;
    72                                 if(true) _pprintLine_("   maximum number of iterations (" << thermal_maxiter << ") exceeded");
     72                                _pprintLine_("   maximum number of iterations (" << thermal_maxiter << ") exceeded");
    7373                        }
    7474                }
Note: See TracChangeset for help on using the changeset viewer.