Changeset 8808

Timestamp:

07/06/11 08:13:37 (14 years ago)

Author:

Mathieu Morlighem

Message:

CreateNodalConstraints require the configuration and not the analysis

Location:

issm/trunk/src/c

Files:

• modules/Reduceloadx/Reduceloadx.cpp (modified) (1 diff)
• objects/Node.cpp (modified) (1 diff)
• solvers/solver_linear.cpp (modified) (1 diff)

issm/trunk/src/c/modules/Reduceloadx/Reduceloadx.cpp ¶

@@ -27 +27 @@
         if(pf && global_m*global_n){
 
+                /*Some checks in debugging mode*/
+                _assert_(y_s);
+
                 /*pf = pf - Kfs * y_s;*/
                 MatGetLocalSize(Kfs,&Kfsm,&Kfsn);

issm/trunk/src/c/objects/Node.cpp ¶

@@ -119 +119 @@
                 if (iomodel->dim==3){
                         /*On a 3d mesh, we may have collapsed elements, hence dead nodes. Freeze them out: */
-                        if (!iomodel->nodeonbed) _error_("iomodel->nodeonbed is NULL");
+                        _assert_(iomodel->nodeonbed);
                         if (!iomodel->nodeonbed[io_index]){
                                 for(k=1;k<=gsize;k++){

issm/trunk/src/c/solvers/solver_linear.cpp ¶

@@ -17 +17 @@
         Vec  df  = NULL;
         Vec  ys  = NULL;
-        int  analysis_type;
+        int  configuration_type;
 
         /*Recover parameters: */
-        femmodel->parameters->FindParam(&analysis_type,AnalysisTypeEnum);
+        femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
 
         SystemMatricesx(&Kff, &Kfs, &pf, &df, NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
-        CreateNodalConstraintsx(&ys,femmodel->nodes,analysis_type);
+        CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type);
         Reduceloadx(pf, Kfs, ys); MatFree(&Kfs);
         Solverx(&uf, Kff, pf, NULL, df, femmodel->parameters); MatFree(&Kff); VecFree(&pf); VecFree(&df);