Changeset 1905

Timestamp:

08/26/09 07:45:07 (15 years ago)

Author:

Mathieu Morlighem

Message:

if thermal and 2d, do not throw error, ust return empty datasets

Location:

issm/trunk/src/c/ModelProcessorx

Files:

• Melting/CreateElementsNodesAndMaterialsMelting.cpp (modified) (1 diff)
• Melting/CreateLoadsMelting.cpp (modified) (1 diff)
• Melting/CreateParametersMelting.cpp (modified) (2 diffs)
• Thermal/CreateConstraintsThermal.cpp (modified) (1 diff)
• Thermal/CreateElementsNodesAndMaterialsThermal.cpp (modified) (1 diff)
• Thermal/CreateLoadsThermal.cpp (modified) (1 diff)
• Thermal/CreateParametersThermal.cpp (modified) (2 diffs)

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

@@ -123 +123 @@
 
         /*Width of elements: */
-        if(strcmp(iomodel->meshtype,"2d")==0)throw ErrorException(__FUNCT__," error message: 2d temperature computations not supported yet!");
+        if (strcmp(iomodel->meshtype,"2d")==0)goto cleanup_and_return;
         elements_width=6; //penta elements
 

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

@@ -45 +45 @@
         count=0;
 
+        /*if 2d: return*/
+        if (strcmp(iomodel->meshtype,"2d")==0)goto cleanup_and_return;
+
         //create penalties for grids: no grid can have a temperature over the melting point
         IoModelFetchData((void**)&iomodel->gridonbed,NULL,NULL,iomodel_handle,"gridonbed","Matrix","Mat");

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

@@ -25 +25 @@
         parameters=*pparameters;
 
+        /*if 2d: return*/
+        if (strcmp(iomodel->meshtype,"2d")==0)goto cleanup_and_return;
+
         count=parameters->Size();
 
@@ -48 +51 @@
                 xfree((void**)&melting);
         }
+
+        cleanup_and_return:
         
         /*Assign output pointer: */

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

@@ -33 +33 @@
         /*Create constraints: */
         constraints = new DataSet(ConstraintsEnum());
+
+        /*return if 2d mesh*/
+        if (strcmp(iomodel->meshtype,"2d")==0)goto cleanup_and_return;
 
         /*Fetch data: */

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

@@ -123 +123 @@
         materials = new DataSet(MaterialsEnum());
 
+        /*return if 2d mesh*/
+        if (strcmp(iomodel->meshtype,"2d")==0)goto cleanup_and_return;
+
         /*Width of elements: */
-        if(strcmp(iomodel->meshtype,"2d")==0){
-                throw ErrorException(__FUNCT__," 2d temperature computation not supported yet!");
-        }
-                
         elements_width=6; //penta elements
 

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

@@ -46 +46 @@
         count=0;
 
+        /*return if 2d mesh*/
+        if (strcmp(iomodel->meshtype,"2d")==0)goto cleanup_and_return;
+
         //create penalties for grids: no grid can have a temperature over the melting point
         IoModelFetchData((void**)&iomodel->spctemperature,NULL,NULL,iomodel_handle,"spctemperature","Matrix","Mat");

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

@@ -29 +29 @@
         /*recover parameters : */
         parameters=*pparameters;
+
+        /*return if 2d mesh*/
+        if (strcmp(iomodel->meshtype,"2d")==0)goto cleanup_and_return;
 
         count=parameters->Size();
@@ -80 +83 @@
                 xfree((void**)&temperature);
         }
+
+        cleanup_and_return:
         
         /*Assign output pointer: */