From d4a8617b8f5137331e4a5de2f7a8f93d1752f892 Mon Sep 17 00:00:00 2001
From: whimsial <ai1v14@soton.ac.uk>
Date: Wed, 25 Jul 2018 20:02:48 +0100
Subject: [PATCH] Uncommented conflicting imports

---
 LoadCase/Interaction.py               |  4 ++--
 LoadCase/InteractionHelpers.py        |  6 +++---
 LoadCase/LoadsAndBCs.py               |  4 ++--
 LoadCase/Step.py                      |  4 ++--
 Parts/GeometryBuilder.py              | 20 ++++++++++----------
 Parts/standard_parts.py               | 20 ++++++++++----------
 SpindleAssembly/AddComponents.py      |  4 ++--
 SpindleAssembly/PositionComponents.py |  4 ++--
 SpindleAssembly/PositionConnectors.py |  4 ++--
 SpindleAssembly/assembly_random.py    |  4 ++--
 SpindleMesh/generate_mesh.py          |  6 +++---
 job.py                                |  6 +++---
 12 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/LoadCase/Interaction.py b/LoadCase/Interaction.py
index 148b21e..a2bc5b9 100644
--- a/LoadCase/Interaction.py
+++ b/LoadCase/Interaction.py
@@ -1,5 +1,5 @@
-# from abaqus import *
-# from abaqusConstants import *
+from abaqus import *
+from abaqusConstants import *
 from LoadCase.InteractionHelpers import (
     create_RP, sum_regions, coupling_constraint, attach_spring, pick_region,
     couple_nearest_aMTs, find_nearest)
diff --git a/LoadCase/InteractionHelpers.py b/LoadCase/InteractionHelpers.py
index 5d741ee..6f32c39 100644
--- a/LoadCase/InteractionHelpers.py
+++ b/LoadCase/InteractionHelpers.py
@@ -1,7 +1,7 @@
 import math
-# from abaqus import *
-# from abaqusConstants import *
-# import regionToolset
+from abaqus import *
+from abaqusConstants import *
+import regionToolset
 from SpindleAssembly.AddComponents import return_assembly
 
 
diff --git a/LoadCase/LoadsAndBCs.py b/LoadCase/LoadsAndBCs.py
index a19dc26..48add7c 100644
--- a/LoadCase/LoadsAndBCs.py
+++ b/LoadCase/LoadsAndBCs.py
@@ -1,5 +1,5 @@
-# from abaqus import *
-# from abaqusConstants import *
+from abaqus import *
+from abaqusConstants import *
 
 
 def create_load(data, **kwargs):
diff --git a/LoadCase/Step.py b/LoadCase/Step.py
index c1c0566..494d40b 100644
--- a/LoadCase/Step.py
+++ b/LoadCase/Step.py
@@ -1,5 +1,5 @@
-# from abaqus import *
-# from abaqusConstants import *
+from abaqus import *
+from abaqusConstants import *
 
 
 def Step(**kwargs):
diff --git a/Parts/GeometryBuilder.py b/Parts/GeometryBuilder.py
index 0b45cb0..4b1bbe2 100644
--- a/Parts/GeometryBuilder.py
+++ b/Parts/GeometryBuilder.py
@@ -1,15 +1,15 @@
 """ Module contains helper functions to build microtubules, centrosomes
 and interMT connectors"""
-# from abaqus import *
-# from abaqusConstants import *
-# import __main__
-# import section
-# import regionToolset
-# import displayGroupMdbToolset as dgm
-# import part
-# import material
-# import sketch
-# import displayGroupOdbToolset as dgo
+from abaqus import *
+from abaqusConstants import *
+import __main__
+import section
+import regionToolset
+import displayGroupMdbToolset as dgm
+import part
+import material
+import sketch
+import displayGroupOdbToolset as dgo
 
 
 def create_MT_part( l, type, i, **kwargs ):
diff --git a/Parts/standard_parts.py b/Parts/standard_parts.py
index 7bbaf04..b211a18 100644
--- a/Parts/standard_parts.py
+++ b/Parts/standard_parts.py
@@ -1,13 +1,13 @@
-# from abaqus import *
-# from abaqusConstants import *
-# import __main__
-# import section
-# import regionToolset
-# import displayGroupMdbToolset as dgm
-# import part
-# import material
-# import sketch
-# import displayGroupOdbToolset as dgo
+from abaqus import *
+from abaqusConstants import *
+import __main__
+import section
+import regionToolset
+import displayGroupMdbToolset as dgm
+import part
+import material
+import sketch
+import displayGroupOdbToolset as dgo
 from Parts import GeometryBuilder as gb
 
 
diff --git a/SpindleAssembly/AddComponents.py b/SpindleAssembly/AddComponents.py
index d56155b..4427d72 100644
--- a/SpindleAssembly/AddComponents.py
+++ b/SpindleAssembly/AddComponents.py
@@ -1,7 +1,7 @@
 from Parts import standard_parts as sparts
 from Parts import GeometryBuilder as gb
-# from abaqus import *
-# from abaqusConstants import *
+from abaqus import *
+from abaqusConstants import *
 import math
 
 
diff --git a/SpindleAssembly/PositionComponents.py b/SpindleAssembly/PositionComponents.py
index fccdef7..387fa59 100644
--- a/SpindleAssembly/PositionComponents.py
+++ b/SpindleAssembly/PositionComponents.py
@@ -1,5 +1,5 @@
-# from abaqus import *
-# from abaqusConstants import *
+from abaqus import *
+from abaqusConstants import *
 import math
 from SpindleAssembly import AddComponents as ah
 from SpindleAssembly.AddComponents import return_assembly, create_MT_instance
diff --git a/SpindleAssembly/PositionConnectors.py b/SpindleAssembly/PositionConnectors.py
index fb5d56f..c1e0d1a 100644
--- a/SpindleAssembly/PositionConnectors.py
+++ b/SpindleAssembly/PositionConnectors.py
@@ -1,6 +1,6 @@
 import itertools
-# from abaqus import *
-# from abaqusConstants import *
+from abaqus import *
+from abaqusConstants import *
 from SpindleAssembly import AddComponents as ah
 from SpindleAssembly.AddComponents import return_assembly
 
diff --git a/SpindleAssembly/assembly_random.py b/SpindleAssembly/assembly_random.py
index d1722a9..e386268 100644
--- a/SpindleAssembly/assembly_random.py
+++ b/SpindleAssembly/assembly_random.py
@@ -1,5 +1,5 @@
-# from abaqus import *
-# from abaqusConstants import *
+from abaqus import *
+from abaqusConstants import *
 import sys
 from SpindleAssembly.PositionComponents import assign_aMT
 from SpindleAssembly.PositionConnectors import attach_connectors
diff --git a/SpindleMesh/generate_mesh.py b/SpindleMesh/generate_mesh.py
index 41afd30..74ab3e9 100644
--- a/SpindleMesh/generate_mesh.py
+++ b/SpindleMesh/generate_mesh.py
@@ -1,6 +1,6 @@
-# from abaqus import *
-# from abaqusConstants import *
-# import mesh
+from abaqus import *
+from abaqusConstants import *
+import mesh
 
 
 def standard_mesh(**kwargs):
diff --git a/job.py b/job.py
index 705727f..0d979f2 100644
--- a/job.py
+++ b/job.py
@@ -1,6 +1,6 @@
-# from abaqus import *
-# from abaqusConstants import *
-# import __main__
+from abaqus import *
+from abaqusConstants import *
+import __main__
 from LoadCase import Interaction
 from LoadCase import Step
 from LoadCase import LoadsAndBCs
-- 
GitLab