Skip to content

Commit 8d145da

Browse files
committed
Add tweaks and examples
1 parent 3f9e922 commit 8d145da

19 files changed

Lines changed: 7784 additions & 152 deletions

Examples/sscha_and_aiida/Si.pwi

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
&CONTROL
2+
calculation = 'scf'
3+
etot_conv_thr = 2.0000000000d-05
4+
forc_conv_thr = 1.0000000000d-04
5+
outdir = './out/'
6+
prefix = 'aiida'
7+
pseudo_dir = './pseudo/'
8+
tprnfor = .true.
9+
tstress = .true.
10+
verbosity = 'high'
11+
/
12+
&SYSTEM
13+
degauss = 1.4699723600d-02
14+
ecutrho = 2.4000000000d+02
15+
ecutwfc = 3.0000000000d+01
16+
ibrav = 0
17+
nat = 2
18+
nosym = .false.
19+
ntyp = 1
20+
occupations = 'smearing'
21+
smearing = 'cold'
22+
/
23+
&ELECTRONS
24+
conv_thr = 4.0000000000d-10
25+
electron_maxstep = 80
26+
mixing_beta = 4.0000000000d-01
27+
/
28+
ATOMIC_SPECIES
29+
Si 28.0855 Si.pbesol-n-rrkjus_psl.1.0.0.UPF
30+
ATOMIC_POSITIONS crystal
31+
Si 0.0000000000 0.0000000000 0.0000000000
32+
Si 0.2500000000 0.2500000000 0.2500000000
33+
K_POINTS automatic
34+
11 11 11 0 0 0
35+
CELL_PARAMETERS angstrom
36+
2.7154800000 2.7154800000 0.0000000000
37+
2.7154800000 0.0000000000 2.7154800000
38+
0.0000000000 2.7154800000 2.7154800000

Examples/sscha_and_aiida/analysis.ipynb

Lines changed: 140 additions & 0 deletions
Large diffs are not rendered by default.

Examples/sscha_and_aiida/clean_runs.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,8 @@ rm -r disp_*
66
rm minim_*
77
rm nohup.out
88
rm *.log
9+
rm -r thermal*
10+
rm *.dat
11+
rm *.pdf
912
rm otf_run*
13+
rm input_tmp.in

Examples/sscha_and_aiida/dataset-sscha.xyz

Lines changed: 1638 additions & 0 deletions
Large diffs are not rendered by default.

Examples/sscha_and_aiida/get_sgp.py

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@
88
from ase.build import make_supercell
99

1010
# Define kernel.
11-
sigma = 2.0
12-
power = 1.0
13-
dotprod_kernel = DotProduct(sigma, power)
14-
normdotprod_kernel = NormalizedDotProduct(sigma, power)
11+
sigma_ = 2.0
12+
power_ = 2.0
13+
dotprod_kernel_ = DotProduct(sigma_, power_)
14+
normdotprod_kernel_ = NormalizedDotProduct(sigma_, power_)
1515

1616
# Define remaining parameters for the SGP wrapper.
17-
sigma_e = 0.005
18-
sigma_f = 0.01
19-
sigma_s = 0.001
20-
species_map = {6: 0, 8: 1}
21-
single_atom_energies = {0: 0, 1: 0}
22-
variance_type = "local"
23-
max_iterations = 40
24-
opt_method = "L-BFGS-B"
25-
bounds = [(None, None), (sigma_e, None), (None, None), (None, None)]
17+
sigma_e_ = 0.01
18+
sigma_f_ = 0.1
19+
sigma_s_ = 0.005
20+
species_map_ = {6: 0, 8: 1}
21+
single_atom_energies_ = {0: 0, 1: 0}
22+
variance_type_ = "local"
23+
max_iterations_ = 100
24+
opt_method_ = "L-BFGS-B"
25+
bounds_ = [(None, None), (sigma_e_, None), (None, None), (None, None)]
2626

2727

2828
def get_atoms(a=2.0, sc_size=2, numbers=[6, 8]) -> Atoms:
@@ -69,9 +69,9 @@ def get_empty_sgp(
6969
the_atom_energies=None, kernel_type="NormalizedDotProduct") -> SGP_Wrapper:
7070
"""Return an empty SGP model."""
7171
if kernel_type == "NormalizedDotProduct":
72-
kernel = normdotprod_kernel
72+
kernel = normdotprod_kernel_
7373
elif kernel_type == "DotProduct":
74-
kernel = dotprod_kernel
74+
kernel = dotprod_kernel_
7575

7676
kernel.power = power
7777

@@ -95,22 +95,22 @@ def get_empty_sgp(
9595
cutoff_matrix,
9696
)
9797

98-
species_map = species_map if the_map is None else the_map
99-
single_atom_energies = single_atom_energies if the_map is None else the_atom_energies
98+
species_map = species_map_ if the_map is None else the_map
99+
single_atom_energies = single_atom_energies_ if the_map is None else the_atom_energies
100100

101101
empty_sgp = SGP_Wrapper(
102102
[kernel],
103103
[b2_calc],
104104
cutoff,
105-
sigma_e,
106-
sigma_f,
107-
sigma_s,
105+
sigma_e_,
106+
sigma_f_,
107+
sigma_s_,
108108
species_map,
109109
single_atom_energies=single_atom_energies,
110-
variance_type=variance_type,
111-
opt_method=opt_method,
112-
bounds=bounds,
113-
max_iterations=max_iterations,
110+
variance_type=variance_type_,
111+
opt_method=opt_method_,
112+
bounds=bounds_,
113+
max_iterations=max_iterations_,
114114
)
115115

116116
return empty_sgp

0 commit comments

Comments
 (0)