Fix contraction tests

src/simulation.jl

@@ -609,12 +609,11 @@ function init_dec_matrices!(d::SummationDecapode, dec_matrices::Vector{Symbol},
   end
 end
 
-"""    link_contract_operators!(d::SummationDecapode, contract_defs, con_dec_operators::Set{Symbol}, stateeltype::DataType, code_target::AbstractGenerationTarget)
+"""    link_contract_operators!(d::SummationDecapode, contract_defs::Expr, con_dec_operators::Set{Symbol}, stateeltype::DataType, code_target::AbstractGenerationTarget)
 
 Collects arrays of DEC matrices together, replaces the array with a generated function name and computes the contracted multiplication
 """
-function link_contract_operators!(d::SummationDecapode, contract_defs, con_dec_operators::Set{Symbol}, stateeltype::DataType, code_target::AbstractGenerationTarget)
-
+function link_contract_operators!(d::SummationDecapode, contract_defs::Expr, con_dec_operators::Set{Symbol}, stateeltype::DataType, code_target::AbstractGenerationTarget)
   compute_to_name = Dict()
   curr_id = 1
 
@@ -642,8 +641,6 @@ function link_contract_operators!(d::SummationDecapode, contract_defs, con_dec_o
       d[op1_id, :op1] = computation_name
     end
   end
-
-  contract_defs
 end
 
 # TODO: Allow user to overload these hooks with user-defined code_target
@@ -746,9 +743,10 @@ function gensim(user_d::SummationDecapode, input_vars::Vector{Symbol}; dimension
   contracted_dec_operators = Set{Symbol}()
   if contract
     contract_operators!(gen_d, white_list = optimizable_dec_operators)
-    cont_defs = link_contract_operators!(gen_d, contract_defs, contracted_dec_operators, stateeltype, code_target)
+    link_contract_operators!(gen_d, contract_defs, contracted_dec_operators, stateeltype, code_target)
   end
 
+
   union!(optimizable_dec_operators, contracted_dec_operators, extra_dec_operators)
 
   # Compilation of the simulation
@@ -764,7 +762,7 @@ function gensim(user_d::SummationDecapode, input_vars::Vector{Symbol}; dimension
   quote
     (mesh, operators, hodge=GeometricHodge()) -> begin
       $func_defs
-      $cont_defs
+      $contract_defs
       $prologue
       $vect_defs
       f(__du__, __u__, __p__, __t__) = begin

test/simulation.jl

@@ -325,16 +325,13 @@ end
 
 @testset "Gensim Transformations" begin
 
-  function checkForContractionInGensim(d::SummationDecapode)
-    results = []
-    block = gensim(d).args[2].args[2].args[5]
-    for line in 2:length(block.args)
-      push!(results, block.args[line].args[1])
-    end
-
-    return results
+  function count_contractions(e::Expr)
+    block = e.args[2].args[2].args[5]
+    length(block.args) - 1
   end
 
+  count_contractions(d::SummationDecapode) = count_contractions(gensim(d))
+
   begin
     primal_earth = loadmesh(Icosphere(1))
     nploc = argmax(x -> x[3], primal_earth[:point])
@@ -376,7 +373,9 @@ end
     B == ⋆(⋆(A))
     D == d(d(C))
   end
-  @test 4 == length(checkForContractionInGensim(single_contract))
+  @test 4 == count_contractions(single_contract)
+
+  @test 0 == count_contractions(gensim(single_contract; contract=false))
 
   sim = eval(gensim(single_contract))
   f = sim(earth, default_dec_generate)
@@ -403,7 +402,7 @@ end
 
     D == d(d(C))
   end
-  @test 4 == length(checkForContractionInGensim(single_contract))
+  @test 4 == count_contractions(contract_with_summation)
 
   sim = eval(gensim(contract_with_summation))
   f = sim(earth, default_dec_generate)
@@ -430,7 +429,7 @@ end
 
     D == d(d(C))
   end
-  @test 4 == length(checkForContractionInGensim(single_contract))
+  @test 4 == count_contractions(contract_with_op2)
 
   for prealloc in [false, true]
     let sim = eval(gensim(contract_with_op2, preallocate = prealloc))
@@ -456,7 +455,7 @@ end
     B == A * A
     D == ⋆(⋆(B))
   end
-  @test 4 == length(checkForContractionInGensim(single_contract))
+  @test 2 == count_contractions(later_contraction)
 
   sim = eval(gensim(later_contraction))
   f = sim(earth, default_dec_generate)
@@ -476,7 +475,7 @@ end
     D == ∂ₜ(A)
     D == d(A)
   end
-  @test 0 == length(checkForContractionInGensim(no_contraction))
+  @test 0 == count_contractions(no_contraction)
 
   sim = eval(gensim(no_contraction))
   f = sim(earth, default_dec_generate)
@@ -496,7 +495,7 @@ end
     D == ∂ₜ(A)
     D == d(k(A))
   end
-  @test 0 == length(checkForContractionInGensim(no_unallowed))
+  @test 0 == count_contractions(no_unallowed)
 
   sim = eval(gensim(no_unallowed))