From be12fa28c6fe510e24eedb5921adba48aa1ef07b Mon Sep 17 00:00:00 2001 From: Francis Russell Date: Sat, 15 Sep 2012 22:04:32 +0100 Subject: [PATCH] Simplify DSL index binding notation. --- examples/density_on_dbl_grid.ofl | 4 ++-- examples/integrals_grad.ofl | 2 +- examples/integrals_kinetic.ofl | 2 +- examples/integrals_pos.ofl | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/density_on_dbl_grid.ofl b/examples/density_on_dbl_grid.ofl index f54c83f..ed4c1fd 100644 --- 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 054d9fe..6547a16 100644 --- 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 9c029fb..3adf52c 100644 --- 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 9d6c20c..d2b9c6e 100644 --- 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) -- 2.47.3