Changeset 22647

Timestamp:

03/28/18 14:18:01 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: simplifying number of ids, removing index as it just repeats sid

Location:

issm/trunk-jpl/src/c

Files:

• classes/Elements/Penta.cpp (modified) (3 diffs)
• classes/Elements/Penta.h (modified) (1 diff)
• classes/Elements/Seg.cpp (modified) (1 diff)
• classes/Elements/Seg.h (modified) (1 diff)
• classes/Elements/Tetra.cpp (modified) (2 diffs)
• classes/Elements/Tetra.h (modified) (1 diff)
• classes/Elements/Tria.cpp (modified) (2 diffs)
• classes/Elements/Tria.h (modified) (1 diff)
• modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

@@ -24 +24 @@
 }
 /*}}}*/
-Penta::Penta(int penta_id, int penta_sid, int index, IoModel* iomodel,int nummodels)/*{{{*/
-        :ElementHook(nummodels,index+1,NUMVERTICES,iomodel){
+Penta::Penta(int penta_id, int penta_sid,IoModel* iomodel,int nummodels)/*{{{*/
+        :ElementHook(nummodels,penta_id,NUMVERTICES,iomodel){
 
         int penta_elements_ids[2];
@@ -38 +38 @@
 
         /*Build neighbors list*/
-        if (xIsNan<IssmDouble>(iomodel->Data("md.mesh.upperelements")[index]) || iomodel->Data("md.mesh.upperelements")[index]==-1.) penta_elements_ids[1]=this->id; //upper penta is the same penta
-        else                                    penta_elements_ids[1]=reCast<int,IssmDouble>((iomodel->Data("md.mesh.upperelements")[index]));
-        if (xIsNan<IssmDouble>(iomodel->Data("md.mesh.lowerelements")[index]) || iomodel->Data("md.mesh.lowerelements")[index]==-1.) penta_elements_ids[0]=this->id; //lower penta is the same penta
-        else                                    penta_elements_ids[0]=reCast<int,IssmDouble>((iomodel->Data("md.mesh.lowerelements")[index]));
+        if (xIsNan<IssmDouble>(iomodel->Data("md.mesh.upperelements")[penta_sid]) || iomodel->Data("md.mesh.upperelements")[penta_sid]==-1.) penta_elements_ids[1]=this->id; //upper penta is the same penta
+        else                                    penta_elements_ids[1]=reCast<int,IssmDouble>((iomodel->Data("md.mesh.upperelements")[penta_sid]));
+        if (xIsNan<IssmDouble>(iomodel->Data("md.mesh.lowerelements")[penta_sid]) || iomodel->Data("md.mesh.lowerelements")[penta_sid]==-1.) penta_elements_ids[0]=this->id; //lower penta is the same penta
+        else                                    penta_elements_ids[0]=reCast<int,IssmDouble>((iomodel->Data("md.mesh.lowerelements")[penta_sid]));
         this->InitHookNeighbors(penta_elements_ids);
 
@@ -2801 +2801 @@
         /*Checks if debuging*/
         _assert_(iomodel->elements);
+        _assert_(index==this->sid); 
 
         /*Recover element type*/

issm/trunk-jpl/src/c/classes/Elements/Penta.h

@@ -36 +36 @@
                 /*Penta constructors and destructor: {{{*/
                 Penta(){};
-                Penta(int penta_id,int penta_sid,int i, IoModel* iomodel,int nummodels);
+                Penta(int penta_id,int penta_sid,IoModel* iomodel,int nummodels);
                 ~Penta();
                 /*}}}*/

issm/trunk-jpl/src/c/classes/Elements/Seg.cpp

@@ -19 +19 @@
 #define NUMVERTICES 2
 /*Constructors/destructor/copy*/
-Seg::Seg(int seg_id, int seg_sid, int index, IoModel* iomodel,int nummodels)/*{{{*/
-                :ElementHook(nummodels,index+1,NUMVERTICES,iomodel){
+Seg::Seg(int seg_id, int seg_sid,IoModel* iomodel,int nummodels)/*{{{*/
+                :ElementHook(nummodels,seg_id,NUMVERTICES,iomodel){
 
                         /*id: */

issm/trunk-jpl/src/c/classes/Elements/Seg.h

@@ -32 +32 @@
                 /*Seg constructors, destructors {{{*/
                 Seg(){};
-                Seg(int seg_id,int seg_sid,int i, IoModel* iomodel,int nummodels);
+                Seg(int seg_id,int seg_sid,IoModel* iomodel,int nummodels);
                 ~Seg();
                 /*}}}*/

issm/trunk-jpl/src/c/classes/Elements/Tetra.cpp

@@ -20 +20 @@
 
 /*Constructors/destructor/copy*/
-Tetra::Tetra(int seg_id, int seg_sid, int index, IoModel* iomodel,int nummodels)/*{{{*/
-                :ElementHook(nummodels,index+1,NUMVERTICES,iomodel){
+Tetra::Tetra(int tet_id, int tet_sid,IoModel* iomodel,int nummodels)/*{{{*/
+                :ElementHook(nummodels,tet_id,NUMVERTICES,iomodel){
 
                         /*id: */
-                        this->id  = seg_id;
-                        this->sid = seg_sid;
+                        this->id  = tet_id;
+                        this->sid = tet_sid;
 
                         //this->parameters: we still can't point to it, it may not even exist. Configure will handle this.
@@ -904 +904 @@
         /*Checks if debuging*/
         _assert_(iomodel->elements);
+        _assert_(index==this->sid); 
 
         /*Recover element type*/

issm/trunk-jpl/src/c/classes/Elements/Tetra.h

@@ -32 +32 @@
                 /*Tetra constructors, destructors {{{*/
                 Tetra(){};
-                Tetra(int seg_id,int seg_sid,int i, IoModel* iomodel,int nummodels);
+                Tetra(int tet_id,int tet_sid,IoModel* iomodel,int nummodels);
                 ~Tetra();
                 /*}}}*/

issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

@@ -25 +25 @@
 
 /*Constructors/destructor/copy*/
-Tria::Tria(int tria_id, int tria_sid, int index, IoModel* iomodel,int nummodels)/*{{{*/
-        :ElementHook(nummodels,index+1,NUMVERTICES,iomodel){
+Tria::Tria(int tria_id, int tria_sid, IoModel* iomodel,int nummodels)/*{{{*/
+        :ElementHook(nummodels,tria_id,NUMVERTICES,iomodel){
 
                 /*id: */
@@ -3604 +3604 @@
         /*Checks if debuging*/
         _assert_(iomodel->elements);
+        _assert_(index==this->sid); 
 
         /*Recover element type*/

issm/trunk-jpl/src/c/classes/Elements/Tria.h

@@ -34 +34 @@
                 /*Tria constructors, destructors {{{*/
                 Tria(){};
-                Tria(int tria_id,int tria_sid,int i, IoModel* iomodel,int nummodels);
+                Tria(int tria_id,int tria_sid,IoModel* iomodel,int nummodels);
                 ~Tria();
                 /*}}}*/

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

@@ -37 +37 @@
                 case TriaEnum:
                         for(i=0;i<iomodel->numberofelements;i++){
-                                if(iomodel->my_elements[i]) elements->AddObject(new Tria(i+1,i,i,iomodel,nummodels));
+                                if(iomodel->my_elements[i]) elements->AddObject(new Tria(i+1,i,iomodel,nummodels));
                         }
                         break;
                 case TetraEnum:
                         for(i=0;i<iomodel->numberofelements;i++){
-                                if(iomodel->my_elements[i]) elements->AddObject(new Tetra(i+1,i,i,iomodel,nummodels));
+                                if(iomodel->my_elements[i]) elements->AddObject(new Tetra(i+1,i,iomodel,nummodels));
                         }
                         break;
@@ -48 +48 @@
                         iomodel->FetchData(2,"md.mesh.upperelements","md.mesh.lowerelements");
                         for(i=0;i<iomodel->numberofelements;i++){
-                                if(iomodel->my_elements[i]) elements->AddObject(new Penta(i+1,i,i,iomodel,nummodels));
+                                if(iomodel->my_elements[i]) elements->AddObject(new Penta(i+1,i,iomodel,nummodels));
                         }
                         break;