Commit fe4a6768 authored by Yingzhou Li's avatar Yingzhou Li
Browse files

Merge branch 'defaultSolver' into 'master'

Added default solver to case

See merge request !2
parents e4868860 a5e773fc
Pipeline #2054 canceled with stage
......@@ -38,7 +38,7 @@ contains
type(rci_instr), intent(inout) :: iS
select case (r_h%solver)
case (RCI_SOLVER_DAVIDSON)
case (RCI_SOLVER, RCI_SOLVER_DAVIDSON)
call rci_davidson_allocate(r_h, ijob, iS, task)
case (RCI_SOLVER_OMM)
call rci_omm_allocate(r_h, ijob, iS, task)
......@@ -65,7 +65,7 @@ contains
type(rci_instr), intent(inout) :: iS
select case (r_h%solver)
case (RCI_SOLVER_DAVIDSON)
case (RCI_SOLVER, RCI_SOLVER_DAVIDSON)
call rci_davidson_deallocate(r_h, ijob, iS, task)
case (RCI_SOLVER_OMM)
call rci_omm_deallocate(r_h, ijob, iS, task)
......@@ -93,7 +93,7 @@ contains
type(rci_instr), intent(inout) :: iS
select case (r_h%solver)
case (RCI_SOLVER_DAVIDSON)
case (RCI_SOLVER, RCI_SOLVER_DAVIDSON)
call rci_davidson(r_h, ijob, iS, task, resvec)
case (RCI_SOLVER_OMM)
call rci_omm(r_h, ijob, iS, task, resvec)
......
......@@ -56,7 +56,7 @@ contains
r_h%cheb_max_inneriter = 10
select case (solver)
case (RCI_SOLVER_DAVIDSON)
case (RCI_SOLVER, RCI_SOLVER_DAVIDSON)
r_h%n_res = min(4*n_state,n_basis)
r_h%max_n = min(4*n_state,n_basis)
case (RCI_SOLVER_OMM)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment