Changeset 4012

Timestamp:

06/03/10 10:20:31 (15 years ago)

Author:

Eric.Larour

Message:

New solver linear core + remodeled slope_core solution

Location:

issm/trunk/src/c/solutions

Files:

• diagnostic_core.cpp (modified) (1 diff)
• slope_core.cpp (modified) (3 diffs)
• solutions.h (modified) (1 diff)
• solver_linear.cpp (added)

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

@@ -87 +87 @@
 
         /*Compute slopes: */
-        slope_core(&surfaceslopex,&surfaceslopey,femmodel,SurfaceAnalysisEnum);
-        slope_core(&bedslopex,&bedslopey,femmodel,BedAnalysisEnum);
-                
-        /*Update: */
-        model->UpdateInputsFromVector(surfaceslopex,SurfaceSlopexEnum,VertexEnum);
-        model->UpdateInputsFromVector(surfaceslopey,SurfaceSlopeyEnum,VertexEnum);
-        model->UpdateInputsFromVector(bedslopex,BedSlopexEnum,VertexEnum);
-        model->UpdateInputsFromVector(bedslopey,BedSlopeyEnum,VertexEnum);
-
+        slope_core(femmodel,SurfaceXAnalysisEnum);
+        slope_core(femmodel,SurfaceYAnalysisEnum);
+        slope_core(femmodel,BedSlopeXAnalysisEnum);
+        slope_core(femmodel,BedSlopeYAnalysisEnum);
+                
         
         if(ishutter){

issm/trunk/src/c/solutions/slope_core.cpp

@@ -9 +9 @@
 #include "../modules/modules.h"
 
-void slope_core(Vec* pslopex,Vec* pslopey,FemModel* femmodel, int AnalysisEnum){
+void slope_core(FemModel* femmodel, int sub_analysis_type){
 
         /*parameters: */
@@ -16 +16 @@
         bool isstokes;
         bool ishutter;
-        int xanalysis;
-        int yanalysis;
 
         /*output: */
-        Vec slopex=NULL;
-        Vec slopey=NULL; 
+        Vec slope=NULL;
 
         /*Recover some parameters: */
@@ -29 +26 @@
         femmodel->parameters->FindParam(&ishutter,IsHutterEnum);
 
-        if(verbose)_printf_("%s\n","computing slope (x and y derivatives)...");
-
-        /*Specify type of computations: */
-        if(AnalysisEnum==SurfaceAnalysisEnum){
-                xanalysis=SurfaceXAnalysisEnum;
-                yanalysis=SurfaceYAnalysisEnum;
-        }
-        else if(AnalysisEnum==BedAnalysisEnum){
-                xanalysis=BedXAnalysisEnum;
-                yanalysis=BedYAnalysisEnum;
-        }
-        else ISSMERROR("%s%s%s"," analysis ",EnumAsString(AnalysisEnum)," not supported yet!");
-
+        if(verbose)_printf_("%s\n","computing slope...");
 
         /*Early return possible? */
-        if(!ishutter && AnalysisEnum==SurfaceAnalysisEnum){
-                /*no need to compute Surface Slope except for Hutter: */
-                *pslopex=NULL;
-                *pslopey=NULL;
-                return;
-        }
-        if(!isstokes && AnalysisEnum==BedAnalysisEnum){
-                /*no need to compute Bed Slope except for full Stokes: */
-                *pslopex=NULL;
-                *pslopey=NULL;
-                return;
-        }
+        if(!ishutter && AnalysisEnum==SurfaceAnalysisEnum) return;
+        if(!isstokes && AnalysisEnum==BedAnalysisEnum) return;
+
+        /*Call on core computations: */
+        solver_linear(&slope,femmodel,SlopecomputeAnalysisEnum,sub_analysis_type);
         
-        
-        /*Call on core computations: */
-        diagnostic_core_linear(&slopex,femmodel,SlopecomputeAnalysisEnum,xanalysis);
-        diagnostic_core_linear(&slopey,femmodel,SlopecomputeAnalysisEnum,yanalysis);
+        /*Plug solution into inputs: */
+        UpdateInputsFromSolutionx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,slope,analysis_type, sub_analysis_type);
 
         /*extrude if we are in 3D: */
         if (dim==3){
-                if(verbose)_printf_("%s\n","extruding slopes in 3d...");
-                FieldExtrudex( slopex, femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,"slopex",0);
-                FieldExtrudex( slopey, femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,"slopey",0);
+                if(verbose)_printf_("%s\n","extruding slope in 3d...");
+                switch(sub_analysis_type){
+                        case SurfaceXAnalysisEnum:
+                                InputsExtrudex( femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SurfaceSlopeXEnum,0);
+                        case SurfaceYAnalysisEnum:
+                                InputsExtrudex( femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SurfaceSlopeYEnum,0);
+                        case BedXAnalysisEnum:
+                                InputsExtrudex( femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BedSlopeXEnum,0);
+                        case BedYAnalysisEnum:
+                                InputsExtrudex( femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BedSlopeYEnum,0);
+                        default: ISSMERROR("%s%s%s"," sub_analysis_type ",EnumAsString(sub_analysis_type)," not supported yet!");
+                }
         }
 
-        /*Assign output pointers:*/
-        *pslopex=slopex;
-        *pslopey=slopey;
+        /*Free ressources:*/
+        VecFree(&slope);
 }

issm/trunk/src/c/solutions/solutions.h

@@ -32 +32 @@
 void diagnostic_core_nonlinear(Vec* pug,Mat* pK_ff0,Mat* pK_fs0, DataSet* loads, FemModel* fem,int analysis_type,int sub_analysis_type);
 void diagnostic_core_linear(Vec* ppg,FemModel* fem,int  analysis_type,int sub_analysis_type);
-void slope_core(Vec* pslopex,Vec* pslopey,FemModel* fem,int AnalysisEnum);
-
-
-
+void solver_linear(Vec* ppg,FemModel* fem,int  analysis_type,int sub_analysis_type);
+void slope_core(FemModel* fem,int sub_analysis_type);