Changeset 3722


Ignore:
Timestamp:
05/11/10 12:02:56 (15 years ago)
Author:
Eric.Larour
Message:

some cleanup

Location:
issm/trunk/src/c
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/c/Makefile.am

    r3703 r3722  
    808808                                        ./parallel/balancedvelocities_core.cpp\
    809809                                        ./parallel/slopecompute_core.cpp\
     810                                        ./parallel/slope_core.cpp\
    810811                                        ./parallel/transient_core.cpp\
    811812                                        ./parallel/transient_core_2d.cpp\
  • issm/trunk/src/c/Qmux/DakotaResponses.cpp

    r3720 r3722  
    262262
    263263                        SplitSolutionVector(u_g,numberofnodes,numberofdofspernode,&vx,&vy,&vz);
    264                         SplitSolutionVector(u_g,numberofnodes,2,temperature,melting);
    265264
    266265                        /*Add to inputs: */
  • issm/trunk/src/c/parallel/diagnostic.cpp

    r3709 r3722  
    149149
    150150        /*Free ressources */
    151         xfree((void**)&u_g_initial);
    152         xfree((void**)&u_g_obs);
    153         xfree((void**)&weights);
    154151        xfree((void**)&control_type);
    155152        delete model;
  • issm/trunk/src/c/parallel/diagnostic_core.cpp

    r3717 r3722  
    9090        if(ishutter){
    9191                       
    92                 if(verbose)_printf_("%s\n","computing surface slope (x and y derivatives)...");
    93                 diagnostic_core_linear(&slopex,fem_sl,SlopecomputeAnalysisEnum,SurfaceXAnalysisEnum);
    94                 diagnostic_core_linear(&slopey,fem_sl,SlopecomputeAnalysisEnum,SurfaceYAnalysisEnum);
    95 
    96                 if (dim==3){
    97                
    98                         if(verbose)_printf_("%s\n","extruding slopes in 3d...");
    99                         FieldExtrudex( slopex, fem_sl->elements,fem_sl->nodes,fem_sl->vertices,fem_sl->loads,fem_sl->materials,fem_sl->parameters,"slopex",0);
    100                         FieldExtrudex( slopey, fem_sl->elements,fem_sl->nodes,fem_sl->vertices,fem_sl->loads,fem_sl->materials,fem_sl->parameters,"slopex",0);
    101                 }
    102 
     92                slope_core(&slopex,&slopey,fem_sl,SurfaceAnalysisEnum);
     93                       
    10394                if(verbose)_printf_("%s\n"," adding slopes in inputs...");
    10495                inputs->Add("surfaceslopex",slopex,numberofdofspernode_sl,numberofnodes);
     
    159150
    160151                        if(verbose)_printf_("%s\n","computing bed slope (x and y derivatives)...");
    161                         diagnostic_core_linear(&slopex,fem_sl,SlopecomputeAnalysisEnum,BedXAnalysisEnum);
    162                         diagnostic_core_linear(&slopey,fem_sl,SlopecomputeAnalysisEnum,BedYAnalysisEnum);
    163                         FieldExtrudex( slopex, fem_sl->elements,fem_sl->nodes,fem_sl->vertices,fem_sl->loads,fem_sl->materials,fem_sl->parameters,"slopex",0);
    164                         FieldExtrudex( slopey, fem_sl->elements,fem_sl->nodes,fem_sl->vertices,fem_sl->loads,fem_sl->materials,fem_sl->parameters,"slopey",0);
     152                        slope_core(&slopex,&slopey,fem_sl,BedAnalysisEnum);
    165153
    166154                        inputs->Add("bedslopex",slopex,numberofdofspernode_sl,numberofnodes);
  • issm/trunk/src/c/parallel/parallel.h

    r3673 r3722  
    3636void transient_core_3d(DataSet* results,Model* model);
    3737
     38void slope_core(Vec* pslopex,Vec* pslopey,FemModel* fem,int AnalysisEnum);
     39
    3840//int GradJOrth(WorkspaceParams* workspaceparams);
    3941
Note: See TracChangeset for help on using the changeset viewer.