Changeset 4696

Timestamp:

07/21/10 12:32:18 (15 years ago)

Author:

seroussi

Message:

some bug fixing

File:

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

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

@@ -35 +35 @@
         /*data: */
         int    riftfront_node_ids[2];
+        int    riftfront_elem_ids[2];
         int    riftfront_matpar_id;
         int    riftfront_type;
@@ -60 +61 @@
         riftfront_node_ids[0]=iomodel->nodecounter+grid1;
         riftfront_node_ids[1]=iomodel->nodecounter+grid2;
+        riftfront_elem_ids[0]=el1;
+        riftfront_elem_ids[1]=el2;
         riftfront_matpar_id=iomodel->numberofelements+1; //matlab indexing
 
         this->hnodes=new Hook(riftfront_node_ids,2);
+        this->helements=new Hook(riftfront_elem_ids,2);
         this->hmatpar=new Hook(&riftfront_matpar_id,1);
 
@@ -102 +106 @@
         this->parameters=NULL;
         delete hnodes;
+        delete helements;
         delete hmatpar;
         delete helements;
@@ -120 +125 @@
         printf("   analysis_type: %s\n",EnumAsString(analysis_type));
         hnodes->DeepEcho();
+        helements->DeepEcho();
         hmatpar->DeepEcho();
         printf("   parameters\n");
@@ -168 +174 @@
         /*Marshall hooks: */
         hnodes->Marshall(&marshalled_dataset);
+        helements->Marshall(&marshalled_dataset);
         hmatpar->Marshall(&marshalled_dataset);
 
@@ -199 +206 @@
                 +sizeof(penalty_lock)
                 +hnodes->MarshallSize()
+                +helements->MarshallSize()
                 +hmatpar->MarshallSize()
                 +inputs->MarshallSize()
@@ -231 +239 @@
         /*demarshall hooks: */
         hnodes=new Hook(); hnodes->Demarshall(&marshalled_dataset);
+        helements=new Hook(); helements->Demarshall(&marshalled_dataset);
         hmatpar=new Hook(); hmatpar->Demarshall(&marshalled_dataset);
         
@@ -271 +280 @@
         /*now deal with hooks and objects: */
         riftfront->hnodes=(Hook*)this->hnodes->copy();
+        riftfront->helements=(Hook*)this->helements->copy();
         riftfront->hmatpar=(Hook*)this->hmatpar->copy();
 
@@ -285 +295 @@
          * datasets, using internal ids and offsets hidden in hooks: */
         hnodes->configure(nodesin);
+        helements->configure(elementsin);
         hmatpar->configure(materialsin);
 
@@ -298 +309 @@
          * datasets, using internal ids and offsets hidden in hooks: */
         hnodes->configure(nodesin);
+        helements->configure(elementsin);
         hmatpar->configure(materialsin);