diff --git a/generate/generate.py b/generate/generate.py index 507a0847802dfdfc79b5c302d0d70b3aa4eea8ba..d3d2543fe6ac8b1e95bfd5c82689acb6caf9fbfe 100644 --- a/generate/generate.py +++ b/generate/generate.py @@ -265,6 +265,7 @@ def generate_operator( function_space.LagrangianFunctionSpace(2, symbolizer) ), "N1E1": function_space.N1E1Space(symbolizer), + "P2PlusBubble": function_space.P2PlusBubbleSpace(symbolizer), } geometries = { 2: element_geometry.TriangleElement(), diff --git a/generate/requirements.txt b/generate/requirements.txt index bbd26127afcac40b2a4236ec495adcf0e6c85ebb..8e157107f7c921e102d231de39705cbd47dc3c89 100644 --- a/generate/requirements.txt +++ b/generate/requirements.txt @@ -1,10 +1,10 @@ --extra-index-url https://test.pypi.org/simple/ # users with account on i10git.cs.fau.de can use ssh -# hog @ git+ssh://git@i10git.cs.fau.de/hyteg/hog@5cecb2d0c7cfb2449f80f6069a4fb6b4b3cb312d +# hog @ git+ssh://git@i10git.cs.fau.de/hyteg/hog@c9487067d79ddb2593bb5bcbef3d4649ea44f3cb # others should prefer https -hog @ git+https://i10git.cs.fau.de/hyteg/hog@5cecb2d0c7cfb2449f80f6069a4fb6b4b3cb312d +hog @ git+https://i10git.cs.fau.de/hyteg/hog@c9487067d79ddb2593bb5bcbef3d4649ea44f3cb tomli >= 1.1.0 ; python_version < "3.11" clang-format diff --git a/operators-diffusion.toml b/operators-diffusion.toml index 5124cc2eee13f9b9736ff8fa84aae7bbcc0a4484..8a51907bd60e99b4a1c62559ed4c38bcbac883b6 100644 --- a/operators-diffusion.toml +++ b/operators-diffusion.toml @@ -49,3 +49,20 @@ quadrature = 2 loop-strategy = "sawtooth" optimizations = ["moveconstants", "vectorize"] blending = "ParametricP2Map" + +[[diffusion]] +trial-space = "P2PlusBubble" +test-space = "P2PlusBubble" +dimensions = [2] +quadrature = 4 +loop-strategy = "cubes" +optimizations = ["moveconstants", "vectorize"] + +[[diffusion]] +trial-space = "P2PlusBubble" +test-space = "P2PlusBubble" +dimensions = [2] +quadrature = 4 +loop-strategy = "sawtooth" +optimizations = ["moveconstants", "vectorize"] +blending = "AnnulusMap" diff --git a/operators-mass.toml b/operators-mass.toml index 9af841684114b196d9de282ac299344cb0d12fdd..8d235eeee92c920dd59fc1abd9c9eb31fc0fe300 100644 --- a/operators-mass.toml +++ b/operators-mass.toml @@ -49,3 +49,20 @@ quadrature = 4 loop-strategy = "sawtooth" optimizations = ["moveconstants", "vectorize", "quadloops"] blending = "ParametricP2Map" + +[[mass]] +trial-space = "P2PlusBubble" +test-space = "P2PlusBubble" +dimensions = [2] +quadrature = 6 +loop-strategy = "sawtooth" +optimizations = ["moveconstants", "vectorize", "quadloops"] + +[[mass]] +trial-space = "P2PlusBubble" +test-space = "P2PlusBubble" +dimensions = [2] +quadrature = 4 +loop-strategy = "sawtooth" +optimizations = ["moveconstants", "vectorize", "quadloops"] +blending = "AnnulusMap"