Changeset 3456 for issm/trunk/src/c/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp

Timestamp:

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

Author:

seroussi

Message:

more cleaning on ModelProcessor

File:

• issm/trunk/src/c/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp (modified) (2 diffs)

issm/trunk/src/c/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp

@@ -18 +18 @@
         Spc*    spc  = NULL;
 
-        /*spc intermediary data: */
-        double* spcthickness=NULL;
-        
         /*Create constraints: */
         constraints = new DataSet(ConstraintsEnum());
 
         /*Fetch data: */
-        IoModelFetchData(&spcthickness,NULL,NULL,iomodel_handle,"spcthickness");
+        IoModelFetchData(&iomodel->spcthickness,NULL,NULL,iomodel_handle,"spcthickness");
 
         count=1;//matlab indexing
@@ -33 +30 @@
                 if((iomodel->my_vertices[i]==1)){
 
-                        if ((int)spcthickness[2*i]){
+                        if ((int)iomodel->spcthickness[2*i]){
 
-                                constraints->AddObject(new Spc(count,i+1,1,*(spcthickness+2*i+1)));
+                                constraints->AddObject(new Spc(count,i+1,1,*(iomodel->spcthickness+2*i+1)));
                                 count++;
                         }
-
                 } //if((my_vertices[i]==1))
         }
 
+        /*Free data: */
+        xfree((void**)&iomodel->spcthickness);
+        
         /*All our datasets are already order by ids. Set presort flag so that later on, when sorting is requested on these 
          * datasets, it will not be redone: */
         constraints->Presort();
 
-        /*Free data: */
-        xfree((void**)&spcthickness);
-        
         cleanup_and_return: