Changeset 5524


Ignore:
Timestamp:
08/23/10 16:23:07 (15 years ago)
Author:
seroussi
Message:

removed deadgrids from model

Location:
issm/trunk/src
Files:
18 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/src/c/modules/ModelProcessorx/Balancedthickness/CreateNodesBalancedthickness.cpp

    r5114 r5524  
    3939
    4040        /*First fetch data: */
    41         if (iomodel->dim==3){
    42                 IoModelFetchData(&iomodel->deadgrids,NULL,NULL,iomodel_handle,"deadgrids");
    43         }
    4441        IoModelFetchData(&iomodel->elements,NULL,NULL,iomodel_handle,"elements");
    4542        IoModelFetchData(&iomodel->gridonbed,NULL,NULL,iomodel_handle,"gridonbed");
    … …  
    8885        /*Clean fetched data: */
    8986        xfree((void**)&iomodel->elements);
    90         xfree((void**)&iomodel->deadgrids);
    9187        xfree((void**)&iomodel->gridonbed);
    9288        xfree((void**)&iomodel->gridonsurface);

  • issm/trunk/src/c/modules/ModelProcessorx/Balancedvelocities/CreateNodesBalancedvelocities.cpp

    r5114 r5524  
    3232
    3333        /*First fetch data: */
    34         if (iomodel->dim==3){
    35                 IoModelFetchData(&iomodel->deadgrids,NULL,NULL,iomodel_handle,"deadgrids");
    36         }
    3734        IoModelFetchData(&iomodel->gridonbed,NULL,NULL,iomodel_handle,"gridonbed");
    3835        IoModelFetchData(&iomodel->gridonsurface,NULL,NULL,iomodel_handle,"gridonsurface");
    … …  
    5148
    5249        /*Clean fetched data: */
    53         xfree((void**)&iomodel->deadgrids);
    5450        xfree((void**)&iomodel->gridonbed);
    5551        xfree((void**)&iomodel->gridonsurface);

  • issm/trunk/src/c/modules/ModelProcessorx/BedSlope/CreateNodesBedSlope.cpp

    r5114 r5524  
    3232       
    3333        /*First fetch data: */
    34         if (iomodel->dim==3){
    35                 IoModelFetchData(&iomodel->deadgrids,NULL,NULL,iomodel_handle,"deadgrids");
    36         }
    3734        IoModelFetchData(&iomodel->gridonbed,NULL,NULL,iomodel_handle,"gridonbed");
    3835        IoModelFetchData(&iomodel->gridonsurface,NULL,NULL,iomodel_handle,"gridonsurface");
    … …  
    5249
    5350        /*Clean fetched data: */
    54         xfree((void**)&iomodel->deadgrids);
    5551        xfree((void**)&iomodel->gridonbed);
    5652        xfree((void**)&iomodel->gridonsurface);

  • issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp

    r5114 r5524  
    4141        IoModelFetchData(&iomodel->gridoniceshelf,NULL,NULL,iomodel_handle,"gridoniceshelf");
    4242        IoModelFetchData(&iomodel->vertices_type,NULL,NULL,iomodel_handle,"vertices_type");
    43         if (iomodel->dim==3){
    44                 IoModelFetchData(&iomodel->deadgrids,NULL,NULL,iomodel_handle,"deadgrids");
    45         }
    4643       
    4744        for (i=0;i<iomodel->numberofvertices;i++){
    … …  
    6057        xfree((void**)&iomodel->gridonicesheet);
    6158        xfree((void**)&iomodel->gridoniceshelf);
    62         xfree((void**)&iomodel->deadgrids);
    6359        xfree((void**)&iomodel->vertices_type);
    6460

  • issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp

    r5114 r5524  
    3535
    3636        /*First fetch data: */
    37         if (iomodel->dim==3){
    38                 IoModelFetchData(&iomodel->deadgrids,NULL,NULL,iomodel_handle,"deadgrids");
    39         }
    4037        IoModelFetchData(&iomodel->gridonbed,NULL,NULL,iomodel_handle,"gridonbed");
    4138        IoModelFetchData(&iomodel->gridonsurface,NULL,NULL,iomodel_handle,"gridonsurface");
    … …  
    5956
    6057        /*Clean fetched data: */
    61         xfree((void**)&iomodel->deadgrids);
    6258        xfree((void**)&iomodel->gridonbed);
    6359        xfree((void**)&iomodel->gridonsurface);

  • issm/trunk/src/c/modules/ModelProcessorx/DiagnosticStokes/CreateNodesDiagnosticStokes.cpp

    r5114 r5524  
    3636
    3737        /*First fetch data: */
    38         IoModelFetchData(&iomodel->deadgrids,NULL,NULL,iomodel_handle,"deadgrids");
    3938        IoModelFetchData(&iomodel->gridonbed,NULL,NULL,iomodel_handle,"gridonbed");
    4039        IoModelFetchData(&iomodel->gridonsurface,NULL,NULL,iomodel_handle,"gridonsurface");
    … …  
    5655
    5756        /*Clean fetched data: */
    58         xfree((void**)&iomodel->deadgrids);
    5957        xfree((void**)&iomodel->gridonbed);
    6058        xfree((void**)&iomodel->gridonsurface);

  • issm/trunk/src/c/modules/ModelProcessorx/DiagnosticVert/CreateNodesDiagnosticVert.cpp

    r5114 r5524  
    3535       
    3636        /*First fetch data: */
    37         IoModelFetchData(&iomodel->deadgrids,NULL,NULL,iomodel_handle,"deadgrids");
    3837        IoModelFetchData(&iomodel->gridonbed,NULL,NULL,iomodel_handle,"gridonbed");
    3938        IoModelFetchData(&iomodel->gridonsurface,NULL,NULL,iomodel_handle,"gridonsurface");
    … …  
    5352
    5453        /*Clean fetched data: */
    55         xfree((void**)&iomodel->deadgrids);
    5654        xfree((void**)&iomodel->gridonbed);
    5755        xfree((void**)&iomodel->gridonsurface);

  • issm/trunk/src/c/modules/ModelProcessorx/Melting/CreateNodesMelting.cpp

    r5114 r5524  
    3232
    3333        /*First fetch data: */
    34         if (iomodel->dim==3){
    35                 IoModelFetchData(&iomodel->deadgrids,NULL,NULL,iomodel_handle,"deadgrids");
    36         }
    3734        IoModelFetchData(&iomodel->gridonbed,NULL,NULL,iomodel_handle,"gridonbed");
    3835        IoModelFetchData(&iomodel->gridonsurface,NULL,NULL,iomodel_handle,"gridonsurface");
    … …  
    5249
    5350        /*Clean fetched data: */
    54         xfree((void**)&iomodel->deadgrids);
    5551        xfree((void**)&iomodel->gridonbed);
    5652        xfree((void**)&iomodel->gridonsurface);

  • issm/trunk/src/c/modules/ModelProcessorx/Prognostic/CreateNodesPrognostic.cpp

    r5114 r5524  
    3939
    4040        /*First fetch data: */
    41         if (iomodel->dim==3){
    42                 IoModelFetchData(&iomodel->deadgrids,NULL,NULL,iomodel_handle,"deadgrids");
    43         }
    4441        IoModelFetchData(&iomodel->elements,NULL,NULL,iomodel_handle,"elements");
    4542        IoModelFetchData(&iomodel->gridonbed,NULL,NULL,iomodel_handle,"gridonbed");
    … …  
    8784
    8885        /*Clean fetched data: */
    89         xfree((void**)&iomodel->deadgrids);
    9086        xfree((void**)&iomodel->gridonbed);
    9187        xfree((void**)&iomodel->gridonsurface);

  • issm/trunk/src/c/modules/ModelProcessorx/SurfaceSlope/CreateNodesSurfaceSlope.cpp

    r5114 r5524  
    3232       
    3333        /*First fetch data: */
    34         if (iomodel->dim==3){
    35                 IoModelFetchData(&iomodel->deadgrids,NULL,NULL,iomodel_handle,"deadgrids");
    36         }
    3734        IoModelFetchData(&iomodel->gridonbed,NULL,NULL,iomodel_handle,"gridonbed");
    3835        IoModelFetchData(&iomodel->gridonsurface,NULL,NULL,iomodel_handle,"gridonsurface");
    … …  
    5249
    5350        /*Clean fetched data: */
    54         xfree((void**)&iomodel->deadgrids);
    5551        xfree((void**)&iomodel->gridonbed);
    5652        xfree((void**)&iomodel->gridonsurface);

  • issm/trunk/src/c/modules/ModelProcessorx/Thermal/CreateNodesThermal.cpp

    r5114 r5524  
    3232
    3333        /*Create nodes and vertices: */
    34         if (iomodel->dim==3){
    35                 IoModelFetchData(&iomodel->deadgrids,NULL,NULL,iomodel_handle,"deadgrids");
    36         }
    3734        IoModelFetchData(&iomodel->gridonbed,NULL,NULL,iomodel_handle,"gridonbed");
    3835        IoModelFetchData(&iomodel->gridonsurface,NULL,NULL,iomodel_handle,"gridonsurface");
    … …  
    5249
    5350        /*Clean fetched data: */
    54         xfree((void**)&iomodel->deadgrids);
    5551        xfree((void**)&iomodel->gridonbed);
    5652        xfree((void**)&iomodel->gridonsurface);

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

    r5472 r5524  
    4444        if (this->dim==3){
    4545                xfree((void**)&this->elements2d);
    46                 xfree((void**)&this->deadgrids);
    4746                xfree((void**)&this->upperelements);
    4847                xfree((void**)&this->lowerelements);
    … …  
    247246        this->numberofvertices2d=0;
    248247        this->elements2d=NULL;
    249         this->deadgrids=NULL;
    250248        this->numlayers=0;
    251249        this->upperelements=NULL;

  • issm/trunk/src/c/objects/IoModel.h

    r5472 r5524  
    3838                int     numberofelements2d;
    3939                double* elements2d;
    40                 double* deadgrids;
    4140                int     numlayers;
    4241                double* upperelements;

  • issm/trunk/src/c/objects/Node.cpp

    r5433 r5524  
    9191                if (iomodel->dim==3){
    9292                        /*We have a  3d mesh, we may have collapsed elements, hence dead grids. Freeze them out: */
    93                         if (!iomodel->deadgrids) ISSMERROR("iomodel->deadgrids is NULL");
    94                         if (iomodel->deadgrids[io_index]){
     93                        if (!iomodel->gridonbed) ISSMERROR("iomodel->gridonbed is NULL");
     94                        if (!iomodel->vertices_type) ISSMERROR("iomodel->vertices_type is NULL");
     95                        if (iomodel->vertices_type[io_index]==MacAyealApproximationEnum && !iomodel->gridonbed[io_index]){
    9596                                for(k=1;k<=numdofs;k++){
    9697                                        this->FreezeDof(k);

  • issm/trunk/src/m/classes/@model/model.m

    r5519 r5524  
    9494        md.lowerelements=NaN;
    9595        md.lowergrids=NaN;
    96         md.deadgrids=NaN;
    9796       
    9897        %Extrusion

  • issm/trunk/src/m/classes/public/extrude.m

    r5433 r5524  
    182182        md.gridonpattyn=project3d(md,md.gridonpattyn,'node');
    183183        md.gridonstokes=project3d(md,md.gridonstokes,'node');
    184 
    185         %dead grids
    186         md.deadgrids=ones(md.numberofgrids,1);
    187         md.deadgrids(md.elements(md.elements_type~=MacAyealApproximationEnum,:))=0;%non macayeal grids are not dead
    188         md.deadgrids(find(md.gridonbed))=0;%grids from elements on bed are not dead
    189184end
    190185

  • issm/trunk/src/m/classes/public/marshall.m

    r5359 r5524  
    4040        WriteData(fid,md.numberofgrids2d,'Integer','numberofgrids2d');
    4141        WriteData(fid,md.elements2d,'Mat','elements2d');
    42         WriteData(fid,md.deadgrids,'Mat','deadgrids');
    4342        WriteData(fid,md.numlayers,'Integer','numlayers');
    4443        WriteData(fid,md.gridonpattyn,'Mat','gridonpattyn');

  • issm/trunk/src/m/classes/public/setelementstype.m

    r5441 r5524  
    172172end
    173173
    174 %flag dead grids (strictly in MacAyeal and not on bed -> not used in diagnostic horiz)
    175 nonmacayeal_el=find(~macayealflag);                   %non macayeal elements
    176 deadgrids=ones(md.numberofgrids,1);
    177 deadgrids(md.elements(nonmacayeal_el,:))=0;          %non macayeal grids are not dead
    178 deadgrids(find(md.gridonbed))=0;                      %grids from elements on bed are not dead
    179 md.deadgrids=deadgrids;
    180 
    181174%figure out solution types
    182175md.ishutter=double(any(md.elements_type==HutterApproximationEnum));
Note: See TracChangeset for help on using the changeset viewer.