Changeset 6412 for issm/trunk/src/c/objects/FemModel.cpp

Timestamp:

10/25/10 08:57:04 (14 years ago)

Author:

Mathieu Morlighem

Message:

moved ISSMERROR to _error_, ISSMASSERT to _assert_ and ISSMPRINTF to _printf_

File:

• issm/trunk/src/c/objects/FemModel.cpp (modified) (3 diffs)

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

@@ -53 +53 @@
         for(i=0;i<nummodels;i++){
 
-                ISSMPRINTF(VerboseMProcessor(),"   Processing finite element model of analysis %s:\n",EnumToString(analysis_type_list[i]));
+                _printf_(VerboseMProcessor(),"   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){
-                        ISSMPRINTF(VerboseMProcessor(),"      create vertex degrees of freedom\n");
+                        _printf_(VerboseMProcessor(),"      create vertex degrees of freedom\n");
                         VerticesDofx(vertices,parameters); //only call once, we only have one set of vertices
                 }
 
-                ISSMPRINTF(VerboseMProcessor(),"      resolve node constraints\n");
+                _printf_(VerboseMProcessor(),"      resolve node constraints\n");
                 SpcNodesx(nodes,constraints,analysis_type); 
         
-                ISSMPRINTF(VerboseMProcessor(),"      create nodal degrees of freedom\n");
+                _printf_(VerboseMProcessor(),"      create nodal degrees of freedom\n");
                 NodesDofx(nodes,parameters,analysis_type);
         
-                ISSMPRINTF(VerboseMProcessor(),"      create nodal constraints vector\n");
+                _printf_(VerboseMProcessor(),"      create nodal constraints vector\n");
                 CreateNodalConstraintsx(&m_ys[i],nodes,analysis_type);
 
-                ISSMPRINTF(VerboseMProcessor(),"      create node sets\n");
+                _printf_(VerboseMProcessor(),"      create node sets\n");
                 BuildNodeSetsx(&m_nodesets[i], nodes,analysis_type);
 
-                ISSMPRINTF(VerboseMProcessor(),"      configuring element and loads\n");
+                _printf_(VerboseMProcessor(),"      configuring element and loads\n");
                 ConfigureObjectsx(elements, loads, nodes, vertices, materials,parameters);
         }
@@ -152 +152 @@
         }
         if(found!=-1) analysis_counter=found;
-        else ISSMERROR("Could not find alias for analysis_type %s in list of FemModel analyses",EnumToString(configuration_type));
+        else _error_("Could not find alias for analysis_type %s in list of FemModel analyses",EnumToString(configuration_type));
 
         /*activate matrices/vectors: */
@@ -170 +170 @@
         /*take care of petsc options, that depend on this analysis type: */
         PetscOptionsFromAnalysis(this->parameters,analysis_type);
-        ISSMPRINTF(VerboseSolver(),"      petsc Options set for analysis type: %s\n",EnumToString(analysis_type));
+        _printf_(VerboseSolver(),"      petsc Options set for analysis type: %s\n",EnumToString(analysis_type));
 
 }