Changeset 9356 for issm/trunk/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp

Timestamp:

08/19/11 18:04:03 (14 years ago)

Author:

Eric.Larour

Message:

Major rewrite of the code so that IoModel now has a parameters dataset, which gets
loaded with all the int,char and double objects in the input file.
This is a lot more flexible, as anyone can add a field to the model, and it will
automatically appear in the IoModel parameters dataset.

Not debugged with respect to nightly runs yet. Trying to get the whole change finished.

File:

• issm/trunk/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp (modified) (5 diffs)

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

@@ -17 +17 @@
         /*Intermediary*/
         int i,j,k,n;
+        int    dim;
+        int    numberofelements;
+        int    numberofvertices;
 
         /*DataSets: */
@@ -22 +25 @@
         Vertices*     vertices = NULL;
         Materials*    materials = NULL;
+
+        /*Fetch parameters: */
+        iomodel->parameters->FindParam(&dim,DimEnum);
+        iomodel->parameters->FindParam(&numberofelements,NumberOfElementsEnum);
+        iomodel->parameters->FindParam(&numberofvertices,NumberOfVerticesEnum);
 
         /*Did we already create the elements? : */
@@ -46 +54 @@
         
         /*Create elements and materials: */
-        for (i=0;i<iomodel->numberofelements;i++){
+        for (i=0;i<numberofelements;i++){
 
                 if(iomodel->my_elements[i]){
 
                         /*Create and add tria element to elements dataset: */
-                        if(iomodel->dim==2)
+                        if(dim==2)
                          elements->AddObject(new Tria(i+1,i,i,iomodel,nummodels));
                         else
@@ -73 +81 @@
 
         /*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
+        materials->AddObject(new Matpar(numberofelements+1,iomodel));//put it at the end of the materials
         
         /*Create vertices: */
@@ -82 +90 @@
         iomodel->FetchData(&iomodel->thickness,NULL,NULL,ThicknessEnum);
         
-        for (i=0;i<iomodel->numberofvertices;i++){
+        for (i=0;i<numberofvertices;i++){
 
                 /*vertices and nodes (same number, as we are running continuous galerkin formulation: */