Fixed bug in node set putting/naming

Author: calleman21

exodus_helper/core.py

@@ -278,13 +278,13 @@ def __init__(self, filename, **kwargs):
 
                     for idx in range(dimensions['num_el_blk'].size):
                         d1 = dataset.createDimension(
-                            f'num_el_in_blk{idx+1}',
+                            f'num_el_in_blk{idx + 1}',
                             size=num_el_in_blks[idx])
                         d2 = dataset.createDimension(
-                            f'num_nod_per_el{idx+1}',
+                            f'num_nod_per_el{idx + 1}',
                             size=num_nodes_per_els[idx])
                         v = dataset.createVariable(
-                            f'connect{idx+1}',
+                            f'connect{idx + 1}',
                             self.int_type,
                             dimensions=(d1.name, d2.name))
 
@@ -383,10 +383,10 @@ def __init__(self, filename, **kwargs):
                 # node and side set variables
                 if self.get_num_node_sets() > 0:
                     v = variables['ns_prop1']
-                    v[:] = np.arange(dimensions['num_node_sets'].size) + 1
+                    # v[:] = np.arange(dimensions['num_node_sets'].size) + 1
                     v.setncattr('name', 'ID')
                     v = variables['ns_status']
-                    v[:] = [1] * dimensions['num_node_sets'].size
+                    v[:] = [0] * dimensions['num_node_sets'].size
 
                 if self.get_num_side_sets() > 0:
                     v = variables['ss_prop1']
@@ -2423,16 +2423,23 @@ def put_node_set_params(self, id_ns, num_nodes, numSetDistFacts=0) -> bool:
         """
         try:
             dataset = self.dataset
-            d = dataset.createDimension(f'num_nod_ns{id_ns}', size=num_nodes)
+            if id_ns in dataset.variables['ns_prop1']:
+                idx = list(dataset.variables['ns_prop1']).index(id_ns)
+            else:
+                idx = np.argwhere(dataset.variables['ns_status'][:] == 0)[0][0]
+                dataset.variables['ns_prop1'][idx] = id_ns
+            dataset.variables['ns_status'][idx] = 1
+
+            d = dataset.createDimension(f'num_nod_ns{idx + 1}', size=num_nodes)
             dataset.createVariable(
-                f'node_ns{id_ns}', self.int_type, dimensions=d.name)
+                f'node_ns{idx + 1}', self.int_type, dimensions=d.name)
             if numSetDistFacts > 0:
                 d = dataset.createDimension(
-                    f'num_df_ns{id_ns}', size=num_nodes)
+                    f'num_df_ns{idx + 1}', size=num_nodes)
                 dataset.createVariable(
-                    f'dist_fact_ns{id_ns}', np.dtype('float'),
+                    f'dist_fact_ns{idx + 1}', np.dtype('float'),
                     dimensions=d.name)
-                dataset.variables[f'dist_fact_ns{id_ns}'][:] = 1.
+                dataset.variables[f'dist_fact_ns{idx + 1}'][:] = 1.
         except RuntimeError as exc:
             raise DatabaseError from exc
         return True

exodus_helper/dir_exodus.py

@@ -375,7 +375,7 @@
 # _attr_inputs['get_side_set_ids'] = []
 _attr_inputs['get_side_set_name'] = [1]
 # _attr_inputs['get_side_set_names'] = []
-# _attr_inputs['get_side_set_node_list'] = []
+_attr_inputs['get_side_set_node_list'] = [1]
 _attr_inputs['get_side_set_params'] = [1]
 # _attr_inputs['get_side_set_property_names'] = []
 _attr_inputs['get_side_set_property_value'] = [1, 'ID']

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'poetry.core.masonry.api'
 
 [tool.poetry]
 name = 'exodus_helper'
-version = '1.3.2'
+version = '1.3.3'
 description = 'A package for manipulating ExodusII databases'
 license = 'BSD-3-Clause'
 authors = ['Coleman Alleman <callema@sandia.gov>']

tests/test_exodus_helper.py

@@ -684,13 +684,23 @@ def test_get_node_set_ids(mesh):
     assert np.all(ids == np.arange(1, len(ids) + 1))
 
 
-def test_get_node_set_name(mesh):
+def test_get_node_set_name(dir_test_file, monkeypatch):
     # Put and get a node set name
-    assert mesh.put_node_set_name(1, 'test_ns_name1')
-    assert mesh.get_node_set_name(1) == 'test_ns_name1'
+
+    try:
+        file_path = os.path.join(dir_test_file, 'delete_me.g')
+        monkeypatch.setattr('builtins.input', lambda _: 'y')
+        mesh = exodus_helper.Exodus(file_path, mode='w', numNodeSets=2)
+        mesh.put_node_set_params(99, 1)
+        mesh.put_node_set_name(99, 'test_ns_name1')
+        assert mesh.get_node_set_name(99) == 'test_ns_name1'
+    finally:
+        mesh.close()
+        os.remove(file_path)
 
 
 def test_get_node_set_names(mesh):
+    assert mesh.put_node_set_name(1, 'test_ns_name1')
     assert mesh.put_node_set_name(2, 'test_ns_name2')
     names = mesh.get_node_set_names()
     assert names[0] == 'test_ns_name1'
@@ -1472,7 +1482,7 @@ def test_put_node_set_params(dir_test_file, monkeypatch):
         # Params can only be used once on a fresh mesh
         file_path = os.path.join(dir_test_file, 'delete_me.g')
         monkeypatch.setattr('builtins.input', lambda _: 'y')
-        mesh = exodus_helper.Exodus(file_path, mode='w')
+        mesh = exodus_helper.Exodus(file_path, mode='w', numNodeSets=1)
         mesh.put_node_set_params(1, 1, numSetDistFacts=1)
 
         # Assert that dimensions and variables were created properly