Changeset 4696


Ignore:
Timestamp:
07/21/10 12:32:18 (15 years ago)
Author:
seroussi
Message:

some bug fixing

File:
1 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/c/objects/Loads/Riftfront.cpp

    r4575 r4696  
    3535        /*data: */
    3636        int    riftfront_node_ids[2];
     37        int    riftfront_elem_ids[2];
    3738        int    riftfront_matpar_id;
    3839        int    riftfront_type;
     
    6061        riftfront_node_ids[0]=iomodel->nodecounter+grid1;
    6162        riftfront_node_ids[1]=iomodel->nodecounter+grid2;
     63        riftfront_elem_ids[0]=el1;
     64        riftfront_elem_ids[1]=el2;
    6265        riftfront_matpar_id=iomodel->numberofelements+1; //matlab indexing
    6366
    6467        this->hnodes=new Hook(riftfront_node_ids,2);
     68        this->helements=new Hook(riftfront_elem_ids,2);
    6569        this->hmatpar=new Hook(&riftfront_matpar_id,1);
    6670
     
    102106        this->parameters=NULL;
    103107        delete hnodes;
     108        delete helements;
    104109        delete hmatpar;
    105110        delete helements;
     
    120125        printf("   analysis_type: %s\n",EnumAsString(analysis_type));
    121126        hnodes->DeepEcho();
     127        helements->DeepEcho();
    122128        hmatpar->DeepEcho();
    123129        printf("   parameters\n");
     
    168174        /*Marshall hooks: */
    169175        hnodes->Marshall(&marshalled_dataset);
     176        helements->Marshall(&marshalled_dataset);
    170177        hmatpar->Marshall(&marshalled_dataset);
    171178
     
    199206                +sizeof(penalty_lock)
    200207                +hnodes->MarshallSize()
     208                +helements->MarshallSize()
    201209                +hmatpar->MarshallSize()
    202210                +inputs->MarshallSize()
     
    231239        /*demarshall hooks: */
    232240        hnodes=new Hook(); hnodes->Demarshall(&marshalled_dataset);
     241        helements=new Hook(); helements->Demarshall(&marshalled_dataset);
    233242        hmatpar=new Hook(); hmatpar->Demarshall(&marshalled_dataset);
    234243       
     
    271280        /*now deal with hooks and objects: */
    272281        riftfront->hnodes=(Hook*)this->hnodes->copy();
     282        riftfront->helements=(Hook*)this->helements->copy();
    273283        riftfront->hmatpar=(Hook*)this->hmatpar->copy();
    274284
     
    285295         * datasets, using internal ids and offsets hidden in hooks: */
    286296        hnodes->configure(nodesin);
     297        helements->configure(elementsin);
    287298        hmatpar->configure(materialsin);
    288299
     
    298309         * datasets, using internal ids and offsets hidden in hooks: */
    299310        hnodes->configure(nodesin);
     311        helements->configure(elementsin);
    300312        hmatpar->configure(materialsin);
    301313
Note: See TracChangeset for help on using the changeset viewer.