setup.py install (#56)

Co-authored-by: Neil Wu <[email protected]> Co-authored-by: Neil Wu <[email protected]> Co-authored-by: Eirikur Jonsson <[email protected]>
mdolab · Jun 16, 2020 · a6d0ac0 · a6d0ac0
1 parent fe92eea
commit a6d0ac0
Show file tree

Hide file tree

Showing 95 changed files with 125 additions and 233 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -39,7 +39,7 @@ install:
   # We thrown away the existing repo in Docker, and copy the new one in-place
   - docker exec -it app /bin/bash -c "rm -rf $DOCKER_WORKING_DIR && cp -r $DOCKER_MOUNT_DIR $DOCKER_WORKING_DIR"
   # Now download the regression input files
-  - docker exec -it app /bin/bash -c ". \$HOME/.bashrc_mdolab && cd $DOCKER_WORKING_DIR/python && wget http://mdolab.engin.umich.edu/sites/default/files/mdolabwebsite/repos/adflow/adflow_input_files.tar.gz && tar -xzf adflow_input_files.tar.gz"
+  - docker exec -it app /bin/bash -c ". \$HOME/.bashrc_mdolab && cd $DOCKER_WORKING_DIR && wget http://mdolab.engin.umich.edu/sites/default/files/mdolabwebsite/repos/adflow/adflow_input_files.tar.gz && tar -xzf adflow_input_files.tar.gz"
   # Copy over the correct config file and modify as needed
   - if [[ "$DOCKER_TAG" == "py3-centos7-impi" ]]; then
       docker exec -it app /bin/bash -c ". \$HOME/.bashrc_mdolab && cd $DOCKER_WORKING_DIR && cp config/defaults/config.LINUX_INTEL.mk config/config.mk";
@@ -55,14 +55,16 @@ install:
     else
       docker exec -it app /bin/bash -c ". \$HOME/.bashrc_mdolab && cd $DOCKER_WORKING_DIR && make -f Makefile_CS PETSC_ARCH=complex-opt-\$COMPILERS-\$PETSCVERSION";
     fi
+  # Install Python interface
+  - docker exec -it app /bin/bash -c ". \$HOME/.bashrc_mdolab && cd $DOCKER_WORKING_DIR && pip install ."
 
 script:
   # Some of the complex tests take >10 min, so adding travis_wait to stop travis from timing out after 10min
   # the sleep infinity is a workaround since docker exec forks another process which won't work directly with travis_wait
   - if [ "$TEST_TYPE" = "REAL" ]; then
-      travis_wait 120 sleep infinity & docker exec -it app /bin/bash -c ". \$HOME/.bashrc_mdolab && cd $DOCKER_WORKING_DIR/python/reg_tests && python run_reg_tests.py";
+      travis_wait 120 sleep infinity & docker exec -it app /bin/bash -c ". \$HOME/.bashrc_mdolab && cd $DOCKER_WORKING_DIR/reg_tests && python run_reg_tests.py";
     else
-      travis_wait 120 sleep infinity & docker exec -it app /bin/bash -c ". \$HOME/.bashrc_mdolab && cd $DOCKER_WORKING_DIR/python/reg_tests && export PETSC_ARCH=complex-opt-\$COMPILERS-\$PETSCVERSION && python run_reg_tests_cs.py";
+      travis_wait 120 sleep infinity & docker exec -it app /bin/bash -c ". \$HOME/.bashrc_mdolab && cd $DOCKER_WORKING_DIR/reg_tests && export PETSC_ARCH=complex-opt-\$COMPILERS-\$PETSCVERSION && python run_reg_tests_cs.py";
     fi
 
 after_script:

diff --git a/Makefile b/Makefile
@@ -13,7 +13,7 @@ default:
 	echo "The modify this config file as required. Typically the CGNS directory "; \
 	echo "will have to be modified. With the config file specified, rerun "; \
 	echo "'make' and the build will start"; \
-	else make adflow;\
+	else make adflow_build;\
 	fi;
 
 clean:
@@ -26,7 +26,7 @@ clean:
 
 
 
-adflow:
+adflow_build:
 	ln -sf config/config.mk config.mk;
 	(cd src/build/ && make)
 
diff --git a/Makefile_CS b/Makefile_CS
@@ -12,7 +12,7 @@ default:
 	echo "The modify this config file as required. Typically the CGNS directory "; \
 	echo "will have to be modified. With the config file specified, rerun "; \
 	echo "'make' and the build will start"; \
-	else make -f Makefile_CS adflow;\
+	else make -f Makefile_CS adflow_build;\
 	fi;
 
 
@@ -41,7 +41,7 @@ clean:
 	rm -fr src_cs/wallDistance
 	rm -fr src_cs/warping
 
-adflow:
+adflow_build:
 	ln -sf config/config.mk config.mk;
 	(cd src_cs/build/ && make -f Makefile1 directories)
 	(cd src_cs/build/ && make -f Makefile1 complexify)

diff --git a/python/MExt.py → adflow/MExt.py b/python/MExt.py → adflow/MExt.py
diff --git a/__init__.py → adflow/__init__.py b/__init__.py → adflow/__init__.py
@@ -1,9 +1,11 @@
+__version__ = '2.2.0'
+
 from mpi4py import MPI
 
-from .python.pyADflow import ADFLOW
-from .python.pyADflow_C import ADFLOW_C
-from .python.oversetCheck import OversetCheck
-from .python.checkZipper import checkZipper
+from .pyADflow import ADFLOW
+from .pyADflow_C import ADFLOW_C
+from .oversetCheck import OversetCheck
+from .checkZipper import checkZipper
 
 
 try: 
@@ -15,7 +17,7 @@
         print('Warning: OpenMDAO dependency is not installed. OM_ADFLOW wrapper will not be active')
 
 if openmdao is not None: 
-    from .python.om_adflow import OM_ADFLOW
+    from .om_adflow import OM_ADFLOW
 
 
 

diff --git a/python/checkZipper.py → adflow/checkZipper.py b/python/checkZipper.py → adflow/checkZipper.py
diff --git a/python/om_adflow.py → adflow/om_adflow.py b/python/om_adflow.py → adflow/om_adflow.py
diff --git a/python/om_func_comp.py → adflow/om_func_comp.py b/python/om_func_comp.py → adflow/om_func_comp.py
diff --git a/python/om_geocon_comp.py → adflow/om_geocon_comp.py b/python/om_geocon_comp.py → adflow/om_geocon_comp.py
diff --git a/python/om_states_comp.py → adflow/om_states_comp.py b/python/om_states_comp.py → adflow/om_states_comp.py
diff --git a/python/om_utils.py → adflow/om_utils.py b/python/om_utils.py → adflow/om_utils.py
diff --git a/python/oversetCheck.py → adflow/oversetCheck.py b/python/oversetCheck.py → adflow/oversetCheck.py
diff --git a/python/pyADflow.py → adflow/pyADflow.py b/python/pyADflow.py → adflow/pyADflow.py
diff --git a/python/pyADflow_C.py → adflow/pyADflow_C.py b/python/pyADflow_C.py → adflow/pyADflow_C.py
diff --git a/python/pyDynamicPerformance.py → adflow/pyDynamicPerformance.py b/python/pyDynamicPerformance.py → adflow/pyDynamicPerformance.py
diff --git a/python/pyPerformanceClass.py → adflow/pyPerformanceClass.py b/python/pyPerformanceClass.py → adflow/pyPerformanceClass.py
diff --git a/python/pyWeightAndBalance.py → adflow/pyWeightAndBalance.py b/python/pyWeightAndBalance.py → adflow/pyWeightAndBalance.py
diff --git a/python/pyWingCG.py → adflow/pyWingCG.py b/python/pyWingCG.py → adflow/pyWingCG.py
diff --git a/doc/install.rst b/doc/install.rst
@@ -7,7 +7,12 @@ It is therefore necessary to build this library before using ``ADflow``.
 
 Requirements
 ------------
-See :ref:`install3rdPartyPackages` for details on installing required 3rd party packages.
+ADflow requires the following dependencies:
+- CGNS Library
+- PETSc
+- MPI
+
+See the MDO Lab installation guide `here <http://mdolab.engin.umich.edu/docs/installInstructions/install3rdPartyPackages.html>`_ for the supported versions and installation instructions.
 
 Building
 --------
@@ -24,7 +29,7 @@ If you are a beginner user installing the packages on a linux desktop,
 you should use the ``config.LINUX_GFORTRAN`` versions of the configuration 
 files. The ``config.LINUX_INTEL`` versions are usually used on clusters.
 ADflow has been successfully compiled on LINUX with either
-ifort or gfortran.
+``ifort`` or ``gfortran``.
 
 Once you have copied the config file, compile ADflow by running::
 
@@ -36,13 +41,17 @@ the screen (near the end)::
    Testing if module adflow can be imported...
    Module adflow was successfully imported.
 
-If you don't see this, it will be necessary to configure the build
-manually. To configure manually, open ``config/config.mk`` and modify options as necessary.
+If you don't see this, it will be necessary to configure the build manually.
+To configure manually, open ``config/config.mk`` and modify options as necessary.
 
 It is most likely that you need to modify the ``CGNS_INCLUDE_FLAGS`` and the ``CGNS_LINKER_FLAGS`` variables.
-It is also necessary to have``PETSc`` already compiled. 
 After changes to the configuration file, run ``make clean`` before attempting a new build.
 
+Lastly, to build and install the Python interface, type::
+
+    pip install .
+
+
 Verification
 ------------
 ADflow contains a set of simple tests that can be run automatically

diff --git a/python/examples/numOfProcsLB.py → examples/numOfProcsLB.py b/python/examples/numOfProcsLB.py → examples/numOfProcsLB.py
diff --git a/python/inputFiles/Readme.md → inputFiles/Readme.md b/python/inputFiles/Readme.md → inputFiles/Readme.md
@@ -2,11 +2,9 @@
 
 The input files for test need to be downloaded.
 
-From the command line, navigate to the `adflow/python` directory and download and extract the archive
+From the command line, navigate to the root directory and download and extract the archive
 
-```
 wget http://mdolab.engin.umich.edu/sites/default/files/mdolabwebsite/repos/adflow/adflow_input_files.tar.gz
 tar -xzvf adflow_input_files.tar.gz 
-```
 
-The above should extract the files to the `adflow/python/inputFiles` directory.
+The above should extract the files to the root directory.
diff --git a/python/__init__.py → reg_tests/adflow_reg.ref b/python/__init__.py → reg_tests/adflow_reg.ref
diff --git a/python/reg_tests/commonUtils.py → reg_tests/commonUtils.py b/python/reg_tests/commonUtils.py → reg_tests/commonUtils.py
diff --git a/python/reg_tests/mdo_regression_compare.py → reg_tests/mdo_regression_compare.py b/python/reg_tests/mdo_regression_compare.py → reg_tests/mdo_regression_compare.py
diff --git a/python/reg_tests/mdo_regression_helper.py → reg_tests/mdo_regression_helper.py b/python/reg_tests/mdo_regression_helper.py → reg_tests/mdo_regression_helper.py
diff --git a/python/reg_tests/om_commonUtils.py → reg_tests/om_commonUtils.py b/python/reg_tests/om_commonUtils.py → reg_tests/om_commonUtils.py
diff --git a/python/reg_tests/om_tests/__init__.py → reg_tests/om_tests/__init__.py b/python/reg_tests/om_tests/__init__.py → reg_tests/om_tests/__init__.py
diff --git a/...eg_tests/om_tests/test_adjoint_compare.py → reg_tests/om_tests/test_adjoint_compare.py b/...eg_tests/om_tests/test_adjoint_compare.py → reg_tests/om_tests/test_adjoint_compare.py
diff --git a/...on/reg_tests/om_tests/test_sol_compare.py → reg_tests/om_tests/test_sol_compare.py b/...on/reg_tests/om_tests/test_sol_compare.py → reg_tests/om_tests/test_sol_compare.py
diff --git a/...on/reg_tests/om_tests/test_std_compare.py → reg_tests/om_tests/test_std_compare.py b/...on/reg_tests/om_tests/test_std_compare.py → reg_tests/om_tests/test_std_compare.py
diff --git a/python/reg_tests/ref/adflow_test10_reg.ref → reg_tests/ref/adflow_test10_reg.ref b/python/reg_tests/ref/adflow_test10_reg.ref → reg_tests/ref/adflow_test10_reg.ref
diff --git a/python/reg_tests/ref/adflow_test11_reg.ref → reg_tests/ref/adflow_test11_reg.ref b/python/reg_tests/ref/adflow_test11_reg.ref → reg_tests/ref/adflow_test11_reg.ref
diff --git a/python/reg_tests/ref/adflow_test12_reg.ref → reg_tests/ref/adflow_test12_reg.ref b/python/reg_tests/ref/adflow_test12_reg.ref → reg_tests/ref/adflow_test12_reg.ref
diff --git a/python/reg_tests/ref/adflow_test13_reg.ref → reg_tests/ref/adflow_test13_reg.ref b/python/reg_tests/ref/adflow_test13_reg.ref → reg_tests/ref/adflow_test13_reg.ref
diff --git a/python/reg_tests/ref/adflow_test14_reg.ref → reg_tests/ref/adflow_test14_reg.ref b/python/reg_tests/ref/adflow_test14_reg.ref → reg_tests/ref/adflow_test14_reg.ref
diff --git a/python/reg_tests/ref/adflow_test15_reg.ref → reg_tests/ref/adflow_test15_reg.ref b/python/reg_tests/ref/adflow_test15_reg.ref → reg_tests/ref/adflow_test15_reg.ref
diff --git a/python/reg_tests/ref/adflow_test16_reg.ref → reg_tests/ref/adflow_test16_reg.ref b/python/reg_tests/ref/adflow_test16_reg.ref → reg_tests/ref/adflow_test16_reg.ref
diff --git a/python/reg_tests/ref/adflow_test17_reg.ref → reg_tests/ref/adflow_test17_reg.ref b/python/reg_tests/ref/adflow_test17_reg.ref → reg_tests/ref/adflow_test17_reg.ref
diff --git a/python/reg_tests/ref/adflow_test18_reg.ref → reg_tests/ref/adflow_test18_reg.ref b/python/reg_tests/ref/adflow_test18_reg.ref → reg_tests/ref/adflow_test18_reg.ref
diff --git a/python/reg_tests/ref/adflow_test1_reg.ref → reg_tests/ref/adflow_test1_reg.ref b/python/reg_tests/ref/adflow_test1_reg.ref → reg_tests/ref/adflow_test1_reg.ref
diff --git a/python/reg_tests/ref/adflow_test2_reg.ref → reg_tests/ref/adflow_test2_reg.ref b/python/reg_tests/ref/adflow_test2_reg.ref → reg_tests/ref/adflow_test2_reg.ref
diff --git a/python/reg_tests/ref/adflow_test3_reg.ref → reg_tests/ref/adflow_test3_reg.ref b/python/reg_tests/ref/adflow_test3_reg.ref → reg_tests/ref/adflow_test3_reg.ref
diff --git a/python/reg_tests/ref/adflow_test4_reg.ref → reg_tests/ref/adflow_test4_reg.ref b/python/reg_tests/ref/adflow_test4_reg.ref → reg_tests/ref/adflow_test4_reg.ref
diff --git a/python/reg_tests/ref/adflow_test5_reg.ref → reg_tests/ref/adflow_test5_reg.ref b/python/reg_tests/ref/adflow_test5_reg.ref → reg_tests/ref/adflow_test5_reg.ref
diff --git a/python/reg_tests/ref/adflow_test6_reg.ref → reg_tests/ref/adflow_test6_reg.ref b/python/reg_tests/ref/adflow_test6_reg.ref → reg_tests/ref/adflow_test6_reg.ref
diff --git a/python/reg_tests/ref/adflow_test7_reg.ref → reg_tests/ref/adflow_test7_reg.ref b/python/reg_tests/ref/adflow_test7_reg.ref → reg_tests/ref/adflow_test7_reg.ref
diff --git a/python/reg_tests/ref/adflow_test8_reg.ref → reg_tests/ref/adflow_test8_reg.ref b/python/reg_tests/ref/adflow_test8_reg.ref → reg_tests/ref/adflow_test8_reg.ref
diff --git a/python/reg_tests/ref/adflow_test9_reg.ref → reg_tests/ref/adflow_test9_reg.ref b/python/reg_tests/ref/adflow_test9_reg.ref → reg_tests/ref/adflow_test9_reg.ref
diff --git a/python/reg_tests/ref_cs/adflow_test1_reg.ref → reg_tests/ref_cs/adflow_test1_reg.ref b/python/reg_tests/ref_cs/adflow_test1_reg.ref → reg_tests/ref_cs/adflow_test1_reg.ref
diff --git a/python/reg_tests/ref_cs/adflow_test2_reg.ref → reg_tests/ref_cs/adflow_test2_reg.ref b/python/reg_tests/ref_cs/adflow_test2_reg.ref → reg_tests/ref_cs/adflow_test2_reg.ref
diff --git a/python/reg_tests/ref_cs/adflow_test3_reg.ref → reg_tests/ref_cs/adflow_test3_reg.ref b/python/reg_tests/ref_cs/adflow_test3_reg.ref → reg_tests/ref_cs/adflow_test3_reg.ref
diff --git a/python/reg_tests/ref_cs/adflow_test4_reg.ref → reg_tests/ref_cs/adflow_test4_reg.ref b/python/reg_tests/ref_cs/adflow_test4_reg.ref → reg_tests/ref_cs/adflow_test4_reg.ref
diff --git a/python/reg_tests/ref_cs/adflow_test5_reg.ref → reg_tests/ref_cs/adflow_test5_reg.ref b/python/reg_tests/ref_cs/adflow_test5_reg.ref → reg_tests/ref_cs/adflow_test5_reg.ref
diff --git a/python/reg_tests/ref_cs/adflow_test6_reg.ref → reg_tests/ref_cs/adflow_test6_reg.ref b/python/reg_tests/ref_cs/adflow_test6_reg.ref → reg_tests/ref_cs/adflow_test6_reg.ref
diff --git a/python/reg_tests/ref_cs/adflow_test7_reg.ref → reg_tests/ref_cs/adflow_test7_reg.ref b/python/reg_tests/ref_cs/adflow_test7_reg.ref → reg_tests/ref_cs/adflow_test7_reg.ref
diff --git a/python/reg_tests/ref_cs/adflow_test8_reg.ref → reg_tests/ref_cs/adflow_test8_reg.ref b/python/reg_tests/ref_cs/adflow_test8_reg.ref → reg_tests/ref_cs/adflow_test8_reg.ref
diff --git a/python/reg_tests/ref_cs/adflow_test9_reg.ref → reg_tests/ref_cs/adflow_test9_reg.ref b/python/reg_tests/ref_cs/adflow_test9_reg.ref → reg_tests/ref_cs/adflow_test9_reg.ref
diff --git a/python/reg_tests/run_om_reg_tests.py → reg_tests/run_om_reg_tests.py b/python/reg_tests/run_om_reg_tests.py → reg_tests/run_om_reg_tests.py
diff --git a/python/reg_tests/run_reg_tests.py → reg_tests/run_reg_tests.py b/python/reg_tests/run_reg_tests.py → reg_tests/run_reg_tests.py
diff --git a/python/reg_tests/run_reg_tests_cs.py → reg_tests/run_reg_tests_cs.py b/python/reg_tests/run_reg_tests_cs.py → reg_tests/run_reg_tests_cs.py
diff --git a/python/reg_tests/tests/__init__.py → reg_tests/tests/__init__.py b/python/reg_tests/tests/__init__.py → reg_tests/tests/__init__.py
diff --git a/python/reg_tests/tests/test1.py → reg_tests/tests/test1.py b/python/reg_tests/tests/test1.py → reg_tests/tests/test1.py
@@ -8,13 +8,7 @@
 from baseclasses import AeroProblem
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-from python.pyADflow import ADFLOW
-# ###################################################################
+from adflow import ADFLOW
 
 # ****************************************************************************
 printHeader('Test 1: MDO tutorial -- Euler -- Scalar JST')

diff --git a/python/reg_tests/tests/test10.py → reg_tests/tests/test10.py b/python/reg_tests/tests/test10.py → reg_tests/tests/test10.py
@@ -8,13 +8,7 @@
 from baseclasses import AeroProblem
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-from python.pyADflow import ADFLOW
-# ###################################################################
+from adflow import ADFLOW
 
 # ****************************************************************************
 printHeader('Test10: MDO tutorial -- Solve-CL Test')

diff --git a/python/reg_tests/tests/test11.py → reg_tests/tests/test11.py b/python/reg_tests/tests/test11.py → reg_tests/tests/test11.py
@@ -8,13 +8,7 @@
 from baseclasses import AeroProblem
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-from python.pyADflow import ADFLOW
-# ###################################################################
+from adflow import ADFLOW
 
 # ****************************************************************************
 printHeader('Test11: MDO tutorial -- Viscous -- Solution Test')

diff --git a/python/reg_tests/tests/test12.py → reg_tests/tests/test12.py b/python/reg_tests/tests/test12.py → reg_tests/tests/test12.py
@@ -8,13 +8,7 @@
 from baseclasses import AeroProblem
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-from python.pyADflow import ADFLOW
-# ###################################################################
+from adflow import ADFLOW
 
 # ****************************************************************************
 printHeader('Test12: MDO tutorial -- RANS -- Solution Test')

diff --git a/python/reg_tests/tests/test13.py → reg_tests/tests/test13.py b/python/reg_tests/tests/test13.py → reg_tests/tests/test13.py
@@ -11,13 +11,7 @@
 from idwarp import USMesh
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-from python.pyADflow import ADFLOW
-# ###################################################################
+from adflow import ADFLOW
 
 # ****************************************************************************
 printHeader('Test13: MDO tutorial -- Euler -- Adjoint Test')

diff --git a/python/reg_tests/tests/test14.py → reg_tests/tests/test14.py b/python/reg_tests/tests/test14.py → reg_tests/tests/test14.py
@@ -11,13 +11,7 @@
 from idwarp import USMesh
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-from python.pyADflow import ADFLOW
-# ###################################################################
+from adflow import ADFLOW
 
 # ****************************************************************************
 printHeader('Test14: MDO tutorial -- Rans -- Adjoint Test')

diff --git a/python/reg_tests/tests/test15.py → reg_tests/tests/test15.py b/python/reg_tests/tests/test15.py → reg_tests/tests/test15.py
@@ -8,12 +8,7 @@
 from baseclasses import AeroProblem
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-from python.pyADflow import ADFLOW
+from adflow import ADFLOW
 
 printHeader('Test 15: NACA 0012 2D Time-Accurate, Forced motion, Rigid Rotation of Mesh - DADI Smoother')
 gridFile = '../inputFiles/naca0012_rans-L2.cgns'

diff --git a/python/reg_tests/tests/test16.py → reg_tests/tests/test16.py b/python/reg_tests/tests/test16.py → reg_tests/tests/test16.py
@@ -8,13 +8,7 @@
 from baseclasses import AeroProblem
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-from python.pyADflow import ADFLOW
-# ###################################################################
+from adflow import ADFLOW
 
 # ****************************************************************************
 printHeader('Test 16: Euler Convergenent Nozzle -- Flow Properties Integration ')

diff --git a/python/reg_tests/tests/test17.py → reg_tests/tests/test17.py b/python/reg_tests/tests/test17.py → reg_tests/tests/test17.py
@@ -8,13 +8,7 @@
 from baseclasses import AeroProblem
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-from python.pyADflow import ADFLOW
-# ###################################################################
+from adflow import ADFLOW
 
 # ======================================================================
 #         Input Information -- Modify accordingly!

diff --git a/python/reg_tests/tests/test18.py → reg_tests/tests/test18.py b/python/reg_tests/tests/test18.py → reg_tests/tests/test18.py
@@ -8,13 +8,7 @@
 from baseclasses import AeroProblem
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-from python.pyADflow import ADFLOW
-# ###################################################################
+from adflow import ADFLOW
 
 # ======================================================================
 #         Input Information -- Modify accordingly!

diff --git a/python/reg_tests/tests/test2.py → reg_tests/tests/test2.py b/python/reg_tests/tests/test2.py → reg_tests/tests/test2.py
@@ -8,13 +8,7 @@
 from baseclasses import AeroProblem
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-from python.pyADflow import ADFLOW
-# ###################################################################
+from adflow import ADFLOW
 
 # ****************************************************************************
 printHeader('Test 2: MDO tutorial -- Euler -- Matrix')

diff --git a/python/reg_tests/tests/test3.py → reg_tests/tests/test3.py b/python/reg_tests/tests/test3.py → reg_tests/tests/test3.py
@@ -8,13 +8,7 @@
 from baseclasses import AeroProblem
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-from python.pyADflow import ADFLOW
-# ###################################################################
+from adflow import ADFLOW
 
 # ****************************************************************************
 printHeader('Test 3: MDO tutorial -- Euler -- Matrix')

diff --git a/python/reg_tests/tests/test4.py → reg_tests/tests/test4.py b/python/reg_tests/tests/test4.py → reg_tests/tests/test4.py
@@ -8,13 +8,7 @@
 from baseclasses import AeroProblem
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-from python.pyADflow import ADFLOW
-# ###################################################################
+from adflow import ADFLOW
 
 # ****************************************************************************
 printHeader('Test 4: MDO tutorial -- Random Mesh -- Euler -- Scalar JST')

diff --git a/python/reg_tests/tests/test5.py → reg_tests/tests/test5.py b/python/reg_tests/tests/test5.py → reg_tests/tests/test5.py
@@ -8,13 +8,7 @@
 from baseclasses import AeroProblem
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-from python.pyADflow import ADFLOW
-# ###################################################################
+from adflow import ADFLOW
 
 # ****************************************************************************
 printHeader('Test 5: MDO tutorial -- Viscous -- Scalar JST')

diff --git a/python/reg_tests/tests/test6.py → reg_tests/tests/test6.py b/python/reg_tests/tests/test6.py → reg_tests/tests/test6.py
@@ -8,13 +8,7 @@
 from baseclasses import AeroProblem
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-from python.pyADflow import ADFLOW
-# ###################################################################
+from adflow import ADFLOW
 
 # ****************************************************************************
 printHeader('Test 6: MDO tutorial -- Rans -- Scalar JST')

diff --git a/python/reg_tests/tests/test7.py → reg_tests/tests/test7.py b/python/reg_tests/tests/test7.py → reg_tests/tests/test7.py
@@ -8,13 +8,7 @@
 from baseclasses import AeroProblem
 from mdo_regression_helper import *
 from commonUtils import *
-
-# ###################################################################
-# DO NOT USE THIS IMPORT STRATEGY! THIS IS ONLY USED FOR REGRESSION
-# SCRIPTS ONLY. Use 'from adflow import ADFLOW' for regular scripts.
-sys.path.append(os.path.abspath('../../'))
-from python.pyADflow import ADFLOW
-# ###################################################################
+from adflow import ADFLOW
 
 # ****************************************************************************
 printHeader('Test 7: MDO tutorial -- Random -- Rans -- Scalar JST')