Changeset 6213 for issm/trunk/src/c/objects/IoModel.cpp

Timestamp:

10/08/10 16:49:12 (14 years ago)

Author:

Mathieu Morlighem

Message:

Prepared ISSM for multivariable CM, Added modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp

File:

• issm/trunk/src/c/objects/IoModel.cpp (modified) (3 diffs)

issm/trunk/src/c/objects/IoModel.cpp ¶

@@ -84 +84 @@
         xfree((void**)&this->rheology_B);
         xfree((void**)&this->rheology_n);
+        xfree((void**)&this->control_type);
         xfree((void**)&this->cm_responses);
         xfree((void**)&this->weights);
@@ -152 +153 @@
         /*Get control parameters: */
         IoModelFetchData(&this->num_control_type,iomodel_handle,"num_control_type"); 
-        IoModelFetchData(&this->control_type,iomodel_handle,"control_type"); 
 
         /*!Get solution parameters: */
@@ -295 +295 @@
 
         /*!solution parameters: */
+        this->control_type=NULL;
         this->cm_responses=NULL;
         this->weights=NULL;