Commit bb205bef authored by Salko Jr, Robert's avatar Salko Jr, Robert
Browse files

Semi-fix to build 

pip install will create a functioning skbuild script as is because
wasp is not in the correct location when built using cmake.  This
makes it a bit easier because I just have to go into the build
dir and move wasp under SubKit and then do pip install and it works.
In the future we need to fix this.  Also, I found an issue where
modelParallel was not being defaulted, which can lead to a failure
for script mode models that do not set parallel options.
parent 9f88c0cc

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ ELSE(NOT TRIBITS_PROCESSING_PACKAGE) 
  TRIBITS_PACKAGE_POSTPROCESS()

ENDIF(NOT TRIBITS_PROCESSING_PACKAGE)



file(COPY SubKit doc tests LICENSE MANIFEST.in README.md DESTINATION ${CMAKE_CURRENT_BINARY_DIR})

file(COPY SubKit doc tests LICENSE MANIFEST.in README.md setup.py DESTINATION  ${CMAKE_CURRENT_BINARY_DIR})



find_package(PythonInterp 2.7.5 REQUIRED )

find_package(PythonLibs 2.7.5 REQUIRED )

SubKit/build/InpParse.py

+6 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ import utils.utils as utils 
from subprocess import Popen, PIPE, check_call

mypath = os.path.abspath(os.path.dirname(__file__))

localWaspPath = os.path.join(mypath, "../../wasp")

waspSitePackage = os.path.join(mypath, '../wasp')

inCTFpath = os.path.join(mypath, '../../../wasp')

inCTFInstall = os.path.join(mypath, '../../bin')

CIpath = "/Users/rsk/SubKit/SubKit/wasp/build/install"
@@ -16,7 +17,11 @@ if os.path.exists(os.path.join(localWaspPath, 'wasputils/ddivalid')): 
    # This is where users should have built and installed WASP

    sys.path.append(sys.path.append(os.path.join(localWaspPath, "wasppy")))

    waspPath = os.path.join(localWaspPath, 'wasputils')

elif os.path.exists(os.path.join(CIpath, 'wasputils/ddivalid')):

elif os.path.exists(os.path.join(waspSitePackage, 'wasputils/ddivalid')):

    # This is where wasp will be in the site packages dir when installed by pip

    sys.path.append(os.path.join(waspSitePackage, "wasppy"))

    waspPath = os.path.join(waspSitePackage, 'wasputils')

elif os.path.exists(os.path.join(waspSitePackage, 'wasputils/ddivalid')):

    # This is where the test CI will look for it on the testing machine

    sys.path.append(os.path.join(CIpath, "wasppy"))

    waspPath = os.path.join(CIpath, 'wasputils')

SubKit/build/Model.py

+2 −0
Original line number Diff line number Diff line
@@ -74,6 +74,8 @@ class Model: 
      me.qprime = 0.0 # kW/m

      me.dhfrac = 0.0



      me.modelParallel = False



      # Stopping criteria for steady state

      me.runSteadyState = True