From 8c8ea8363a254bfcd1f9ae062e5e6b0e40cf8a02 Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Wed, 24 Jan 2018 16:34:50 +0100 Subject: [PATCH] Fixed --- Basis/TwoElectronRR.ml | 1 + Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Basis/TwoElectronRR.ml b/Basis/TwoElectronRR.ml index 7619f88..766bcfa 100644 --- a/Basis/TwoElectronRR.ml +++ b/Basis/TwoElectronRR.ml @@ -38,6 +38,7 @@ let hvrr_two_e m (angMom_a, angMom_b, angMom_c, angMom_d) let am = [| angMom_a.(0) ; angMom_a.(1) ; angMom_a.(2) |] and amm = [| angMom_a.(0) ; angMom_a.(1) ; angMom_a.(2) |] and xyz = + match angMom_a with | [|0;0;_|] -> 2 | [|0;_;_|] -> 1 | _ -> 0 diff --git a/Makefile b/Makefile index abe9e5d..df0872a 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ INCLUDE_DIRS=Nuclei,Utils,Basis LIBS= PKGS= OCAMLCFLAGS="-g -warn-error A" -OCAMLOPTFLAGS="opt -O3 -nodynlink -remove-unused-arguments -rounds 16 -inline 16 -inline-max-unroll 16" +OCAMLOPTFLAGS="opt -O3 -nodynlink -remove-unused-arguments -rounds 16 -inline 100 -inline-max-unroll 100" OCAMLBUILD=ocamlbuild -j 0 -cflags $(OCAMLCFLAGS) -lflags $(OCAMLCFLAGS) -Is $(INCLUDE_DIRS) -ocamlopt $(OCAMLOPTFLAGS) MLLFILES=$(wildcard */*.mll) $(wildcard *.mll) MLYFILES=$(wildcard */*.mly) $(wildcard *.mly)