Changeset 4029

Timestamp:

06/09/10 17:02:30 (15 years ago)

Author:

Eric.Larour

Message:

New core solvers used by our solutions

Location:

issm/trunk/src/c

Files:

• EnumDefinitions/EnumDefinitions.h (modified) (2 diffs)
• solutions/diagnostic_core.cpp (modified) (5 diffs)
• solutions/solutions.h (modified) (2 diffs)
• solvers (added)
• solvers/solver_diagnostic_nonlinear.cpp (added)
• solvers/solver_linear.cpp (added)
• solvers/solver_thermal_nonlinear.cpp (added)
• solvers/solvers.h (added)

issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h

@@ -20 +20 @@
         VerticesEnum,
         /*}}}*/
+        /*Solution types {{{1 */
+        SolutionTypeEnum,
+        DiagnosticSolutionEnum,
+        SurfaceSlopeSolutionEnum,
+        BedSlopeSolutionEnum,
+        /*}}}*/
         /*Analysis types {{{1 */
-        SolutionTypeEnum,
-        AnalysisEnum,
         AnalysisTypeEnum,
         SubAnalysisTypeEnum,
@@ -46 +50 @@
         SteadyAnalysisEnum,
         //slope
-        SurfaceAnalysisEnum,
         SlopeComputeAnalysisEnum,
-        BedXAnalysisEnum,
-        BedYAnalysisEnum,
-        BedAnalysisEnum,
-        SurfaceXAnalysisEnum,
-        SurfaceYAnalysisEnum,
+        BedSlopeXAnalysisEnum,
+        BedSlopeYAnalysisEnum,
+        SurfaceSlopeXAnalysisEnum,
+        SurfaceSlopeYAnalysisEnum,
         //prognostic
         Balancedthickness2AnalysisEnum,

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

@@ -22 +22 @@
         double stokesreconditioning;
 
-        //first recover parameters needed to drive the solution
+        /* recover parameters: */
         femmodel->parameters->FindParam(&verbose,VerboseEnum);
         femmodel->parameters->FindParam(&dim,DimEnum);
@@ -40 +40 @@
 
         /*Compute slopes: */
-        if(ishutter){
-                slope_core(femmodel,SurfaceXAnalysisEnum);
-                slope_core(femmodel,SurfaceYAnalysisEnum);
-        }
-        if(isstokes){
-                slope_core(femmodel,BedSlopeXAnalysisEnum);
-                slope_core(femmodel,BedSlopeYAnalysisEnum);
-        }
+        if(ishutter) surfaceslope_core(femmodel);
+        if(isstokes) bedslope_core(femmodel);
                 
         if(ishutter){
                         
                 if(verbose)_printf_("%s\n"," computing hutter velocities...");
-                solve_linear(NULL,femmodel,DiagnosticAnalysisEnum,HutterAnalysisEnum);
+                solver_linear(NULL,femmodel,DiagnosticAnalysisEnum,HutterAnalysisEnum);
                 
                 if (ismacayealpattyn) ResetBoundaryConditions(femmodel,DiagnosticAnalysisEnum,HorizAnalysisEnum);
@@ -60 +54 @@
                 
                 if(verbose)_printf_("%s\n"," computing horizontal velocities...");
-                diagnostic_core_nonlinear(NULL,NULL,NULL,femmodel,false,DiagnosticAnalysisEnum,HorizAnalysisEnum); //false means we expose loads to changes inside the solution
+                solver_diagnostic_nonlinear(NULL,NULL,NULL,femmodel,false,DiagnosticAnalysisEnum,HorizAnalysisEnum); //false means we expose loads to changes inside the solution
         }
         
@@ -67 +61 @@
 
                 if(verbose)_printf_("%s\n"," computing vertical velocities...");
-                solve_linear(NULL,femmodel,DiagnosticAnalysisEnum,VertAnalysisEnum);
+                solver_linear(NULL,femmodel,DiagnosticAnalysisEnum,VertAnalysisEnum);
 
                 if (isstokes){
@@ -79 +73 @@
 
                         if(verbose)_printf_("%s\n"," computing stokes velocities and pressure ...");
-                        diagnostic_core_nonlinear(NULL,NULL,NULL,NULL,fem_ds,DiagnosticAnalysisEnum,StokesAnalysisEnum);
+                        solver_diagnostic_nonlinear(NULL,NULL,NULL,NULL,fem_ds,DiagnosticAnalysisEnum,StokesAnalysisEnum);
                 }
         }

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

@@ -3 +3 @@
  */
 
-#ifndef PARALLEL_H_
-#define PARALLEL_H_
+#ifndef SOLUTIONS_H_
+#define SOLUTIONS_H_
 
 #include "../objects/objects.h"
@@ -29 +29 @@
 void slope_core(FemModel* fem,int sub_analysis_type);
 
-/*computational cores: */
-void thermal_core_nonlinear(Vec* ptg,double* pmelting_offset,FemModel* fem,int analysis_type,int sub_analysis_type);
-void diagnostic_core_nonlinear(Vec* pug,Mat* pK_ff0,Mat* pK_fs0, FemModel* fem,bool conserve_loads,int analysis_type,int sub_analysis_type);
-void diagnostic_core_linear(Vec* ppg,FemModel* fem,int  analysis_type,int sub_analysis_type);
-void solver_linear(Vec* pug, FemModel* femmodel,int  analysis_type,int sub_analysis_type);
-
-
 //int GradJOrth(WorkspaceParams* workspaceparams);
 void convergence(int* pconverged, Mat K_ff,Vec p_f,Vec u_f,Vec u_f_old,Parameters* parameters);