Ignore:
Timestamp:
10/14/10 16:20:41 (14 years ago)
Author:
Mathieu Morlighem
Message:

Added verbose class

File:
1 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/c/solutions/convergence.cpp

    r5016 r6305  
    2828        double eps_rel;
    2929        double eps_abs;
    30         int    verbose;
    3130        double yts;
    3231
     
    4342        parameters->FindParam(&eps_abs,EpsAbsEnum);
    4443        parameters->FindParam(&yts,YtsEnum);
    45         parameters->FindParam(&verbose,VerboseEnum);
    4644
    4745        /*Display solver caracteristics*/
    48         if (verbose>1){
     46        if (VerbConverge()){
    4947
    5048                //compute KUF = KU - F = K*U - F
     
    8280        //print
    8381        if(res<eps_res){
    84                 if (verbose) _printf_("%-50s%g%s%g%s\n","   mechanical equilibrium convergence criterion",res*100," < ",eps_res*100," %");
     82                if (VerbConverge()) _printf_("%-50s%g%s%g%s\n","   mechanical equilibrium convergence criterion",res*100," < ",eps_res*100," %");
    8583                converged=1;
    8684        }
    8785        else{
    88                 if (verbose) _printf_("%-50s%g%s%g%s\n","   mechanical equilibrium convergence criterion",res*100," > ",eps_res*100," %");
     86                if (VerbConverge()) _printf_("%-50s%g%s%g%s\n","   mechanical equilibrium convergence criterion",res*100," > ",eps_res*100," %");
    8987                converged=0;
    9088        }
    9189
    9290        /*Relative criterion (optional)*/
    93         if (!isnan(eps_rel) || (verbose>1)){
     91        if (!isnan(eps_rel) || (VerbConverge())){
    9492
    9593                //compute norm(du)/norm(u)
     
    105103                if (!isnan(eps_rel)){
    106104                        if((ndu/nu)<eps_rel){
    107                                 if (verbose) _printf_("%-50s%g%s%g%s\n","   Convergence criterion: norm(du)/norm(u)",ndu/nu*100," < ",eps_rel*100," %");
     105                                if (VerbConverge()) _printf_("%-50s%g%s%g%s\n","   Convergence criterion: norm(du)/norm(u)",ndu/nu*100," < ",eps_rel*100," %");
    108106                        }
    109107                        else{
    110                                 if (verbose) _printf_("%-50s%g%s%g%s\n","   Convergence criterion: norm(du)/norm(u)",ndu/nu*100," > ",eps_rel*100," %");
     108                                if (VerbConverge()) _printf_("%-50s%g%s%g%s\n","   Convergence criterion: norm(du)/norm(u)",ndu/nu*100," > ",eps_rel*100," %");
    111109                                converged=0;
    112110                        }
     
    117115
    118116        /*Absolute criterion (Optional) = max(du)*/
    119         if (!isnan(eps_abs) || (verbose>1)){
     117        if (!isnan(eps_abs) || (VerbConverge())){
    120118
    121119                //compute max(du)
     
    130128                if (!isnan(eps_abs)){
    131129                        if ((nduinf*yts)<eps_abs){
    132                                 if (verbose) _printf_("%-50s%g%s%g%s\n","   Convergence criterion: max(du)",nduinf*yts," < ",eps_abs," m/yr");
     130                                if (VerbConverge()) _printf_("%-50s%g%s%g%s\n","   Convergence criterion: max(du)",nduinf*yts," < ",eps_abs," m/yr");
    133131                        }
    134132                        else{
    135                                 if (verbose) _printf_("%-50s%g%s%g%s\n","   Convergence criterion: max(du)",nduinf*yts," > ",eps_abs," m/yr");
     133                                if (VerbConverge()) _printf_("%-50s%g%s%g%s\n","   Convergence criterion: max(du)",nduinf*yts," > ",eps_abs," m/yr");
    136134                                converged=0;
    137135                        }
Note: See TracChangeset for help on using the changeset viewer.