Changeset 5358 for issm/trunk/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp

Timestamp:

08/18/10 10:13:49 (15 years ago)

Author:

Mathieu Morlighem

Message:

Control_type is now an enum and moved RheologyB2d to RheologyBbar

File:

• issm/trunk/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp (modified) (1 diff)

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

@@ -40 +40 @@
         IoModelFetchData(&iomodel->rheology_B,NULL,NULL,iomodel_handle,"rheology_B");
         IoModelFetchData(&iomodel->rheology_n,NULL,NULL,iomodel_handle,"rheology_n");
-        if(iomodel->control_analysis && strcmp(iomodel->control_type,"rheology_B")==0){
-                IoModelFetchData(&iomodel->control_parameter,NULL,NULL,iomodel_handle,iomodel->control_type); //copy the control parameter in iomodel
+        if(iomodel->control_analysis && iomodel->control_type==RheologyBbarEnum){
+                IoModelFetchData(&iomodel->control_parameter,NULL,NULL,iomodel_handle,EnumToModelField(iomodel->control_type)); //copy the control parameter in iomodel
         }