NatLabRockies · johnjasa · Dec 11, 2025 · Jan 16, 2025 · Jan 22, 2025 · Jan 24, 2025
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -49,7 +49,7 @@ the problem. All code and full tracebacks should be properly markdown formatted.
 <!-- Add your information here. -->
 - OS: <macOS 12.4>
   <!-- e.g. Ubuntu 20.04 or macOS 10.12 -->
-- Python version: <3.10.4>
+- Python version: <3.11.1>
   <!-- All OS: `python --version`-->
 - HOPP version: <0.1.1>
   <!--
@@ -66,7 +66,7 @@ the problem. All code and full tracebacks should be properly markdown formatted.
 ### Relevant library versions
 <!--
 Use `pip freeze` to gather the relevant versions, and use the markdown table formatting as
-demonstrated below to replacing all relavant packages and their versions.
+demonstrated below to replacing all relevant packages and their versions.
 -->
 
   | Package | Version |

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ jobs:
         shell: bash -el {0}
     strategy:
       matrix:
-        python-version: ["3.10", "3.11"]
+        python-version: ["3.11", "3.12", "3.13"]
 
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/conda_build.yml b/.github/workflows/conda_build.yml
diff --git a/README.md b/README.md
@@ -9,9 +9,19 @@ As part of NREL's [Hybrid Energy Systems Research](https://www.nrel.gov/wind/hyb
 software assesses optimal designs for the deployment of distributed, commercial, and utility-scale hybrid energy plants, particularly considering wind,
 solar and storage.
 
+
+## Part of the WETO Stack
+
+HOPP is primarily developed with the support of the U.S. Department of Energy and is part of the [WETO Software Stack](https://nrel.github.io/WETOStack). For more information and other integrated modeling software, see:
+- [Portfolio Overview](https://nrel.github.io/WETOStack/portfolio_analysis/overview.html)
+- [Entry Guide](https://nrel.github.io/WETOStack/_static/entry_guide/index.html)
+- [Techno-Economic Modeling Workshop](https://nrel.github.io/WETOStack/workshops/user_workshops_2024.html#tea-and-cost-modeling)
+- [Systems Engineering Workshop](https://nrel.github.io/WETOStack/workshops/user_workshops_2024.html#systems-engineering)
+
+
 ## Software requirements
 
-- Python version 3.10, and 3.11 only
+- Python version 3.11 or higher
 
 ## Installing from Package Repositories
 

diff --git a/RELEASE.md b/RELEASE.md
@@ -1,4 +1,46 @@
 # Release Notes
+## Unreleased
+* Add `overwrite_fin_values` from H2Integrate to sync cost input methods
+* Bump minimum NREL-PySAM version to 7.0.0
+* Clarify that the `nominal_discount_rate` method of the `CustomFinancialModel` uses the Fisher equation
+* Bug-fix in `WindPlant` for handling model_input_file for PySAM simulations.
+* Remove `tidal_resource` as a required input to the tidal model because it's no longer required in the SSC model ([NREL/SSC PR #1305](https://github.com/NREL/ssc/pull/1305))
+* Add load following heuristic dispatch test
+* Consolidated utilities, renamed MHKConfig to MHKWaveConfig
+* Updated solar resource download to use GOES Aggregated PSM v4 download
+
+## Version 3.3.0, April 30, 2025
+
+* Added GenericPlant model ([PR #472](https://github.com/NREL/HOPP/pull/472)) which may be used to:
+    - simulate grid and battery performance without resimulating generation of other technologies
+    - represent the physics-based performance of a generation technology that is not included in HOPP
+* Loosened strictness of comparison for wind turbine config checking and added tests
+* Loosened strictness of comparison for wind turbine hub-height and wind resource hub-height
+* Updated workflow for specifying wind turbine parameters without specifying a turbine name with PySAM.
+* Added ability to download wind resource data from WTK-LED for Alaska ([PR #461](https://github.com/NREL/HOPP/pull/461))
+* Added ability to download wind resource data from BC-HRRR CONUS 60-minute (NOAA + NREL) for 2015-2023 ([PR #474](https://github.com/NREL/HOPP/pull/474))
+* Updated HOPP for pySAM 7.0.0 release ([PR #477](https://github.com/NREL/HOPP/pull/477))
+* Add long-duration energy storage (LDES) ([PR #471](https://github.com/NREL/HOPP/pull/471))
+* Bugfix for cycle counting in the minimum operating cost objective function - no longer throws an error
+* Bugfix for flicker mismatch; cases with a single `Point` now correctly work
+
+
+
+## Version 3.3.0, April 30, 2025
+
+* Added GenericPlant model ([PR #472](https://github.com/NREL/HOPP/pull/472)) which may be used to:
+    - simulate grid and battery performance without resimulating generation of other technologies
+    - represent the physics-based performance of a generation technology that is not included in HOPP
+* Loosened strictness of comparison for wind turbine config checking and added tests
+* Loosened strictness of comparison for wind turbine hub-height and wind resource hub-height
+* Updated workflow for specifying wind turbine parameters without specifying a turbine name with PySAM.
+* Added ability to download wind resource data from WTK-LED for Alaska ([PR #461](https://github.com/NREL/HOPP/pull/461))
+* Added ability to download wind resource data from BC-HRRR CONUS 60-minute (NOAA + NREL) for 2015-2023 ([PR #474](https://github.com/NREL/HOPP/pull/474))
+* Updated HOPP for pySAM 7.0.0 release ([PR #477](https://github.com/NREL/HOPP/pull/477))
+* Add long-duration energy storage (LDES) ([PR #471](https://github.com/NREL/HOPP/pull/471))
+* Bugfix for cycle counting in the minimum operating cost objective function - no longer throws an error
+* Bugfix for flicker mismatch; cases with a single `Point` now correctly work
+
 
 
 ## Version 3.3.0, April 30, 2025

diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
diff --git a/conda_build.sh b/conda_build.sh
diff --git a/docs/api/hopp_interface.md b/docs/api/hopp_interface.md
@@ -1,6 +1,6 @@
 # HOPP Simulation Interface
 
-This class is the main interaction point for HOPP simulations. See [Examples](https://github.com/NREL/HOPP/tree/main/examples/workshop) for in-depth notebooks and configuration files.
+This class is the main interaction point for HOPP simulations. See [Examples](https://github.com/NREL/HOPP/tree/main/examples) for in-depth notebooks and configuration files.
 
 ```{eval-rst}
 .. currentmodule:: hopp.simulation.hopp_interface

diff --git a/docs/api/technology/mhk_wave_plant.md b/docs/api/technology/mhk_wave_plant.md
@@ -14,7 +14,7 @@ MHK Wave Generator class
 ## Wave Plant Configuration
 
 ```{eval-rst}
-.. autoclass:: hopp.simulation.technologies.wave.mhk_wave_plant.MHKConfig
+.. autoclass:: hopp.simulation.technologies.wave.mhk_wave_plant.MHKWaveConfig
     :members:
     :undoc-members:
 ```

diff --git a/examples/10-tidal-battery.ipynb b/examples/10-tidal-battery.ipynb
@@ -19,9 +19,17 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 16,
+   "execution_count": 1,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "/Users/kbrunik/github/HOPP/examples/log/hybrid_systems_2025-07-23T14.55.37.333918.log\n"
+     ]
+    }
+   ],
    "source": [
     "from hopp.simulation import HoppInterface"
    ]
@@ -35,8 +43,7 @@
     "\n",
     "For the site information, the tidal resource data **must be pre-loaded** in the format given in the `Tidal_resource_timeseries.csv`.\n",
     "\n",
-    "The tidal technology configuration requires the device rating (kw), power curve of tidal energy device as function of stream speeds (kW), and number of devices. Additionally there's a variable called `tidal_resource`, which is required for model instantiation but doesn't impact a timeseries simulation.\n",
-    "\n",
+    "The tidal technology configuration requires the device rating (kw), power curve of tidal energy device as function of stream speeds (kW), and number of devices.\n",
     "Note that the tidal model doesn't come with a default financial model. To address this, you must establish the `CustomFinancialModel` from HOPP.\n",
     "\n",
     "The `default_fin_config` contains all of the necessary parameters for the financial calculations.\n",
@@ -46,7 +53,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 17,
+   "execution_count": 2,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -144,7 +151,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "pysam6",
+   "display_name": "pysam7",
    "language": "python",
    "name": "python3"
   },

diff --git a/examples/inputs/10-tidal-battery.yaml b/examples/inputs/10-tidal-battery.yaml
@@ -72,41 +72,41 @@ technologies:
     # this is a dummy resource profile and does not 
     # impact simulation when using timeseries data
     # TODO: Remove once PySAM Pypi updates
-    tidal_resource:
-    - [0.000000, 0.009000]
-    - [0.100000, 0.031000]
-    - [0.200000, 0.042000]
-    - [0.300000, 0.044000]
-    - [0.400000, 0.048000]
-    - [0.500000, 0.049000]
-    - [0.600000, 0.053000]
-    - [0.700000, 0.051000]
-    - [0.800000, 0.052000]
-    - [0.900000, 0.056000]
-    - [1.000000, 0.050000]
-    - [1.100000, 0.052000]
-    - [1.200000, 0.050000]
-    - [1.300000, 0.048000]
-    - [1.400000, 0.047000]
-    - [1.500000, 0.043000]
-    - [1.600000, 0.042000]
-    - [1.700000, 0.040000]
-    - [1.800000, 0.034000]
-    - [1.900000, 0.031000]
-    - [2.000000, 0.026000]
-    - [2.100000, 0.023000]
-    - [2.200000, 0.020000]
-    - [2.300000, 0.016000]
-    - [2.400000, 0.013000]
-    - [2.500000, 0.011000]
-    - [2.600000, 0.007000]
-    - [2.700000, 0.005000]
-    - [2.800000, 0.004000]
-    - [2.900000, 0.002000]
-    - [3.000000, 0.001000]
-    - [3.100000, 0.000000]
-    - [3.200000, 0.000000]
-    - [3.300000, 0.000000]
+    # tidal_resource:
+    # - [0.000000, 0.009000]
+    # - [0.100000, 0.031000]
+    # - [0.200000, 0.042000]
+    # - [0.300000, 0.044000]
+    # - [0.400000, 0.048000]
+    # - [0.500000, 0.049000]
+    # - [0.600000, 0.053000]
+    # - [0.700000, 0.051000]
+    # - [0.800000, 0.052000]
+    # - [0.900000, 0.056000]
+    # - [1.000000, 0.050000]
+    # - [1.100000, 0.052000]
+    # - [1.200000, 0.050000]
+    # - [1.300000, 0.048000]
+    # - [1.400000, 0.047000]
+    # - [1.500000, 0.043000]
+    # - [1.600000, 0.042000]
+    # - [1.700000, 0.040000]
+    # - [1.800000, 0.034000]
+    # - [1.900000, 0.031000]
+    # - [2.000000, 0.026000]
+    # - [2.100000, 0.023000]
+    # - [2.200000, 0.020000]
+    # - [2.300000, 0.016000]
+    # - [2.400000, 0.013000]
+    # - [2.500000, 0.011000]
+    # - [2.600000, 0.007000]
+    # - [2.700000, 0.005000]
+    # - [2.800000, 0.004000]
+    # - [2.900000, 0.002000]
+    # - [3.000000, 0.001000]
+    # - [3.100000, 0.000000]
+    # - [3.200000, 0.000000]
+    # - [3.300000, 0.000000]
     fin_model: !include default_fin_config.yaml
   battery:
     system_capacity_kwh: 80000

diff --git a/examples/legacy/analysis/main_usa_new.py b/examples/legacy/analysis/main_usa_new.py
@@ -23,6 +23,7 @@
 
 from hopp.tools.analysis import create_cost_calculator
 from hopp.tools.resource import *
+from hopp.tools.resource.resource_tools import get_offset
 from hopp import ROOT_DIR
 
 

diff --git a/examples/legacy/analysis/multi_location.py b/examples/legacy/analysis/multi_location.py
@@ -27,6 +27,7 @@
 from hopp.simulation.hybrid_simulation import HybridSimulation
 from hopp.tools.analysis import create_cost_calculator
 from hopp.tools.resource import *
+from hopp.tools.resource.resource_tools import get_offset
 from hopp.tools.resource.resource_loader import site_details_creator
 from hopp import ROOT_DIR
 resource_dir = ROOT_DIR / "simulation" / "resource_files"

diff --git a/examples/legacy/analysis/single_location.py b/examples/legacy/analysis/single_location.py
@@ -24,6 +24,7 @@
 from hopp.simulation.hybrid_simulation import HybridSimulation
 from hopp.tools.analysis import create_cost_calculator
 from hopp.tools.resource import *
+from hopp.tools.resource.resource_tools import get_offset
 from hopp import ROOT_DIR
 
 resource_dir = ROOT_DIR / "simulation" / "resource_files"

diff --git a/hopp/__init__.py b/hopp/__init__.py
@@ -1,7 +1,7 @@
 from pathlib import Path
 
 
-__version__ = "3.3.0"
+__version__ = "3.4.0"
 
 ROOT_DIR = Path(__file__).resolve().parent