Changeset 9302

Timestamp:

08/11/11 16:14:52 (14 years ago)

Author:

Mathieu Morlighem

Message:

minor

Location:

issm/trunk/src

Files:

• c/objects/Constraints/SpcDynamic.cpp (modified) (1 diff)
• c/objects/Node.cpp (modified) (1 diff)
• m/solutions/ResetBoundaryConditions.m (modified) (1 diff)
• mex/UpdateDynamicConstraints/UpdateDynamicConstraints.cpp (modified) (3 diffs)
• mex/UpdateDynamicConstraints/UpdateDynamicConstraints.h (modified) (3 diffs)

issm/trunk/src/c/objects/Constraints/SpcDynamic.cpp ¶

@@ -196 +196 @@
 
         Node* node=(Node*)nodes->GetObjectById(NULL,nodeid);
-        pos=node->GetDof(dof,GsetEnum);
+        pos=node->GetDof(dof-1,GsetEnum);
 
         this->value=yg_serial[pos];

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

@@ -285 +285 @@
 
         if(setenum==GsetEnum){
+                _assert_(dofindex>=0 && dofindex<indexing.gsize);
                 return indexing.gdoflist[dofindex];
         }
         else if(setenum==FsetEnum){
+                _assert_(dofindex>=0 && dofindex<indexing.fsize);
                 return indexing.fdoflist[dofindex];
         }
         else if(setenum==SsetEnum){
+                _assert_(dofindex>=0 && dofindex<indexing.ssize);
                 return indexing.sdoflist[dofindex];
         }

issm/trunk/src/m/solutions/ResetBoundaryConditions.m ¶

@@ -16 +16 @@
 
         %update values of spcs inside nodes
-        femmodel.nodes=UpdateDynamicConstraints(femmodel.constraints,femmodel.nodes,femmodel.parameters,ug);
+        femmodel.constraints=UpdateDynamicConstraints(femmodel.constraints,femmodel.nodes,femmodel.parameters,ug);

issm/trunk/src/mex/UpdateDynamicConstraints/UpdateDynamicConstraints.cpp ¶

@@ -23 +23 @@
         FetchMatlabData((DataSet**)&nodes,NODESIN);
         FetchMatlabData((Parameters**)&parameters,PARAMETERS);
-        FetchMatlabData(&yg,YS);
+        FetchMatlabData(&yg,YG);
         
         /*!Generate internal degree of freedom numbers: */
@@ -29 +29 @@
 
         /*write output datasets: */
-        WriteMatlabData(NODESOUT,nodes);
+        WriteMatlabData(CONSTRAINTSOUT,constraints);
 
         /*Free ressources: */
@@ -44 +44 @@
 {
         _printf_(true,"\n");
-        _printf_(true,"   usage: m.nodes=%s(m.nodes,m.parameters,ys);\n",__FUNCT__);
+        _printf_(true,"   usage: m.constraints=%s(m.constraints,m.nodes,m.parameters,ys);\n",__FUNCT__);
         _printf_(true,"\n");
 }

issm/trunk/src/mex/UpdateDynamicConstraints/UpdateDynamicConstraints.h ¶

@@ -3 +3 @@
 */
 
-#ifndef _UPDATESPCS_H
-#define _UPDATESPCS_H
+#ifndef _UPDATEDYNAMICCONSTRAINTS_H
+#define _UPDATEDYNAMICCONSTRAINTS_H
 
 /* local prototypes: */
@@ -20 +20 @@
 #define NODESIN (mxArray*)prhs[1]
 #define PARAMETERS (mxArray*)prhs[2]
-#define YS (mxArray*)prhs[3]
+#define YG (mxArray*)prhs[3]
 
 /* serial output macros: */
-#define NODESOUT (mxArray**)&plhs[0]
+#define CONSTRAINTSOUT (mxArray**)&plhs[0]
 
 /* serial arg counts: */
@@ -31 +31 @@
 #define NRHS  4
 
-#endif  /* _UPDATESPCS_H */
+#endif