Changeset 3985

Timestamp:

06/01/10 15:04:26 (15 years ago)

Author:

Eric.Larour

Message:

Updated Makefile.am and nodecounter to keep track how many nodes are created, and give them a different starting id

Location:

issm/trunk/src/c

Files:

• Makefile.am (modified) (1 diff)
• Makefile.am.hide (deleted)
• modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp (modified) (2 diffs)
• objects/IoModel.cpp (modified) (1 diff)
• objects/IoModel.h (modified) (1 diff)

issm/trunk/src/c/Makefile.am

@@ -300 +300 @@
                                         ./modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp
                                         ./modules/ModelProcessorx/NodesPartitioning.cpp
-                                        ./modules/ModelProcessorx/Partitioning.cpp\
                                         ./modules/ModelProcessorx/CreateDataSets.cpp\
                                         ./modules/ModelProcessorx/CreateParameters.cpp\
                                         ./modules/ModelProcessorx/CreateSingleNodeToElementConnectivity.cpp\
                                         ./modules/ModelProcessorx/CreateNumberNodeToElementConnectivity.cpp\
-                                        ./modules/ModelProcessorx/DiagnosticHoriz/CreateElementsNodesAndMaterialsDiagnosticHoriz.cpp\
+                                        ./modules/ModelProcessorx/CreateElementsMaterialsAndVertices.cpp\
+                                        ./modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp\
+                                        ./modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp \
                                         ./modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp \
                                         ./modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp\
-                                        ./modules/ModelProcessorx/DiagnosticVert/CreateElementsNodesAndMaterialsDiagnosticVert.cpp\
+                                        ./modules/ModelProcessorx/DiagnosticVert/UpdateElementsDiagnosticVert.cpp\
+                                        ./modules/ModelProcessorx/DiagnosticVert/CreateNodesDiagnosticVert.cpp \
                                         ./modules/ModelProcessorx/DiagnosticVert/CreateConstraintsDiagnosticVert.cpp \
                                         ./modules/ModelProcessorx/DiagnosticVert/CreateLoadsDiagnosticVert.cpp\
-                                        ./modules/ModelProcessorx/DiagnosticHutter/CreateElementsNodesAndMaterialsDiagnosticHutter.cpp\
+                                        ./modules/ModelProcessorx/DiagnosticHutter/UpdateElementsDiagnosticHutter.cpp\
+                                        ./modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp \
                                         ./modules/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp \
                                         ./modules/ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp\
-                                        ./modules/ModelProcessorx/DiagnosticStokes/CreateElementsNodesAndMaterialsDiagnosticStokes.cpp\
+                                        ./modules/ModelProcessorx/DiagnosticStokes/UpdateElementsDiagnosticStokes.cpp\
+                                        ./modules/ModelProcessorx/DiagnosticStokes/CreateNodesDiagnosticStokes.cpp \
                                         ./modules/ModelProcessorx/DiagnosticStokes/CreateConstraintsDiagnosticStokes.cpp \
                                         ./modules/ModelProcessorx/DiagnosticStokes/CreateLoadsDiagnosticStokes.cpp\
-                                        ./modules/ModelProcessorx/SlopeCompute/CreateElementsNodesAndMaterialsSlopeCompute.cpp\
+                                        ./modules/ModelProcessorx/SlopeCompute/UpdateElementsSlopeCompute.cpp\
+                                        ./modules/ModelProcessorx/SlopeCompute/CreateNodesSlopeCompute.cpp \
                                         ./modules/ModelProcessorx/SlopeCompute/CreateConstraintsSlopeCompute.cpp \
                                         ./modules/ModelProcessorx/SlopeCompute/CreateLoadsSlopeCompute.cpp\
                                         ./modules/ModelProcessorx/Control/CreateParametersControl.cpp\
-                                        ./modules/ModelProcessorx/Thermal/CreateElementsNodesAndMaterialsThermal.cpp\
+                                        ./modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp\
+                                        ./modules/ModelProcessorx/Thermal/CreateNodesThermal.cpp\
                                         ./modules/ModelProcessorx/Thermal/CreateConstraintsThermal.cpp\
                                         ./modules/ModelProcessorx/Thermal/CreateLoadsThermal.cpp\
-                                        ./modules/ModelProcessorx/Melting/CreateElementsNodesAndMaterialsMelting.cpp\
+                                        ./modules/ModelProcessorx/Melting/UpdateElementsMelting.cpp\
+                                        ./modules/ModelProcessorx/Melting/CreateNodesMelting.cpp\
                                         ./modules/ModelProcessorx/Melting/CreateConstraintsMelting.cpp\
                                         ./modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp\
-                                        ./modules/ModelProcessorx/Prognostic/CreateElementsNodesAndMaterialsPrognostic.cpp\
+                                        ./modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp\
+                                        ./modules/ModelProcessorx/Prognostic/CreateNodesPrognostic.cpp\
                                         ./modules/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp\
                                         ./modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp\
-                                        ./modules/ModelProcessorx/Prognostic2/CreateElementsNodesAndMaterialsPrognostic2.cpp\
+                                        ./modules/ModelProcessorx/Prognostic2/UpdateElementsPrognostic2.cpp\
+                                        ./modules/ModelProcessorx/Prognostic2/CreateNodesPrognostic2.cpp\
                                         ./modules/ModelProcessorx/Prognostic2/CreateConstraintsPrognostic2.cpp\
                                         ./modules/ModelProcessorx/Prognostic2/CreateLoadsPrognostic2.cpp\
-                                        ./modules/ModelProcessorx/Balancedthickness/CreateElementsNodesAndMaterialsBalancedthickness.cpp\
+                                        ./modules/ModelProcessorx/Balancedthickness/UpdateElementsBalancedthickness.cpp\
+                                        ./modules/ModelProcessorx/Balancedthickness/CreateNodesBalancedthickness.cpp\
                                         ./modules/ModelProcessorx/Balancedthickness/CreateConstraintsBalancedthickness.cpp\
                                         ./modules/ModelProcessorx/Balancedthickness/CreateLoadsBalancedthickness.cpp\
-                                        ./modules/ModelProcessorx/Balancedthickness2/CreateElementsNodesAndMaterialsBalancedthickness2.cpp\
+                                        ./modules/ModelProcessorx/Balancedthickness2/UpdateElementsBalancedthickness2.cpp\
+                                        ./modules/ModelProcessorx/Balancedthickness2/CreateNodesBalancedthickness2.cpp\
                                         ./modules/ModelProcessorx/Balancedthickness2/CreateConstraintsBalancedthickness2.cpp\
                                         ./modules/ModelProcessorx/Balancedthickness2/CreateLoadsBalancedthickness2.cpp\
-                                        ./modules/ModelProcessorx/Balancedvelocities/CreateElementsNodesAndMaterialsBalancedvelocities.cpp\
+                                        ./modules/ModelProcessorx/Balancedvelocities/UpdateElementsBalancedvelocities.cpp\
+                                        ./modules/ModelProcessorx/Balancedvelocities/CreateNodesBalancedvelocities.cpp\
                                         ./modules/ModelProcessorx/Balancedvelocities/CreateConstraintsBalancedvelocities.cpp\
                                         ./modules/ModelProcessorx/Balancedvelocities/CreateLoadsBalancedvelocities.cpp\

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

@@ -28 +28 @@
         if (!iomodel->ismacayealpattyn)goto cleanup_and_return;
 
+        /*Recover number of nodes already created in other analyses: */
+        totalnodes=iomodel->nodecounter;
+
         /*Galerkin continus partition of nodes: */
         NodesPartitioning(&iomodel->my_nodes,iomodel->my_elements, iomodel->my_vertices, iomodel->my_bordervertices, iomodel, iomodel_handle,galerkin_continuous);
@@ -47 +50 @@
                         
                         /*Add node to nodes dataset: */
-                        nodes->AddObject(new Node(i+1,i,iomodel,DiagnosticHorizAnalysisEnum));
+                        nodes->AddObject(new Node(totalnodes+i+1,i,iomodel,DiagnosticHorizAnalysisEnum));
                 }
         }
+
+        /*Increase nodecounter for other analyses to start their node indexing correctly: */
+        totalnodes+=iomodel->numberofvertices;
+        iomodel->nodecounter=totalnodes;
 
         /*Clean fetched data: */

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

@@ -380 +380 @@
         this->singlenodetoelementconnectivity=NULL;
         this->numbernodetoelementconnectivity=NULL;
+        this->nodecounter=0;
 }
 /*}}}*/

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

@@ -186 +186 @@
                 int*    singlenodetoelementconnectivity;
                 int*    numbernodetoelementconnectivity;
+                int     nodecounter; //keep track of how many nodes are being created in each analysis type
                 /*}}}*/
                 /*Methods: {{{1*/