Changeset 14846

Timestamp:

05/02/13 08:04:05 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: cosmetics

Location:

issm/trunk-jpl/src/c/classes

Files:

• DofIndexing.cpp (modified) (4 diffs)
• objects/Node.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/classes/DofIndexing.cpp

@@ -37 +37 @@
 /*FUNCTION DofIndexing::DofIndexing(int gsize){{{*/
 DofIndexing::DofIndexing(int in_gsize){
+
         this->Init(in_gsize,NULL);
+
 }
 /*}}}*/
@@ -93 +95 @@
 void DofIndexing::Init(int in_gsize,int* in_doftype){
 
-        this->gsize=in_gsize;
-        this->clone=false;
-
-        /*allocate: */
+        this->gsize = in_gsize;
+
+        /*At this point, assume this is not a clone (will be dealt with later)*/
+        this->clone = false;
+
+        /*memory allocation */
         if(this->gsize>0){
-                this->f_set=xNew<bool>(this->gsize);
-                this->s_set=xNew<bool>(this->gsize);
-                this->svalues=xNew<IssmDouble>(this->gsize);
-                if(in_doftype)this->doftype=xNew<int>(this->gsize);
-                this->gdoflist=xNew<int>(this->gsize);
-        }
-
+                this->f_set    = xNew<bool>(this->gsize);
+                this->s_set    = xNew<bool>(this->gsize);
+                this->svalues  = xNew<IssmDouble>(this->gsize);
+                this->gdoflist = xNew<int>(this->gsize);
+
+                if(in_doftype)
+                 this->doftype = xNew<int>(this->gsize);
+        }
+
+        /*Assign values assuming no Dirichlet at this point*/
         for(int i=0;i<this->gsize;i++){
-                /*assume dof is free, no constraints, no rigid body constraint: */
-                this->f_set[i]=true;
-                this->s_set[i]=false;
-                if(this->doftype)this->doftype[i]=in_doftype[i];
-                this->svalues[i]=0; //0 constraint is the default value
-                this->gdoflist[i]=UNDEF;
+                this->f_set[i]    = true;
+                this->s_set[i]    = false;
+                this->svalues[i]  = 0.;      //0 constraint is the default value
+                this->gdoflist[i] = UNDEF;
+
+                if(this->doftype)
+                 this->doftype[i]=in_doftype[i];
         }
 }
@@ -128 +136 @@
                 this->fsize=size;
                 xDelete<int>(this->fdoflist);
-                if(this->fsize)this->fdoflist=xNew<int>(size);
-                else this->fdoflist=NULL;
+
+                if(this->fsize)
+                 this->fdoflist=xNew<int>(size);
+                else
+                 this->fdoflist=NULL;
         }
         else if(setenum==SsetEnum){
@@ -136 +147 @@
                 this->ssize=size;
                 xDelete<int>(this->sdoflist);
-                if(this->ssize)this->sdoflist=xNew<int>(size);
-                else this->sdoflist=NULL;
+
+                if(this->ssize)
+                 this->sdoflist=xNew<int>(size);
+                else
+                 this->sdoflist=NULL;
         }
         else _error_("set of enum type " << EnumToStringx(setenum) << " not supported yet!");

issm/trunk-jpl/src/c/classes/objects/Node.cpp

@@ -40 +40 @@
 
         /*id: */
-        this->id=node_id; 
-        this->sid=node_sid; 
-        this->analysis_type=analysis_type;
+        this->id            = node_id;
+        this->sid           = node_sid;
+        this->analysis_type = analysis_type;
 
         /*Initialize coord_system: Identity matrix by default*/