This commit is contained in:
Anthony Scemama 2020-07-21 17:40:50 +02:00
parent 04594fab4f
commit 3d5a003050
2 changed files with 84 additions and 63 deletions

View File

@ -4552,13 +4552,15 @@ for basis in ['dz', 'tz', 'qz']:
print("Basis,Method,Mu,Molecule,TotalEnergy,TotalEnergyErr,AtomizationEnergy,AtomizationEnergyErr,Ndet")
def print_data(x,basis,method,mu):
ndet = ""
ndet = ","
if mu is None:
mu = ""
if len(x[0]) == 5:
for line in x[2:]:
if line[0] != "":
if mu is not "":
if mu == "opt":
ndet = ""
elif mu is not "":
ndet = line[-1]
line = [ line[0], line[1], "", line[2], ""]
line = ",".join([str(x) for x in line[:5]])
@ -4566,7 +4568,9 @@ def print_data(x,basis,method,mu):
else:
for line in x[2:]:
if line[0] != "":
if mu is not "":
if mu == "opt":
ndet = ""
elif mu is not "":
ndet = line[-1]
line = ",".join([str(x) for x in line[:5]])
print (f"{basis},{method},{mu},{line},{ndet}")
@ -5227,13 +5231,13 @@ summary(raw_data)
Max. : -0.0226 Max. :1.1423 Max. :1.1520 Max. :198.3121
NA's :55 NA's :1295 NA's :408 NA's :1343
Ndet ref ae.diff
Min. : 0 Min. :0.00000 Min. :-70.699
1st Qu.: 31 1st Qu.:0.09243 1st Qu.: -5.196
Median : 899 Median :0.24300 Median : 0.000
Mean : 1229087 Mean :0.29096 Mean : -3.109
3rd Qu.: 78705 3rd Qu.:0.42940 3rd Qu.: 0.000
Min. : 1 Min. :0.00000 Min. :-70.699
1st Qu.: 43 1st Qu.:0.09243 1st Qu.: -5.196
Median : 1200 Median :0.24300 Median : 0.000
Mean : 1265121 Mean :0.29096 Mean : -3.109
3rd Qu.: 91236 3rd Qu.:0.42940 3rd Qu.: 0.000
Max. :19555662 Max. :1.13690 Max. : 12.632
NA's :1139 NA's :408
NA's :1194 NA's :408
#+end_example
*** Figure energy H2O
@ -5789,6 +5793,44 @@ p
#+RESULTS:
[[file:/tmp/babel-RBQjE9/figureD9kKIs.png]]
*** Fraction of determinants
#+begin_src R :results output :exports both :session *R*
molecules <- levels(ref$"Molecule")
raw_data$"NdetFraction" <- as.numeric(levels(factor(raw_data$"Mu")))
molecules="H2O"
for (mol in molecules)
{
fraction = list()
data <- subset(raw_data, (Method == "DMC" & Basis == "cc-pVDZ" & Molecule == mol ))
data$"Mu" <- as.numeric(levels(factor(data$"Mu")))
NdetFCI <- subset(data, Mu == Inf)$Ndet
print (NdetFCI)
fraction <- data["Ndet"]/NdetFCI * 100.
print ("COUCOU")
for (x in fraction) {
print(row(x))
}
print (fraction)
}
#+end_src
#+RESULTS:
#+begin_example
Error in `$<-.data.frame`(`*tmp*`, "NdetFraction", value = c(NA, 0, 0.25, :
replacement has 9 rows, data has 3070
In addition: Warning message:
NAs introduced by coercion
[1] 109904
[1] "COUCOU"
Error in row(x) : a matrix-like object is required as argument to 'row'
In addition: Warning message:
In as.numeric(levels(factor(data$Mu))) : NAs introduced by coercion
#+end_example
*** Figure MAD R DZ
#+begin_src R :results output :session *R* :exports both
data <- data.frame(ref["Molecule"])

View File

@ -566,64 +566,43 @@ The 55 molecules of the benchmark for the Gaussian-1
theory\cite{Pople_1989,Curtiss_1990} were chosen to test the quality
of the RSDFT-CIPSI trial wave functions for energy differences.
\begin{table}[h]
\centering
\begin{tabular}{lcrr}
Method & Basis & $\mu$ & MAD (kcal/mol) \\
\hline
PBE & VDZ-BFD & & 5.02 \\
& VTZ-BFD & & 4.57 \\
& VQZ-BFD & & 5.31 \\
BLYP & VDZ-BFD & & 9.53 \\
& VTZ-BFD & & 5.58 \\
& VQZ-BFD & & 5.86 \\
PBE0 & VDZ-BFD & & 11.20 \\
& VTZ-BFD & & 6.40 \\
& VQZ-BFD & & 6.28 \\
B3LYP & VDZ-BFD & & 11.27 \\
& VTZ-BFD & & 7.27 \\
& VQZ-BFD & & 6.75 \\
\hline
CCSD(T) & VDZ-BFD & & 24.10 \\
& VTZ-BFD & & 9.11 \\
& VQZ-BFD & & 4.52 \\
\hline
RSDFT-CIPSI & VDZ-BFD & 0 & 10.08 \\
& & 1/4 & 5.55 \\
& & 1/2 & 13.42 \\
& & 1 & 17.07 \\
& & 2 & 19.20 \\
& & 5 & 22.93 \\
& & $\infty$ & 23.62 \\
& VTZ-BFD & 0 & 6.31 \\
& & 1/4 & 4.58 \\
& & 1/2 & 6.77 \\
& & 1 & 9.06 \\
& VQZ-BFD & 0 & 6.35 \\
& & 1/4 & 5.48 \\
& & 1/2 & 6.35 \\
\hline
DMC/RSDFT-CIPSI & VDZ-BFD & 0 & 5.07 $\pm$ 0.44 \\
& & 1/4 & 4.04 $\pm$ 0.37 \\
& & 1/2 & 3.74 $\pm$ 0.35 \\
& & 1 & 5.42 $\pm$ 0.29 \\
& & 2 & 5.98 $\pm$ 0.83 \\
& & 5 & 6.18 $\pm$ 0.84 \\
& & $\infty$ & 7.38 $\pm$ 1.08 \\
& & Optimal & 5.84 $\pm$ 1.75 \\
& VTZ-BFD & 0 & 3.52 $\pm$ 0.19 \\
& & 1/4 & 3.39 $\pm$ 0.77 \\
& & 1/2 & 2.46 $\pm$ 0.18 \\
& & 1 & 4.38 $\pm$ 0.94 \\
& VQZ-BFD & 0 & 3.16 $\pm$ 0.26 \\
& & 1/4 & 2.90 $\pm$ 0.25 \\
& & 1/2 & 2.06 $\pm$ 0.35 \\
\hline
\end{tabular}
\begin{squeezetable}
\begin{table}
\caption{Mean absolute deviations obtained with the different
methods and basis sets.}
\label{tab:mad}
\begin{ruledtabular}
\begin{tabular}{lrrrr}
Method & \(\mu\) & VDZ-BFD & VTZ-BFD & VQZ-BFD\\
\hline
PBE & 0 & 5.02 & 4.57 & 5.31\\
BLYP & 0 & 9.53 & 5.58 & 5.86\\
PBE0 & 0 & 11.20 & 6.40 & 6.28\\
B3LYP & 0 & 11.27 & 7.27 & 6.75\\
\hline
CCSD(T) & \(\infty\) & 24.10 & 9.11 & 4.52\\
\hline
RSDFT-CIPSI & 0 & 10.08 & 6.31 & 6.35\\
& 1/4 & 5.55 & 4.58 & 5.48\\
& 1/2 & 13.42 & 6.77 & 6.35\\
& 1 & 17.07 & 9.06 & \\
& 2 & 19.20 & & \\
& 5 & 22.93 & & \\
& \(\infty\) & 23.62 & & \\
\hline
DMC@RSDFT-CIPSI & 0 & 5.07 \(\pm\) 0.44 & 3.52 \(\pm\) 0.19 & 3.16 \(\pm\) 0.26\\
& 1/4 & 4.04 \(\pm\) 0.37 & 3.39 \(\pm\) 0.77 & 2.90 \(\pm\) 0.25\\
& 1/2 & 3.74 \(\pm\) 0.35 & 2.46 \(\pm\) 0.18 & 2.06 \(\pm\) 0.35\\
& 1 & 5.42 \(\pm\) 0.29 & 4.38 \(\pm\) 0.94 & \\
& 2 & 5.98 \(\pm\) 0.83 & & \\
& 5 & 6.18 \(\pm\) 0.84 & & \\
& \(\infty\) & 7.38 \(\pm\) 1.08 & & \\
& Opt. & 5.84 \(\pm\) 1.75 & & \\
\end{tabular}
\end{ruledtabular}
\end{table}
\end{squeezetable}
\begin{figure}[h]
\centering