add curl-curl plus mass operator for scaling run

generate/generate.py

@@ -63,7 +63,7 @@ def generate_toplevel_cmake(
     output_path = os.path.join(args.output, "CMakeLists.txt")
 
     with open(output_path, "w") as f:
-        print(f'add_compile_options( "-Wno-shadow" )', file=f)
+        # print(f'add_compile_options( "-Wno-shadow" )', file=f)
         print(f"", file=f)
         print(f"if(NOT WALBERLA_DOUBLE_ACCURACY)", file=f)
         print(f'   add_compile_options( "-Wno-float-conversion" )', file=f)

generate/requirements.txt

 --extra-index-url https://test.pypi.org/simple/
 
-hfg @ git+ssh://git@i10git.cs.fau.de/terraneo/hyteg-form-generator.git@2a830d525314b1ec1d718720534267c485b5a9a7
+hfg @ git+ssh://git@i10git.cs.fau.de/terraneo/hyteg-form-generator.git@aeeb7d4c4f99e59d208a8d09a51522a7093fd7ff
 tomli >= 1.1.0 ; python_version < "3.11"
-clang-format
+# clang-format

operators.toml

-[[curl_curl]]
+# [[curl_curl]]
+# trial-space   = "N1E1"
+# test-space    = "N1E1"
+# dimensions    = [3]
+# quadrature    = 0
+# loop-strategy = "sawtooth"
+# optimizations = ["moveconstants", "vectorize"]
+
+[[curl_curl_plus_mass]]
 trial-space   = "N1E1"
 test-space    = "N1E1"
+form-space-args = { alpha_fem_space = "P1", beta_fem_space = "P1" }
 dimensions    = [3]
-quadrature    = 0
+quadrature    = "xiao_gimbutas_02"
 loop-strategy = "sawtooth"
-optimizations = ["moveconstants", "vectorize"]
+optimizations = ["moveconstants", "vectorize", "quadloops", "tabulate"]
 
-[[diffusion]]
-trial-space   = "P1"
-test-space    = "P1"
-dimensions    = [2, 3]
-quadrature    = 0
-loop-strategy = "cubes"
-optimizations = ["cutloops", "moveconstants", "vectorize"]
+# [[diffusion]]
+# trial-space   = "P1"
+# test-space    = "P1"
+# dimensions    = [2, 3]
+# quadrature    = 0
+# loop-strategy = "cubes"
+# optimizations = ["cutloops", "moveconstants", "vectorize"]
 
 [[div_k_grad]]
 trial-space   = "P1"
 test-space    = "P1"
 form-space-args.coefficient_function_space = "P1"
 dimensions    = [2, 3]
-quadrature    = 2
+quadrature    = "xiao_gimbutas_01"
 loop-strategy = "sawtooth"
-optimizations = ["moveconstants", "vectorize", "quadloops"]
+optimizations = ["moveconstants", "vectorize", "quadloops", "tabulate"]
 
 [[div_k_grad]]
 trial-space   = "P2"
@@ -32,10 +41,10 @@ quadrature    = 2
 loop-strategy = "sawtooth"
 optimizations = ["moveconstants", "vectorize", "quadloops"]
 
-[[mass]]
-trial-space   = "P1"
-test-space    = "P1"
-dimensions    = [2, 3]
-quadrature    = 2
-loop-strategy = "sawtooth"
-optimizations = ["moveconstants", "vectorize", "quadloops", "tabulate"]
+# [[mass]]
+# trial-space   = "P1"
+# test-space    = "P1"
+# dimensions    = [2, 3]
+# quadrature    = 2
+# loop-strategy = "sawtooth"
+# optimizations = ["moveconstants", "vectorize", "quadloops", "tabulate"]