diff --git a/blast/_src/CMakeLists.txt b/blast/_src/CMakeLists.txt index b24d48dd4dee046078fdd5625e1a54d7729c0ba1..1f7d54b90565fc6c4f1184ebf34e47e08e565de0 100644 --- a/blast/_src/CMakeLists.txt +++ b/blast/_src/CMakeLists.txt @@ -26,9 +26,9 @@ SET_PROPERTY(TARGET blastw PROPERTY SWIG_USE_TARGET_INCLUDE_DIRECTORIES ON) MACRO_DebugPostfix(blastw) TARGET_INCLUDE_DIRECTORIES(blastw PRIVATE ${PROJECT_SOURCE_DIR}/blast/_src - ${PROJECT_SOURCE_DIR}/modules/dartflo/dart/_src ${PROJECT_SOURCE_DIR}/modules/dartflo/ext/amfe/tbox/_src ${PROJECT_SOURCE_DIR}/modules/dartflo/ext/amfe/fwk/_src + ${PROJECT_SOURCE_DIR}/modules/dartflo/dart/_src ${PYTHON_INCLUDE_PATH}) TARGET_LINK_LIBRARIES(blastw PRIVATE blast dart tbox fwk ${PYTHON_LIBRARIES}) diff --git a/blast/interfaces/dart/DartInterface.py b/blast/interfaces/dart/DartInterface.py index 10c0f11e3ce2d6c5cd2144f3c9452b875d860f35..92c7919afdff7b9478245e10bf995fdf90d215ef 100644 --- a/blast/interfaces/dart/DartInterface.py +++ b/blast/interfaces/dart/DartInterface.py @@ -27,7 +27,7 @@ from blast.interfaces.DSolversInterface import SolversInterface class DartInterface(SolversInterface): def __init__(self, dartCfg, vSolver, _cfg): try: - from dartflo.dart.api.core import initDart + from modules.dartflo.dart.api.core import initDart argOut = initDart(dartCfg, viscous=True) self.solver = argOut.get('sol') # Solver self.wrt = argOut.get('wrt') # Writer diff --git a/run.py b/run.py index 61cb32bdfc478d9bcd5c20366b9a1d402b28e088..c78653cf3c823996abc7703d44ce90293d12453b 100755 --- a/run.py +++ b/run.py @@ -22,10 +22,14 @@ def main(): import os.path, sys # adds fwk/tbox to the python path thisdir = os.path.split(os.path.abspath(__file__))[0] - fwkdir = os.path.abspath(os.path.join(thisdir, 'modules/dartflo/ext/amfe')) + fwkdir = os.path.abspath(os.path.join(thisdir, 'modules', 'dartflo', 'ext', 'amfe')) + dartflodir = os.path.abspath(os.path.join(thisdir, 'modules', 'dartflo')) if not os.path.isdir(fwkdir): raise Exception('blaster/modules/dartflo/amfe not found!\n') + if not os.path.isdir(dartflodir): + raise Exception('blaster/modules/dartflo not found!\n') sys.path.append(fwkdir) + sys.path.append(dartflodir) # adds "." to the pythonpath sys.path.append(thisdir)