Update ofTools imports

johnjasa · Jan 6, 2021 · 9540362 · 9540362
1 parent 7cd186c
commit 9540362
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/Examples/ROSCO_walkthrough.ipynb b/Examples/ROSCO_walkthrough.ipynb
@@ -44,7 +44,7 @@
     "from ROSCO_toolbox import utilities as ROSCO_utilities\n",
     "from ROSCO_toolbox import controller as ROSCO_controller\n",
     "from ROSCO_toolbox import control_interface as ROSCO_ci\n",
-    "from ofTools.fast_io.output_processing import output_processing\n"
+    "from ROSCO_toolbox.ofTools.fast_io.output_processing import output_processing\n"
    ]
   },
   {
@@ -648,4 +648,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 4
-}
+}
diff --git a/Examples/example_08.py b/Examples/example_08.py
@@ -16,7 +16,7 @@
 import matplotlib.pyplot as plt 
 # ROSCO toolbox modules 
 from ROSCO_toolbox import utilities as ROSCO_utilities
-from ofTools.fast_io import output_processing
+from ROSCO_toolbox.ofTools.fast_io import output_processing
 import os
 
 this_dir = os.path.dirname(__file__)

diff --git a/ROSCO_testing/ROSCO_testing.py b/ROSCO_testing/ROSCO_testing.py
@@ -17,10 +17,10 @@
 import glob
 import multiprocessing as mp
 
-import ofTools.fast_io.read_fast_input as fast_io
-from ofTools.fast_io.FAST_reader import InputReader_OpenFAST
-from ofTools.case_gen.CaseGen_IEC import CaseGen_IEC
-from ofTools.case_gen.runFAST_pywrapper import runFAST_pywrapper_batch
+import ROSCO_toolbox.ofTools.fast_io.read_fast_input as fast_io
+from ROSCO_toolbox.ofTools.fast_io.FAST_reader import InputReader_OpenFAST
+from ROSCO_toolbox.ofTools.case_gen.CaseGen_IEC import CaseGen_IEC
+from ROSCO_toolbox.ofTools.case_gen.runFAST_pywrapper import runFAST_pywrapper_batch
 
 
 

diff --git a/ROSCO_toolbox/turbine.py b/ROSCO_toolbox/turbine.py
@@ -159,7 +159,7 @@ def load_from_fast(self, FAST_InputFile,FAST_directory, FAST_ver='OpenFAST',dev_
             txt_filename: str, optional
                           filename for *.txt, only used if rot_source='txt'
         """
-        from ofTools.fast_io.FAST_reader import InputReader_OpenFAST
+        from ROSCO_toolbox.ofTools.fast_io.FAST_reader import InputReader_OpenFAST
 
         print('Loading FAST model: %s ' % FAST_InputFile)
         self.TurbineName = FAST_InputFile.strip('.fst')
@@ -316,8 +316,8 @@ def generate_rotperf_fast(self, openfast_path, FAST_runDirectory=None, run_BeamD
             'serial' - run in serial, 'multi' - run using python multiprocessing tools, 
             'mpi' - run using mpi tools
         '''
-        from ofTools.case_gen import runFAST_pywrapper, CaseGen_General
-        from ofTools.util import FileTools
+        from ROSCO_toolbox.ofTools.case_gen import runFAST_pywrapper, CaseGen_General
+        from ROSCO_toolbox.ofTools.util import FileTools
         # Load pCrunch tools
         from pCrunch import pdTools, Processing
 
@@ -499,7 +499,7 @@ def load_blade_info(self):
         -----------
             self - note: needs to contain fast input file info provided by load_from_fast.
         '''
-        from ofTools.fast_io.FAST_reader import InputReader_OpenFAST
+        from ROSCO_toolbox.ofTools.fast_io.FAST_reader import InputReader_OpenFAST
         from wisdem.ccblade.ccblade import CCAirfoil, CCBlade
 
         # Create CC-Blade Rotor

diff --git a/ROSCO_toolbox/utilities.py b/ROSCO_toolbox/utilities.py
@@ -29,7 +29,7 @@
 from itertools import takewhile, product
 import struct
 
-from ofTools.util import spectral
+from ROSCO_toolbox.ofTools.util import spectral
 # Some useful constants
 now = datetime.datetime.now()
 pi = np.pi