Simplify DSL index binding notation.

diff --git a/examples/density_on_dbl_grid.ofl b/examples/density_on_dbl_grid.ofl
index f54c83ff7f868b5f05aaeb33025a46db7207d10f..ed4c1fd4e767d616077e7f5c38ca024270a332ef 100644 (file)
--- a/examples/density_on_dbl_grid.ofl
+++ b/examples/density_on_dbl_grid.ofl
@@ -11,8 +11,8 @@ density_dbl[spin] = sum(ngwfs[alpha]*sum(denskern[spin, alpha, beta] * ngwfs[bet
 
 # Implementation specific
 target ONETEP
-Variable density_dbl    = fortran_param with name("density_dbl"), type(double(a,b,c,d)), space(psinc_fine_grid(a,b,c)), indexed(spin(d))
-Variable denskern       = fortran_param with name("denskern"), type(spam3(a)), indexed(direction(a) * row * col)
+Variable density_dbl    = fortran_param with name("density_dbl"), type(double(a,b,c,spin)), space(psinc_fine_grid(a,b,c)), indexed(spin)
+Variable denskern       = fortran_param with name("denskern"), type(spam3(direction)), indexed(direction, row, col)
 Variable overlap        = fortran_param with name("overlap"), type(spam3)
 Parameter ngwf_basis    = fortran_param with name("ngwf_basis"), type(func_basis)
 Parameter ngwfs_on_grid = fortran_param with name("ngwfs_on_grid"), type(double(:))

diff --git a/examples/integrals_grad.ofl b/examples/integrals_grad.ofl
index 054d9fea5b620558fce9d8bd8fa1aa7f52c80203..6547a164f9abf636c110cbfd3f1b3395dfedd64b 100644 (file)
--- a/examples/integrals_grad.ofl
+++ b/examples/integrals_grad.ofl
@@ -9,7 +9,7 @@ kinet[i, alpha, beta] = inner(bra[alpha], derivative(ket[beta], i))
 
 # Implementation specific
 target ONETEP
-Variable kinet         = fortran_param with name("kinet"), type(spam3(a)), indexed(direction(a) * row * col)
+Variable kinet         = fortran_param with name("kinet"), type(spam3(direction)), indexed(direction, row, col)
 Parameter bra_basis    = fortran_param with name("bra_basis"), type(func_basis)
 Parameter bras_on_grid = fortran_param with name("bras_on_grid"), type(double(:))
 Parameter ket_basis    = fortran_param with name("ket_basis") , type(func_basis)

diff --git a/examples/integrals_kinetic.ofl b/examples/integrals_kinetic.ofl
index 9c029fb386bea41083d2ee24a502ed9993e39c0e..3adf52cc265f5f213182a3e7f25da918ef6b30bd 100644 (file)
--- a/examples/integrals_kinetic.ofl
+++ b/examples/integrals_kinetic.ofl
@@ -14,6 +14,6 @@ Parameter bras_on_grid = fortran_param with name("bras_on_grid"), type(double(:)
 Parameter ket_basis    = fortran_param with name("ket_basis"), type(func_basis)
 Parameter kets_on_grid = fortran_param with name("kets_on_grid"), type(double(:))
 Variable bra           = ppd_function_set with data(bras_on_grid), basis(bra_basis)
-Variable ket           = ppd_function_set with data(kets_on_grid), bais(ket_basis)
+Variable ket           = ppd_function_set with data(kets_on_grid), basis(ket_basis)
 OutputFunction output  = fortran_function with name("integrals_kinetic"),
                                               params(kinet, bras_on_grid, bra_basis, kets_on_grid, ket_basis)

diff --git a/examples/integrals_pos.ofl b/examples/integrals_pos.ofl
index 9d6c20cb640e6e572b0d0cf8df1d5eaf89dd28b8..d2b9c6e45ad588fc16ce6f1dc9afe7c644f06c85 100644 (file)
--- a/examples/integrals_pos.ofl
+++ b/examples/integrals_pos.ofl
@@ -10,10 +10,10 @@ rmat[i, alpha, beta] = inner(bra[alpha], ket[beta] * r[i]^order)
 
 # Implementation specific
 target ONETEP
-Variable rmat          = fortran_param with name("rmat"), type(spam3(a)), indexed(direction(a) * row * col)
+Variable rmat          = fortran_param with name("rmat"), type(spam3(direction)), indexed(direction, row, col)
 Parameter bra_basis    = fortran_param with name("bra_basis"), type(func_basis)
 Parameter bras_on_grid = fortran_param with name("bras_on_grid"), type(double(:))
-Variable order         = fortran_param with name("order", type(integer)
+Variable order         = fortran_param with name("order"), type(integer)
 Parameter ket_basis    = fortran_param with name("ket_basis"), type(func_basis)
 Parameter kets_on_grid = fortran_param with name("kets_on_grid"), type(double(:))
 Variable bra           = ppd_function_set with data(bras_on_grid), basis(bra_basis)