Changeset 3999 for issm/trunk/src/c/modules/ModelProcessorx/SlopeCompute/CreateNodesSlopeConpute.cpp

Timestamp:

06/02/10 15:51:23 (15 years ago)

Author:

Mathieu Morlighem

Message:

updated CreateNodes

File:

• issm/trunk/src/c/modules/ModelProcessorx/SlopeCompute/CreateNodesSlopeConpute.cpp (modified) (6 diffs)

issm/trunk/src/c/modules/ModelProcessorx/SlopeCompute/CreateNodesSlopeConpute.cpp

@@ -1 +1 @@
 /*
- * CreateElementsNodesAndMaterialsSlopeCompute.c:
+ * CreateNodesSlopeCompute.c:
  */
 
@@ -13 +13 @@
 #include "../ModelProcessorx.h"
 
-void    CreateElementsNodesAndMaterialsSlopeCompute(DataSet** pelements,DataSet** pnodes, DataSet** pvertices,DataSet** pmaterials, IoModel* iomodel,ConstDataHandle iomodel_handle){
+void    CreateNodesSlopeCompute(DataSet** pelements,DataSet** pnodes, DataSet** pvertices,DataSet** pmaterials, IoModel* iomodel,ConstDataHandle iomodel_handle){
 
-                /*output: int* epart, int* my_grids, double* my_bordergrids*/
+        /*Intermediary*/
+        int i;
+        int totalnodes;
+        bool continuous_galerkin=true;
 
-        int i,j,k,n;
         /*DataSets: */
-        DataSet*    elements  = NULL;
         DataSet*    nodes = NULL;
-        DataSet*    vertices = NULL;
-        DataSet*    materials = NULL;
         
-        /*First create the elements, nodes and material properties: */
-        elements  = new DataSet(ElementsEnum);
-        nodes     = new DataSet(NodesEnum);
-        vertices  = new DataSet(VerticesEnum);
-        materials = new DataSet(MaterialsEnum);
+        /*First create nodes*/ 
+        nodes = new DataSet(NodesEnum);
 
-        /*Partition elements and vertices and nodes: */
-        Partitioning(&iomodel->my_elements, &iomodel->my_vertices, &iomodel->my_nodes, &iomodel->my_bordervertices, iomodel, iomodel_handle);
+        /*Recover number of nodes already created in other analyses: */
+        totalnodes=iomodel->nodecounter;
 
-        /*2d mesh: */
-        if (iomodel->dim==2){
-
-                /*Fetch data needed: */
-                IoModelFetchData(&iomodel->elements,NULL,NULL,iomodel_handle,"elements");
-                IoModelFetchData(&iomodel->surface,NULL,NULL,iomodel_handle,"surface");
-                IoModelFetchData(&iomodel->elementonwater,NULL,NULL,iomodel_handle,"elementonwater");
-                IoModelFetchData(&iomodel->bed,NULL,NULL,iomodel_handle,"bed");
-                
-                for (i=0;i<iomodel->numberofelements;i++){
-
-                        if(iomodel->my_elements[i]){
-                                
-                                /*Create and add tria element to elements dataset: */
-                                elements->AddObject(new Tria(i+1,i,iomodel));
-
-                                /*Create and add material property to materials dataset: */
-                                materials->AddObject(new Matice(i+1,i,iomodel,3));
-                        }
-
-                }//for (i=0;i<numberofelements;i++)
-
-        
-                /*Free data : */
-                xfree((void**)&iomodel->elements);
-                xfree((void**)&iomodel->surface);
-                xfree((void**)&iomodel->bed);
-                xfree((void**)&iomodel->elementonwater);
-
-        }
-        else{ //        if (dim==2)
-
-                /*Fetch data needed: */
-                IoModelFetchData(&iomodel->elements,NULL,NULL,iomodel_handle,"elements");
-                IoModelFetchData(&iomodel->surface,NULL,NULL,iomodel_handle,"surface");
-                IoModelFetchData(&iomodel->bed,NULL,NULL,iomodel_handle,"bed");
-                IoModelFetchData(&iomodel->elementonbed,NULL,NULL,iomodel_handle,"elementonbed");
-                IoModelFetchData(&iomodel->elementonwater,NULL,NULL,iomodel_handle,"elementonwater");
-                IoModelFetchData(&iomodel->upperelements,NULL,NULL,iomodel_handle,"upperelements");
-                IoModelFetchData(&iomodel->lowerelements,NULL,NULL,iomodel_handle,"lowerelements");
-        
-                for (i=0;i<iomodel->numberofelements;i++){
-                        if(iomodel->my_elements[i]){
-                                /*Create and add penta element to elements dataset: */
-                                elements->AddObject(new Penta(i+1,i,iomodel));
-
-                                /*Create and add material property to materials dataset: */
-                                materials->AddObject(new Matice(i+1,i,iomodel,6));
-
-                        }//if(my_elements[i])
-                }//for (i=0;i<numberofelements;i++)
-
-                /*Free data: */
-                xfree((void**)&iomodel->elements);
-                xfree((void**)&iomodel->surface);
-                xfree((void**)&iomodel->bed);
-                xfree((void**)&iomodel->elementonbed);
-                xfree((void**)&iomodel->elementonwater);
-                xfree((void**)&iomodel->upperelements);
-                xfree((void**)&iomodel->lowerelements);
-
-        } //if (dim==2)
-
-        /*Add new constrant material property tgo materials, at the end: */
-        materials->AddObject(new Matpar(iomodel->numberofelements+1,iomodel)); //put it at the end of the materials
+        /*Continuous Galerkin partition of nodes: */
+        NodesPartitioning(&iomodel->my_nodes,iomodel->my_elements, iomodel->my_vertices, iomodel->my_bordervertices, iomodel, iomodel_handle,continuous_galerkin);
         
         /*First fetch data: */
@@ -104 +37 @@
                 IoModelFetchData(&iomodel->uppernodes,NULL,NULL,iomodel_handle,"uppergrids");
         }
-        IoModelFetchData(&iomodel->x,NULL,NULL,iomodel_handle,"x");
-        IoModelFetchData(&iomodel->y,NULL,NULL,iomodel_handle,"y");
-        IoModelFetchData(&iomodel->z,NULL,NULL,iomodel_handle,"z");
-        IoModelFetchData(&iomodel->thickness,NULL,NULL,iomodel_handle,"thickness");
-        IoModelFetchData(&iomodel->bed,NULL,NULL,iomodel_handle,"bed");
         IoModelFetchData(&iomodel->gridonbed,NULL,NULL,iomodel_handle,"gridonbed");
         IoModelFetchData(&iomodel->gridonsurface,NULL,NULL,iomodel_handle,"gridonsurface");
@@ -116 +44 @@
         for (i=0;i<iomodel->numberofvertices;i++){
 
-                /*vertices and nodes (same number, as we are running continuous galerkin formulation: */
                 if(iomodel->my_vertices[i]){
                         
-                        /*Add vertex to vertices dataset: */
-                        vertices->AddObject(new Vertex(i+1,i,iomodel));
-
                         /*Add node to nodes dataset: */
                         nodes->AddObject(new Node(i+1,i,iomodel));
@@ -130 +54 @@
         /*Clean fetched data: */
         xfree((void**)&iomodel->deadgrids);
-        xfree((void**)&iomodel->x);
-        xfree((void**)&iomodel->y);
-        xfree((void**)&iomodel->z);
-        xfree((void**)&iomodel->thickness);
-        xfree((void**)&iomodel->bed);
         xfree((void**)&iomodel->gridonbed);
         xfree((void**)&iomodel->gridonsurface);
@@ -143 +62 @@
         /*All our datasets are already order 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();
-        materials->Presort();
-
-        cleanup_and_return:
 
         /*Assign output pointer: */
-        *pelements=elements;
         *pnodes=nodes;
-        *pvertices=vertices;
-        *pmaterials=materials;
 
 }