Changeset 16544

Timestamp:

10/24/13 16:40:03 (11 years ago)

Author:

Mathieu Morlighem

Message:

DEL: getting rid of 2 very simple files

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (1 diff)
• modules/ModelProcessorx/CreateDataSets.cpp (modified) (1 diff)
• modules/ModelProcessorx/ModelProcessorx.cpp (modified) (1 diff)
• modules/ModelProcessorx/ModelProcessorx.h (modified) (1 diff)
• modules/ModelProcessorx/SortDataSets.cpp (deleted)
• modules/ModelProcessorx/UpdateCounters.cpp (deleted)

issm/trunk-jpl/src/c/Makefile.am

@@ -246 +246 @@
                                         ./modules/ModelProcessorx/EdgesPartitioning.cpp\
                                         ./modules/ModelProcessorx/FacesPartitioning.cpp\
-                                        ./modules/ModelProcessorx/SortDataSets.cpp\
-                                        ./modules/ModelProcessorx/UpdateCounters.cpp\
                                         ./modules/ModelProcessorx/CreateDataSets.cpp\
                                         ./modules/ModelProcessorx/CreateParameters.cpp\

issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateDataSets.cpp

@@ -44 +44 @@
         #endif
 
-        /*Sort datasets: */
-        SortDataSets(elements,nodes,vertices,loads,materials,constraints,parameters);
-
         /* Update counters, because we have created more nodes, loads and
          * constraints, and ids for objects created in next call to CreateDataSets
          * will need to start at the end of the updated counters: */
-        UpdateCounters(iomodel,nodes,loads,constraints);
+        iomodel->nodecounter       = nodes->MaximumId();
+        iomodel->loadcounter       = loads->NumberOfLoads();
+        iomodel->constraintcounter = constraints->NumberOfConstraints();
 }

issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.cpp

@@ -77 +77 @@
                 CreateDataSets(elements,nodes,vertices,materials,constraints,loads,parameters,iomodel,toolkitfile,rootpath,solution_enum,analysis_type,nummodels,i);
         }
+
+        /* Sort datasets:
+         * All our datasets are already ordered by ids. Set presort flag so that
+         * later on, when sorting is requested on these datasets, it will not be
+         * redone: */
+        elements->Presort();
+        nodes->Presort();
+        vertices->Presort();
+        loads->Presort();
+        materials->Presort();
+
+        constraints->Presort();
+        parameters->Presort();
         if(VerboseMProcessor()) _printf0_("   done with model processor \n");
 

issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.h

@@ -37 +37 @@
 void CreateSingleNodeToElementConnectivity(IoModel* iomodel);
 void CreateNumberNodeToElementConnectivity(IoModel* iomodel);
-
-/*Diverse: */
-void SortDataSets(Elements*elements,Nodes*nodes,Vertices*vertices, Loads*loads, Materials*materials, Constraints*constraints, Parameters*parameters);
-void UpdateCounters(IoModel* iomodel,Nodes*nodes,Loads*loads, Constraints*constraints);
-
 #endif