Update import statements to direct to files in to_organize2

NREL · Jul 29, 2023 · 66989b0 · 66989b0
1 parent fc80d98
commit 66989b0
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 26 deletions.
diff --git a/examples/offshore-hybrid/wind-h2.py b/examples/offshore-hybrid/wind-h2.py
@@ -54,7 +54,7 @@
 # OSW specific HOPP imports 
 # Jared: take all these models with a grain of salt and check them before trusting final result because they are built specifically for the OSW project and may not be sufficiently general
 import hopp.tools.hopp_tools as hopp_tools
-from hopp.to_organize.H2_Analysis.hopp_for_h2_floris import hopp_for_h2_floris as hopp_for_h2; use_floris = True
+from hopp.to_organize.to_organize2.hopp_for_h2_floris import hopp_for_h2_floris as hopp_for_h2; use_floris = True
 from hopp.simulation.technologies.hydrogen.electrolysis.H2_cost_model import basic_H2_cost_model
 
 

diff --git a/hopp/eco/hopp_mgmt.py b/hopp/eco/hopp_mgmt.py
@@ -1,7 +1,7 @@
 from hopp.simulation.technologies.sites import SiteInfo
 from hopp.simulation.technologies.sites import flatirons_site as sample_site
 
-from hopp.to_organize.H2_Analysis.hopp_for_h2_floris import (
+from hopp.to_organize.to_organize2.hopp_for_h2_floris import (
     hopp_for_h2_floris as hopp_for_h2,
 )
 

diff --git a/hopp/to_organize/hopp_tools_steel.py b/hopp/to_organize/hopp_tools_steel.py
@@ -25,7 +25,7 @@
 import inspect
 from datetime import datetime
 
-from hopp.to_organize import LCA_single_scenario
+from hopp.to_organize.to_organize2 import LCA_single_scenario
 
 
 
@@ -694,7 +694,7 @@ def run_HOPP(
         #                         'floris_config': floris_config # if not specified, use default SAM models
         #                     }}
 
-        from hopp.to_organize.H2_Analysis.hopp_for_h2_floris import hopp_for_h2_floris
+        from hopp.to_organize.to_organize2.hopp_for_h2_floris import hopp_for_h2_floris
         custom_powercurve=False
         hybrid_plant, combined_pv_wind_power_production_hopp, combined_pv_wind_curtailment_hopp,\
                 energy_shortfall_hopp, annual_energies, wind_plus_solar_npv, npvs, lcoe, lcoe_nom =  \
@@ -846,7 +846,7 @@ def pipeline(site_df,
     site_depth = int(site_depth)
 
     #from hopp.to_organize.H2_Analysis.pipeline_model import Pipeline
-    from hopp.to_organize.H2_Analysis.pipelineASME import PipelineASME
+    from hopp.to_organize.to_organize2.pipelineASME import PipelineASME
     in_dict = dict()
     #in_dict['pipeline_model'] = 'nrwl'
     #in_dict['pipeline_model'] = 'nexant'
@@ -1919,7 +1919,7 @@ def steel_LCOS(
         }
 
         hopp_dict.add('Models', {'steel_LCOS': {'input_dict': input_dict}})
-    from hopp.to_organize import run_profast_for_steel
+    from hopp.to_organize.to_organize2.run_profast_for_steel import run_profast_for_steel
 
     import ProFAST
 
@@ -2014,7 +2014,7 @@ def steel_LCOS_SMR(
 
     #     hopp_dict.add('Models', {'steel_LCOS': {'input_dict': input_dict}})
 
-    from hopp.to_organize import run_profast_for_steel
+    from hopp.to_organize.to_organize2.run_profast_for_steel import run_profast_for_steel
 
     import ProFAST
 
@@ -2088,7 +2088,8 @@ def levelized_cost_of_ammonia(
         }
 
         hopp_dict.add('Models', {'levelized_cost_of_ammonia': {'input_dict': input_dict}})
-    from hopp.to_organize import run_profast_for_ammonia
+    from hopp.to_organize.to_organize2.run_profast_for_ammonia import run_profast_for_ammonia
+
     # Specify file path to PyFAST
     # import sys
     # #sys.path.insert(1,'../PyFAST/')
@@ -2174,7 +2175,7 @@ def levelized_cost_of_ammonia_SMR(
 
     #     hopp_dict.add('Models', {'levelized_cost_of_ammonia': {'input_dict': input_dict}})
 
-    from hopp.to_organize import run_profast_for_ammonia
+    from hopp.to_organize.to_organize2.run_profast_for_ammonia import run_profast_for_ammonia
 
     import ProFAST
 
@@ -2242,7 +2243,7 @@ def levelized_cost_of_h2_transmission(
         }
 
         hopp_dict.add('Models', {'levelized_cost_of_h2_transmission': {'input_dict': input_dict}})
-    from hopp.to_organize import run_profast_for_h2_transmission
+    from hopp.to_organize.to_organize2.run_profast_for_h2_transmission import run_profast_for_h2_transmission
 
     import ProFAST
     # Specify file path to PyFAST

diff --git a/hopp/to_organize/probably_to_project/landbased_nationwide_LCOH.py b/hopp/to_organize/probably_to_project/landbased_nationwide_LCOH.py
@@ -11,7 +11,7 @@
 # from plot_reopt_results import plot_reopt_results
 # from run_reopt import run_reopt
 from hopp.to_organize.H2_Analysis.hopp_for_h2 import hopp_for_h2
-from hopp.to_organize.H2_Analysis.hopp_for_h2 import run_h2a as run_h2a
+from hopp.to_organize.H2_Analysis.hopp_for_h2 import run_h2a as run_h2a #no h2a function 
 from hopp.to_organize.H2_Analysis.simple_dispatch import SimpleDispatch
 from hopp.to_organize.H2_Analysis import simple_cash_annuals
 import hopp.simulation.technologies.hydrogen.electrolysis.run_h2_PEM as run_h2_PEM
@@ -29,7 +29,7 @@
 import copy
 
 from hopp.to_organize import plot_results
-from hopp.to_organize import run_profast_for_hydrogen
+from hopp.to_organize.to_organize2 import run_profast_for_hydrogen
 #from hopp.to_organize import run_profast_for_hydrogen Unsure if it is meant to be run_profast
 from hopp.to_organize.hopp_tools_steel import hoppDict
 import yaml

diff --git a/hopp/to_organize/probably_to_project/osw-h2.py b/hopp/to_organize/probably_to_project/osw-h2.py
@@ -9,7 +9,7 @@
 # from plot_reopt_results import plot_reopt_results
 # from run_reopt import run_reopt
 from hopp.to_organize.H2_Analysis.hopp_for_h2 import hopp_for_h2
-from hopp.to_organize.H2_Analysis.hopp_for_h2 import run_h2a as run_h2a
+from hopp.to_organize.H2_Analysis.hopp_for_h2 import run_h2a as run_h2a #no h2a function
 from hopp.to_organize.H2_Analysis.simple_dispatch import SimpleDispatch
 from hopp.to_organize.H2_Analysis import simple_cash_annuals
 import hopp.simulation.technologies.hydrogen.electrolysis.run_h2_PEM as run_h2_PEM

diff --git a/hopp/to_organize/probably_to_project/osw_h2_LCOH.py b/hopp/to_organize/probably_to_project/osw_h2_LCOH.py
@@ -10,7 +10,7 @@
 # from plot_reopt_results import plot_reopt_results
 # from run_reopt import run_reopt
 from hopp.to_organize.H2_Analysis.hopp_for_h2 import hopp_for_h2
-from hopp.to_organize.H2_Analysis.hopp_for_h2 import run_h2a as run_h2a
+from hopp.to_organize.H2_Analysis.hopp_for_h2 import run_h2a as run_h2a #no h2a function
 from hopp.to_organize.H2_Analysis.simple_dispatch import SimpleDispatch
 from hopp.to_organize.H2_Analysis import simple_cash_annuals
 import hopp.simulation.technologies.hydrogen.electrolysis.run_h2_PEM as run_h2_PEM
@@ -27,7 +27,7 @@
 from hopp.to_organize import hopp_tools_steel
 import copy 
 from hopp.to_organize import plot_results
-from hopp.to_organize import run_profast_for_hydrogen
+from hopp.to_organize.to_organize2 import run_profast_for_hydrogen
 from hopp.to_organize.hopp_tools_steel import hoppDict
 import yaml
 

diff --git a/hopp/to_organize/probably_to_project/steel_model.py b/hopp/to_organize/probably_to_project/steel_model.py
@@ -11,10 +11,11 @@
 from hopp.simulation.technologies.sites import SiteInfo
 from hopp.simulation.technologies.sites import flatirons_site as sample_site
 from hopp.utilities.keys import set_developer_nrel_gov_key
-from hopp.to_organize.H2_Analysis.plot_reopt_results import plot_reopt_results
-from hopp.to_organize.H2_Analysis.run_reopt import run_reopt
+from hopp.to_organize.to_organize2.plot_reopt_results import plot_reopt_results
+from hopp.to_organize.to_organize2.run_reopt import run_reopt
+from hopp.to_organize.to_organize2.run_reopt import run_reopt
 from hopp.to_organize.H2_Analysis.hopp_for_h2 import hopp_for_h2
-from hopp.to_organize.H2_Analysis.hopp_for_h2 import run_h2a as run_h2a
+from hopp.to_organize.H2_Analysis.hopp_for_h2 import run_h2a as run_h2a #no h2a function
 from hopp.to_organize.H2_Analysis.simple_dispatch import SimpleDispatch
 import hopp.simulation.technologies.hydrogen.electrolysis.run_h2_PEM as run_h2_PEM
 import numpy as np

diff --git a/hopp/tools/hopp_tools.py b/hopp/tools/hopp_tools.py
@@ -401,7 +401,7 @@ def run_HOPP(scenario,
                                 'floris_config': floris_config # if not specified, use default SAM models
                             }}
 
-        from hopp.to_organize.H2_Analysis.hopp_for_h2_floris import hopp_for_h2_floris
+        from hopp.to_organize.to_organize2.hopp_for_h2_floris import hopp_for_h2_floris
         custom_powercurve=False
         hybrid_plant, combined_pv_wind_power_production_hopp, combined_pv_wind_curtailment_hopp,\
                 energy_shortfall_hopp, annual_energies, wind_plus_solar_npv, npvs, lcoe, lcoe_nom =  \
@@ -504,7 +504,7 @@ def pipeline(site_df,
     site_depth = int(site_depth)
 
     #from examples.H2_Analysis.pipeline_model import Pipeline
-    from hopp.to_organize.H2_Analysis.pipelineASME import PipelineASME
+    from hopp.to_organize.to_organize2.pipelineASME import PipelineASME
     in_dict = dict()
     #in_dict['pipeline_model'] = 'nrwl'
     #in_dict['pipeline_model'] = 'nexant'
@@ -951,7 +951,7 @@ def steel_LCOS(levelized_cost_hydrogen,
                 lime_unitcost,
                 carbon_unitcost,
                 iron_ore_pellet_unitcost):
-    from hopp.to_organize.run_profast_for_steel import run_profast_for_steel
+    from hopp.to_organize.to_organize2.run_profast_for_steel import run_profast_for_steel
     # Specify file path to PyFAST
     import sys
     #sys.path.insert(1,'../PyFAST/')

diff --git a/tests/analysis/test_h2_main.py b/tests/analysis/test_h2_main.py
@@ -2,7 +2,7 @@
 from pathlib import Path
 import pandas as pd
 from pytest import approx
-from hopp.to_organize.H2_Analysis.h2_main import h2_main
+from hopp.to_organize.to_organize2.h2_main import h2_main
 
 class TestH2Main:
     def test_h2_main(self):

diff --git a/tests/analysis/test_h2_optimize_gf.py b/tests/analysis/test_h2_optimize_gf.py
@@ -1,5 +1,5 @@
 import pytest
-from hopp.to_organize.H2_Analysis.h2_optimize_gf import optimize_gf
+from hopp.to_organize.to_organize2.h2_optimize_gf import optimize_gf #Not a function in h2_optimize_gf
 from pathlib import Path
 
 @pytest.mark.skip

diff --git a/tests/hopp/hopp_tools_test.py b/tests/hopp/hopp_tools_test.py
@@ -370,7 +370,7 @@ def run_HOPP(scenario,
                                 'timestep': [0,8760],
                                 'floris_config': floris_config # if not specified, use default SAM models
                             }}
-        from hopp.to_organize.H2_Analysis.hopp_for_h2_floris import hopp_for_h2_floris
+        from hopp.to_organize.to_organize2.hopp_for_h2_floris import hopp_for_h2_floris
         custom_powercurve=False
         hybrid_plant, combined_pv_wind_power_production_hopp, combined_pv_wind_curtailment_hopp,\
                 energy_shortfall_hopp, annual_energies, wind_plus_solar_npv, npvs, lcoe, lcoe_nom =  \
@@ -474,7 +474,7 @@ def pipeline(site_df,
     site_depth = int(site_depth)
 
     #from examples.H2_Analysis.pipeline_model import Pipeline
-    from hopp.to_organize.H2_Analysis.pipelineASME import PipelineASME
+    from hopp.to_organize.to_organize2.pipelineASME import PipelineASME
     in_dict = dict()
     #in_dict['pipeline_model'] = 'nrwl'
     #in_dict['pipeline_model'] = 'nexant'
@@ -1047,7 +1047,7 @@ def write_outputs_PyFAST(electrical_generation_timeseries,
 
 def steel_LCOS(levelized_cost_hydrogen,
                 hydrogen_annual_production):
-    from hopp.to_organize.run_profast_for_steel import run_profast_for_steel
+    from hopp.to_organize.to_organize2.run_profast_for_steel import run_profast_for_steel
     # Specify file path to PyFAST
     import sys
     #sys.path.insert(1,'../PyFAST/')