From 8733aa742ec6afb7142c9d5c562023def38d7a53 Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Mon, 25 Jul 2016 13:51:47 +0200 Subject: [PATCH] Removed check of Jastrow and pseudo --- ocaml/Input.ml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/ocaml/Input.ml b/ocaml/Input.ml index 01e8f97..ba7a001 100644 --- a/ocaml/Input.ml +++ b/ocaml/Input.ml @@ -758,13 +758,6 @@ end = struct let _ = Lazy.force Qputils.ezfio_filename in - let () = - match (Pseudo.read () |> Pseudo.to_bool, t) with - | (false, _) - | (true , None) -> () - | _ -> failwith "Jastrow and Pseudopotentials are incompatible for now" - in - to_string t |> Ezfio.set_jastrow_jast_type @@ -843,8 +836,6 @@ let validate () = Sampling.read () and ts = Time_step.read () - and jast_type = - Jastrow_type.read () and do_pseudo = Pseudo.read () in @@ -900,14 +891,6 @@ let validate () = | _ -> () in - (* Pseudo and Jastrow are incompatible *) - let () = - match (Pseudo.to_bool do_pseudo, jast_type) with - | (true, Jastrow_type.Core ) - | (true, Jastrow_type.Simple) -> failwith "Jastrow and Pseudopotentials are incompatible" - | _ -> () - in - (* Fitcusp is incompatible with pseudo *) let () = let f =