Move ofTools into ROSCO_toolbox folder for consistency

dzalkind · Jan 6, 2021 · 7cd186c · 7cd186c
1 parent 3aab5c8
commit 7cd186c
Show file tree

Hide file tree

Showing 27 changed files with 19 additions and 19 deletions.
diff --git a/ofTools/README.md → ROSCO_toolbox/ofTools/README.md b/ofTools/README.md → ROSCO_toolbox/ofTools/README.md
diff --git a/ofTools/__init__.py → ROSCO_toolbox/ofTools/__init__.py b/ofTools/__init__.py → ROSCO_toolbox/ofTools/__init__.py
diff --git a/ofTools/case_gen/CaseGen_General.py → ...olbox/ofTools/case_gen/CaseGen_General.py b/ofTools/case_gen/CaseGen_General.py → ...olbox/ofTools/case_gen/CaseGen_General.py
@@ -1,6 +1,6 @@
 import os, itertools
 import numpy as np
-from ofTools.util.FileTools import save_yaml
+from ROSCO_toolbox.ofTools.util.FileTools import save_yaml
 
 def save_case_matrix_direct(case_list, dir_matrix):
     ### assumes all elements of the list are dict for that case that has the same keys!

diff --git a/ofTools/case_gen/CaseGen_IEC.py → ...O_toolbox/ofTools/case_gen/CaseGen_IEC.py b/ofTools/case_gen/CaseGen_IEC.py → ...O_toolbox/ofTools/case_gen/CaseGen_IEC.py
@@ -2,8 +2,8 @@
 import os, sys, copy, itertools
 import multiprocessing as mp
 
-from ofTools.case_gen.CaseGen_General import CaseGen_General, save_case_matrix, save_case_matrix_yaml
-from ofTools.fast_io.pyIECWind import pyIECWind_extreme, pyIECWind_turb
+from ROSCO_toolbox.ofTools.case_gen.CaseGen_General import CaseGen_General, save_case_matrix, save_case_matrix_yaml
+from ROSCO_toolbox.ofTools.fast_io.pyIECWind import pyIECWind_extreme, pyIECWind_turb
 
 try:
     from mpi4py import MPI

diff --git a/ofTools/case_gen/__init__.py → ROSCO_toolbox/ofTools/case_gen/__init__.py b/ofTools/case_gen/__init__.py → ROSCO_toolbox/ofTools/case_gen/__init__.py
diff --git a/ofTools/case_gen/runFAST_pywrapper.py → ...box/ofTools/case_gen/runFAST_pywrapper.py b/ofTools/case_gen/runFAST_pywrapper.py → ...box/ofTools/case_gen/runFAST_pywrapper.py
@@ -9,10 +9,10 @@
 import multiprocessing as mp
 # sys.path.insert(0, os.path.abspath(".."))
 
-from ofTools.fast_io.FAST_reader import InputReader_Common, InputReader_OpenFAST, InputReader_FAST7
-from ofTools.fast_io.FAST_writer import InputWriter_Common, InputWriter_OpenFAST, InputWriter_FAST7
-from ofTools.fast_io.FAST_wrapper import FastWrapper
-from ofTools.fast_io.FAST_post   import FAST_IO_timeseries
+from ROSCO_toolbox.ofTools.fast_io.FAST_reader import InputReader_Common, InputReader_OpenFAST, InputReader_FAST7
+from ROSCO_toolbox.ofTools.fast_io.FAST_writer import InputWriter_Common, InputWriter_OpenFAST, InputWriter_FAST7
+from ROSCO_toolbox.ofTools.fast_io.FAST_wrapper import FastWrapper
+from ROSCO_toolbox.ofTools.fast_io.FAST_post   import FAST_IO_timeseries
 
 import numpy as np
 

diff --git a/ofTools/fast_io/FAST_post.py → ROSCO_toolbox/ofTools/fast_io/FAST_post.py b/ofTools/fast_io/FAST_post.py → ROSCO_toolbox/ofTools/fast_io/FAST_post.py
@@ -1,5 +1,5 @@
 from __future__ import print_function
-from ofTools.fast_io.output_processing import output_processing
+from ROSCO_toolbox.ofTools.fast_io.output_processing import output_processing
 import ROSCO_toolbox
 
 def FAST_IO_timeseries(fname):

diff --git a/ofTools/fast_io/FAST_reader.py → ROSCO_toolbox/ofTools/fast_io/FAST_reader.py b/ofTools/fast_io/FAST_reader.py → ROSCO_toolbox/ofTools/fast_io/FAST_reader.py
@@ -4,7 +4,7 @@
 from functools import reduce
 import operator
 
-from ofTools.fast_io.FAST_vars import FstModel
+from ROSCO_toolbox.ofTools.fast_io.FAST_vars import FstModel
 from ROSCO_toolbox.utilities import read_DISCON, load_from_txt
 from ROSCO_toolbox import turbine as ROSCO_turbine
 ROSCO = True

diff --git a/ofTools/fast_io/FAST_vars.py → ROSCO_toolbox/ofTools/fast_io/FAST_vars.py b/ofTools/fast_io/FAST_vars.py → ROSCO_toolbox/ofTools/fast_io/FAST_vars.py
@@ -1,6 +1,6 @@
 from numpy import zeros, array
 import numpy as np
-from ofTools.fast_io.FAST_vars_out import FstOutput, Fst7Output
+from ROSCO_toolbox.ofTools.fast_io.FAST_vars_out import FstOutput, Fst7Output
 
 # This variable tree contains all parameters required to create a FAST model
 # for FAST versions 7 and 8.

diff --git a/ofTools/fast_io/FAST_vars_out.py → ..._toolbox/ofTools/fast_io/FAST_vars_out.py b/ofTools/fast_io/FAST_vars_out.py → ..._toolbox/ofTools/fast_io/FAST_vars_out.py
diff --git a/ofTools/fast_io/FAST_wrapper.py → ...O_toolbox/ofTools/fast_io/FAST_wrapper.py b/ofTools/fast_io/FAST_wrapper.py → ...O_toolbox/ofTools/fast_io/FAST_wrapper.py
diff --git a/ofTools/fast_io/FAST_writer.py → ROSCO_toolbox/ofTools/fast_io/FAST_writer.py b/ofTools/fast_io/FAST_writer.py → ROSCO_toolbox/ofTools/fast_io/FAST_writer.py
@@ -4,8 +4,8 @@
 import numpy as np
 from functools import reduce
 
-from ofTools.fast_io.FAST_reader import InputReader_Common, InputReader_OpenFAST, InputReader_FAST7
-from ofTools.fast_io.FAST_vars import FstModel
+from ROSCO_toolbox.ofTools.fast_io.FAST_reader import InputReader_Common, InputReader_OpenFAST, InputReader_FAST7
+from ROSCO_toolbox.ofTools.fast_io.FAST_vars import FstModel
 
 from ROSCO_toolbox.utilities import write_rotor_performance, write_DISCON
 ROSCO = True

diff --git a/ofTools/fast_io/__init__.py → ROSCO_toolbox/ofTools/fast_io/__init__.py b/ofTools/fast_io/__init__.py → ROSCO_toolbox/ofTools/fast_io/__init__.py
diff --git a/ofTools/fast_io/file.py → ROSCO_toolbox/ofTools/fast_io/file.py b/ofTools/fast_io/file.py → ROSCO_toolbox/ofTools/fast_io/file.py
diff --git a/ofTools/fast_io/output_processing.py → ...lbox/ofTools/fast_io/output_processing.py b/ofTools/fast_io/output_processing.py → ...lbox/ofTools/fast_io/output_processing.py
@@ -16,7 +16,7 @@
 from itertools import takewhile
 import struct
 
-from ofTools.util import spectral
+from ROSCO_toolbox.ofTools.util import spectral
 
 class output_processing():
     '''

diff --git a/ofTools/fast_io/pyIECWind.py → ROSCO_toolbox/ofTools/fast_io/pyIECWind.py b/ofTools/fast_io/pyIECWind.py → ROSCO_toolbox/ofTools/fast_io/pyIECWind.py
@@ -2,9 +2,9 @@
 import os, sys
 # import matplotlib.pyplot as plt 
 
-from ofTools.fast_io.turbsim_io.turbsim_writer import TurbsimBuilder
-from ofTools.fast_io.turbsim_io.turbsim_wrapper import Turbsim_wrapper
-from ofTools.fast_io.turbsim_io.turbsim_vartrees import turbsiminputs
+from ROSCO_toolbox.ofTools.fast_io.turbsim_io.turbsim_writer import TurbsimBuilder
+from ROSCO_toolbox.ofTools.fast_io.turbsim_io.turbsim_wrapper import Turbsim_wrapper
+from ROSCO_toolbox.ofTools.fast_io.turbsim_io.turbsim_vartrees import turbsiminputs
 
 # from AeroelasticSE.Turbsim_mdao.pyturbsim_wrapper import pyTurbsim_wrapper
 

diff --git a/ofTools/fast_io/read_fast_input.py → ...oolbox/ofTools/fast_io/read_fast_input.py b/ofTools/fast_io/read_fast_input.py → ...oolbox/ofTools/fast_io/read_fast_input.py
diff --git a/ofTools/fast_io/turbsim_io/__init__.py → ...ox/ofTools/fast_io/turbsim_io/__init__.py b/ofTools/fast_io/turbsim_io/__init__.py → ...ox/ofTools/fast_io/turbsim_io/__init__.py
diff --git a/ofTools/fast_io/turbsim_io/turbsim_reader.py → ...ools/fast_io/turbsim_io/turbsim_reader.py b/ofTools/fast_io/turbsim_io/turbsim_reader.py → ...ools/fast_io/turbsim_io/turbsim_reader.py
diff --git a/...ls/fast_io/turbsim_io/turbsim_vartrees.py → ...ls/fast_io/turbsim_io/turbsim_vartrees.py b/...ls/fast_io/turbsim_io/turbsim_vartrees.py → ...ls/fast_io/turbsim_io/turbsim_vartrees.py
diff --git a/...ols/fast_io/turbsim_io/turbsim_wrapper.py → ...ols/fast_io/turbsim_io/turbsim_wrapper.py b/...ols/fast_io/turbsim_io/turbsim_wrapper.py → ...ols/fast_io/turbsim_io/turbsim_wrapper.py
diff --git a/ofTools/fast_io/turbsim_io/turbsim_writer.py → ...ools/fast_io/turbsim_io/turbsim_writer.py b/ofTools/fast_io/turbsim_io/turbsim_writer.py → ...ools/fast_io/turbsim_io/turbsim_writer.py
@@ -1,6 +1,6 @@
-from ofTools.fast_io.turbsim_io.turbsim_vartrees import turbsiminputs
-from ofTools.fast_io.turbsim_io.turbulence_spectrum import turb_specs
-from ofTools.fast_io.turbsim_io.wind_profile_writer import write_wind
+from ROSCO_toolbox.ofTools.fast_io.turbsim_io.turbsim_vartrees import turbsiminputs
+from ROSCO_toolbox.ofTools.fast_io.turbsim_io.turbulence_spectrum import turb_specs
+from ROSCO_toolbox.ofTools.fast_io.turbsim_io.wind_profile_writer import write_wind
 import os
 import numpy as np
 import random

diff --git a/...fast_io/turbsim_io/turbulence_spectrum.py → ...fast_io/turbsim_io/turbulence_spectrum.py b/...fast_io/turbsim_io/turbulence_spectrum.py → ...fast_io/turbsim_io/turbulence_spectrum.py
diff --git a/...fast_io/turbsim_io/wind_profile_writer.py → ...fast_io/turbsim_io/wind_profile_writer.py b/...fast_io/turbsim_io/wind_profile_writer.py → ...fast_io/turbsim_io/wind_profile_writer.py
diff --git a/ofTools/util/FileTools.py → ROSCO_toolbox/ofTools/util/FileTools.py b/ofTools/util/FileTools.py → ROSCO_toolbox/ofTools/util/FileTools.py
diff --git a/ofTools/util/__init__.py → ROSCO_toolbox/ofTools/util/__init__.py b/ofTools/util/__init__.py → ROSCO_toolbox/ofTools/util/__init__.py
diff --git a/ofTools/util/spectral.py → ROSCO_toolbox/ofTools/util/spectral.py b/ofTools/util/spectral.py → ROSCO_toolbox/ofTools/util/spectral.py