Changeset 7516


Ignore:
Timestamp:
02/25/11 15:16:21 (14 years ago)
Author:
Eric.Larour
Message:

Grid on water was not being freezed whenever bedslope solution was run

Location:
issm/trunk/src/c/modules/ModelProcessorx
Files:
9 edited

Legend:

Unmodified
Added
Removed

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

    r6412 r7516  
    4545        IoModelFetchData(&iomodel->gridoniceshelf,NULL,NULL,iomodel_handle,"gridoniceshelf");
    4646        IoModelFetchData(&iomodel->vertices_type,NULL,NULL,iomodel_handle,"vertices_type");
     47        IoModelFetchData(&iomodel->gridonwater,NULL,NULL,iomodel_handle,"gridonwater");
    4748
    4849        if(continuous_galerkin){
    … …  
    8889        xfree((void**)&iomodel->gridonsurface);
    8990        xfree((void**)&iomodel->gridonicesheet);
     91        xfree((void**)&iomodel->gridonwater);
    9092        xfree((void**)&iomodel->gridoniceshelf);
    9193        xfree((void**)&iomodel->vertices_type);

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

    r5524 r7516  
    3737        IoModelFetchData(&iomodel->gridoniceshelf,NULL,NULL,iomodel_handle,"gridoniceshelf");
    3838        IoModelFetchData(&iomodel->vertices_type,NULL,NULL,iomodel_handle,"vertices_type");
     39        IoModelFetchData(&iomodel->gridonwater,NULL,NULL,iomodel_handle,"gridonwater");
    3940        for (i=0;i<iomodel->numberofvertices;i++){
    4041
    … …  
    5253        xfree((void**)&iomodel->gridonicesheet);
    5354        xfree((void**)&iomodel->gridoniceshelf);
     55        xfree((void**)&iomodel->gridonwater);
    5456        xfree((void**)&iomodel->vertices_type);
    5557

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

    r5524 r7516  
    3737        IoModelFetchData(&iomodel->gridoniceshelf,NULL,NULL,iomodel_handle,"gridoniceshelf");
    3838        IoModelFetchData(&iomodel->vertices_type,NULL,NULL,iomodel_handle,"vertices_type");
     39        IoModelFetchData(&iomodel->gridonwater,NULL,NULL,iomodel_handle,"gridonwater");
    3940
    4041        for (i=0;i<iomodel->numberofvertices;i++){
    … …  
    5253        xfree((void**)&iomodel->gridonsurface);
    5354        xfree((void**)&iomodel->gridonicesheet);
     55        xfree((void**)&iomodel->gridonwater);
    5456        xfree((void**)&iomodel->gridoniceshelf);
    5557        xfree((void**)&iomodel->vertices_type);

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

    r5524 r7516  
    4242        IoModelFetchData(&iomodel->elements,NULL,NULL,iomodel_handle,"elements");
    4343        IoModelFetchData(&iomodel->vertices_type,NULL,NULL,iomodel_handle,"vertices_type");
     44        IoModelFetchData(&iomodel->gridonwater,NULL,NULL,iomodel_handle,"gridonwater");
    4445
    4546        CreateNumberNodeToElementConnectivity(iomodel);
    … …  
    6263        xfree((void**)&iomodel->gridoniceshelf);
    6364        xfree((void**)&iomodel->elements);
     65        xfree((void**)&iomodel->gridonwater);
    6466        xfree((void**)&iomodel->numbernodetoelementconnectivity);
    6567        xfree((void**)&iomodel->vertices_type);

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

    r5524 r7516  
    4040        IoModelFetchData(&iomodel->gridoniceshelf,NULL,NULL,iomodel_handle,"gridoniceshelf");
    4141        IoModelFetchData(&iomodel->vertices_type,NULL,NULL,iomodel_handle,"vertices_type");
     42        IoModelFetchData(&iomodel->gridonwater,NULL,NULL,iomodel_handle,"gridonwater");
    4243
    4344        for (i=0;i<iomodel->numberofvertices;i++){
    … …  
    5657        xfree((void**)&iomodel->gridonicesheet);
    5758        xfree((void**)&iomodel->gridoniceshelf);
     59        xfree((void**)&iomodel->gridonwater);
    5860        xfree((void**)&iomodel->vertices_type);
    5961       

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

    r5524 r7516  
    3737        IoModelFetchData(&iomodel->gridoniceshelf,NULL,NULL,iomodel_handle,"gridoniceshelf");
    3838        IoModelFetchData(&iomodel->vertices_type,NULL,NULL,iomodel_handle,"vertices_type");
     39        IoModelFetchData(&iomodel->gridonwater,NULL,NULL,iomodel_handle,"gridonwater");
    3940
    4041        for (i=0;i<iomodel->numberofvertices;i++){
    … …  
    5253        xfree((void**)&iomodel->gridonsurface);
    5354        xfree((void**)&iomodel->gridonicesheet);
     55        xfree((void**)&iomodel->gridonwater);
    5456        xfree((void**)&iomodel->gridoniceshelf);
    5557        xfree((void**)&iomodel->vertices_type);

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

    r6412 r7516  
    4545        IoModelFetchData(&iomodel->gridoniceshelf,NULL,NULL,iomodel_handle,"gridoniceshelf");
    4646        IoModelFetchData(&iomodel->vertices_type,NULL,NULL,iomodel_handle,"vertices_type");
     47        IoModelFetchData(&iomodel->gridonwater,NULL,NULL,iomodel_handle,"gridonwater");
    4748
    4849        if(continuous_galerkin){
    … …  
    8889        xfree((void**)&iomodel->gridonicesheet);
    8990        xfree((void**)&iomodel->gridoniceshelf);
     91        xfree((void**)&iomodel->gridonwater);
    9092        xfree((void**)&iomodel->elements);
    9193        xfree((void**)&iomodel->vertices_type);

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

    r5524 r7516  
    3737        IoModelFetchData(&iomodel->gridoniceshelf,NULL,NULL,iomodel_handle,"gridoniceshelf");
    3838        IoModelFetchData(&iomodel->vertices_type,NULL,NULL,iomodel_handle,"vertices_type");
     39        IoModelFetchData(&iomodel->gridonwater,NULL,NULL,iomodel_handle,"gridonwater");
    3940
    4041        for (i=0;i<iomodel->numberofvertices;i++){
    … …  
    5354        xfree((void**)&iomodel->gridonicesheet);
    5455        xfree((void**)&iomodel->gridoniceshelf);
     56        xfree((void**)&iomodel->gridonwater);
    5557        xfree((void**)&iomodel->vertices_type);
    5658       

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

    r5524 r7516  
    3737        IoModelFetchData(&iomodel->gridoniceshelf,NULL,NULL,iomodel_handle,"gridoniceshelf");
    3838        IoModelFetchData(&iomodel->vertices_type,NULL,NULL,iomodel_handle,"vertices_type");
     39        IoModelFetchData(&iomodel->gridonwater,NULL,NULL,iomodel_handle,"gridonwater");
    3940
    4041        for (i=0;i<iomodel->numberofvertices;i++){
    … …  
    5253        xfree((void**)&iomodel->gridonsurface);
    5354        xfree((void**)&iomodel->gridonicesheet);
     55        xfree((void**)&iomodel->gridonwater);
    5456        xfree((void**)&iomodel->gridoniceshelf);
    5557        xfree((void**)&iomodel->vertices_type);
Note: See TracChangeset for help on using the changeset viewer.