Changeset 9406

Timestamp:

08/24/11 13:24:41 (14 years ago)

Author:

Mathieu Morlighem

Message:

Fixed rift Error

Location:

issm/trunk/src/c

Files:

• modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp (modified) (4 diffs)
• solutions/diagnostic_core.cpp (modified) (1 diff)

issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp

@@ -28 +28 @@
         int numberofvertices;
         bool ismacayealpattyn,isstokes;
-        int  numpenalties,numberofpressureloads,numrifts;
+        int  numpenalties,numberofpressureloads,numrifts,numriftsegments;
         double *pressureload   = NULL;
         double *elements_type  = NULL;
         double *nodeoniceshelf = NULL;
         double *riftinfo       = NULL;
-        double *surface        = NULL;
         double *nodeonbed      = NULL;
         double *nodeonstokes   = NULL;
@@ -39 +38 @@
         double *vertices_type  = NULL;
         double *penalties      = NULL;
-
 
         /*Fetch parameters: */
@@ -175 +173 @@
         /*Create Riffront loads for rifts: */
         if(numrifts){
+                iomodel->FetchData(&riftinfo,&numriftsegments,NULL,RiftinfoEnum);
                 iomodel->FetchData(5,RiftinfoEnum,ThicknessEnum,BedEnum,SurfaceEnum,NodeOnIceShelfEnum);
-                for(i=0;i<numrifts;i++){
-                        if(iomodel->my_elements[(int)*(iomodel->Data(RiftinfoEnum)+RIFTINFOSIZE*i+2)-1]){
+                for(i=0;i<numriftsegments;i++){
+                        if(iomodel->my_elements[(int)*(riftinfo+RIFTINFOSIZE*i+2)-1]){
                                 loads->AddObject(new Riftfront(iomodel->loadcounter+count+1,i,iomodel,DiagnosticHorizAnalysisEnum));
                                 count++;
@@ -183 +182 @@
                 }
                 iomodel->DeleteData(5,RiftinfoEnum,ThicknessEnum,BedEnum,SurfaceEnum,NodeOnIceShelfEnum);
+                xfree((void**)&riftfront);
         }
 

issm/trunk/src/c/solutions/diagnostic_core.cpp

@@ -24 +24 @@
         bool   control_analysis;
         int    solution_type;
-
 
         /* recover parameters:*/