From: Francis Russell <francis@unchartedbackwaters.co.uk>
Date: Mon, 10 Sep 2012 14:14:51 +0000 (+0100)
Subject: Use 'Real' instead of 'Scalar' for certain DSL types.
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=57e80a8ac66dc2300f4d569c171662e252612a37;p=francis%2Fofc.git

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 a1f812e..e428ed3 100644
--- 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 147c40f..054d9fe 100644
--- 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 787ec98..9c029fb 100644
--- 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 77962ce..8169299 100644
--- 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 68e089b..6214ce2 100644
--- 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