Changeset 9406
- Timestamp:
- 08/24/11 13:24:41 (14 years ago)
- Location:
- issm/trunk/src/c
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp
r9405 r9406 28 28 int numberofvertices; 29 29 bool ismacayealpattyn,isstokes; 30 int numpenalties,numberofpressureloads,numrifts ;30 int numpenalties,numberofpressureloads,numrifts,numriftsegments; 31 31 double *pressureload = NULL; 32 32 double *elements_type = NULL; 33 33 double *nodeoniceshelf = NULL; 34 34 double *riftinfo = NULL; 35 double *surface = NULL;36 35 double *nodeonbed = NULL; 37 36 double *nodeonstokes = NULL; … … 39 38 double *vertices_type = NULL; 40 39 double *penalties = NULL; 41 42 40 43 41 /*Fetch parameters: */ … … 175 173 /*Create Riffront loads for rifts: */ 176 174 if(numrifts){ 175 iomodel->FetchData(&riftinfo,&numriftsegments,NULL,RiftinfoEnum); 177 176 iomodel->FetchData(5,RiftinfoEnum,ThicknessEnum,BedEnum,SurfaceEnum,NodeOnIceShelfEnum); 178 for(i=0;i<numrifts ;i++){179 if(iomodel->my_elements[(int)*( iomodel->Data(RiftinfoEnum)+RIFTINFOSIZE*i+2)-1]){177 for(i=0;i<numriftsegments;i++){ 178 if(iomodel->my_elements[(int)*(riftinfo+RIFTINFOSIZE*i+2)-1]){ 180 179 loads->AddObject(new Riftfront(iomodel->loadcounter+count+1,i,iomodel,DiagnosticHorizAnalysisEnum)); 181 180 count++; … … 183 182 } 184 183 iomodel->DeleteData(5,RiftinfoEnum,ThicknessEnum,BedEnum,SurfaceEnum,NodeOnIceShelfEnum); 184 xfree((void**)&riftfront); 185 185 } 186 186 -
issm/trunk/src/c/solutions/diagnostic_core.cpp
r9112 r9406 24 24 bool control_analysis; 25 25 int solution_type; 26 27 26 28 27 /* recover parameters:*/
Note:
See TracChangeset
for help on using the changeset viewer.