Changeset 3722

Timestamp:

05/11/10 12:02:56 (15 years ago)

Author:

Eric.Larour

Message:

some cleanup

Location:

issm/trunk/src/c

Files:

• Makefile.am (modified) (1 diff)
• Qmux/DakotaResponses.cpp (modified) (1 diff)
• parallel/diagnostic.cpp (modified) (1 diff)
• parallel/diagnostic_core.cpp (modified) (2 diffs)
• parallel/parallel.h (modified) (1 diff)

issm/trunk/src/c/Makefile.am

@@ -808 +808 @@
                                         ./parallel/balancedvelocities_core.cpp\
                                         ./parallel/slopecompute_core.cpp\
+                                        ./parallel/slope_core.cpp\
                                         ./parallel/transient_core.cpp\
                                         ./parallel/transient_core_2d.cpp\

issm/trunk/src/c/Qmux/DakotaResponses.cpp

@@ -262 +262 @@
 
                         SplitSolutionVector(u_g,numberofnodes,numberofdofspernode,&vx,&vy,&vz);
-                        SplitSolutionVector(u_g,numberofnodes,2,temperature,melting);
 
                         /*Add to inputs: */

issm/trunk/src/c/parallel/diagnostic.cpp

@@ -149 +149 @@
 
         /*Free ressources */
-        xfree((void**)&u_g_initial);
-        xfree((void**)&u_g_obs);
-        xfree((void**)&weights);
         xfree((void**)&control_type);
         delete model;

issm/trunk/src/c/parallel/diagnostic_core.cpp

@@ -90 +90 @@
         if(ishutter){
                         
-                if(verbose)_printf_("%s\n","computing surface slope (x and y derivatives)...");
-                diagnostic_core_linear(&slopex,fem_sl,SlopecomputeAnalysisEnum,SurfaceXAnalysisEnum);
-                diagnostic_core_linear(&slopey,fem_sl,SlopecomputeAnalysisEnum,SurfaceYAnalysisEnum);
-
-                if (dim==3){
-                
-                        if(verbose)_printf_("%s\n","extruding slopes in 3d...");
-                        FieldExtrudex( slopex, fem_sl->elements,fem_sl->nodes,fem_sl->vertices,fem_sl->loads,fem_sl->materials,fem_sl->parameters,"slopex",0);
-                        FieldExtrudex( slopey, fem_sl->elements,fem_sl->nodes,fem_sl->vertices,fem_sl->loads,fem_sl->materials,fem_sl->parameters,"slopex",0);
-                }
-
+                slope_core(&slopex,&slopey,fem_sl,SurfaceAnalysisEnum);
+                        
                 if(verbose)_printf_("%s\n"," adding slopes in inputs...");
                 inputs->Add("surfaceslopex",slopex,numberofdofspernode_sl,numberofnodes);
@@ -159 +150 @@
 
                         if(verbose)_printf_("%s\n","computing bed slope (x and y derivatives)...");
-                        diagnostic_core_linear(&slopex,fem_sl,SlopecomputeAnalysisEnum,BedXAnalysisEnum);
-                        diagnostic_core_linear(&slopey,fem_sl,SlopecomputeAnalysisEnum,BedYAnalysisEnum);
-                        FieldExtrudex( slopex, fem_sl->elements,fem_sl->nodes,fem_sl->vertices,fem_sl->loads,fem_sl->materials,fem_sl->parameters,"slopex",0);
-                        FieldExtrudex( slopey, fem_sl->elements,fem_sl->nodes,fem_sl->vertices,fem_sl->loads,fem_sl->materials,fem_sl->parameters,"slopey",0);
+                        slope_core(&slopex,&slopey,fem_sl,BedAnalysisEnum);
 
                         inputs->Add("bedslopex",slopex,numberofdofspernode_sl,numberofnodes);

issm/trunk/src/c/parallel/parallel.h

@@ -36 +36 @@
 void transient_core_3d(DataSet* results,Model* model);
 
+void slope_core(Vec* pslopex,Vec* pslopey,FemModel* fem,int AnalysisEnum);
+
 //int GradJOrth(WorkspaceParams* workspaceparams);