Changeset 6305

Timestamp:

10/14/10 16:20:41 (14 years ago)

Author:

Mathieu Morlighem

Message:

Added verbose class

Location:

issm/trunk/src/c

Files:

• modules/ModelProcessorx/ModelProcessorx.cpp (modified) (2 diffs)
• objects/FemModel.cpp (modified) (2 diffs)
• objects/IoModel.cpp (modified) (1 diff)
• shared/Numerics/Verbosity.h (modified) (1 diff)
• solutions/convergence.cpp (modified) (6 diffs)

issm/trunk/src/c/modules/ModelProcessorx/ModelProcessorx.cpp

@@ -36 +36 @@
         _printf_("   fill model with matlab workspace data\n");
         iomodel = new IoModel(IOMODEL);
+        SetVerbosityLevel(iomodel->verbose);
 
         for(i=0;i<nummodels;i++){
@@ -41 +42 @@
                 analysis_type=analysis_type_list[i];
         
-                _printf_("   create datasets for analysis %s\n",EnumToString(analysis_type));
+                if (VerbModProc()) _printf_("   create datasets for analysis %s\n",EnumToString(analysis_type));
                 CreateDataSets(&elements,&nodes,&vertices,&materials,&constraints,&loads,&parameters,iomodel,IOMODEL,solution_type,analysis_type,nummodels,i);
         }

issm/trunk/src/c/objects/FemModel.cpp

@@ -25 +25 @@
         int i;
         int analysis_type;
-        int  verbosity_level;
-        bool verbose;
 
         /*Initialize internal data: */
@@ -47 +45 @@
         ModelProcessorx(&this->elements,&this->nodes,&this->vertices,&this->materials,&this->constraints,&this->loads,&this->parameters,IOMODEL,this->solution_type,nummodels,analyses);
 
-        /*Shall we verbose?*/
-        this->parameters->FindParam(&verbosity_level,VerboseEnum); verbose=IsModelProcessorVerbosity(verbosity_level);
-
         /*do the post-processing of the datasets to get an FemModel that can actually run analyses: */
         for(i=0;i<nummodels;i++){
 
-                if(verbose) _printf_("   processing finite element model of analysis %s:\n",EnumToString(analysis_type_list[i]));
+                if(VerbModProc()) _printf_("   Processing finite element model of analysis %s:\n",EnumToString(analysis_type_list[i]));
                 analysis_type=analysis_type_list[i];
                 this->SetCurrentConfiguration(analysis_type);
         
                 if(i==0){
-                        if(verbose) _printf_("      create vertex degrees of freedom\n");
+                        if(VerbModProc()) _printf_("      create vertex degrees of freedom\n");
                         VerticesDofx(vertices,parameters); //only call once, we only have one set of vertices
                 }
 
-                if(verbose) _printf_("      resolve node constraints\n");
+                if(VerbModProc()) _printf_("      resolve node constraints\n");
                 SpcNodesx(nodes,constraints,analysis_type); 
         
-                if(verbose) _printf_("      create nodal degrees of freedom\n");
+                if(VerbModProc()) _printf_("      create nodal degrees of freedom\n");
                 NodesDofx(nodes,parameters,analysis_type);
         
-                if(verbose) _printf_("      create nodal constraints vector\n");
+                if(VerbModProc()) _printf_("      create nodal constraints vector\n");
                 CreateNodalConstraintsx(&m_ys[i],nodes,analysis_type);
 
-                if(verbose) _printf_("      create node sets\n");
+                if(VerbModProc()) _printf_("      create node sets\n");
                 BuildNodeSetsx(&m_nodesets[i], nodes,analysis_type);
 
-                if(verbose) _printf_("      configuring element and loads\n");
+                if(VerbModProc()) _printf_("      configuring element and loads\n");
                 ConfigureObjectsx(elements, loads, nodes, vertices, materials,parameters);
         }

issm/trunk/src/c/objects/IoModel.cpp

@@ -160 +160 @@
         IoModelFetchData(&this->meanvel,iomodel_handle,"meanvel");
         IoModelFetchData(&this->epsvel,iomodel_handle,"epsvel");
-        IoModelFetchData(&this->verbose,iomodel_handle,"verbose");
+        IoModelFetchData(&this->verbose,iomodel_handle,"verbose_binary");
         IoModelFetchData(&this->plot,iomodel_handle,"plot");
         IoModelFetchData(&this->output_frequency,iomodel_handle,"output_frequency");

issm/trunk/src/c/shared/Numerics/Verbosity.h

@@ -10 +10 @@
 
 bool VerbModule(void);
-bool VerbConvergence(void);
-bool VerbModelProcessor(void);
+bool VerbConverge(void);
+bool VerbModProc(void);
 bool VerbSolver(void);
 

issm/trunk/src/c/solutions/convergence.cpp

@@ -28 +28 @@
         double eps_rel;
         double eps_abs;
-        int    verbose;
         double yts;
 
@@ -43 +42 @@
         parameters->FindParam(&eps_abs,EpsAbsEnum);
         parameters->FindParam(&yts,YtsEnum);
-        parameters->FindParam(&verbose,VerboseEnum);
 
         /*Display solver caracteristics*/
-        if (verbose>1){
+        if (VerbConverge()){
 
                 //compute KUF = KU - F = K*U - F
@@ -82 +80 @@
         //print
         if(res<eps_res){
-                if (verbose) _printf_("%-50s%g%s%g%s\n","   mechanical equilibrium convergence criterion",res*100," < ",eps_res*100," %");
+                if (VerbConverge()) _printf_("%-50s%g%s%g%s\n","   mechanical equilibrium convergence criterion",res*100," < ",eps_res*100," %");
                 converged=1;
         }
         else{ 
-                if (verbose) _printf_("%-50s%g%s%g%s\n","   mechanical equilibrium convergence criterion",res*100," > ",eps_res*100," %");
+                if (VerbConverge()) _printf_("%-50s%g%s%g%s\n","   mechanical equilibrium convergence criterion",res*100," > ",eps_res*100," %");
                 converged=0;
         }
 
         /*Relative criterion (optional)*/
-        if (!isnan(eps_rel) || (verbose>1)){
+        if (!isnan(eps_rel) || (VerbConverge())){
 
                 //compute norm(du)/norm(u)
@@ -105 +103 @@
                 if (!isnan(eps_rel)){
                         if((ndu/nu)<eps_rel){
-                                if (verbose) _printf_("%-50s%g%s%g%s\n","   Convergence criterion: norm(du)/norm(u)",ndu/nu*100," < ",eps_rel*100," %");
+                                if (VerbConverge()) _printf_("%-50s%g%s%g%s\n","   Convergence criterion: norm(du)/norm(u)",ndu/nu*100," < ",eps_rel*100," %");
                         }
                         else{ 
-                                if (verbose) _printf_("%-50s%g%s%g%s\n","   Convergence criterion: norm(du)/norm(u)",ndu/nu*100," > ",eps_rel*100," %");
+                                if (VerbConverge()) _printf_("%-50s%g%s%g%s\n","   Convergence criterion: norm(du)/norm(u)",ndu/nu*100," > ",eps_rel*100," %");
                                 converged=0;
                         }
@@ -117 +115 @@
 
         /*Absolute criterion (Optional) = max(du)*/
-        if (!isnan(eps_abs) || (verbose>1)){
+        if (!isnan(eps_abs) || (VerbConverge())){
 
                 //compute max(du)
@@ -130 +128 @@
                 if (!isnan(eps_abs)){
                         if ((nduinf*yts)<eps_abs){
-                                if (verbose) _printf_("%-50s%g%s%g%s\n","   Convergence criterion: max(du)",nduinf*yts," < ",eps_abs," m/yr");
+                                if (VerbConverge()) _printf_("%-50s%g%s%g%s\n","   Convergence criterion: max(du)",nduinf*yts," < ",eps_abs," m/yr");
                         }
                         else{
-                                if (verbose) _printf_("%-50s%g%s%g%s\n","   Convergence criterion: max(du)",nduinf*yts," > ",eps_abs," m/yr");
+                                if (VerbConverge()) _printf_("%-50s%g%s%g%s\n","   Convergence criterion: max(du)",nduinf*yts," > ",eps_abs," m/yr");
                                 converged=0;
                         }