Merge branch 'feature/ini-options' into 'master'

Feature/ini options

* Read formcompiler options from ini files
* Have a systemtest macros allowing variation in formcompiler arguments
* Rewrite the test suite using it

Exhibits some more problems in our test suite.

This fixes #1.

See merge request !20

test/poisson/poisson_symdiff_matrix_free.mini

-__name = poisson_symdiff_matrix_free
-
-lowerleft = 0.0 0.0
-upperright = 1.0 1.0
-elements = 32 32
-elementType = simplical
-
-[wrapper.vtkcompare]
-name = {__name}
-reference = poisson_ref
-extension = vtu

test/stokes/CMakeLists.txt

@@ -2,59 +2,20 @@ dune_symlink_to_source_files(FILES hagenpoiseuille_ref.vtu
                                    hagenpoiseuille_dg_ref.vtu
                              )
 
-add_generated_executable(UFLFILE stokes.ufl
-                         TARGET stokes_numdiff
-                         FORM_COMPILER_ARGS --numerical-jacobian
-                         )
-
-dune_add_system_test(TARGET stokes_numdiff
-                     INIFILE stokes_numdiff.mini
-                     SCRIPT dune_vtkcompare.py
-                     )
-
-add_generated_executable(UFLFILE stokes.ufl
-                         TARGET stokes_symdiff
-                         )
-
-dune_add_system_test(TARGET stokes_symdiff
-                     INIFILE stokes_symdiff.mini
-                     SCRIPT dune_vtkcompare.py
-                     )
-
-add_generated_executable(UFLFILE stokes_dg.ufl
-                         TARGET stokes_dg_numdiff
-                         FORM_COMPILER_ARGS --numerical-jacobian
-                         )
-
-dune_add_system_test(TARGET stokes_dg_numdiff
-                     INIFILE stokes_dg_numdiff.mini
-                     SCRIPT dune_vtkcompare.py
-                     )
-
-add_generated_executable(UFLFILE stokes_dg.ufl
-                         TARGET stokes_dg_symdiff
-                         )
-
-dune_add_system_test(TARGET stokes_dg_symdiff
-                     INIFILE stokes_dg_symdiff.mini
-                     SCRIPT dune_vtkcompare.py
-                     )
-
-add_generated_executable(UFLFILE stokes_stress.ufl
-                         TARGET stokes_stress_numdiff
-                         FORM_COMPILER_ARGS --numerical-jacobian
-                         )
-
-dune_add_system_test(TARGET stokes_stress_numdiff
-                     INIFILE stokes_stress_numdiff.mini
-                     SCRIPT dune_vtkcompare.py
-                     )
-
-add_generated_executable(UFLFILE stokes_stress.ufl
-                         TARGET stokes_stress_symdiff
-                         )
-
-dune_add_system_test(TARGET stokes_stress_symdiff
-                     INIFILE stokes_stress_symdiff.mini
-                     SCRIPT dune_vtkcompare.py
-                     )
+dune_add_formcompiler_system_test(UFLFILE stokes.ufl
+                                  BASENAME stokes
+                                  INIFILE stokes.mini
+                                  SCRIPT dune_vtkcompare.py
+                                  )
+
+dune_add_formcompiler_system_test(UFLFILE stokes_dg.ufl
+                                  BASENAME stokes_dg
+                                  INIFILE stokes_dg.mini
+                                  SCRIPT dune_vtkcompare.py
+                                  )
+
+dune_add_formcompiler_system_test(UFLFILE stokes_stress.ufl
+                                  BASENAME stokes_stress
+                                  INIFILE stokes_stress.mini
+                                  SCRIPT dune_vtkcompare.py
+                                  )

test/stokes/stokes_stress_symdiff.mini → test/stokes/stokes.mini

-__name = stokes_stress_symdiff
+__name = stokes_{__exec_suffix}
+__exec_suffix = symdiff, numdiff | expand num
 
 lowerleft = 0.0 0.0
 upperright = 1.0 1.0
@@ -10,3 +11,6 @@ printmatrix = false
 name = {__name}
 reference = hagenpoiseuille_ref
 extension = vtu
+
+[formcompiler]
+numerical_jacobian = 0, 1 | expand num

test/stokes/stokes_dg_numdiff.mini → test/stokes/stokes_dg.mini

-__name = stokes_dg_numdiff
+__name = stokes_dg_{__exec_suffix}
+__exec_suffix = symdiff, numdiff | expand num
 
 lowerleft = 0.0 0.0
 upperright = 1.0 1.0
@@ -12,3 +13,6 @@ reference = hagenpoiseuille_dg_ref
 extension = vtu
 zeroThreshold.data_0 = 1e-6
 zeroThreshold.data_1 = 1e-6
+
+[formcompiler]
+numerical_jacobian = 0, 1 | expand num

test/stokes/stokes_dg_symdiff.mini

-__name = stokes_dg_symdiff
-
-lowerleft = 0.0 0.0
-upperright = 1.0 1.0
-elements = 16 16
-elementType = simplical
-printmatrix = false
-
-[wrapper.vtkcompare]
-name = {__name}
-reference = hagenpoiseuille_dg_ref
-extension = vtu

test/stokes/stokes_numdiff.mini

-__name = stokes_numdiff
-
-lowerleft = 0.0 0.0
-upperright = 1.0 1.0
-elements = 16 16
-elementType = simplical
-printmatrix = false
-
-[wrapper.vtkcompare]
-name = {__name}
-reference = hagenpoiseuille_ref
-extension = vtu

test/stokes/stokes_symdiff.mini → test/stokes/stokes_stress.mini

-__name = stokes_symdiff
+__name = stokes_stress_{__exec_suffix}
+__exec_suffix = symdiff, numdiff | expand num
 
 lowerleft = 0.0 0.0
 upperright = 1.0 1.0
@@ -7,7 +8,9 @@ elementType = simplical
 printmatrix = false
 
 [wrapper.vtkcompare]
-zeroThreshold.data_0 = 1e-7
 name = {__name}
 reference = hagenpoiseuille_ref
 extension = vtu
+
+[formcompiler]
+numerical_jacobian = 0, 1 | expand num

test/stokes/stokes_stress_numdiff.mini

-__name = stokes_stress_numdiff
-
-lowerleft = 0.0 0.0
-upperright = 1.0 1.0
-elements = 16 16
-elementType = simplical
-printmatrix = false
-
-[wrapper.vtkcompare]
-name = {__name}
-reference = hagenpoiseuille_ref
-extension = vtu