Changeset 23516

Timestamp:

12/06/18 21:22:40 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: cleaning up, solution_type should not be in CreateConnectivity, this function should not be called in the first place

Location:

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

Files:

• CreateElementsVerticesAndMaterials.cpp (modified) (1 diff)
• CreateNumberNodeToElementConnectivity.cpp (modified) (2 diffs)
• ModelProcessorx.h (modified) (1 diff)

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

@@ -250 +250 @@
         if (isoceancoupling) iomodel->FetchData(2,"md.mesh.lat","md.mesh.long");
 
-        CreateNumberNodeToElementConnectivity(iomodel,solution_type);
+        if (solution_type!=LoveSolutionEnum) CreateNumberNodeToElementConnectivity(iomodel);
 
         int lid = 0;

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

@@ -14 +14 @@
 #include "./ModelProcessorx.h"
 
-void CreateNumberNodeToElementConnectivity(IoModel* iomodel,int solution_type){
+void CreateNumberNodeToElementConnectivity(IoModel* iomodel){
 
         /*Intermediary*/
@@ -28 +28 @@
 
         /*Some checks if debugging*/
-        if (solution_type==LoveSolutionEnum){
-                /*do nothing, we don't have a mesh. Just initialize to NULL*/
+        _assert_(iomodel->numberofvertices);
+        _assert_(iomodel->numberofelements);
+        _assert_(iomodel->elements);
+
+        /*Allocate ouput*/
+        connectivity=xNewZeroInit<int>(iomodel->numberofvertices);
+
+        /*Get element width*/
+        switch(iomodel->meshelementtype){
+                case TriaEnum:  elementswidth=3; break;
+                case TetraEnum: elementswidth=4; break;
+                case PentaEnum: elementswidth=6; break;
+                default:                   _error_("mesh not supported yet");
         }
-        else{
 
-                /*Some checks if debugging*/
-                _assert_(iomodel->numberofvertices);
-                _assert_(iomodel->numberofelements);
-                _assert_(iomodel->elements);
-
-                /*Allocate ouput*/
-                connectivity=xNewZeroInit<int>(iomodel->numberofvertices);
-
-                /*Get element width*/
-                switch(iomodel->meshelementtype){
-                        case TriaEnum:  elementswidth=3; break;
-                        case TetraEnum: elementswidth=4; break;
-                        case PentaEnum: elementswidth=6; break;
-                        default:                   _error_("mesh not supported yet");
-                }
-
-                /*Create connectivity table*/
-                for (i=0;i<iomodel->numberofelements;i++){
-                        for (j=0;j<elementswidth;j++){
-                                vertexid=iomodel->elements[elementswidth*i+j];
-                                _assert_(vertexid>0 && vertexid-1<iomodel->numberofvertices);
-                                connectivity[vertexid-1]+=1;
-                        }
+        /*Create connectivity table*/
+        for (i=0;i<iomodel->numberofelements;i++){
+                for (j=0;j<elementswidth;j++){
+                        vertexid=iomodel->elements[elementswidth*i+j];
+                        _assert_(vertexid>0 && vertexid-1<iomodel->numberofvertices);
+                        connectivity[vertexid-1]+=1;
                 }
         }

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

@@ -38 +38 @@
 /*Connectivity*/
 void CreateSingleNodeToElementConnectivity(IoModel* iomodel);
-void CreateNumberNodeToElementConnectivity(IoModel* iomodel,int solution_type);
+void CreateNumberNodeToElementConnectivity(IoModel* iomodel);
 #endif