Use 'Real' instead of 'Scalar' for certain DSL types.

diff --git a/examples/density_on_dbl_grid.ofl b/examples/density_on_dbl_grid.ofl
index a1f812e576ce1ccaf358f63f429617f80e026aa8..e428ed3e687b700a6f68cca703c76a198a0a4a8b 100644 (file)
--- a/examples/density_on_dbl_grid.ofl
+++ b/examples/density_on_dbl_grid.ofl
@@ -1,7 +1,7 @@
 # Parameter information
 Function[SpinIndex] density_dbl
-Scalar[SpinIndex, FunctionIndex, FunctionIndex] denskern
-Scalar[FunctionIndex, FunctionIndex] overlap
+Real[SpinIndex, FunctionIndex, FunctionIndex] denskern
+Real[FunctionIndex, FunctionIndex] overlap
 Function[FunctionIndex] ngwfs
 SpinIndex spin
 FunctionIndex alpha, beta

diff --git a/examples/integrals_grad.ofl b/examples/integrals_grad.ofl
index 147c40f58875e30f6ced6335acbfd6518c582e8c..054d9fea5b620558fce9d8bd8fa1aa7f52c80203 100644 (file)
--- a/examples/integrals_grad.ofl
+++ b/examples/integrals_grad.ofl
@@ -1,5 +1,5 @@
 # Parameter information
-Scalar[SpatialIndex, FunctionIndex, FunctionIndex] kinet
+Real[SpatialIndex, FunctionIndex, FunctionIndex] kinet
 Function[FunctionIndex] bra, ket
 FunctionIndex alpha, beta
 SpatialIndex i

diff --git a/examples/integrals_kinetic.ofl b/examples/integrals_kinetic.ofl
index 787ec9812b75e4224ccef96b84c7941787a45c8f..9c029fb386bea41083d2ee24a502ed9993e39c0e 100644 (file)
--- a/examples/integrals_kinetic.ofl
+++ b/examples/integrals_kinetic.ofl
@@ -1,5 +1,5 @@
 # Parameter information
-Scalar[FunctionIndex, FunctionIndex] kinet
+Real[FunctionIndex, FunctionIndex] kinet
 Function[FunctionIndex] bra, ket
 FunctionIndex alpha, beta
 

diff --git a/examples/integrals_locpot.ofl b/examples/integrals_locpot.ofl
index 77962ce042f8384696d6ec5b845f3b4ec5ecd2ea..81692995d01c4cad250fd9a399c1ce14bd1c6aa5 100644 (file)
--- a/examples/integrals_locpot.ofl
+++ b/examples/integrals_locpot.ofl
@@ -1,5 +1,5 @@
 # Parameter information
-Scalar[FunctionIndex, FunctionIndex] locpot
+Real[FunctionIndex, FunctionIndex] locpot
 Function potential_fine
 Function[FunctionIndex] bra, ket
 FunctionIndex alpha, beta

diff --git a/examples/integrals_pos.ofl b/examples/integrals_pos.ofl
index 68e089b43616d9f93ada2c65b0f9967a787e73a0..6214ce24ea9fdbfc3ff16bf50824db153b2ee42c 100644 (file)
--- a/examples/integrals_pos.ofl
+++ b/examples/integrals_pos.ofl
@@ -1,8 +1,8 @@
 # Parameter information
-Scalar[SpatialIndex, FunctionIndex, FunctionIndex] rmat
+Real[SpatialIndex, FunctionIndex, FunctionIndex] rmat
 Function[FunctionIndex] bra, ket
 FunctionIndex alpha, beta
-Scalar order
+Integer order
 SpatialIndex i
 
 # Computation