Changeset 257

Timestamp:

05/06/09 11:42:13 (16 years ago)

Author:

Eric.Larour

Message:

bug fix: ndof was getting clobbered

File:

• issm/trunk/src/c/objects/Input.cpp (modified) (4 diffs)

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

@@ -120 +120 @@
                 
 
-void  Input::Recover(double* values, int ndof, int* dofs,int numnodes,void** vpnodes){
+void  Input::Recover(double* valuesin, int ndofin, int* dofsin,int numnodesin,void** vpnodesin){
 
         //ex: 
@@ -133 +133 @@
         int  dof;
         int  i,j;
+        
         Node** nodes=NULL;
         Node* node=NULL;
 
         /*recover pointer to nodes: */
-        nodes=(Node**)vpnodes;
+        nodes=(Node**)vpnodesin;
         
         if (type!=DOUBLEVEC) throw ErrorException(__FUNCT__,exprintf("%s%i%s"," cannot recover values from a ",type," input type"));
@@ -143 +144 @@
         /*Ok, we are trying to fill values. values is of size ndof*numnodes.  The dofs 
          * for picking up the values are found in the numnodes nodes. We firt build the dof list: */
-        doflist=(int*)xmalloc(ndof*numnodes*sizeof(int));
-
-        for(i=0;i<numnodes;i++){
+        doflist=(int*)xmalloc(ndofin*numnodesin*sizeof(int));
+
+        for(i=0;i<numnodesin;i++){
                 node=nodes[i];
 
@@ -151 +152 @@
                 dof1=node->GetDoflist1();
 
-                for(j=0;j<ndof;j++){
-                        dof=dofs[j];
-                        doflist[i*ndof+j]=dof1*ndof+dof;
+                for(j=0;j<ndofin;j++){
+                        dof=dofsin[j];
+                        doflist[i*ndofin+j]=dof1*ndof+dof;
                 }
         }
         
-        for(i=0;i<ndof*numnodes;i++){
+        for(i=0;i<ndofin*numnodesin;i++){
                 values[i]=vector[doflist[i]];
         }