From d56f1c0ff2f8b35ba51f1da1131c667b35bdc2b8 Mon Sep 17 00:00:00 2001
From: Anthony Scemama <scemama@irsamc.ups-tlse.fr>
Date: Fri, 23 Feb 2018 03:25:25 +0100
Subject: [PATCH] Minor changes

---
 Basis/TwoElectronRR.ml           |  5 ++---
 Basis/TwoElectronRRVectorized.ml | 15 +++++++--------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/Basis/TwoElectronRR.ml b/Basis/TwoElectronRR.ml
index 1f3a498..edbe122 100644
--- a/Basis/TwoElectronRR.ml
+++ b/Basis/TwoElectronRR.ml
@@ -148,7 +148,7 @@ let rec hvrr_two_e (angMom_a, angMom_b, angMom_c, angMom_d)
           in Zmap.add map_2d key result;
           result
 
-(*
+    (*
     and trr angMom_a angMom_c =
 
       match (angMom_a.tot, angMom_c.tot) with
@@ -205,11 +205,10 @@ let rec hvrr_two_e (angMom_a, angMom_b, angMom_c, angMom_d)
           Zmap.add map_2d key [|result|];
           result
 
-
-
 *)
     in
 
+
     let vrr a c = 
         (vrr a c).(0)
         (*
diff --git a/Basis/TwoElectronRRVectorized.ml b/Basis/TwoElectronRRVectorized.ml
index 788e76c..1159627 100644
--- a/Basis/TwoElectronRRVectorized.ml
+++ b/Basis/TwoElectronRRVectorized.ml
@@ -344,7 +344,7 @@ let hvrr_two_e_vector (angMom_a, angMom_b, angMom_c, angMom_d)
   and trr_v angMom_a angMom_c =
 
     match (angMom_a.tot, angMom_c.tot) with
-    | (i,0) -> Some (vrr0_v 0 angMom_a)
+    | (i,0) -> Some (vrr0_v angMom_a).(0)
     | (_,_) ->
 
       let key =  Zkey.of_powers_six angMom_a angMom_c in
@@ -472,19 +472,18 @@ let hvrr_two_e_vector (angMom_a, angMom_b, angMom_c, angMom_d)
     Array.fold_left (fun accu c -> accu +. Array.fold_left (+.) 0. c) 0. matrix
   in
 
-  let vrr_v a b = 
+  let vrr_v a c = 
     let v = 
       (*
-      if Array.length zero_m_array < 10 then
-      *)
-      vrr_v 0 a b
-      (*
-      else trr_v a b
+      if c.tot <> 0 then
+        vrr_v 0 a c
+      else trr_v a c
       *)
+      vrr_v 0 a c
     in
     match v with 
-      | None -> 0.
       | Some matrix -> sum matrix
+      | None -> 0.
   in