Changeset 23217

Timestamp:

09/05/18 08:39:08 (7 years ago)

Author:

wester

Message:

CHG: Added SchurCG compatibility to control_core.cpp

File:

• issm/trunk-jpl/src/c/cores/control_core.cpp (modified) (2 diffs)

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

@@ -143 +143 @@
         /*Update control input*/
         SetControlInputsFromVectorx(femmodel,X);
-
+        
+        
         /*solve forward: */
         switch(solution_type){
@@ -152 +153 @@
                 case StressbalanceSolutionEnum:
                         femmodel->SetCurrentConfiguration(StressbalanceAnalysisEnum);
-                        solutionsequence_nonlinear(femmodel,conserve_loads); 
-                        break;
+                        
+                        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{
+                         solutionsequence_nonlinear(femmodel,conserve_loads); 
+                        }
+                         break;
                 case BalancethicknessSolutionEnum:
                         femmodel->SetCurrentConfiguration(BalancethicknessAnalysisEnum);