From 48cdafaf9cf90ed136a094baa316e1b9711232e3 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 4 Mar 2021 16:47:58 +0100
Subject: [PATCH] [T] Extracted snakemake rule generate_square_mesh.
---
Applications/Utils/ExtractBoundary.smk | 21 ++++++-------------
...ry.vtu => square_10_1x1_quad_boundary.vtu} | 0
...ary.vtu => square_10_1x1_tri_boundary.vtu} | 0
scripts/snakemake/modules/meshes.smk | 10 +++++++++
4 files changed, 16 insertions(+), 15 deletions(-)
rename Tests/Data/FileIO/{square_1x1_quad_boundary.vtu => square_10_1x1_quad_boundary.vtu} (100%)
rename Tests/Data/FileIO/{square_1x1_tri_boundary.vtu => square_10_1x1_tri_boundary.vtu} (100%)
create mode 100644 scripts/snakemake/modules/meshes.smk
diff --git a/Applications/Utils/ExtractBoundary.smk b/Applications/Utils/ExtractBoundary.smk
index ed091c3ef5d..2d5837de3e3 100644
--- a/Applications/Utils/ExtractBoundary.smk
+++ b/Applications/Utils/ExtractBoundary.smk
@@ -14,33 +14,24 @@ workdir: f"{config['Data_BINARY_DIR']}/{output_path}"
elem_types = ['tri', 'quad']
rule all:
input:
- expand("square_1x1_{type}_boundary_diff.out", type=elem_types)
+ expand("square_10_1x1_{type}_boundary_diff.out", type=elem_types)
-rule generate_meshes:
- output:
- "input_square_1x1_{type}.vtu"
- shell:
- """
- generateStructuredMesh -e {wildcards.type} \
- --lx 1 --ly 1 \
- --nx 10 --ny 10 \
- -o {output}
- """
+include: f"{config['SOURCE_DIR']}/scripts/snakemake/modules/meshes.smk"
rule extract_boundary:
input:
- rules.generate_meshes.output
+ rules.generate_square_mesh.output
output:
- "square_1x1_{type}_boundary.vtu"
+ "square_{size}_{lx}x{ly}_{type}_boundary.vtu"
shell:
"ExtractBoundary -i {input} -o {output}"
rule vtkdiff:
input:
- a = rules.extract_boundary.output, # "square_1x1_{type}_boundary.vtu"
+ a = rules.extract_boundary.output,
b = f"{config['Data_SOURCE_DIR']}/{output_path}/{rules.extract_boundary.output}"
output:
- "square_1x1_{type}_boundary_diff.out"
+ "square_{size}_{lx}x{ly}_{type}_boundary_diff.out"
params:
check_mesh = True,
fields = [
diff --git a/Tests/Data/FileIO/square_1x1_quad_boundary.vtu b/Tests/Data/FileIO/square_10_1x1_quad_boundary.vtu
similarity index 100%
rename from Tests/Data/FileIO/square_1x1_quad_boundary.vtu
rename to Tests/Data/FileIO/square_10_1x1_quad_boundary.vtu
diff --git a/Tests/Data/FileIO/square_1x1_tri_boundary.vtu b/Tests/Data/FileIO/square_10_1x1_tri_boundary.vtu
similarity index 100%
rename from Tests/Data/FileIO/square_1x1_tri_boundary.vtu
rename to Tests/Data/FileIO/square_10_1x1_tri_boundary.vtu
diff --git a/scripts/snakemake/modules/meshes.smk b/scripts/snakemake/modules/meshes.smk
new file mode 100644
index 00000000000..08c0c6e247f
--- /dev/null
+++ b/scripts/snakemake/modules/meshes.smk
@@ -0,0 +1,10 @@
+rule generate_square_mesh:
+ output:
+ "square_{size}_{lx}x{ly}_{type}.vtu"
+ shell:
+ """
+ generateStructuredMesh -e {wildcards.type} \
+ --lx {wildcards.lx} --ly {wildcards.ly} \
+ --nx {wildcards.size} --ny {wildcards.size} \
+ -o {output}
+ """
--
GitLab