Changeset 6305 for issm/trunk/src/c/solutions/convergence.cpp
- Timestamp:
- 10/14/10 16:20:41 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/solutions/convergence.cpp
r5016 r6305 28 28 double eps_rel; 29 29 double eps_abs; 30 int verbose;31 30 double yts; 32 31 … … 43 42 parameters->FindParam(&eps_abs,EpsAbsEnum); 44 43 parameters->FindParam(&yts,YtsEnum); 45 parameters->FindParam(&verbose,VerboseEnum);46 44 47 45 /*Display solver caracteristics*/ 48 if ( verbose>1){46 if (VerbConverge()){ 49 47 50 48 //compute KUF = KU - F = K*U - F … … 82 80 //print 83 81 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," %"); 85 83 converged=1; 86 84 } 87 85 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," %"); 89 87 converged=0; 90 88 } 91 89 92 90 /*Relative criterion (optional)*/ 93 if (!isnan(eps_rel) || ( verbose>1)){91 if (!isnan(eps_rel) || (VerbConverge())){ 94 92 95 93 //compute norm(du)/norm(u) … … 105 103 if (!isnan(eps_rel)){ 106 104 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," %"); 108 106 } 109 107 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," %"); 111 109 converged=0; 112 110 } … … 117 115 118 116 /*Absolute criterion (Optional) = max(du)*/ 119 if (!isnan(eps_abs) || ( verbose>1)){117 if (!isnan(eps_abs) || (VerbConverge())){ 120 118 121 119 //compute max(du) … … 130 128 if (!isnan(eps_abs)){ 131 129 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"); 133 131 } 134 132 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"); 136 134 converged=0; 137 135 }
Note:
See TracChangeset
for help on using the changeset viewer.