From 4e11329b5843ab4f56e318849207ae28118c5b4d Mon Sep 17 00:00:00 2001 From: Ivo Steinbrecher Date: Tue, 11 Feb 2025 17:39:49 +0100 Subject: [PATCH] Dont print empyt BC sections to input file --- cubitpy/cubitpy_to_dat.py | 11 ++++++----- .../test_contact_condition_beam_to_surface.dat | 3 --- .../test_contact_condition_surface_to_surface.dat | 3 --- tests/input-files-ref/test_create_block.dat | 3 --- tests/input-files-ref/test_cubit_tutorial.dat | 3 --- tests/input-files-ref/test_element_types_hex.dat | 3 --- tests/input-files-ref/test_element_types_tet.dat | 3 --- tests/input-files-ref/test_fluid_functionality.dat | 3 --- tests/input-files-ref/test_fsi_functionality.dat | 3 --- tests/input-files-ref/test_groups.dat | 2 -- tests/input-files-ref/test_groups_multiple_sets.dat | 3 --- tests/input-files-ref/test_point_coupling.dat | 3 --- tests/testing_tutorial.py | 1 - 13 files changed, 6 insertions(+), 38 deletions(-) diff --git a/cubitpy/cubitpy_to_dat.py b/cubitpy/cubitpy_to_dat.py index 7920152..bd815bc 100644 --- a/cubitpy/cubitpy_to_dat.py +++ b/cubitpy/cubitpy_to_dat.py @@ -107,11 +107,12 @@ def add_node_sets(dat_lines, cubit, exo): ], ] for geo, section_name, set_label in name_geometry_tuple: - dat_lines.append(section_name) - for i_set, node_set in enumerate(node_sets[geo]): - node_set.sort() - for i_node in node_set: - dat_lines.append(f"NODE {i_node:6d} {set_label} {i_set+1}") + if len(node_sets[geo]) > 0: + dat_lines.append(section_name) + for i_set, node_set in enumerate(node_sets[geo]): + node_set.sort() + for i_node in node_set: + dat_lines.append(f"NODE {i_node:6d} {set_label} {i_set+1}") def get_element_connectivity_string(connectivity): diff --git a/tests/input-files-ref/test_contact_condition_beam_to_surface.dat b/tests/input-files-ref/test_contact_condition_beam_to_surface.dat index 4acc289..d23ce7f 100644 --- a/tests/input-files-ref/test_contact_condition_beam_to_surface.dat +++ b/tests/input-files-ref/test_contact_condition_beam_to_surface.dat @@ -2,14 +2,11 @@ ----------------------------------------BEAM INTERACTION/BEAM TO SOLID SURFACE CONTACT SURFACE // block1_contact_side E 1 COUPLING_ID 1 ------------------------------------------------DNODE-NODE TOPOLOGY ------------------------------------------------DLINE-NODE TOPOLOGY -----------------------------------------------DSURF-NODE TOPOLOGY NODE 1 DSURFACE 1 NODE 4 DSURFACE 1 NODE 5 DSURFACE 1 NODE 8 DSURFACE 1 ------------------------------------------------DVOL-NODE TOPOLOGY -------------------------------------------------------NODE COORDS NODE 1 COORD -5.0000000000000000e-01 -5.0000000000000000e-01 5.0000000000000000e-01 NODE 2 COORD -5.0000000000000000e-01 -5.0000000000000000e-01 -5.0000000000000000e-01 diff --git a/tests/input-files-ref/test_contact_condition_surface_to_surface.dat b/tests/input-files-ref/test_contact_condition_surface_to_surface.dat index 4f905e7..b5287cf 100644 --- a/tests/input-files-ref/test_contact_condition_surface_to_surface.dat +++ b/tests/input-files-ref/test_contact_condition_surface_to_surface.dat @@ -4,8 +4,6 @@ E 1 0 Master // block2_contact_side E 2 0 Slave ------------------------------------------------DNODE-NODE TOPOLOGY ------------------------------------------------DLINE-NODE TOPOLOGY -----------------------------------------------DSURF-NODE TOPOLOGY NODE 1 DSURFACE 1 NODE 4 DSURFACE 1 @@ -15,7 +13,6 @@ NODE 9 DSURFACE 2 NODE 10 DSURFACE 2 NODE 11 DSURFACE 2 NODE 12 DSURFACE 2 ------------------------------------------------DVOL-NODE TOPOLOGY -------------------------------------------------------NODE COORDS NODE 1 COORD -5.0000000000000000e-01 -5.0000000000000000e-01 5.0000000000000000e-01 NODE 2 COORD -5.0000000000000000e-01 -5.0000000000000000e-01 -5.0000000000000000e-01 diff --git a/tests/input-files-ref/test_create_block.dat b/tests/input-files-ref/test_create_block.dat index 46dedae..5c5b834 100644 --- a/tests/input-files-ref/test_create_block.dat +++ b/tests/input-files-ref/test_create_block.dat @@ -15,8 +15,6 @@ E 4 NUMDOF 6 ONOFF 1 1 1 0 0 0 VAL 0.0 0.0 0.0 0.0 0.0 0.0 FUNCT 0 0 0 0 0 0 E 5 NUMDOF 6 ONOFF 1 1 1 0 0 0 VAL 0.0 0.0 0.0 0.0 0.0 0.0 FUNCT 0 0 0 0 0 0 // load5 E 6 NUMDOF 6 ONOFF 1 1 1 0 0 0 VAL 0.0 0.0 0.0 0.0 0.0 0.0 FUNCT 0 0 0 0 0 0 ------------------------------------------------DNODE-NODE TOPOLOGY ------------------------------------------------DLINE-NODE TOPOLOGY -----------------------------------------------DSURF-NODE TOPOLOGY NODE 1 DSURFACE 1 NODE 4 DSURFACE 1 @@ -192,7 +190,6 @@ NODE 132 DSURFACE 6 NODE 133 DSURFACE 6 NODE 134 DSURFACE 6 NODE 135 DSURFACE 6 ------------------------------------------------DVOL-NODE TOPOLOGY -------------------------------------------------------NODE COORDS NODE 1 COORD -5.0000000000000003e-02 -5.0000000000000000e-01 0.0000000000000000e+00 NODE 2 COORD -5.0000000000000003e-02 -5.0000000000000000e-01 -1.2500000000000000e+00 diff --git a/tests/input-files-ref/test_cubit_tutorial.dat b/tests/input-files-ref/test_cubit_tutorial.dat index 73173e9..dfd2f26 100644 --- a/tests/input-files-ref/test_cubit_tutorial.dat +++ b/tests/input-files-ref/test_cubit_tutorial.dat @@ -49,8 +49,6 @@ E 1 NUMDOF 3 ONOFF 1 1 1 VAL 0 0 0 FUNCT 0 0 0 ----------------------------------------DESIGN SURF NEUMANN CONDITIONS // load E 2 NUMDOF 3 ONOFF 0 1 0 VAL 0 0.1 0 FUNCT 0 1 0 ------------------------------------------------DNODE-NODE TOPOLOGY ------------------------------------------------DLINE-NODE TOPOLOGY -----------------------------------------------DSURF-NODE TOPOLOGY NODE 18 DSURFACE 1 NODE 20 DSURFACE 1 @@ -70,7 +68,6 @@ NODE 11 DSURFACE 2 NODE 35 DSURFACE 2 NODE 36 DSURFACE 2 NODE 37 DSURFACE 2 ------------------------------------------------DVOL-NODE TOPOLOGY -------------------------------------------------------NODE COORDS NODE 1 COORD 1.8369701987210294e-16 3.0000000000000000e+00 0.0000000000000000e+00 NODE 2 COORD 2.1213203435596428e+00 2.1213203435596419e+00 0.0000000000000000e+00 diff --git a/tests/input-files-ref/test_element_types_hex.dat b/tests/input-files-ref/test_element_types_hex.dat index 8470fc1..ab56656 100644 --- a/tests/input-files-ref/test_element_types_hex.dat +++ b/tests/input-files-ref/test_element_types_hex.dat @@ -16,8 +16,6 @@ E 2 NUMDOF 3 ONOFF 1 1 1 VAL 0 0 0 FUNCT 0 0 0 E 3 NUMDOF 3 ONOFF 1 1 1 VAL 0 0 0 FUNCT 0 0 0 // fix_3 E 4 NUMDOF 3 ONOFF 1 1 1 VAL 0 0 0 FUNCT 0 0 0 ------------------------------------------------DNODE-NODE TOPOLOGY ------------------------------------------------DLINE-NODE TOPOLOGY -----------------------------------------------DSURF-NODE TOPOLOGY NODE 1 DSURFACE 1 NODE 2 DSURFACE 1 @@ -44,7 +42,6 @@ NODE 124 DSURFACE 4 NODE 125 DSURFACE 4 NODE 128 DSURFACE 4 NODE 129 DSURFACE 4 ------------------------------------------------DVOL-NODE TOPOLOGY -------------------------------------------------------NODE COORDS NODE 1 COORD 9.0000000000000002e-01 0.0000000000000000e+00 0.0000000000000000e+00 NODE 2 COORD 1.1000000000000001e+00 0.0000000000000000e+00 0.0000000000000000e+00 diff --git a/tests/input-files-ref/test_element_types_tet.dat b/tests/input-files-ref/test_element_types_tet.dat index 8b184aa..210f30f 100644 --- a/tests/input-files-ref/test_element_types_tet.dat +++ b/tests/input-files-ref/test_element_types_tet.dat @@ -12,8 +12,6 @@ DISPLACEMENT Yes E 1 NUMDOF 3 ONOFF 1 1 1 VAL 0 0 0 FUNCT 0 0 0 // fix_1 E 2 NUMDOF 3 ONOFF 1 1 1 VAL 0 0 0 FUNCT 0 0 0 ------------------------------------------------DNODE-NODE TOPOLOGY ------------------------------------------------DLINE-NODE TOPOLOGY -----------------------------------------------DSURF-NODE TOPOLOGY NODE 1 DSURFACE 1 NODE 3 DSURFACE 1 @@ -24,7 +22,6 @@ NODE 8 DSURFACE 2 NODE 11 DSURFACE 2 NODE 12 DSURFACE 2 NODE 14 DSURFACE 2 ------------------------------------------------DVOL-NODE TOPOLOGY -------------------------------------------------------NODE COORDS NODE 1 COORD 5.9999999999999998e-01 -1.0392304845413263e+00 -5.0000000000000000e-01 NODE 2 COORD 5.9999999999999998e-01 1.0392304845413263e+00 -5.0000000000000000e-01 diff --git a/tests/input-files-ref/test_fluid_functionality.dat b/tests/input-files-ref/test_fluid_functionality.dat index 246ba8e..2a8c16f 100644 --- a/tests/input-files-ref/test_fluid_functionality.dat +++ b/tests/input-files-ref/test_fluid_functionality.dat @@ -5,8 +5,6 @@ E 1 1 ----------------------------------------FLUID NEUMANN INFLOW SURF CONDITIONS // inflow_stabilization E 2 1 ------------------------------------------------DNODE-NODE TOPOLOGY ------------------------------------------------DLINE-NODE TOPOLOGY -----------------------------------------------DSURF-NODE TOPOLOGY NODE 1 DSURFACE 1 NODE 2 DSURFACE 1 @@ -16,7 +14,6 @@ NODE 3 DSURFACE 2 NODE 6 DSURFACE 2 NODE 8 DSURFACE 2 NODE 9 DSURFACE 2 ------------------------------------------------DVOL-NODE TOPOLOGY -------------------------------------------------------NODE COORDS NODE 1 COORD -5.0000000000000000e-01 -5.0000000000000000e-01 5.0000000000000000e-01 NODE 2 COORD 5.0000000000000000e-01 -5.0000000000000000e-01 5.0000000000000000e-01 diff --git a/tests/input-files-ref/test_fsi_functionality.dat b/tests/input-files-ref/test_fsi_functionality.dat index 0cab16f..852f2ea 100644 --- a/tests/input-files-ref/test_fsi_functionality.dat +++ b/tests/input-files-ref/test_fsi_functionality.dat @@ -7,8 +7,6 @@ E 2 1 ----------------------------------------DESIGN SURF ALE DIRICH CONDITIONS // ale_dirichlet_side E 3 NUMDOF 3 ONOFF 1 1 1 VAL 0 0 0 FUNCT 0 0 0 ------------------------------------------------DNODE-NODE TOPOLOGY ------------------------------------------------DLINE-NODE TOPOLOGY -----------------------------------------------DSURF-NODE TOPOLOGY NODE 9 DSURFACE 1 NODE 12 DSURFACE 1 @@ -22,7 +20,6 @@ NODE 9 DSURFACE 3 NODE 10 DSURFACE 3 NODE 11 DSURFACE 3 NODE 12 DSURFACE 3 ------------------------------------------------DVOL-NODE TOPOLOGY -------------------------------------------------------NODE COORDS NODE 1 COORD -5.0000000000000000e-01 -5.0000000000000000e-01 5.0000000000000000e-01 NODE 2 COORD -5.0000000000000000e-01 -5.0000000000000000e-01 -5.0000000000000000e-01 diff --git a/tests/input-files-ref/test_groups.dat b/tests/input-files-ref/test_groups.dat index a401b57..aa1c072 100644 --- a/tests/input-files-ref/test_groups.dat +++ b/tests/input-files-ref/test_groups.dat @@ -66,7 +66,6 @@ NODE 75 DNODE 2 NODE 76 DNODE 2 NODE 79 DNODE 2 NODE 80 DNODE 2 ------------------------------------------------DLINE-NODE TOPOLOGY -----------------------------------------------DSURF-NODE TOPOLOGY NODE 1 DSURFACE 1 NODE 2 DSURFACE 1 @@ -236,7 +235,6 @@ NODE 17 DSURFACE 4 NODE 19 DSURFACE 4 NODE 20 DSURFACE 4 NODE 23 DSURFACE 4 ------------------------------------------------DVOL-NODE TOPOLOGY -------------------------------------------------------NODE COORDS NODE 1 COORD -2.0000000000000000e+00 -1.0000000000000000e+00 5.0000000000000000e-01 NODE 2 COORD -2.0000000000000000e+00 -1.0000000000000000e+00 0.0000000000000000e+00 diff --git a/tests/input-files-ref/test_groups_multiple_sets.dat b/tests/input-files-ref/test_groups_multiple_sets.dat index d7bf122..f618f67 100644 --- a/tests/input-files-ref/test_groups_multiple_sets.dat +++ b/tests/input-files-ref/test_groups_multiple_sets.dat @@ -7,9 +7,6 @@ E 1 NUMDOF 3 ONOFF 1 1 1 VAL 0 0 0 FUNCT 0 0 0 ----------------------------------------DESIGN VOL NEUMANN CONDITIONS // all_vol_1 E 2 NUMDOF 3 ONOFF 0 0 1 VAL 0 0 1 FUNCT 0 0 0 ------------------------------------------------DNODE-NODE TOPOLOGY ------------------------------------------------DLINE-NODE TOPOLOGY ------------------------------------------------DSURF-NODE TOPOLOGY -----------------------------------------------DVOL-NODE TOPOLOGY NODE 1 DVOL 1 NODE 2 DVOL 1 diff --git a/tests/input-files-ref/test_point_coupling.dat b/tests/input-files-ref/test_point_coupling.dat index f0d4876..79488f1 100644 --- a/tests/input-files-ref/test_point_coupling.dat +++ b/tests/input-files-ref/test_point_coupling.dat @@ -40,9 +40,6 @@ NODE 27 DNODE 12 NODE 62 DNODE 12 NODE 17 DNODE 13 NODE 36 DNODE 13 ------------------------------------------------DLINE-NODE TOPOLOGY ------------------------------------------------DSURF-NODE TOPOLOGY ------------------------------------------------DVOL-NODE TOPOLOGY -------------------------------------------------------NODE COORDS NODE 1 COORD -5.0000000000000000e-01 -1.0000000000000000e+00 5.0000000000000000e-01 NODE 2 COORD -5.0000000000000000e-01 -1.0000000000000000e+00 0.0000000000000000e+00 diff --git a/tests/testing_tutorial.py b/tests/testing_tutorial.py index 6e71591..e0a55a8 100644 --- a/tests/testing_tutorial.py +++ b/tests/testing_tutorial.py @@ -32,7 +32,6 @@ """This script is used to test the tutorial.""" import os -import sys import unittest from cubitpy_tutorial import cubit_step_by_step_tutorial_cli