Changeset 3476

Timestamp:

04/08/10 15:16:08 (15 years ago)

Author:

Mathieu Morlighem

Message:

Bug fix

Location:

issm/trunk/src/c

Files:

• DataSet/DataSet.cpp (modified) (1 diff)
• Dofx/Dofx.cpp (modified) (1 diff)
• ModelProcessorx/Balancedthickness/CreateElementsNodesAndMaterialsBalancedthickness.cpp (modified) (1 diff)
• ModelProcessorx/DiagnosticHoriz/CreateElementsNodesAndMaterialsDiagnosticHoriz.cpp (modified) (2 diffs)
• ModelProcessorx/DiagnosticHutter/CreateElementsNodesAndMaterialsDiagnosticHutter.cpp (modified) (1 diff)
• ModelProcessorx/DiagnosticStokes/CreateElementsNodesAndMaterialsDiagnosticStokes.cpp (modified) (2 diffs)
• ModelProcessorx/DiagnosticVert/CreateElementsNodesAndMaterialsDiagnosticVert.cpp (modified) (2 diffs)
• ModelProcessorx/Melting/CreateElementsNodesAndMaterialsMelting.cpp (modified) (1 diff)
• ModelProcessorx/Thermal/CreateElementsNodesAndMaterialsThermal.cpp (modified) (1 diff)

issm/trunk/src/c/DataSet/DataSet.cpp

@@ -965 +965 @@
 
         /*Check that dofcount is positive*/
-        ISSMASSERT(dofcount>0);
+        if (Size()) ISSMASSERT(dofcount>0);
 
         /*Ok, now every object has distributed dofs, but locally, and with a dof count starting from 

issm/trunk/src/c/Dofx/Dofx.cpp

@@ -27 +27 @@
         DofVec* partition=NULL;
         DofVec* tpartition=NULL;
+
+        /*Check that vertices and nodes are not empty*/
+        ISSMASSERT(nodes && vertices);
 
         /*Initialize dofvecs: */

issm/trunk/src/c/ModelProcessorx/Balancedthickness/CreateElementsNodesAndMaterialsBalancedthickness.cpp

@@ -12 +12 @@
 #include "../IoModel.h"
 
-
 void    CreateElementsNodesAndMaterialsBalancedthickness(DataSet** pelements,DataSet** pnodes, DataSet** pvertices, DataSet** pmaterials, IoModel* iomodel,ConstDataHandle iomodel_handle){
-
 
         /*Intermediary*/

issm/trunk/src/c/ModelProcessorx/DiagnosticHoriz/CreateElementsNodesAndMaterialsDiagnosticHoriz.cpp

@@ -22 +22 @@
         DataSet*    vertices = NULL;
         DataSet*    materials = NULL;
-        
-        /*Now, is the flag macayaealpattyn on? otherwise, do nothing: */
-        if (!iomodel->ismacayealpattyn)goto cleanup_and_return;
 
         /*First create the elements, nodes and material properties: */
@@ -31 +28 @@
         vertices  = new DataSet(VerticesEnum());
         materials = new DataSet(MaterialsEnum());
+        
+        /*Now, is the flag macayaealpattyn on? otherwise, do nothing: */
+        if (!iomodel->ismacayealpattyn)goto cleanup_and_return;
 
         /*Partition elements and vertices and nodes: */

issm/trunk/src/c/ModelProcessorx/DiagnosticHutter/CreateElementsNodesAndMaterialsDiagnosticHutter.cpp

@@ -22 +22 @@
         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());
 
         /*Now, is the flag ishutter on? otherwise, do nothing: */

issm/trunk/src/c/ModelProcessorx/DiagnosticStokes/CreateElementsNodesAndMaterialsDiagnosticStokes.cpp

@@ -23 +23 @@
         DataSet*    vertices = NULL;
         DataSet*    materials = NULL;
-        
-        /*Objects: */
-        Node*       node   = NULL;
-        Vertex*     vertex = NULL;
-        Penta*      penta = NULL;
-        Matice*     matice  = NULL;
-        Matpar*     matpar  = NULL;
-
-        /*Now, do we have Stokes elements?*/
-        if (strcmp(iomodel->meshtype,"2d")==0) ISSMERROR("Stokes elements only supported in 3d!");
-        if (!iomodel->isstokes)goto cleanup_and_return;
 
         /*First create the elements, nodes and material properties: */
@@ -40 +29 @@
         vertices  = new DataSet(VerticesEnum());
         materials = new DataSet(MaterialsEnum());
+
+        /*Now, do we have Stokes elements?*/
+        if (strcmp(iomodel->meshtype,"2d")==0) goto cleanup_and_return;
+        if (!iomodel->isstokes)                goto cleanup_and_return;
+
 
         /*Partition elements and vertices and nodes: */

issm/trunk/src/c/ModelProcessorx/DiagnosticVert/CreateElementsNodesAndMaterialsDiagnosticVert.cpp

@@ -23 +23 @@
         DataSet*    materials = NULL;
 
-        /*Now, is the flag macayaealpattyn on? otherwise, do nothing: */
-        if (strcmp(iomodel->meshtype,"2d")==0)goto cleanup_and_return;
-
         /*First create the elements, nodes and material properties: */
         elements  = new DataSet(ElementsEnum());
@@ -31 +28 @@
         vertices  = new DataSet(VerticesEnum());
         materials = new DataSet(MaterialsEnum());
+
+        /*Now, is the flag macayaealpattyn on? otherwise, do nothing: */
+        if (strcmp(iomodel->meshtype,"2d")==0)goto cleanup_and_return;
 
         /*Partition elements and vertices and nodes: */

issm/trunk/src/c/ModelProcessorx/Melting/CreateElementsNodesAndMaterialsMelting.cpp

@@ -14 +14 @@
 void    CreateElementsNodesAndMaterialsMelting(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,j,k,n;
 

issm/trunk/src/c/ModelProcessorx/Thermal/CreateElementsNodesAndMaterialsThermal.cpp

@@ -14 +14 @@
 void    CreateElementsNodesAndMaterialsThermal(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,j,k,n;