Changeset 5608

Timestamp:

08/27/10 10:24:12 (15 years ago)

Author:

seroussi

Message:

fixed marshall/demarshall riftfront

File:

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

issm/trunk/src/c/objects/Loads/Riftfront.cpp

@@ -179 +179 @@
 
         /*marshall Riftfront data: */
-        memcpy(&id,marshalled_dataset,sizeof(id));marshalled_dataset+=sizeof(id);
+        memcpy(marshalled_dataset,&id,sizeof(id));marshalled_dataset+=sizeof(id);
         memcpy(marshalled_dataset,&analysis_type,sizeof(analysis_type));marshalled_dataset+=sizeof(analysis_type);
-
         memcpy(marshalled_dataset,&active,sizeof(active));marshalled_dataset+=sizeof(active);
         memcpy(marshalled_dataset,&normal,sizeof(normal));marshalled_dataset+=sizeof(normal);
@@ -190 +189 @@
         memcpy(marshalled_dataset,&prestable,sizeof(prestable));marshalled_dataset+=sizeof(prestable);
         memcpy(marshalled_dataset,&penalty_lock,sizeof(penalty_lock));marshalled_dataset+=sizeof(penalty_lock);
+        memcpy(marshalled_dataset,&material_converged,sizeof(material_converged));marshalled_dataset+=sizeof(material_converged);
 
         /*Marshall hooks: */
@@ -223 +223 @@
                 +sizeof(prestable)
                 +sizeof(penalty_lock)
+                +sizeof(material_converged)
                 +hnodes->MarshallSize()
                 +helements->MarshallSize()
@@ -244 +245 @@
         memcpy(&id,marshalled_dataset,sizeof(id));marshalled_dataset+=sizeof(id);
         memcpy(&analysis_type,marshalled_dataset,sizeof(analysis_type));marshalled_dataset+=sizeof(analysis_type);
-
         memcpy(&active,marshalled_dataset,sizeof(active));marshalled_dataset+=sizeof(active);
         memcpy(&normal,marshalled_dataset,sizeof(normal));marshalled_dataset+=sizeof(normal);