Commit 40f2d244 authored Jul 03, 2019 by Salko Jr, Robert

Fixes to paths and other CTF integration items

Change .gitignore so the build subpackage doesn't get ignored.
Need to modify syspath in several files to prevent usage errors.

parent ad040b36

.gitignore

+0 −1

Original line number	Diff line number	Diff line
		@@ -6,4 +6,3 @@ MCFR
		*.png
		SubKit/wasp/build
		doc/sphinxdoc
		build

SubKit/build/CoreBuilder.py

+4 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,10 @@ import matplotlib.pyplot as plt
		import matplotlib.patches as patches
		import numpy as np
		import Model
		import SubKit.utils.utils as utils
		import os
		import sys
		sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
		import utils.utils as utils
		import Solid
		import Section

SubKit/build/SquareLatticeLWR_Nodal.py

+1 −2

Original line number	Diff line number	Diff line
		@@ -4,8 +4,7 @@ import Model
		import numpy as np
		import Solid
		import Section
		import SubKit
		import SubKit.utils.utils as utils
		import utils.utils as utils

		class NodalChannelGeom(object):
		""" Calculates geometry of a nodal channel in the model

SubKit/build/init.py

+3 −0

Original line number	Diff line number	Diff line
		import os
		import sys
		sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
		from Model import Model
		from CoreBuilder import MSRE
		from SquareLatticeLWR_Nodal import SquareLatticeLWR_Nodal