From b63a70babef7f7ace020c93a7390bfcaf03dfb52 Mon Sep 17 00:00:00 2001 From: Guillaume Demesy <guillaume.demesy@fresnel.fr> Date: Thu, 6 Sep 2018 12:49:50 +0200 Subject: [PATCH] some slepc options are now default --- NonLinearEVP/NonLinearEVP.pro | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/NonLinearEVP/NonLinearEVP.pro b/NonLinearEVP/NonLinearEVP.pro index 95cbe18..137232a 100644 --- a/NonLinearEVP/NonLinearEVP.pro +++ b/NonLinearEVP/NonLinearEVP.pro @@ -498,15 +498,15 @@ PostOperation { } eig_tol = 1e-6; -slepc_options_nep_pol = " -nep_max_it 1000 -nep_type nleigs -nep_target_magnitude "; -// slepc_options_nep_rat = Sprintf(" -nep_max_it 1000 -nep_type nleigs -nep_rational -nep_tol %.10f -nep_view ",eig_tol); -slepc_options_nep_rat = Sprintf(" -nep_type nleigs -nep_rational "); - +// slepc_options_nep_rat = Sprintf(" -nep_max_it 100 -nep_type nleigs -nep_rational -nep_tol %.10f -nep_view ",eig_tol); +// slepc_options_nep_rat = Sprintf(" -nep_type nleigs -nep_rational -nep_view "); +slepc_options_nep_rat = Sprintf(" -nep_view "); // // Warning petsc > 3.9 st_pc_factor_mat_solver_package => st_pc_factor_mat_solver_type -slepc_options_st = " -solve -st_type sinvert -st_ksp_type preonly -st_pc_type lu -st_pc_factor_mat_solver_type mumps -petsc_prealloc 200 -pos"; +// TODO all this should now be default +slepc_options_st = " -st_type sinvert -st_ksp_type preonly -st_pc_type lu -st_pc_factor_mat_solver_type mumps "; -slepc_options_pep = Sprintf(" -pep_max_it 400 -pep_target_magnitude -pep_tol %.10f ",eig_tol); +slepc_options_pep = Sprintf(" -pep_max_it 400 -pep_target_magnitude -pep_tol %.10f -pep_view ",eig_tol); If (flag_res==0) which_res="Aux_E"; @@ -543,5 +543,5 @@ EndIf DefineConstant[ R_ = {StrCat("res_",which_res), Name "GetDP/1ResolutionChoices", Visible 1}, - C_ = {Sprintf(StrCat("-solve -pos -slepc ",str_slepc_options,slepc_options_rg)), Name "GetDP/9ComputeCommand", Visible 1}, + C_ = {Sprintf(StrCat("-solve -pos -slepc -petsc_prealloc 200 ",str_slepc_options,slepc_options_rg)), Name "GetDP/9ComputeCommand", Visible 1}, P_ = {StrCat("postop_",which_res), Name "GetDP/2PostOperationChoices", Visible 1}]; -- GitLab