Adjust block structured tests

cmake/modules/deplist.py

@@ -7,7 +7,7 @@ import sys
 
 ini = parse_ini_file(sys.argv[1])
 section = ini["formcompiler"]
-operators = section.get("operators", "operator")
+operators = section.get("operators", "r")
 
 result = []
 for operator in [i.strip() for i in operators.split(",")]:

test/blockstructured/nonlinear/nonlinear.mini

@@ -10,5 +10,7 @@ extension = vtu
 
 [formcompiler]
 compare_l2errorsquared = 6e-4
+
+[formcompiler.r]
 blockstructured = 1
-number_of_blocks = 5
\ No newline at end of file
+number_of_blocks = 5

test/blockstructured/nonlinear/nonlinear.ufl

@@ -9,7 +9,7 @@ V = FiniteElement("CG", cell, 1)
 u = TrialFunction(V)
 v = TestFunction(V)
 
-forms = [(inner(grad(u), grad(v)) + u*u*v - f*v)*dx]
+r = (inner(grad(u), grad(v)) + u*u*v - f*v)*dx
 interpolate_expression = g
 exact_solution = g
 is_dirichlet = 1

test/blockstructured/poisson/3d/poisson.mini

@@ -10,9 +10,11 @@ reference = poisson_ref
 extension = vtu
 
 [formcompiler]
-numerical_jacobian = 1, 0 | expand num
 exact_solution_expression = g
 compare_l2errorsquared = 1e-7
+
+[formcompiler.r]
+numerical_jacobian = 1, 0 | expand num
 blockstructured = 1
 number_of_blocks = 3
 

test/blockstructured/poisson/3d/poisson.ufl

@@ -10,7 +10,7 @@ u = TrialFunction(V)
 v = TestFunction(V)
 
 
-forms = [(inner(grad(u), grad(v)) - f*v)*dx]
+r = (inner(grad(u), grad(v)) - f*v)*dx
 interpolate_expression = g
 exact_solution = g
 is_dirichlet = 1

test/blockstructured/poisson/poisson.mini

@@ -10,7 +10,9 @@ reference = poisson_ref
 extension = vtu
 
 [formcompiler]
-numerical_jacobian = 1, 0 | expand num
 compare_l2errorsquared = 1e-7
+
+[formcompiler.r]
+numerical_jacobian = 1, 0 | expand num
 blockstructured = 1
 number_of_blocks = 3

test/blockstructured/poisson/poisson.ufl

@@ -9,7 +9,7 @@ V = FiniteElement("CG", cell, 2)
 u = TrialFunction(V)
 v = TestFunction(V)
 
-forms = [(inner(grad(u), grad(v)) - f*v)*dx]
+r = (inner(grad(u), grad(v)) - f*v)*dx
 interpolate_expression = g
 exact_solution = g
 is_dirichlet = 1

test/blockstructured/poisson/poisson_matrix_free.mini

@@ -9,7 +9,9 @@ reference = poisson_ref
 extension = vtu
 
 [formcompiler]
-matrix_free = 1
 compare_l2errorsquared = 1e-7
+
+[formcompiler.r]
+matrix_free = 1
 blockstructured = 1
 number_of_blocks = 4
\ No newline at end of file

test/blockstructured/poisson/poisson_neumann.mini

@@ -10,7 +10,9 @@ reference = poisson_ref
 extension = vtu
 
 [formcompiler]
-numerical_jacobian = 1, 0 | expand num
 compare_l2errorsquared = 1e-8
+
+[formcompiler.r]
+numerical_jacobian = 1, 0 | expand num
 blockstructured = 1
 number_of_blocks = 4

test/blockstructured/poisson/poisson_neumann.ufl

@@ -16,7 +16,7 @@ v = TestFunction(V)
 # Define the boundary measure that knows where we are...
 ds = ds(subdomain_data=bctype)
 
-forms = [(inner(grad(u), grad(v)) - f*v)*dx - j*v*ds(0)]
+r = (inner(grad(u), grad(v)) - f*v)*dx - j*v*ds(0)
 interpolate_expression = g
 exact_solution = g
 is_dirichlet = bctype

test/blockstructured/poisson/poisson_tensor.mini

@@ -10,7 +10,9 @@ reference = poisson_ref
 extension = vtu
 
 [formcompiler]
-numerical_jacobian = 1, 0 | expand num
 compare_l2errorsquared = 1e-7
+
+[formcompiler.r]
+numerical_jacobian = 1, 0 | expand num
 blockstructured = 1
 number_of_blocks = 4

test/blockstructured/poisson/poisson_tensor.ufl

@@ -12,7 +12,7 @@ V = FiniteElement("CG", cell, 1)
 u = TrialFunction(V)
 v = TestFunction(V)
 
-forms = [(inner(A*grad(u), grad(v)) + c*u*v -f*v)*dx]
+r = (inner(A*grad(u), grad(v)) + c*u*v -f*v)*dx
 interpolate_expression = g
 exact_solution = g
 is_dirichlet = 1

test/blockstructured/stokes/stokes.mini

@@ -10,7 +10,9 @@ reference = hagenpoiseuille_ref
 extension = vtu
 
 [formcompiler]
-numerical_jacobian = 0, 1 | expand num
 compare_l2errorsquared = 1e-10
+
+[formcompiler.r]
+numerical_jacobian = 0, 1 | expand num
 blockstructured = 1
-number_of_blocks = 3
\ No newline at end of file
+number_of_blocks = 3

test/blockstructured/stokes/stokes.ufl

@@ -13,7 +13,6 @@ u, p = TrialFunctions(TH)
 
 r = (inner(grad(v), grad(u)) - div(v)*p - q*div(u))*dx
 
-forms = [r]
 is_dirichlet = v_bctype, v_bctype, 0
 interpolate_expression = g_v, None
 exact_solution = g_v, 8.*(1.-x[0])