Merge pull request #191 from ndem0/version2

Version2

Author: ndem0

pygem/khandler.py

@@ -1,6 +1,7 @@
 """
 Derived module from filehandler.py to handle LS-DYNA keyword (.k) files.
 """
+import re 
 import numpy as np
 import pygem.filehandler as fh
 
@@ -30,27 +31,39 @@ def parse(self, filename):
                 coordinates of the points of the mesh.
         :rtype: numpy.ndarray
         """
+
         self._check_filename_type(filename)
         self._check_extension(filename)
         self.infile = filename
-        index = -9
+
         mesh_points = []
+        node_indicator = False
+
         with open(self.infile, 'r') as input_file:
             for num, line in enumerate(input_file):
+
+                expression = re.compile(r'(.+?)(?:,|$)')
+                expression = expression.findall(line)
+
+                if line.startswith("$"):
+                    continue
+
                 if line.startswith('*NODE'):
-                    index = num
-                if num == index + 1:
-                    if line.startswith('$'):
-                        index = num
-                    elif line.startswith('*'):
-                        index = -9
-                    else:
-                        l = []
-                        l.append(float(line[8:24]))
-                        l.append(float(line[24:40]))
-                        l.append(float(line[40:56]))
-                        mesh_points.append(l)
-                        index = num
+                    node_indicator = True
+                    continue
+
+                if line.startswith('*ELEMENT'):
+                    break
+
+                if not node_indicator:
+                    pass
+                else:
+                    if len(expression) == 1:
+                        expression = re.findall(r'\S+', expression[0])
+                    l = [float(expression[1]), float(expression[2]),
+                         float(expression[3])]
+                    mesh_points.append(l)
+
             mesh_points = np.array(mesh_points)
         return mesh_points
 
@@ -68,22 +81,71 @@ def write(self, mesh_points, filename):
         self._check_extension(filename)
         self._check_infile_instantiation()
         self.outfile = filename
-        index = -9
+
         i = 0
+        node_indicator = False
+
         with open(self.outfile, 'w') as output_file:
             with open(self.infile, 'r') as input_file:
-                for num, line in enumerate(input_file):
+                for _, line in enumerate(input_file):
+                    get_num = re.findall(r'[-+]?[0-9]*\.?[0-9]+', line)
+
+                    # Write header files
+                    if line.startswith('$'):
+                        output_file.write(line)
+                        continue
+
+                    # Change the node indicator if you find the elements section
+                    if line.startswith('*ELEMENT'):
+                        node_indicator = False
+
+                    # Change the nodes indicator if you find the nodes section
                     if line.startswith('*NODE'):
-                        index = num
-                    if num == index + 1:
-                        if line.startswith('$'):
-                            index = num
-                        elif line.startswith('*'):
-                            index = -9
-                        else:
-                            for j in range(0, 3):
-                                line = line[:8 + 16 * (j)] + '{:16.10f}'.format(
-                                    mesh_points[i][j]) + line[8 + 16 * (j + 1):]
-                            i += 1
-                            index = num
-                    output_file.write(line)
+                        node_indicator = True
+                        output_file.write(line)
+                        continue
+
+                    # If in the nodes section append the mesh points otherwise copy the data from parsed file
+                    if not node_indicator:
+                        output_file.write(line)
+                    else:
+
+                        # Split lines to find decimeter
+                        split_line = line.split(" ")
+
+                        # Format the data into correct format
+                        data = [int(get_num[0]),
+                                '{:.10f}'.format(float(mesh_points[i][0])),
+                                '{:.10f}'.format(float(mesh_points[i][1])),
+                                '{:.10f}'.format(float(mesh_points[i][2]))]
+
+                        comma_seperator = False
+                        pointer = 0
+
+                        for index, value in enumerate(split_line):
+
+                            if value:
+
+                                if value[len(value) - 1] == ",":
+                                    comma_seperator = True
+                                    new_str = value.replace(value[:-1], str(data[pointer]))
+                                    split_line[index] = new_str
+
+                                else:
+                                    new_str = value.replace(value, str(data[pointer]))
+                                    split_line[index] = new_str
+                                    if float(data[pointer]) < 0 and not comma_seperator:
+                                        del split_line[index - 1]
+
+                                pointer += 1
+                            else:
+                                pass
+
+                        original_str = ""
+                        for j in split_line:
+                            original_str += j + " "
+                        original_str = original_str[:-1]
+
+                        output_file.write(original_str + "\n")
+
+                        i += 1

test.py

@@ -6,13 +6,10 @@
 test_defaults = [
     'tests/test_freeform.py',
     'tests/test_idwparams.py',
-    'tests/test_affine.py',
     'tests/test_idw.py',
     'tests/test_khandler.py',
     'tests/test_mdpahandler.py',
     'tests/test_openfhandler.py',
-    'tests/test_package.py',
-    'tests/test_radial.py',
     'tests/test_rbfparams.py',
     'tests/test_stlhandler.py',
     'tests/test_unvhandler.py',
@@ -27,15 +24,15 @@
 default_argv = ['--tests'] + test_defaults
 cad_argv = ['--tests'] + test_cad
 
+return_value = 0 # Success
+
 try:
     import pygem.cad
-    nose.run(argv=cad_argv)
+    return_value = 1 if nose.run(argv=cad_argv) is False else 0
 except:
     print('module OCC not found, skip tests for CAD')
 
-nose.run(argv=default_argv)
-
-
-
-
+return_value = 1 if nose.run(argv=default_argv) is False else 0
 
+import sys
+sys.exit(int(return_value))