Changeset 3722
- Timestamp:
- 05/11/10 12:02:56 (15 years ago)
- Location:
- issm/trunk/src/c
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/Makefile.am
r3703 r3722 808 808 ./parallel/balancedvelocities_core.cpp\ 809 809 ./parallel/slopecompute_core.cpp\ 810 ./parallel/slope_core.cpp\ 810 811 ./parallel/transient_core.cpp\ 811 812 ./parallel/transient_core_2d.cpp\ -
issm/trunk/src/c/Qmux/DakotaResponses.cpp
r3720 r3722 262 262 263 263 SplitSolutionVector(u_g,numberofnodes,numberofdofspernode,&vx,&vy,&vz); 264 SplitSolutionVector(u_g,numberofnodes,2,temperature,melting);265 264 266 265 /*Add to inputs: */ -
issm/trunk/src/c/parallel/diagnostic.cpp
r3709 r3722 149 149 150 150 /*Free ressources */ 151 xfree((void**)&u_g_initial);152 xfree((void**)&u_g_obs);153 xfree((void**)&weights);154 151 xfree((void**)&control_type); 155 152 delete model; -
issm/trunk/src/c/parallel/diagnostic_core.cpp
r3717 r3722 90 90 if(ishutter){ 91 91 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 103 94 if(verbose)_printf_("%s\n"," adding slopes in inputs..."); 104 95 inputs->Add("surfaceslopex",slopex,numberofdofspernode_sl,numberofnodes); … … 159 150 160 151 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); 165 153 166 154 inputs->Add("bedslopex",slopex,numberofdofspernode_sl,numberofnodes); -
issm/trunk/src/c/parallel/parallel.h
r3673 r3722 36 36 void transient_core_3d(DataSet* results,Model* model); 37 37 38 void slope_core(Vec* pslopex,Vec* pslopey,FemModel* fem,int AnalysisEnum); 39 38 40 //int GradJOrth(WorkspaceParams* workspaceparams); 39 41
Note:
See TracChangeset
for help on using the changeset viewer.