Switch back to "fftbox" not taking an index parameter.

diff --git a/examples/test.ofl b/examples/test.ofl
index 72267b73a2216df332bf33f4e8478b5734cb4195..a923148908cb8bfb340c28d12cd7ba710035ebdd 100644 (file)
--- a/examples/test.ofl
+++ b/examples/test.ofl
@@ -4,7 +4,7 @@ FunctionSet ket
 Index beta
 
 # Computation
-kinet = fftbox(beta, ket[beta])
+kinet = fftbox(ket[beta])
 
 # Implementation specific
 target ONETEP

diff --git a/src/ofc/generators/onetep/SpatialRestriction.scala b/src/ofc/generators/onetep/SpatialRestriction.scala
index bb54d40d9e9856603de047ff74111d7320ec4c60..27903a690f75e864f8a00bf82365cdf53ee313e8 100644 (file)
--- a/src/ofc/generators/onetep/SpatialRestriction.scala
+++ b/src/ofc/generators/onetep/SpatialRestriction.scala
@@ -8,7 +8,7 @@ object SpatialRestriction {
   private val ppdWidth = for(dim <- 0 to 2) yield CellInfo.public % CellInfo.ppdWidth(dim)
 }
 
-class SpatialRestriction(op: IterationSpace, function: BindingIndex) extends IterationSpace {
+class SpatialRestriction(op: IterationSpace) extends IterationSpace {
   def getOperands = List(op)
   def getDiscreteIndices = Nil
   def getSuffixFragment = new NullStatement

diff --git a/src/ofc/generators/onetep/TreeBuilder.scala b/src/ofc/generators/onetep/TreeBuilder.scala
index 643ab769bd4f39674d2e112355f6666322e9ec59..777cb6d84cb89bb01cb7a97dcfde80078b122f57 100644 (file)
--- a/src/ofc/generators/onetep/TreeBuilder.scala
+++ b/src/ofc/generators/onetep/TreeBuilder.scala
@@ -96,8 +96,8 @@ class TreeBuilder(dictionary : Dictionary) {
 
     term match {
       case (t: IndexedIdentifier) => buildIndexedSpace(t)
-      case Operator(Identifier("fftbox"), List(indexID, op)) => 
-        new SpatialRestriction(buildExpression(op), buildIndex(indexID))
+      case Operator(Identifier("fftbox"), List(op)) => 
+        new SpatialRestriction(buildExpression(op))
 
       /*
       case ScalarConstant(s) => new Scalar(s)