Changeset 23161

Timestamp:

08/22/18 11:16:00 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: working on Stokes solver with Luca

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (1 diff)
• analyses/StressbalanceAnalysis.cpp (modified) (1 diff)
• solutionsequences/solutionsequence_schurcg.cpp (added)
• solutionsequences/solutionsequences.h (modified) (1 diff)
• toolkits/petsc/patches/PetscOptionsDetermineSolverType.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/Makefile.am

@@ -251 +251 @@
                                         ./solutionsequences/solutionsequence_newton.cpp\
                                         ./solutionsequences/solutionsequence_fct.cpp\
+                                        ./solutionsequences/solutionsequence_schurcg.cpp\
                                         ./solutionsequences/convergence.cpp\
                                         ./classes/Options/Options.cpp\

issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp

@@ -944 +944 @@
 
                 femmodel->SetCurrentConfiguration(StressbalanceAnalysisEnum);
-                if (fe_FS==XTaylorHoodEnum)
+
+                bool is_schur_cg_solver = false;
+                #ifdef _HAVE_PETSC_
+                int solver_type;
+                PetscOptionsDetermineSolverType(&solver_type);
+                if(solver_type==FSSolverEnum) is_schur_cg_solver = true;
+                #endif
+
+                if(is_schur_cg_solver)
+                 solutionsequence_schurcg(femmodel);
+                else if (fe_FS==XTaylorHoodEnum)
                  solutionsequence_la_theta(femmodel);
                 else if (fe_FS==LATaylorHoodEnum || fe_FS==LACrouzeixRaviartEnum)

issm/trunk-jpl/src/c/solutionsequences/solutionsequences.h

@@ -23 +23 @@
 void solutionsequence_la_theta(FemModel* femmodel);
 void solutionsequence_adjoint_linear(FemModel* femmodel);
+void solutionsequence_schurcg(FemModel* femmodel);
 
 /*convergence*/

issm/trunk-jpl/src/c/toolkits/petsc/patches/PetscOptionsDetermineSolverType.cpp

@@ -72 +72 @@
         PetscOptionsGetString(PETSC_NULL,"-issm_option_solver",&option[0],100,&flag);
         #endif
-        if (strcmp(option,"FS")==0){
+        if(strcmp(option,"FS")==0 || strcmp(option,"stokes")==0){
                 solver_type=FSSolverEnum;
         }