udpate resource files references

NREL · Oct 16, 2024 · 5216a1c · 5216a1c
1 parent efb5b2f
commit 5216a1c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/greenheart/to_organize/probably_to_project/landbased_nationwide_LCOH.py b/greenheart/to_organize/probably_to_project/landbased_nationwide_LCOH.py
@@ -24,7 +24,6 @@
 warnings.filterwarnings("ignore")
 from hopp.tools.resource import *
 from hopp.tools.resource.resource_loader import site_details_creator
-from hopp import ROOT_DIR
 
 from greenheart.to_organize import hopp_tools_steel
 import copy
@@ -35,6 +34,8 @@
 from greenheart.to_organize.hopp_tools_steel import hoppDict
 import yaml
 
+ROOT_DIR = Path(__file__).parents[2]
+
 """
 Landbased LCOH analysis
 """
@@ -88,7 +89,7 @@
 desired_lats = np.linspace(23.833504, 49.3556, N_lat)
 desired_lons = np.linspace(-129.22923, -65.7146, N_lon)
 load_resource_from_file = False
-resource_dir = ROOT_DIR / "simulation" / "resource_files" 
+resource_dir = ROOT_DIR / "resource_files" 
 sitelist_name = 'filtered_site_details_{}_lats_{}_lons_{}_resourceyear'.format(N_lat, N_lon, resource_year)
 
 if load_resource_from_file:

diff --git a/greenheart/tools/eco/utilities.py b/greenheart/tools/eco/utilities.py
@@ -19,7 +19,7 @@
 
 from hopp.utilities import load_yaml
 
-from hopp.simulation.technologies.dispatch import plot_tools
+from hopp.tools.dispatch import plot_tools
 
 from .finance import adjust_orbit_costs
 

diff --git a/tests/greenheart/test_openmdao.py b/tests/greenheart/test_openmdao.py
@@ -8,17 +8,17 @@
 
 from hopp.simulation import HoppInterface
 from hopp.utilities import load_yaml
-from hopp import ROOT_DIR
 
 from greenheart.tools.optimization.openmdao import GreenHeartComponent, HOPPComponent, TurbineDistanceComponent, BoundaryDistanceComponent
 from greenheart.tools.optimization.gc_run_greenheart import run_greenheart
 from greenheart.simulation.greenheart_simulation import GreenHeartSimulationConfig
-from hopp import ROOT_DIR
 
 import unittest
 
-solar_resource_file = ROOT_DIR / "simulation" / "resource_files" / "solar" / "35.2018863_-101.945027_psmv3_60_2012.csv"
-wind_resource_file = ROOT_DIR / "simulation" / "resource_files" / "wind" / "35.2018863_-101.945027_windtoolkit_2012_60min_80m_100m.srw"
+ROOT_DIR = Path(__file__).parents[2]
+
+solar_resource_file = ROOT_DIR / "resource_files" / "solar" / "35.2018863_-101.945027_psmv3_60_2012.csv"
+wind_resource_file = ROOT_DIR / "resource_files" / "wind" / "35.2018863_-101.945027_windtoolkit_2012_60min_80m_100m.srw"
 floris_input_file = Path(__file__).absolute().parent / "inputs" / "floris_input.yaml"
 hopp_config_filename = Path(__file__).absolute().parent / "inputs" / "hopp_config.yaml"
 hopp_config_steel_ammonia_filename = Path(__file__).absolute().parent / "input_files" / "plant" / "hopp_config.yaml"

diff --git a/tests/greenheart/test_openmdao_mpi.py b/tests/greenheart/test_openmdao_mpi.py
@@ -13,10 +13,10 @@
 from greenheart.tools.optimization.gc_run_greenheart import run_greenheart
 from greenheart.simulation.greenheart_simulation import GreenHeartSimulationConfig
 
-from hopp import ROOT_DIR
+ROOT_DIR = Path(__file__).parents[2]
 
-solar_resource_file = ROOT_DIR / "simulation" / "resource_files" / "solar" / "35.2018863_-101.945027_psmv3_60_2012.csv"
-wind_resource_file = ROOT_DIR / "simulation" / "resource_files" / "wind" / "35.2018863_-101.945027_windtoolkit_2012_60min_80m_100m.srw"
+solar_resource_file = ROOT_DIR / "resource_files" / "solar" / "35.2018863_-101.945027_psmv3_60_2012.csv"
+wind_resource_file = ROOT_DIR / "resource_files" / "wind" / "35.2018863_-101.945027_windtoolkit_2012_60min_80m_100m.srw"
 floris_input_filename = Path(__file__).absolute().parent / "inputs" / "floris_input.yaml"
 hopp_config_filename = Path(__file__).absolute().parent / "input_files" / "plant" / "hopp_config_wind_wave_solar_battery.yaml"
 greenheart_config_filename = Path(__file__).absolute().parent / "input_files" / "plant" / "greenheart_config.yaml"