Changeset 3383 for issm/trunk/src/c/ModelProcessorx/Prognostic/CreateElementsNodesAndMaterialsPrognostic.cpp

Timestamp:

04/04/10 23:08:44 (15 years ago)

Author:

Eric.Larour

Message:

New Hook and Element Properties, to simplify element framework. This is a massive commit

File:

• issm/trunk/src/c/ModelProcessorx/Prognostic/CreateElementsNodesAndMaterialsPrognostic.cpp (modified) (8 diffs)

issm/trunk/src/c/ModelProcessorx/Prognostic/CreateElementsNodesAndMaterialsPrognostic.cpp

@@ -10 +10 @@
 #include "../../shared/shared.h"
 #include "../../MeshPartitionx/MeshPartitionx.h"
+#include "../../include/typedefs.h"
 #include "../IoModel.h"
 
@@ -34 +35 @@
         Matice*     matice  = NULL;
         Matpar*     matpar  = NULL;
+        ElementProperties* tria_properties=NULL;
+        ElementProperties* penta_properties=NULL;
 
         /*output: */
@@ -48 +51 @@
         /*tria constructor input: */
         int tria_id;
-        int tria_mid;
-        int tria_mparid;
-        int tria_numparid;
-        int tria_g[3];
+        int tria_matice_id;
+        int tria_matpar_id;
+        int tria_numpar_id;
+        int tria_node_ids[3];
         double tria_h[3];
         double tria_s[3];
         double tria_b[3];
-        double tria_k[3];
-        double tria_melting[3];
-        double tria_accumulation[3];
-        double tria_geothermalflux[3];
-        int    tria_friction_type;
-        double tria_p;
-        double tria_q;
         int    tria_shelf;
         bool   tria_onwater; 
@@ -73 +69 @@
 
         int penta_id;
-        int penta_mid;
-        int penta_mparid;
-        int penta_numparid;
-        int penta_g[6];
+        int penta_matice_id;
+        int penta_matpar_id;
+        int penta_numpar_id;
+        int penta_node_ids[6];
         double penta_h[6];
         double penta_s[6];
         double penta_b[6];
-        double penta_k[6];
-        int penta_friction_type;
-        double penta_p;
-        double penta_q;
         int penta_shelf;
         int penta_onbed;
         int penta_onsurface;
         int penta_collapse;
-        double penta_melting[6];
-        double penta_accumulation[6];
-        double penta_geothermalflux[6];
-        int penta_thermal_steadystate;
         bool   penta_onwater;
 
@@ -191 +179 @@
                         /*ids: */
                         tria_id=i+1; //matlab indexing.
-                        tria_mid=-1; //no need for materials
-                        tria_mparid=-1; //no need for materials
-                        tria_numparid=1;
+                        tria_matice_id=-1; //no need for materials
+                        tria_matpar_id=-1; //no need for materials
+                        tria_numpar_id=1;
 
                         /*vertices offsets: */
-                        tria_g[0]=(int)*(iomodel->elements+elements_width*i+0);
-                        tria_g[1]=(int)*(iomodel->elements+elements_width*i+1);
-                        tria_g[2]=(int)*(iomodel->elements+elements_width*i+2);
+                        tria_node_ids[0]=(int)*(iomodel->elements+elements_width*i+0);
+                        tria_node_ids[1]=(int)*(iomodel->elements+elements_width*i+1);
+                        tria_node_ids[2]=(int)*(iomodel->elements+elements_width*i+2);
 
                         /*thickness,surface and bed:*/
@@ -217 +205 @@
                         tria_onwater=(bool)*(iomodel->elementonwater+i);
 
+                        /*Create properties: */
+                        tria_properties=new ElementProperties(3,tria_h, tria_s, tria_b, NULL, NULL, NULL, NULL, UNDEF, UNDEF, UNDEF, tria_shelf, UNDEF, tria_onwater, UNDEF, UNDEF, UNDEF);
+
                         /*Create tria element using its constructor:*/
-                        tria=new Tria(tria_id, tria_mid, tria_mparid, tria_numparid,tria_g, tria_h, tria_s, tria_b, tria_k, tria_melting,tria_accumulation,tria_geothermalflux,tria_friction_type, tria_p, tria_q, tria_shelf, tria_onwater);
+                        tria=new Tria(tria_id, tria_node_ids, tria_matice_id, tria_matpar_id, tria_numpar_id, tria_properties);
+
+                        /*Delete properties: */
+                        delete tria_properties;
 
                         /*Add tria element to elements dataset: */
@@ -270 +264 @@
                         /*name and id: */
                         penta_id=i+1; //matlab indexing.
-                        penta_mid=-1; 
-                        penta_mparid=-1; //no need for materials
-                        penta_numparid=1;
+                        penta_matice_id=-1; 
+                        penta_matpar_id=-1; //no need for materials
+                        penta_numpar_id=1;
 
                         /*vertices,thickness,surface,bed and drag: */
                         for(j=0;j<6;j++){
-                                penta_g[j]=(int)*(iomodel->elements+elements_width*i+j);
+                                penta_node_ids[j]=(int)*(iomodel->elements+elements_width*i+j);
                                 penta_h[j]=*(iomodel->thickness+    ((int)*(iomodel->elements+elements_width*i+j)-1)); 
                                 penta_s[j]=*(iomodel->surface+    ((int)*(iomodel->elements+elements_width*i+j)-1)); 
@@ -289 +283 @@
                         penta_onwater=(bool)*(iomodel->elementonwater+i);
         
+                        /*Create properties: */
+                        penta_properties=new ElementProperties(6,penta_h, penta_s, penta_b, NULL, NULL, NULL, NULL, UNDEF, UNDEF, UNDEF, penta_shelf, penta_onbed, penta_onwater, penta_onsurface, penta_collapse, UNDEF);
 
                         /*Create Penta using its constructor:*/
-                        penta= new Penta( penta_id,penta_mid,penta_mparid,penta_numparid,penta_g,penta_h,penta_s,penta_b,penta_k,penta_friction_type,
-                                        penta_p,penta_q,penta_shelf,penta_onbed,penta_onsurface,
-                                        penta_collapse,penta_melting,penta_accumulation,penta_geothermalflux,
-                                        penta_thermal_steadystate,penta_onwater); 
+                        penta=new Penta(penta_id, penta_node_ids, penta_matice_id, penta_matpar_id, penta_numpar_id, penta_properties);
+
+                        /*Delete properties: */
+                        delete penta_properties;
 
                         /*Add penta element to elements dataset: */