Changeset 6273

Timestamp:

10/12/10 16:37:43 (15 years ago)

Author:

Mathieu Morlighem

Message:

Added verbosity levels, to be improved

Location:

issm/trunk/src/c

Files:

• Makefile.am (modified) (2 diffs)
• objects/FemModel.cpp (modified) (3 diffs)
• shared/Numerics/Verbosity.cpp (added)
• shared/Numerics/Verbosity.h (added)
• shared/Numerics/cfl_time.cpp (deleted)
• shared/Numerics/numerics.h (modified) (1 diff)
• shared/shared.h (modified) (2 diffs)

issm/trunk/src/c/Makefile.am

@@ -245 +245 @@
                                         ./shared/Numerics/isnan.h\
                                         ./shared/Numerics/isnan.cpp\
+                                        ./shared/Numerics/Verbosity.h\
+                                        ./shared/Numerics/Verbosity.cpp\
                                         ./shared/Numerics/IsInputConverged.cpp\
                                         ./shared/Numerics/GaussPoints.h\
@@ -818 +820 @@
                                         ./shared/Dofs/dofsetgen.cpp\
                                         ./shared/Numerics/numerics.h\
+                                        ./shared/Numerics/Verbosity.h\
+                                        ./shared/Numerics/Verbosity.cpp\
                                         ./shared/Numerics/IsInputConverged.cpp\
                                         ./shared/Numerics/GaussPoints.h\

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

@@ -24 +24 @@
         /*intermediary*/
         int i;
-        IoModel* iomodel=NULL;
         int analysis_type;
+        int  verbosity_level;
+        bool verbose;
 
         /*Initialize internal data: */
@@ -43 +44 @@
         for(i=0;i<nummodels;i++)m_ys[i]=NULL;
 
-        /*create datasets for all analyses: */
+        /*create datasets for all analyses*/
         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++){
 
-                _printf_("   processing finite element model of analysis %s:\n",EnumToString(analysis_type_list[i]));
+                if(verbose) _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){
-                        _printf_("      create vertex degrees of freedom\n");
+                        if(verbose) _printf_("      create vertex degrees of freedom\n");
                         VerticesDofx(vertices,parameters); //only call once, we only have one set of vertices
                 }
 
-                _printf_("      resolve node constraints\n");
+                if(verbose) _printf_("      resolve node constraints\n");
                 SpcNodesx(nodes,constraints,analysis_type); 
         
-                _printf_("      create nodal degrees of freedom\n");
+                if(verbose) _printf_("      create nodal degrees of freedom\n");
                 NodesDofx(nodes,parameters,analysis_type);
         
-                _printf_("      create nodal constraints vector\n");
+                if(verbose) _printf_("      create nodal constraints vector\n");
                 CreateNodalConstraintsx(&m_ys[i],nodes,analysis_type);
 
-                _printf_("      create node sets\n");
+                if(verbose) _printf_("      create node sets\n");
                 BuildNodeSetsx(&m_nodesets[i], nodes,analysis_type);
 
-                _printf_("      configuring element and loads\n");
+                if(verbose) _printf_("      configuring element and loads\n");
                 ConfigureObjectsx(elements, loads, nodes, vertices, materials,parameters);
         }
@@ -163 +167 @@
 
         if(verbose){
-                _printf_("   Petsc Options set for analysis type: %s\n",EnumToString(analysis_type));
+                _printf_("      petsc Options set for analysis type: %s\n",EnumToString(analysis_type));
         }
 

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

@@ -6 +6 @@
 #define  _NUMERICS_H_
 
+#include "./Verbosity.h"
 #include "./GaussPoints.h"
 #include "./isnan.h"

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

@@ -2 +2 @@
  * \brief: header file for all shared  routines.
  */
-
 
 #ifndef _SHARED_H_
@@ -21 +20 @@
 #include "Bamg/shared.h"
 
-
 #endif