Changeset 5254

Timestamp:

08/13/10 15:50:20 (15 years ago)

Author:

seroussi

Message:

added doftype in DofIndexing

Location:

issm/trunk/src/c/objects

Files:

• DofIndexing.cpp (modified) (13 diffs)
• DofIndexing.h (modified) (1 diff)
• Node.cpp (modified) (2 diffs)

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

@@ -27 +27 @@
         this->s_set=NULL;
         this->doflist=NULL;
+        this->doftype=NULL;
 }
 /*}}}*/
 /*FUNCTION DofIndexing::DofIndexing(int numberofdofs){{{1*/
 DofIndexing::DofIndexing(int in_numberofdofs){
-        this->Init(in_numberofdofs);
+        this->Init(in_numberofdofs,NULL);
 }
 /*}}}*/
@@ -44 +45 @@
         this->s_set=(int*)xmalloc(this->numberofdofs*sizeof(int));
         this->doflist=(int*)xmalloc(this->numberofdofs*sizeof(int));
+        if (in->doftype) this->doftype=(int*)xmalloc(this->numberofdofs*sizeof(int));
+        else this->doftype=NULL;
 
         for(i=0;i<this->numberofdofs;i++){
@@ -49 +52 @@
                 this->s_set[i]=in->s_set[i];
                 this->doflist[i]=in->doflist[i];
+                if (in->doftype) this->doftype[i]=in->doftype[i];
         }
 }
@@ -58 +62 @@
         xfree((void**)&s_set); 
         xfree((void**)&doflist); 
+        xfree((void**)&doftype); 
 
 }
 /*}}}*/
 /*FUNCTION DofIndexing::Init{{{1*/
-void DofIndexing::Init(int in_numberofdofs){
+void DofIndexing::Init(int in_numberofdofs,int* in_doftype){
 
         int i;
@@ -72 +77 @@
         this->s_set=(int*)xmalloc(this->numberofdofs*sizeof(int));
         this->doflist=(int*)xmalloc(this->numberofdofs*sizeof(int));
-
+        if (in_doftype) this->doftype=(int*)xmalloc(this->numberofdofs*sizeof(int));
 
         for (i=0;i<this->numberofdofs;i++){
@@ -79 +84 @@
                 this->s_set[i]=0;
                 this->doflist[i]=UNDEF;
+                if(in_doftype) this->doftype[i]=in_doftype[i];
         }
 }
@@ -115 +121 @@
         printf("\n");
 
+        if(doftype){
+                printf("   doftype: |");
+                for(i=0;i<numberofdofs;i++){
+                        printf(" %i |",doftype[i]);
+                }
+                printf("\n");
+        }
+        else printf("   NULL doftype");
+
 }               
 /*}}}*/
@@ -122 +137 @@
         char* marshalled_dataset=NULL;
         int   enum_type;
+        int   flagdoftype;
 
         /*recover marshalled_dataset: */
@@ -141 +157 @@
         memcpy(doflist,marshalled_dataset,numberofdofs*sizeof(int));marshalled_dataset+=numberofdofs*sizeof(int);
         
+        memcpy(&flagdoftype,marshalled_dataset,sizeof(flagdoftype));marshalled_dataset+=sizeof(flagdoftype);
+        if(flagdoftype){ // there is a hook so demarshall it
+                this->doftype=(int*)xmalloc(this->numberofdofs*sizeof(int));
+                memcpy(doftype,marshalled_dataset,numberofdofs*sizeof(int));marshalled_dataset+=numberofdofs*sizeof(int);
+        }
+        else this->doftype=NULL; //There is no coupling, so doftype is NULL
+
         /*return: */
         *pmarshalled_dataset=marshalled_dataset;
@@ -151 +174 @@
         char* marshalled_dataset=NULL;
         int   enum_type=0;
+        int   flagdoftype; //to indicate if there are some doftype or if NULL
 
         /*recover marshalled_dataset: */
@@ -168 +192 @@
         memcpy(marshalled_dataset,doflist,numberofdofs*sizeof(int));marshalled_dataset+=numberofdofs*sizeof(int);
 
+        /*marshall doftype if there are some and add a flag*/
+        if(this->doftype){
+                flagdoftype=1;
+                memcpy(marshalled_dataset,&flagdoftype,sizeof(flagdoftype));marshalled_dataset+=sizeof(flagdoftype);
+                memcpy(marshalled_dataset,doftype,numberofdofs*sizeof(int));marshalled_dataset+=numberofdofs*sizeof(int);
+        }
+        else{
+                flagdoftype=0;
+                memcpy(marshalled_dataset,&flagdoftype,sizeof(flagdoftype));marshalled_dataset+=sizeof(flagdoftype);
+        }
+
         *pmarshalled_dataset=marshalled_dataset;
         return;
@@ -174 +209 @@
 /*FUNCTION DofIndexing::MarshallSize{{{1*/
 int   DofIndexing::MarshallSize(){
+
+        int doftype_size=0;
+        
+        /*FInd size of doftype*/
+        doftype_size+=sizeof(int); //Flag 0 or 1
+        if (this->doftype){
+                doftype_size+=numberofdofs*sizeof(int);
+        }
 
         return sizeof(numberofdofs)+
@@ -180 +223 @@
                 numberofdofs*sizeof(int)+
                 numberofdofs*sizeof(int)+
+                doftype_size+
                 sizeof(int); //sizeof(int) for enum type
 }

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

@@ -21 +21 @@
                 /*list of degrees of freedom: */
                 int*     doflist; //dof list on which we solve
+                int*     doftype; //approximation type of the dofs (used only for coupling)
 
                 /*DofIndexing constructors, destructors {{{1*/
                 DofIndexing();
                 DofIndexing(int numberofdofs);
-                void Init(int numberofdofs);
+                void Init(int numberofdofs,int* doftype);
                 DofIndexing(DofIndexing* properties);
                 ~DofIndexing();

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

@@ -23 +23 @@
 /*FUNCTION Node::Node() default constructor {{{1*/
 Node::Node(){
-        this->inputs=NULL;
-        this->hvertex=NULL;
-        return;
+                 this->inputs=NULL;
+                 this->hvertex=NULL;
+                 return;
 }
 /*}}}*/
@@ -71 +71 @@
 
         /*indexing:*/
-        DistributeNumDofs(&numdofs,analysis_type,iomodel->vertices_type+2*io_index); //number of dofs per node
-        this->indexing.Init(numdofs);
+        DistributeNumDofs(&this->indexing,analysis_type,iomodel->vertices_type+2*io_index); //number of dofs per node
+        numdofs=this->indexing.numberofdofs;
 
         /*Hooks*/