Merge pull request #141 from ckiefer14/green_steel_cleanup

Update import statements and import files that other files depend on

alt_dev/run_alt.py

@@ -2,7 +2,7 @@
 # HOPP optimization problem and driver
 from alt_dev.optimization_problem_alt import HybridSizingProblem, expand_financial_model 
 from alt_dev.optimization_driver_alt import OptimizationDriver
-from hybrid.hybrid_simulation import HybridSimulation
+from hopp.simulation.hybrid_simulation import HybridSimulation
 from PySAM import Singleowner
 
 
@@ -32,8 +32,8 @@
 
 # NREL dev API key, for weather and data files and site information
 from pathlib import Path
-from hybrid.sites import make_circular_site, make_irregular_site, SiteInfo, locations
-from hybrid.keys import set_nrel_key_dot_env
+from hopp.simulation.technologies.sites import make_circular_site, make_irregular_site, SiteInfo, locations
+from hopp.utilities.keys import set_nrel_key_dot_env
 set_nrel_key_dot_env()
 
 from functools import partial

examples/CSP_PV_Battery_Analysis/1_single_plant.py

@@ -1,5 +1,5 @@
-from print_output import print_BCR_table, print_hybrid_output
-from simulation_init import init_hybrid_plant, get_example_path_root
+from examples.CSP_PV_Battery_Analysis.print_output import print_BCR_table, print_hybrid_output
+from examples.CSP_PV_Battery_Analysis.simulation_init import init_hybrid_plant, get_example_path_root
 
 if __name__ == '__main__':
     print_summary_results = True

examples/CSP_PV_Battery_Analysis/2_parametric_study.py

@@ -4,7 +4,7 @@
 
 from alt_dev.optimization_driver_alt import OptimizationDriver
 
-from simulation_init import DesignProblem, get_example_path_root
+from examples.CSP_PV_Battery_Analysis.simulation_init import DesignProblem, get_example_path_root
 
 if __name__ == '__main__':
     is_test = True

examples/CSP_PV_Battery_Analysis/3_optimize.py

@@ -13,8 +13,8 @@
 from alt_dev.optimization_problem_alt import HybridSizingProblem
 from alt_dev.optimization_driver_alt import OptimizationDriver
 
-from print_output import print_BCR_table, print_hybrid_output
-from simulation_init import DesignProblem, get_example_path_root
+from examples.CSP_PV_Battery_Analysis.print_output import print_BCR_table, print_hybrid_output
+from examples.CSP_PV_Battery_Analysis.simulation_init import DesignProblem, get_example_path_root
 
 def maxBCR(result):
     "String comes from hybrid_simulation_outputs keys"

examples/CSP_PV_Battery_Analysis/4_parallel_sample_optimize.py

@@ -4,7 +4,7 @@
 from skopt import gp_minimize, forest_minimize, gbrt_minimize
 
 from alt_dev.optimization_driver_alt import OptimizationDriver
-from simulation_init import DesignProblem, get_example_path_root
+from examples.CSP_PV_Battery_Analysis.simulation_init import DesignProblem, get_example_path_root
 
 
 def maxBCR(result):

examples/CSP_PV_Battery_Analysis/print_output.py

@@ -1,4 +1,4 @@
-from hybrid.hybrid_simulation import HybridSimulation
+from hopp.simulation.hybrid_simulation import HybridSimulation
 
 
 def print_table_metric(hybrid: HybridSimulation, metric: str, display_name: str=None):

examples/CSP_PV_Battery_Analysis/simulation_init.py

@@ -2,8 +2,8 @@
 import json
 import functools
 
-from hybrid.sites import SiteInfo
-from hybrid.hybrid_simulation import HybridSimulation
+from hopp.simulation.technologies.sites import SiteInfo
+from hopp.simulation.hybrid_simulation import HybridSimulation
 from alt_dev.optimization_problem_alt import HybridSizingProblem
 
 

examples/alt_dev/run_alt.py

@@ -11,11 +11,11 @@
 warnings.simplefilter("default")
 
 import pyDOE2 as pyDOE
-from hybrid.hybrid_simulation import HybridSimulation
+from hopp.simulation.hybrid_simulation import HybridSimulation
 from pathlib import Path
-from hybrid.sites import make_circular_site, make_irregular_site, SiteInfo, locations
+from hopp.simulation.technologies.sites import make_circular_site, make_irregular_site, SiteInfo, locations
 
-from hybrid.keys import set_nrel_key_dot_env
+from hopp.utilities.keys import set_nrel_key_dot_env
 set_nrel_key_dot_env()
 
 

examples/analysis/main_usa_new.py

@@ -17,12 +17,12 @@
 import multiprocessing
 import operator
 
-from hopp.log import analysis_logger as logger
-from hopp.sites import SiteInfo, flatirons_site
+from hopp.utilities.log import analysis_logger as logger
+from hopp.simulation.technologies.sites import SiteInfo, flatirons_site
 from hopp.simulation.hybrid_simulation import HybridSimulation
 
-from tools.analysis import create_cost_calculator
-from tools.resource import *
+from hopp.tools.analysis import create_cost_calculator
+from hopp.tools.resource import *
 
 
 def establish_save_output_dict():

examples/analysis/multi_location.py

@@ -20,14 +20,14 @@
 from dotenv import load_dotenv
 from itertools import repeat
 
-from hopp.keys import set_developer_nrel_gov_key
-from hopp.log import analysis_logger as logger
-from hopp.sites import SiteInfo
-from hopp.sites import flatirons_site as sample_site
+from hopp.utilities.keys import set_developer_nrel_gov_key
+from hopp.utilities.log import analysis_logger as logger
+from hopp.simulation.technologies.sites import SiteInfo
+from hopp.simulation.technologies.sites import flatirons_site as sample_site
 from hopp.simulation.hybrid_simulation import HybridSimulation
-from tools.analysis import create_cost_calculator
-from tools.resource import *
-from tools.resource.resource_loader import site_details_creator
+from hopp.tools.analysis import create_cost_calculator
+from hopp.tools.resource import *
+from hopp.tools.resource.resource_loader import site_details_creator
 
 resource_dir = Path(__file__).parent.parent.parent / "resource_files"
 

examples/eco/05-offshore-h2/eco-h2-offshore.py

@@ -21,7 +21,7 @@
 import matplotlib.pyplot as plt
 
 # packages needed for setting NREL API key
-from hopp.keys import set_developer_nrel_gov_key, get_developer_nrel_gov_key
+from hopp.utilities.keys import set_developer_nrel_gov_key, get_developer_nrel_gov_key
 
 # ORBIT imports 
 from ORBIT.core.library import initialize_library

examples/flicker.py

@@ -2,9 +2,9 @@
 from dotenv import load_dotenv
 import matplotlib.pyplot as plt
 
-from hopp.layout.flicker_mismatch_grid import FlickerMismatch, FlickerMismatchGrid
-from hopp.layout.flicker_data.plot_flicker import plot_contour
-from hopp.keys import set_developer_nrel_gov_key
+from hopp.simulation.technologies.layout.flicker_mismatch_grid import FlickerMismatch, FlickerMismatchGrid
+from hopp.simulation.technologies.layout.flicker_data import plot_contour
+from hopp.utilities.keys import set_developer_nrel_gov_key
 
 
 # Set API key