Changeset 2342

Timestamp:

09/28/09 11:37:54 (15 years ago)

Author:

Eric.Larour

Message:

Forgot to marshall and demarshall zigzag_counter and stabilize_constraints -> holy schmuck!

File:

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

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

@@ -104 +104 @@
         memcpy(marshalled_dataset,&matpar,sizeof(matpar));marshalled_dataset+=sizeof(matpar);
         memcpy(marshalled_dataset,&matpar_offset,sizeof(matpar_offset));marshalled_dataset+=sizeof(matpar_offset);
+        memcpy(marshalled_dataset,&stabilize_constraints,sizeof(stabilize_constraints));marshalled_dataset+=sizeof(stabilize_constraints);
+        memcpy(marshalled_dataset,&zigzag_counter,sizeof(zigzag_counter));marshalled_dataset+=sizeof(zigzag_counter);
 
         *pmarshalled_dataset=marshalled_dataset;
@@ -121 +123 @@
                 sizeof(matpar)+
                 sizeof(matpar_offset)+
+                sizeof(stabilize_constraints)+
+                sizeof(zigzag_counter)+
                 sizeof(int); //sizeof(int) for enum type
 }
@@ -149 +153 @@
         memcpy(&matpar,marshalled_dataset,sizeof(matpar));marshalled_dataset+=sizeof(matpar);
         memcpy(&matpar_offset,marshalled_dataset,sizeof(matpar_offset));marshalled_dataset+=sizeof(matpar_offset);
-
+        memcpy(&stabilize_constraints,marshalled_dataset,sizeof(stabilize_constraints));marshalled_dataset+=sizeof(stabilize_constraints);
+        memcpy(&zigzag_counter,marshalled_dataset,sizeof(zigzag_counter));marshalled_dataset+=sizeof(zigzag_counter);
 
         node=NULL;