Begin repo reorganization for v2

examples_artificial_data/00_setup_floris_model/00_visualize_layout.py

@@ -14,7 +14,7 @@
 import matplotlib.pyplot as plt
 import numpy as np
 
-from flasc.utilities_examples import load_floris_artificial as load_floris
+from flasc.utilities.utilities_examples import load_floris_artificial as load_floris
 from flasc.visualization import (
     plot_floris_layout,
     plot_layout_only,

examples_artificial_data/00_setup_floris_model/01_visualize_flowfield.py

@@ -2,7 +2,7 @@
 import matplotlib.pyplot as plt
 from floris.tools.visualization import visualize_cut_plane
 
-from flasc.utilities_examples import load_floris_artificial as load_floris
+from flasc.utilities.utilities_examples import load_floris_artificial as load_floris
 from flasc.visualization import plot_floris_layout
 
 if __name__ == "__main__":

examples_artificial_data/00_setup_floris_model/02_precalculate_floris_solutions.py

@@ -4,8 +4,8 @@
 import numpy as np
 from floris.tools import ParallelComputingInterface
 
-from flasc import floris_tools as ftools
-from flasc.utilities_examples import load_floris_artificial as load_floris
+from flasc.utilities import floris_tools as ftools
+from flasc.utilities.utilities_examples import load_floris_artificial as load_floris
 
 if __name__ == "__main__":
     # User settings

examples_artificial_data/00_setup_floris_model/03_compute_turbine_dependencies.py

@@ -1,8 +1,9 @@
 import matplotlib.pyplot as plt
 import numpy as np
 
-from flasc import floris_tools as fsatools, visualization as fsaviz
-from flasc.utilities_examples import load_floris_artificial as load_floris
+from flasc import visualization as fsaviz
+from flasc.utilities import floris_tools as fsatools
+from flasc.utilities.utilities_examples import load_floris_artificial as load_floris
 
 # Demonstrate the turbine dependency functions in floris_tools
 # Note a turbine is "dependent" on another if it is affected

examples_artificial_data/00_setup_floris_model/04_geometric_dependencies.py

@@ -2,7 +2,7 @@
 import numpy as np
 from floris.tools import FlorisInterface
 
-from flasc.floris_tools import get_all_impacting_turbines_geometrical
+from flasc.utilities.floris_tools import get_all_impacting_turbines_geometrical
 
 # Demonstrate the get_all_impacting_turbines_geometrical
 # function in floris_tools

examples_artificial_data/02_wake_steering_design/00_analyze_single_ws_vs_range.py

@@ -15,10 +15,10 @@
 from _local_helper_functions import evaluate_optimal_yaw_angles, optimize_yaw_angles
 from matplotlib import pyplot as plt
 
-from flasc.utilities_examples import load_floris_artificial as load_floris
+from flasc.utilities.lookup_table_tools import get_yaw_angles_interpolant
+from flasc.utilities.utilities_examples import load_floris_artificial as load_floris
 from flasc.visualization import plot_floris_layout, plot_layout_with_waking_directions
-from flasc.wake_steering.lookup_table_tools import get_yaw_angles_interpolant
-from flasc.wake_steering.yaw_optimizer_visualization import (
+from flasc.yaw_optimizer_visualization import (
     plot_offsets_wd,
     plot_offsets_wswd_heatmap,
     plot_uplifts_by_atmospheric_conditions,

examples_artificial_data/02_wake_steering_design/01_analyze_pP_values.py

@@ -16,8 +16,8 @@
 from _local_helper_functions import evaluate_optimal_yaw_angles, optimize_yaw_angles
 from matplotlib import pyplot as plt
 
-from flasc.utilities_examples import load_floris_artificial as load_floris
-from flasc.wake_steering.lookup_table_tools import get_yaw_angles_interpolant
+from flasc.utilities.lookup_table_tools import get_yaw_angles_interpolant
+from flasc.utilities.utilities_examples import load_floris_artificial as load_floris
 
 if __name__ == "__main__":
     # Define pP range

examples_artificial_data/02_wake_steering_design/02_analyze_wdstd_choices.py

@@ -17,8 +17,8 @@
 from floris.tools.uncertainty_interface import UncertaintyInterface
 from matplotlib import pyplot as plt
 
-from flasc.utilities_examples import load_floris_artificial as load_floris
-from flasc.wake_steering.lookup_table_tools import get_yaw_angles_interpolant
+from flasc.utilities.lookup_table_tools import get_yaw_angles_interpolant
+from flasc.utilities.utilities_examples import load_floris_artificial as load_floris
 
 
 def load_floris_with_uncertainty(std_wd=0.0):

examples_artificial_data/02_wake_steering_design/03_analyze_ti_choices.py

@@ -16,7 +16,7 @@
 from _local_helper_functions import evaluate_optimal_yaw_angles, optimize_yaw_angles
 from matplotlib import pyplot as plt
 
-from flasc.wake_steering.lookup_table_tools import get_yaw_angles_interpolant
+from flasc.utilities.lookup_table_tools import get_yaw_angles_interpolant
 
 if __name__ == "__main__":
     # Define turbulence intensity range

examples_artificial_data/02_wake_steering_design/04_analyze_table_ramp_choices.py

@@ -16,7 +16,7 @@
 from _local_helper_functions import evaluate_optimal_yaw_angles, optimize_yaw_angles
 from matplotlib import pyplot as plt
 
-from flasc.wake_steering.lookup_table_tools import get_yaw_angles_interpolant
+from flasc.utilities.lookup_table_tools import get_yaw_angles_interpolant
 
 if __name__ == "__main__":
     # Define std_wd range

examples_artificial_data/02_wake_steering_design/_local_helper_functions.py

@@ -16,7 +16,7 @@
 from floris.tools.optimization.yaw_optimization.yaw_optimizer_sr import YawOptimizationSR
 from floris.tools.uncertainty_interface import UncertaintyInterface
 
-from flasc.utilities_examples import load_floris_artificial as load_floris
+from flasc.utilities.utilities_examples import load_floris_artificial as load_floris
 
 
 def load_wind_climate_interpolant():

examples_artificial_data/03_energy_ratio/02_energy_ratio_vs_wd_for_single_df.py

@@ -16,11 +16,11 @@
 import matplotlib.pyplot as plt
 import pandas as pd
 
-from flasc import floris_tools as fsatools
-from flasc.dataframe_operations import dataframe_manipulations as dfm
-from flasc.energy_ratio import energy_ratio as er
-from flasc.energy_ratio.energy_ratio_input import EnergyRatioInput
-from flasc.utilities_examples import load_floris_artificial as load_floris
+from flasc.analysis import energy_ratio as er
+from flasc.analysis.energy_ratio_input import EnergyRatioInput
+from flasc.data_processing import dataframe_manipulations as dfm
+from flasc.utilities import floris_tools as fsatools
+from flasc.utilities.utilities_examples import load_floris_artificial as load_floris
 
 
 def load_data():

examples_artificial_data/03_energy_ratio/03_energy_ratio_vs_wd_for_multiple_dfs.py

@@ -17,11 +17,11 @@
 import pandas as pd
 from floris.utilities import wrap_360
 
-from flasc import floris_tools as fsatools
-from flasc.dataframe_operations import dataframe_manipulations as dfm
-from flasc.energy_ratio import energy_ratio as er
-from flasc.energy_ratio.energy_ratio_input import EnergyRatioInput
-from flasc.utilities_examples import load_floris_artificial as load_floris
+from flasc.analysis import energy_ratio as er
+from flasc.analysis.energy_ratio_input import EnergyRatioInput
+from flasc.data_processing import dataframe_manipulations as dfm
+from flasc.utilities import floris_tools as fsatools
+from flasc.utilities.utilities_examples import load_floris_artificial as load_floris
 
 
 def load_data():

examples_artificial_data/03_energy_ratio/04_energy_ratio_in_turbine_array.py

@@ -19,10 +19,10 @@
 from floris.tools.visualization import visualize_cut_plane
 from floris.utilities import wrap_360
 
-from flasc.dataframe_operations import dataframe_manipulations as dfm
-from flasc.energy_ratio import energy_ratio as er
-from flasc.energy_ratio.energy_ratio_input import EnergyRatioInput
-from flasc.utilities_examples import load_floris_artificial as load_floris
+from flasc.analysis import energy_ratio as er
+from flasc.analysis.energy_ratio_input import EnergyRatioInput
+from flasc.data_processing import dataframe_manipulations as dfm
+from flasc.utilities.utilities_examples import load_floris_artificial as load_floris
 from flasc.visualization import plot_floris_layout
 
 

examples_artificial_data/03_energy_ratio/05_estimate_heterogeneity_from_energy_ratios.py

@@ -4,12 +4,12 @@
 import numpy as np
 import pandas as pd
 
-from flasc import floris_tools as ftools
-from flasc.dataframe_operations import dataframe_manipulations as dfm
-from flasc.energy_ratio.energy_ratio_heterogeneity_mapper import heterogeneity_mapper
+from flasc.analysis.energy_ratio_heterogeneity_mapper import heterogeneity_mapper
+from flasc.data_processing import dataframe_manipulations as dfm
+from flasc.utilities import floris_tools as ftools
 
 # from flasc.visualization import plot_floris_layout
-from flasc.utilities_examples import load_floris_artificial as load_floris
+from flasc.utilities.utilities_examples import load_floris_artificial as load_floris
 
 
 def load_data():

examples_artificial_data/03_energy_ratio/06_wake_steering_example.py

@@ -16,9 +16,9 @@
 import pandas as pd
 import seaborn as sns
 
-from flasc.energy_ratio import energy_ratio as er
-from flasc.energy_ratio.energy_ratio_input import EnergyRatioInput
-from flasc.utilities_examples import load_floris_artificial as load_floris
+from flasc.analysis import energy_ratio as er
+from flasc.analysis.energy_ratio_input import EnergyRatioInput
+from flasc.utilities.utilities_examples import load_floris_artificial as load_floris
 from flasc.visualization import plot_binned_mean_and_ci, plot_layout_with_waking_directions
 
 if __name__ == "__main__":

examples_artificial_data/03_energy_ratio/07_wake_steering_total_uplift.py

@@ -15,9 +15,9 @@
 import numpy as np
 import pandas as pd
 
-from flasc.energy_ratio import total_uplift as tup
-from flasc.energy_ratio.energy_ratio_input import EnergyRatioInput
-from flasc.utilities_examples import load_floris_artificial as load_floris
+from flasc.analysis import total_uplift as tup
+from flasc.analysis.energy_ratio_input import EnergyRatioInput
+from flasc.utilities.utilities_examples import load_floris_artificial as load_floris
 from flasc.visualization import plot_binned_mean_and_ci, plot_layout_with_waking_directions
 
 if __name__ == "__main__":

examples_artificial_data/_legacy/parameter_estimation/estimate_ti_floris_debug.py

@@ -5,7 +5,7 @@
 import matplotlib.pyplot as plt
 import numpy as np
 
-from flasc import floris_tools as ftools, turbulence_estimator as fsatiestimator
+from flasc.utilities import floris_tools as ftools, turbulence_estimator as fsatiestimator
 
 if __name__ == "__main__":
     # Initialize the FLORIS interface fi

examples_artificial_data/_legacy/table_analysis/energy_table_for_two_df.py

@@ -4,12 +4,12 @@
 import pandas as pd
 from floris.utilities import wrap_360
 
-from flasc import floris_tools as fsatools
-from flasc.dataframe_operations import (
+from flasc.analysis import energy_ratio_suite
+from flasc.data_processing import (
     dataframe_manipulations as dfm,
 )
-from flasc.energy_ratio import energy_ratio_suite
-from flasc.utilities_examples import load_floris_artificial as load_floris
+from flasc.utilities import floris_tools as fsatools
+from flasc.utilities.utilities_examples import load_floris_artificial as load_floris
 
 
 def load_data():