Changeset 8245

Timestamp:

05/10/11 17:17:25 (14 years ago)

Author:

seroussi

Message:

added refernetial in node

Location:

issm/trunk/src/c/objects

Files:

• Node.cpp (modified) (7 diffs)
• Node.h (modified) (1 diff)

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

@@ -32 +32 @@
 
         /*Intermediary*/
-        int k;
+        int k,l;
         int gsize;
 
@@ -39 +39 @@
         this->sid=node_sid; 
         this->analysis_type=analysis_type;
+        for(k=0;k<3;k++) for(l=0;l<3;l++) this->referential[k][l]=1.0;
 
         /*indexing:*/
@@ -198 +199 @@
         memcpy(marshalled_dataset,&sid,sizeof(sid));marshalled_dataset+=sizeof(sid);
         memcpy(marshalled_dataset,&analysis_type,sizeof(analysis_type));marshalled_dataset+=sizeof(analysis_type);
-        
+        memcpy(marshalled_dataset,&referential,9*sizeof(double));marshalled_dataset+=9*sizeof(double);  
+
         /*marshall objects: */
         indexing.Marshall(&marshalled_dataset);
@@ -225 +227 @@
                 inputs->MarshallSize()+
                 sizeof(analysis_type)+
+                9*sizeof(double)+
                 sizeof(int); //sizeof(int) for enum type
 }
@@ -242 +245 @@
         memcpy(&sid,marshalled_dataset,sizeof(sid));marshalled_dataset+=sizeof(sid);
         memcpy(&analysis_type,marshalled_dataset,sizeof(analysis_type));marshalled_dataset+=sizeof(analysis_type);
+        memcpy(&referential,marshalled_dataset,9*sizeof(double));marshalled_dataset+=9*sizeof(double);
         
         /*demarshall objects: */
@@ -265 +269 @@
 Object* Node::copy() {
                 
-        int i;
+        int k,l;
 
         Node* node=NULL;
@@ -286 +290 @@
                 node->inputs=new Inputs();
         }
+        for(k=0;k<3;k++) for(l=0;l<3;l++) node->referential[k][l]=this->referential[k][l]; 
 }
 

issm/trunk/src/c/objects/Node.h

@@ -30 +30 @@
                 Inputs*        inputs; //properties of this node
                 int            analysis_type;
-                //double         referential[6];
+                double         referential[3][3];
 
                 /*Node constructors, destructors {{{1*/