Changeset 5792

Timestamp:

09/14/10 08:09:50 (15 years ago)

Author:

Mathieu Morlighem

Message:

Fixed tiling

Location:

issm/trunk/src/c/objects

Files:

• DofIndexing.cpp (modified) (9 diffs)
• Node.cpp (modified) (1 diff)

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

@@ -50 +50 @@
         this->clone=in->clone;
 
-        if(this->gsize>0 && this->gsize!=UNDEF){
+        if(this->gsize>0){
                 this->f_set=(bool*)xmalloc(this->gsize*sizeof(bool));
                 this->s_set=(bool*)xmalloc(this->gsize*sizeof(bool));
@@ -67 +67 @@
         if(this->ssize>0 && this->ssize!=UNDEF)this->sdoflist=(int*)xmalloc(this->ssize*sizeof(int)); else this->sdoflist=NULL;
 
-        if(this->gsize>0 && this->gsize!=UNDEF){
+        if(this->gsize>0){
                 memcpy(this->f_set,in->f_set,this->gsize*sizeof(bool));
                 memcpy(this->s_set,in->s_set,this->gsize*sizeof(bool));
@@ -101 +101 @@
 
         /*allocate: */
-        if(this->gsize>0 && this->gsize!=UNDEF){
+        if(this->gsize>0){
                 this->f_set=(bool*)xmalloc(this->gsize*sizeof(bool));
                 this->s_set=(bool*)xmalloc(this->gsize*sizeof(bool));
@@ -115 +115 @@
                 if(this->doftype)this->doftype[i]=in_doftype[i];
                 this->svalues[i]=0; //0 constraint is the default value
+                this->gdoflist[i]=UNDEF;
         }
 }
@@ -228 +229 @@
         
         /*Allocate: */
-        if(this->gsize>0 && this->gsize!=UNDEF){
+        if(this->gsize>0){
                 this->f_set=(bool*)xmalloc(this->gsize*sizeof(bool));
                 this->s_set=(bool*)xmalloc(this->gsize*sizeof(bool));
@@ -243 +244 @@
                 this->gdoflist=NULL;
         }
-        if(this->fsize>0 && this->fsize!=UNDEF)
+        if(this->fsize>0)
          this->fdoflist=(int*)xmalloc(this->fsize*sizeof(int));
         else
          this->fdoflist=NULL;
-        if(this->ssize>0 && this->ssize!=UNDEF)
+        if(this->ssize>0)
          this->sdoflist=(int*)xmalloc(this->ssize*sizeof(int));
         else
@@ -253 +254 @@
 
         /*Copy arrays: */
-        if(this->gsize>0 && this->gsize!=UNDEF){
+        if(this->gsize>0){
                 memcpy(f_set,marshalled_dataset,gsize*sizeof(bool));marshalled_dataset+=gsize*sizeof(bool);
                 memcpy(s_set,marshalled_dataset,gsize*sizeof(bool));marshalled_dataset+=gsize*sizeof(bool);
-                memcpy(this->svalues,marshalled_dataset,this->gsize*sizeof(double));marshalled_dataset+=this->gsize*sizeof(double);
-                if(flagdoftype){ memcpy(doftype,marshalled_dataset,gsize*sizeof(int));marshalled_dataset+=gsize*sizeof(int); }
-                memcpy(this->gdoflist,marshalled_dataset,this->gsize*sizeof(int));marshalled_dataset+=this->gsize*sizeof(int);
+                memcpy(svalues,marshalled_dataset,gsize*sizeof(double));marshalled_dataset+=gsize*sizeof(double);
+                if(flagdoftype){memcpy(doftype,marshalled_dataset,gsize*sizeof(int));marshalled_dataset+=gsize*sizeof(int); }
+                memcpy(gdoflist,marshalled_dataset,gsize*sizeof(int));marshalled_dataset+=gsize*sizeof(int);
         }
         
@@ -296 +297 @@
         memcpy(marshalled_dataset,&clone,sizeof(clone));marshalled_dataset+=sizeof(clone);
         
-        if(this->gsize>0 && this->gsize!=UNDEF){
+        if(this->gsize>0){
                 memcpy(marshalled_dataset,f_set,gsize*sizeof(bool));marshalled_dataset+=gsize*sizeof(bool);
                 memcpy(marshalled_dataset,s_set,gsize*sizeof(bool));marshalled_dataset+=gsize*sizeof(bool);
@@ -316 +317 @@
 
         size+=4*sizeof(int)+sizeof(bool);
-        if(this->gsize>0 && this->gsize!=UNDEF){
+        if(this->gsize>0){
                 size+= 2*this->gsize*sizeof(bool)+
                            this->gsize*sizeof(double)+

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

@@ -566 +566 @@
                 count=0;
                 for(i=0;i<this->indexing.gsize;i++){
-                        if(this->indexing.s_set[i])values[count]=this->indexing.svalues[i];
-                        count++;
+                        if(this->indexing.s_set[i]){
+                                values[count]=this->indexing.svalues[i];
+                                count++;
+                        }
                 }