Changeset 4387

Timestamp:

07/01/10 11:05:05 (15 years ago)

Author:

seroussi

Message:

some fixing in nodesdofs

Location:

issm/trunk/src/c

Files:

• Container/Nodes.cpp (modified) (2 diffs)
• modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp (modified) (1 diff)
• modules/ModelProcessorx/UpdateCounters.cpp (modified) (1 diff)
• modules/NodesDofx/NodesDofx.cpp (modified) (1 diff)
• objects/Node.cpp (modified) (1 diff)

issm/trunk/src/c/Container/Nodes.cpp

@@ -262 +262 @@
 
         /*sid starts at 0*/
-        max_sid++;
+        if (max_sid) max_sid++;
 
         /*return*/
@@ -268 +268 @@
 }
 /*}}}*/
-/*FUNCTION Nodes::NumberOfNodes{{{1*/
+/*FUNCTION Nodes::NumberOfNodes(analysis){{{1*/
 int Nodes::NumberOfNodes(int analysis_type){
 

issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp

@@ -22 +22 @@
         Nodes*    nodes = NULL;
 
+        /*Recover pointer: */
+        nodes=*pnodes;
+
         /*First create nodes*/
-        nodes = new Nodes(NodesEnum);
+        if(!nodes) nodes = new Nodes(NodesEnum);
         
         /*Now, is the flag macayaealpattyn on? otherwise, do nothing: */

issm/trunk/src/c/modules/ModelProcessorx/UpdateCounters.cpp

@@ -27 +27 @@
 
 
-        if(nodes)iomodel->nodecounter=nodes->NumberOfNodes();
+        if(nodes) iomodel->nodecounter=nodes->NumberOfNodes();
         else iomodel->nodecounter=0;
 

issm/trunk/src/c/modules/NodesDofx/NodesDofx.cpp

@@ -26 +26 @@
         found=parameters->FindParam(&numberofdofspernode,NumberOfDofsPerNodeEnum);
         if(!found)ISSMERROR("could not find numberofdofspernode in parameters");
+        /*WARNING: THERE IS A BUG HERE TO BE FIXED (see wiki)*/
+        DistributeNumDofs(&numberofdofspernode,analysis_type);
 
         /*Ensure that only for each cpu, the partition border nodes only will be taken into account once 

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

@@ -883 +883 @@
         /*Ok, we are not a clone, just plug our dofs into truedofs: */
         for(j=0;j<this->indexing.numberofdofs;j++){
-                *(truedofs+this->indexing.numberofdofs*(id-1)+j)=indexing.doflist[j];
+                *(truedofs+this->indexing.numberofdofs*sid+j)=indexing.doflist[j];
         }