Changeset 23215

Timestamp:

09/04/18 13:12:28 (7 years ago)

Author:

wester

Message:

CHG: Added SchurCG switch to control method

Location:

issm/trunk-jpl/src/c/cores

Files:

• adjointstressbalance_core.cpp (modified) (1 diff)
• stressbalance_core.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/cores/adjointstressbalance_core.cpp

@@ -31 +31 @@
         if(VerboseSolution()) _printf0_("   computing velocities\n");
         femmodel->SetCurrentConfiguration(StressbalanceAnalysisEnum);
+        
+        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(isFS){
                 if (fe_FS==LATaylorHoodEnum || fe_FS==LACrouzeixRaviartEnum)
                  solutionsequence_la(femmodel);
+                else if(is_schur_cg_solver)
+                 solutionsequence_schurcg(femmodel);
                 else
                  solutionsequence_nonlinear(femmodel,conserve_loads); 

issm/trunk-jpl/src/c/cores/stressbalance_core.cpp

@@ -37 +37 @@
 
         if(VerboseSolution()) _printf0_("   computing new velocity\n");
-
         /*Compute slopes if necessary */
         if(isSIA || (isFS && domaintype==Domain2DverticalEnum)) surfaceslope_core(femmodel);