From 991e0e96ab46fe61fe71dffecd309feb70055cec Mon Sep 17 00:00:00 2001
From: Daniel Bauer <daniel.j.bauer@fau.de>
Date: Tue, 27 Feb 2024 11:13:18 +0100
Subject: [PATCH] add curl-curl plus mass operator for scaling run
---
generate/generate.py | 2 +-
generate/requirements.txt | 4 ++--
operators.toml | 47 +++++++++++++++++++++++----------------
3 files changed, 31 insertions(+), 22 deletions(-)
diff --git a/generate/generate.py b/generate/generate.py
index ffc23f42..498711b5 100644
--- a/generate/generate.py
+++ b/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)
diff --git a/generate/requirements.txt b/generate/requirements.txt
index 47881e16..8875f4e7 100644
--- a/generate/requirements.txt
+++ b/generate/requirements.txt
@@ -1,5 +1,5 @@
--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
diff --git a/operators.toml b/operators.toml
index a2e525ef..5b1058fb 100644
--- a/operators.toml
+++ b/operators.toml
@@ -1,27 +1,36 @@
-[[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"]
--
GitLab