mirror of
https://github.com/QuantumPackage/qp2.git
synced 2024-08-30 15:53:42 +02:00
![Anthony Scemama](/assets/img/avatar_default.png)
* fixed laplacian of aos * corrected the laplacians of aos * added dft_one_e * added new feature for new dft functionals * changed the configure to add new functionals * changed the configure * added dft_one_e/README.rst * added README.rst in new_functionals * added source/programmers_guide/new_ks.rst * Thesis Yann * Added gmp installation in configure * improved qp_e_conv_fci * Doc * Typos * Added variance_max * Fixed completion in qp_create * modif TODO * fixed DFT potential for n_states gt 1 * improved pot pbe * trying to improve sr PBE * fixed potential pbe * fixed the vxc smashed for pbe sr and normal * Comments in selection * bug fixed by peter * Fixed bug with zero beta electrons * Update README.rst * Update e_xc_new_func.irp.f * Update links.rst * Update quickstart.rst * Update quickstart.rst * updated cipsi * Fixed energies of non-expected s2 (#9) * Moved diag_algorithm in Davdison * Add print_ci_vector in tools (#11) * Fixed energies of non-expected s2 * Moved diag_algorithm in Davdison * Fixed travis * Added print_ci_vector * Documentation * Cleaned qp_set_mo_class.ml * Removed Core in taskserver * Merge develop-toto and manus (#12) * Fixed energies of non-expected s2 * Moved diag_algorithm in Davdison * Fixed travis * Added print_ci_vector * Documentation * Cleaned qp_set_mo_class.ml * Removed Core in taskserver * Frozen core for heavy atoms * Improved molden module * In sync with manus * Fixed some of the documentation errors * Develop toto (#13) * Fixed energies of non-expected s2 * Moved diag_algorithm in Davdison * Fixed travis * Added print_ci_vector * Documentation * Cleaned qp_set_mo_class.ml * Removed Core in taskserver * Frozen core for heavy atoms * Improved molden module * In sync with manus * Fixed some of the documentation errors * Develop manus (#14) * modified printing for rpt2 * Comment * Fixed plugins * Scripting for functionals * Documentation * Develop (#10) * fixed laplacian of aos * corrected the laplacians of aos * added dft_one_e * added new feature for new dft functionals * changed the configure to add new functionals * changed the configure * added dft_one_e/README.rst * added README.rst in new_functionals * added source/programmers_guide/new_ks.rst * Thesis Yann * Added gmp installation in configure * improved qp_e_conv_fci * Doc * Typos * Added variance_max * Fixed completion in qp_create * modif TODO * fixed DFT potential for n_states gt 1 * improved pot pbe * trying to improve sr PBE * fixed potential pbe * fixed the vxc smashed for pbe sr and normal * Comments in selection * bug fixed by peter * Fixed bug with zero beta electrons * Update README.rst * Update e_xc_new_func.irp.f * Update links.rst * Update quickstart.rst * Update quickstart.rst * updated cipsi * Fixed energies of non-expected s2 (#9) * Moved diag_algorithm in Davdison * some modifs * modified gfortran_debug.cfg * fixed automatization of functionals * modified e_xc_general.irp.f * minor modifs in ref_bitmask.irp.f * modifying functionals * rs_ks_scf and ks_scf compiles with the automatic handling of functionals * removed prints * fixed configure * fixed the new functionals * Merge toto * modified automatic functionals * Changed python into python2 * from_xyz suppressed * Cleaning repo * Update README.md * Update README.md * Contributors * Update GITHUB.md * bibtex
339 lines
9.5 KiB
OCaml
339 lines
9.5 KiB
OCaml
open Qputils
|
|
open Qptypes
|
|
|
|
(*
|
|
* Command-line arguments
|
|
* ----------------------
|
|
*)
|
|
|
|
let build_mask from upto n_int =
|
|
let from = MO_number.to_int from
|
|
and upto = MO_number.to_int upto
|
|
and n_int = N_int_number.to_int n_int
|
|
in
|
|
let rec build_mask bit = function
|
|
| 0 -> []
|
|
| i ->
|
|
if ( i = upto ) then
|
|
Bit.One::(build_mask Bit.One (i-1))
|
|
else if ( i = from ) then
|
|
Bit.One::(build_mask Bit.Zero (i-1))
|
|
else
|
|
bit::(build_mask bit (i-1))
|
|
in
|
|
let starting_bit =
|
|
if ( (upto >= n_int*64) || (upto < 0) ) then Bit.One
|
|
else Bit.Zero
|
|
in
|
|
build_mask starting_bit (n_int*64)
|
|
|> List.rev
|
|
|
|
|
|
|
|
type t = MO_class.t option
|
|
|
|
|
|
let set ~core ~inact ~act ~virt ~del =
|
|
|
|
let mo_num =
|
|
Ezfio.get_mo_basis_mo_num ()
|
|
in
|
|
let n_int =
|
|
try N_int_number.of_int (Ezfio.get_determinants_n_int ())
|
|
with _ -> Bitlist.n_int_of_mo_num mo_num
|
|
in
|
|
|
|
|
|
let mo_class =
|
|
Array.init mo_num (fun i -> None)
|
|
in
|
|
|
|
(* Check input data *)
|
|
let apply_class l =
|
|
let rec apply_class t = function
|
|
| [] -> ()
|
|
| k::tail -> let i = MO_number.to_int k in
|
|
begin
|
|
match mo_class.(i-1) with
|
|
| None -> mo_class.(i-1) <- Some t ;
|
|
apply_class t tail;
|
|
| Some x -> failwith
|
|
(Printf.sprintf "Orbital %d is defined both in the %s and %s spaces"
|
|
i (MO_class.to_string x) (MO_class.to_string t))
|
|
end
|
|
in
|
|
match l with
|
|
| MO_class.Core x -> apply_class (MO_class.Core []) x
|
|
| MO_class.Inactive x -> apply_class (MO_class.Inactive []) x
|
|
| MO_class.Active x -> apply_class (MO_class.Active []) x
|
|
| MO_class.Virtual x -> apply_class (MO_class.Virtual []) x
|
|
| MO_class.Deleted x -> apply_class (MO_class.Deleted []) x
|
|
in
|
|
|
|
let check f x =
|
|
try f x with Invalid_argument a ->
|
|
begin
|
|
Printf.printf "Number of MOs: %d\n%!" mo_num;
|
|
raise (Invalid_argument a)
|
|
end
|
|
in
|
|
|
|
let core = check MO_class.create_core core in
|
|
let inact = check MO_class.create_inactive inact in
|
|
let act = check MO_class.create_active act in
|
|
let virt = check MO_class.create_virtual virt in
|
|
let del = check MO_class.create_deleted del in
|
|
|
|
apply_class core ;
|
|
apply_class inact ;
|
|
apply_class act ;
|
|
apply_class virt ;
|
|
apply_class del ;
|
|
|
|
|
|
|
|
for i=1 to (Array.length mo_class)
|
|
do
|
|
if (mo_class.(i-1) = None) then
|
|
failwith (Printf.sprintf "Orbital %d is not specified (mo_num = %d)" i mo_num)
|
|
done;
|
|
|
|
|
|
(* Debug output *)
|
|
MO_class.to_string core |> print_endline ;
|
|
MO_class.to_string inact |> print_endline ;
|
|
MO_class.to_string act |> print_endline ;
|
|
MO_class.to_string virt |> print_endline ;
|
|
MO_class.to_string del |> print_endline ;
|
|
|
|
(* Create masks *)
|
|
let ia = Excitation.create_single inact act
|
|
and aa = Excitation.create_single act act
|
|
and av = Excitation.create_single act virt
|
|
in
|
|
let single_excitations = [ ia ; aa ; av ]
|
|
|> List.map (fun x ->
|
|
let open Excitation in
|
|
match x with
|
|
| Single (x,y) ->
|
|
( MO_class.to_bitlist n_int (Hole.to_mo_class x),
|
|
MO_class.to_bitlist n_int (Particle.to_mo_class y) )
|
|
| Double _ -> assert false
|
|
)
|
|
|
|
and double_excitations = [
|
|
Excitation.double_of_singles ia ia ;
|
|
Excitation.double_of_singles ia aa ;
|
|
Excitation.double_of_singles ia av ;
|
|
Excitation.double_of_singles aa aa ;
|
|
Excitation.double_of_singles aa av ;
|
|
Excitation.double_of_singles av av ]
|
|
|> List.map (fun x ->
|
|
let open Excitation in
|
|
match x with
|
|
| Single _ -> assert false
|
|
| Double (x,y,z,t) ->
|
|
( MO_class.to_bitlist n_int (Hole.to_mo_class x),
|
|
MO_class.to_bitlist n_int (Particle.to_mo_class y) ,
|
|
MO_class.to_bitlist n_int (Hole.to_mo_class z),
|
|
MO_class.to_bitlist n_int (Particle.to_mo_class t) )
|
|
)
|
|
in
|
|
|
|
let extract_hole (h,_) = h
|
|
and extract_particle (_,p) = p
|
|
and extract_hole1 (h,_,_,_) = h
|
|
and extract_particle1 (_,p,_,_) = p
|
|
and extract_hole2 (_,_,h,_) = h
|
|
and extract_particle2 (_,_,_,p) = p
|
|
in
|
|
let init = Bitlist.zero n_int in
|
|
let result = [
|
|
List.map extract_hole single_excitations
|
|
|> List.fold_left Bitlist.or_operator init;
|
|
List.map extract_particle single_excitations
|
|
|> List.fold_left Bitlist.or_operator init;
|
|
List.map extract_hole1 double_excitations
|
|
|> List.fold_left Bitlist.or_operator init;
|
|
List.map extract_particle1 double_excitations
|
|
|> List.fold_left Bitlist.or_operator init;
|
|
List.map extract_hole2 double_excitations
|
|
|> List.fold_left Bitlist.or_operator init;
|
|
List.map extract_particle2 double_excitations
|
|
|> List.fold_left Bitlist.or_operator init;
|
|
]
|
|
in
|
|
|
|
(* Debug masks in output
|
|
List.iter ~f:(fun x-> print_endline (Bitlist.to_string x)) result;
|
|
*)
|
|
|
|
(* Write masks *)
|
|
let result =
|
|
List.map (fun x ->
|
|
let y = Bitlist.to_int64_list x in y@y )
|
|
result
|
|
|> List.concat
|
|
in
|
|
|
|
Ezfio.set_bitmasks_n_int (N_int_number.to_int n_int);
|
|
Ezfio.set_bitmasks_bit_kind 8;
|
|
Ezfio.set_bitmasks_n_mask_gen 1;
|
|
Ezfio.ezfio_array_of_list ~rank:4 ~dim:([| (N_int_number.to_int n_int) ; 2; 6; 1|]) ~data:result
|
|
|> Ezfio.set_bitmasks_generators ;
|
|
|
|
let result =
|
|
let open Excitation in
|
|
match aa with
|
|
| Double _ -> assert false
|
|
| Single (x,y) ->
|
|
( MO_class.to_bitlist n_int (Hole.to_mo_class x) ) @
|
|
( MO_class.to_bitlist n_int (Particle.to_mo_class y) )
|
|
|> Bitlist.to_int64_list
|
|
in
|
|
Ezfio.set_bitmasks_n_mask_cas 1;
|
|
Ezfio.ezfio_array_of_list ~rank:3 ~dim:([| (N_int_number.to_int n_int) ; 2; 1|]) ~data:result
|
|
|> Ezfio.set_bitmasks_cas;
|
|
|
|
let data =
|
|
Array.to_list mo_class
|
|
|> List.map (fun x -> match x with
|
|
|None -> assert false
|
|
| Some x -> MO_class.to_string x
|
|
)
|
|
in
|
|
Ezfio.ezfio_array_of_list ~rank:1 ~dim:[| mo_num |] ~data
|
|
|> Ezfio.set_mo_basis_mo_class
|
|
|
|
|
|
|
|
let get () =
|
|
|
|
let data =
|
|
match Input.Electrons.read () with
|
|
| None -> failwith "Unable to read electrons"
|
|
| Some x -> x
|
|
in
|
|
let elec_alpha_num =
|
|
Elec_alpha_number.to_int data.Input.Electrons.elec_alpha_num
|
|
and elec_beta_num =
|
|
Elec_beta_number.to_int data.Input.Electrons.elec_beta_num
|
|
in
|
|
|
|
let data =
|
|
match Input.Mo_basis.read () with
|
|
| None -> failwith "Unable to read MOs"
|
|
| Some x -> x
|
|
in
|
|
|
|
let mo_num =
|
|
MO_number.to_int data.Input.Mo_basis.mo_num
|
|
in
|
|
|
|
|
|
let n_int =
|
|
try N_int_number.of_int (Ezfio.get_determinants_n_int ())
|
|
with _ -> Bitlist.n_int_of_mo_num mo_num
|
|
in
|
|
|
|
Printf.printf "Electrons: %d %d\n" elec_alpha_num elec_beta_num;
|
|
Printf.printf "MO : %d\n" mo_num;
|
|
Printf.printf "n_int: %d\n" (N_int_number.to_int n_int);
|
|
|
|
|
|
let rec work ?(core="[") ?(inact="[") ?(act="[") ?(virt="[") ?(del="[") i l =
|
|
match l with
|
|
| [] ->
|
|
let (core, inact, act, virt, del) =
|
|
(core ^"]",
|
|
inact ^"]",
|
|
act ^"]",
|
|
virt ^"]",
|
|
del ^"]")
|
|
in
|
|
set ~core ~inact ~act ~virt ~del
|
|
| (MO_class.Core _) :: rest ->
|
|
work ~core:(Printf.sprintf "%s,%d" core i) ~inact ~act ~virt ~del (i+1) rest
|
|
| (MO_class.Inactive _) :: rest ->
|
|
work ~inact:(Printf.sprintf "%s,%d" inact i) ~core ~act ~virt ~del (i+1) rest
|
|
| (MO_class.Active _) :: rest ->
|
|
work ~act:(Printf.sprintf "%s,%d" act i) ~inact ~core ~virt ~del (i+1) rest
|
|
| (MO_class.Virtual _) :: rest ->
|
|
work ~virt:(Printf.sprintf "%s,%d" virt i) ~inact ~act ~core ~del (i+1) rest
|
|
| (MO_class.Deleted _) :: rest ->
|
|
work ~del:(Printf.sprintf "%s,%d" del i) ~inact ~act ~virt ~core (i+1) rest
|
|
in
|
|
work 1 (Array.to_list data.Input.Mo_basis.mo_class)
|
|
|
|
|
|
|
|
let run ~q ?(core="[]") ?(inact="[]") ?(act="[]") ?(virt="[]") ?(del="[]") ezfio_filename =
|
|
|
|
Ezfio.set_file ezfio_filename ;
|
|
if not (Ezfio.has_mo_basis_mo_num ()) then
|
|
failwith "mo_basis/mo_num not found" ;
|
|
|
|
if q then
|
|
get ()
|
|
else
|
|
set ~core ~inact ~act ~virt ~del
|
|
|
|
|
|
|
|
let () =
|
|
let open Command_line in
|
|
begin
|
|
"Set the orbital classes in an EZFIO directory. The range of MOs has the form : \"[36-53,72-107,126-131]\"."
|
|
|> set_footer_doc ;
|
|
|
|
[ { opt=Optional ; short='c'; long="core";
|
|
arg=With_arg "<range>";
|
|
doc="Range of core MOs." };
|
|
|
|
{ opt=Optional ; short='i'; long="inact";
|
|
arg=With_arg "<range>";
|
|
doc="Range of inactive MOs." };
|
|
|
|
{ opt=Optional ; short='a'; long="act";
|
|
arg=With_arg "<range>";
|
|
doc="Range of active MOs." };
|
|
|
|
{ opt=Optional ; short='v'; long="virt";
|
|
arg=With_arg "<range>";
|
|
doc="Range of virtual MOs." };
|
|
|
|
{ opt=Optional ; short='d'; long="del";
|
|
arg=With_arg "<range>";
|
|
doc="Range of deleted MOs." };
|
|
|
|
{ opt=Optional ; short='q'; long="query";
|
|
arg=Without_arg;
|
|
doc="Print the current MO classes." };
|
|
|
|
anonymous "EZFIO_DIR" Mandatory "EZFIO directory.";
|
|
] |> set_specs
|
|
end;
|
|
|
|
(* Handle options *)
|
|
|
|
let core = Command_line.get "core"
|
|
and inact = Command_line.get "inact"
|
|
and act = Command_line.get "act"
|
|
and virt = Command_line.get "virt"
|
|
and del = Command_line.get "del"
|
|
and q = Command_line.get_bool "query"
|
|
in
|
|
|
|
|
|
let ezfio_filename =
|
|
match Command_line.anon_args () with
|
|
| [x] -> x
|
|
| _ -> (Command_line.help () ; failwith "EZFIO_FILE is missing")
|
|
in
|
|
run ~q ?core ?inact ?act ?virt ?del ezfio_filename
|
|
|
|
|
|
|
|
|
|
|