NatLabRockies
diff --git a/‎.github/workflows/ci.yml‎
Lines changed: 3 additions & 9 deletions b/‎.github/workflows/ci.yml‎
Lines changed: 3 additions & 9 deletions
diff --git a/‎.github/workflows/ci_docs.yml‎
Lines changed: 0 additions & 21 deletions b/‎.github/workflows/ci_docs.yml‎
Lines changed: 0 additions & 21 deletions
diff --git a/‎.github/workflows/gh_pages.yml‎
Lines changed: 0 additions & 52 deletions b/‎.github/workflows/gh_pages.yml‎
Lines changed: 0 additions & 52 deletions
diff --git a/‎.github/workflows/pre-commit.yml‎
Lines changed: 6 additions & 5 deletions b/‎.github/workflows/pre-commit.yml‎
Lines changed: 6 additions & 5 deletions
diff --git a/‎.github/workflows/publish_to_pypi.yml‎
Lines changed: 3 additions & 3 deletions b/‎.github/workflows/publish_to_pypi.yml‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎.github/workflows/publish_to_test_pypi.yml‎
Lines changed: 3 additions & 3 deletions b/‎.github/workflows/publish_to_test_pypi.yml‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎.gitignore‎
Lines changed: 14 additions & 1 deletion b/‎.gitignore‎
Lines changed: 14 additions & 1 deletion
diff --git a/‎CHANGELOG.md‎
Lines changed: 47 additions & 0 deletions b/‎CHANGELOG.md‎
Lines changed: 47 additions & 0 deletions
diff --git a/‎README.md‎
Lines changed: 21 additions & 13 deletions b/‎README.md‎
Lines changed: 21 additions & 13 deletions
diff --git a/‎docs/CONTRIBUTING.md‎
Lines changed: 28 additions & 0 deletions b/‎docs/CONTRIBUTING.md‎
Lines changed: 28 additions & 0 deletions
@@ -13,16 +13,16 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.11", "3.12"]
+        python-version: ["3.11", "3.13"]
         optional: [false]
         include:
           - python-version: "3.11"
             optional: true
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
@@ -31,7 +31,6 @@ jobs:
         run: |
           sudo apt-get update && sudo apt-get install -y libglpk-dev glpk-utils coinor-cbc
           python -m pip install --upgrade pip
-          pip install git+https://github.com/NREL/HOPP@develop
           if [ "${{ matrix.optional }}" = "true" ]; then
             pip install ".[develop]"
             pip install git+https://github.com/NREL/MarineCarbonManagement.git
@@ -44,8 +43,3 @@ jobs:
       - name: Run tests
         run: |
           pytest .
-      - name: Lint with flake8
-        run: |
-          # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-          pip install flake8
-          flake8 . --count --exit-zero --statistics --ignore=E501
@@ -1,18 +1,19 @@
 name: pre-commit
 
 on:
-  pull_request:
   push:
-    branches: [main]
+    branches: [main, develop]
+  pull_request:
+    branches: [main, develop]
 
 jobs:
   pre-commit:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
-        python-version: 3.9
+        python-version: 3.13
     - name: Run pre-commit
       uses: pre-commit/action@v3.0.1
@@ -14,11 +14,11 @@ jobs:
     permissions:
       id-token: write
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
-        python-version: 3.9
+        python-version: 3.13
     - name: Build package
       run: |
         python -m pip install --upgrade pip
 
@@ -15,11 +15,11 @@ jobs:
     permissions:
       id-token: write
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
-        python-version: 3.9
+        python-version: 3.13
     - name: Build package
       run: |
         python -m pip install --upgrade pip
 
@@ -117,19 +117,29 @@ ENV/
 *.db-wal
 *n2.html
 
-# H2Integrate structure specific
+# H2Integrate test, documentation, and examples outputs
 tests/h2integrate/data/*
 tests/h2integrate/output.txt
 tests/h2integrate/test_hydrogen/data/*
 tests/h2integrate/test_hydrogen/output.txt
 *speed_dir_data.csv
 examples/h2integrate/*/data
+examples/**/*data/
 examples/h2integrate/*/figures
+examples/*/*_output_dir/
+examples/*/*.sqlite
+examples/*/*_new.*
+examples/*/*[0-9].*
+*wind_electrolyzer/
 tests/h2integrate/reports/
 tests/h2integrate/test_hydrogen/output/
 **/run_*_out/
+**/*_run/
 *_out/
 **/test_*_out/
+**/wind_electrolyzer/*
+docs/misc_resources/wind_electrolyzer/
+docs/_autosummary
 
 output*
 snopt_history.txt
@@ -147,3 +157,6 @@ reports/*
 # Ignore wind and solar resource data files
 resource_files/wind/*
 resource_files/solar/*
+
+# Ignore library files
+library/*
@@ -1,5 +1,52 @@
 # Changelog
 
+## 0.6 [February 10, 2026]
+
+### New Features and Technology Models
+
+- Added standalone iron DRI and steel EAF performance and cost models [PR 409](https://github.com/NatLabRockies/H2Integrate/pull/409)
+- Add geologic hydrogen surface processing converter [PR 405](https://github.com/NatLabRockies/H2Integrate/pull/405)
+- Added [Ard](https://github.com/NLRWindSystems/Ard) as an optional combined performance and cost model [PR 481](https://github.com/NatLabRockies/H2Integrate/pull/481)
+- Added ability to plot multi-layer geospatial point heat map and simple straight line transport routes with GeoPandas and Contextily [PR 413](https://github.com/NatLabRockies/H2Integrate/pull/413)
+
+### Improvements and Refactoring
+
+- Added `PerformanceModelBaseClass` and standardized outputs of converter performance models [PR 463](https://github.com/NatLabRockies/H2Integrate/pull/463)
+- Updates all models in `supported_models` to map between a string version of the class name and
+  the class itself. As such, all examples and documentation have been updated to properly instruct
+  users to the change in model configuration naming conventions. The naming convention is also
+  enforced by a newly added test to ensure adherence. [PR 468](https://github.com/NatLabRockies/H2Integrate/pull/468)
+- Adds `additional_cls_name` kwarg to `BaseConfig.from_dict()` to allow for configuration errors buried in parent or child classes to provide which model had the offending misconfiguration for simpler user debugging. [PR 479](https://github.com/NatLabRockies/H2Integrate/pull/479)
+- Added capability to have transport models that require user input parameters [PR 408](https://github.com/NatLabRockies/H2Integrate/pull/408)
+- Add baseclass for caching functionality [PR 422](https://github.com/NatLabRockies/H2Integrate/pull/422)
+- Minor reorg for profast tools [PR 450](https://github.com/NatLabRockies/H2Integrate/pull/450)
+- Added postprocessing function to save timeseries [PR 440](https://github.com/NatLabRockies/H2Integrate/pull/440)
+- Removed hydrogen tank cost and performance models that were unused [PR 457](https://github.com/NatLabRockies/H2Integrate/pull/457)
+- Allow design variables to be specified with None type units [PR 514](https://github.com/NatLabRockies/H2Integrate/pull/514)
+
+### Documentation, Examples, and Miscellaneous
+
+- Updates models for NumPy version 2.4.0 [PR 422](https://github.com/NatLabRockies/H2Integrate/pull/422)
+- Update test values for WOMBAT update to 0.13.0 [PR 425](https://github.com/NatLabRockies/H2Integrate/pull/425)
+- Converted the documentation Jupyter notebooks to markdown files to simplify output diffs [PR 464](https://github.com/NatLabRockies/H2Integrate/pull/464)
+- Updated the contributing documentation to clarify what developers should expect for including
+  executable content in the documentation. [PR 464](https://github.com/NatLabRockies/H2Integrate/pull/464)
+- Converted the example notebooks to documentation examples, and maintain a basic working example
+  in the examples folder [PR 464](https://github.com/NatLabRockies/H2Integrate/pull/464):
+  - `examples/14_wind_hydrogen_dispatch/hydrogren_dispatch.ipynb` -> `docs/control/controller_demonstrations.md`
+  - `examples/20_solar_electrolyzer_doe/run_csv_doe.ipynb` content added to `docs/user_guide/design_of_experiments_in_h2i.md`
+  - `examples/25_sizing_modes/run_size_modes.ipynb` -> `docs/user_guide/run_size_modes.md`
+- `.gitignore` is updated to be more inclusive of example output data.
+- Documentation builds will now fail if a demonstration errors during execution that is not marked as an allowed error, ensuring previously silent errors get caught. [PR 464](https://github.com/NatLabRockies/H2Integrate/pull/464)
+- `pyproject.toml` is tidied up after moving past Python 3.9 and early H2I limitations. [PR 471](https://github.com/NatLabRockies/H2Integrate/pull/471)
+  - Cleans up unnecessary ignore rules in the ruff settings.
+  - Removes duplicate dependency listings, and alphabetizes for legibility with NLR packages
+    listed at the bottom.
+  - Remove unused dependencies.
+  - Fixes typos for skipped folders.
+  - Fixes missing dependencies for `gis` modifier used in new iron mapping tests.
+  - Remove `pytest-subtests` as it's incorporated into pytest as of v9, and is an archived project.
+
 ## 0.5.1 [December 18, 2025]
 
 - Fixed tagged version number for release
 
@@ -56,6 +56,7 @@ For more context about H2Integrate and to see analyses that have been performed
 PDFs are available in the linked titles.
 
 ### Nationwide techno-economic analysis of clean hydrogen production powered by a hybrid renewable energy plant for over 50,000 locations in the United States.
+
 The levelized cost of hydrogen is calculated for varying technology costs, and tax credits to
 explore cost sensitivities independent of plant design, performance, and site selection. Our
 findings suggest that strategies for cost reduction include selecting sites with abundant wind
@@ -65,6 +66,7 @@ assets to maximize the hybrid plant capacity factor.
 Grant, E., et al. "[Hybrid power plant design for low-carbon hydrogen in the United States.](https://iopscience.iop.org/article/10.1088/1742-6596/2767/8/082019/pdf)" Journal of Physics: Conference Series. Vol. 2767. No. 8. IOP Publishing, 2024.
 
 ### Exploring the role of producing low-carbon hydrogen using water electrolysis powered by offshore wind in facilitating the United States’ transition to a net-zero emissions economy by 2050.
+
 Conducting a regional techno-economic analysis at four U.S. coastal sites, the study evaluates two
 energy transmission configurations and examines associated costs for the years 2025, 2030, and 2035.
 The results highlight that locations using fixed-bottom technology may achieve cost-competitive
@@ -74,6 +76,7 @@ federal policy incentives.
 Brunik, K., et al. "[Potential for large-scale deployment of offshore wind-to-hydrogen systems in the United States.](https://iopscience.iop.org/article/10.1088/1742-6596/2767/6/062017/pdf)" Journal of Physics: Conference Series. Vol. 2767. No. 6. IOP Publishing, 2024.
 
 ### Examining how tightly-coupled gigawatt-scale wind- and solar-sourced H2 depends on the ability to store and deliver otherwise-curtailed H2 during times of shortages.
+
 Modeling results suggest that the levelized cost of storage is highly spatially heterogeneous, with
 minor impact on the cost of H2 in the Midwest, and potentially significant impact in areas with
 emerging H2 economies such as Central California and the Southeast. While TOL/MCH may be the
@@ -84,6 +87,7 @@ concerns.
 Breunig, Hanna, et al. "[Hydrogen Storage Materials Could Meet Requirements for GW-Scale Seasonal Storage and Green Steel.](https://assets-eu.researchsquare.com/files/rs-4326648/v1_covered_338a5071-b74b-4ecd-9d2a-859e8d988b5c.pdf?c=1716199726)" (2024).
 
 ### DOE Hydrogen Program review presentation of H2Integrate
+
 King, J. and Hammond, S. "[Integrated Modeling, TEA, and Reference Design for Renewable Hydrogen to Green Steel and Ammonia - GreenHEART](https://www.hydrogen.energy.gov/docs/hydrogenprogramlibraries/pdfs/review24/sdi001_king_2024_o.pdf?sfvrsn=a800ca84_3)" (2024).
 
 ## Software requirements
@@ -97,6 +101,11 @@ King, J. and Hammond, S. "[Integrated Modeling, TEA, and Reference Design for Re
 pip install h2integrate
 ```
 
+> [!NOTE]
+> If using the Ard models `h2integrate[ard]`, see the source installation instructions (item 3) for
+> creating a conda environment with WISDEM installed through conda, not pip as it can cause issues
+> on some machines.
+
 ## Installing from Source
 
 ### Easiest approach (recommended)
@@ -113,29 +122,28 @@ pip install h2integrate
     cd H2Integrate
     ```
 
-3. Create a conda environment and install H2Integrate and all its dependencies
+3. Create a conda environment and install H2Integrate and all its dependencies. Please read the
+   following two notes about modified installation steps.
+
+    1. If on a Unix machine, uncomment line 8 in `environment.yml` to install Cbc. Windows
+      users will need to manually install from <https://github.com/coin-or/Cbc>.
+    2. If you plan to use Ard, please uncomment line 9 in `environment.yml` to ensure WISDEM (an Ard
+      dependency) is installed from conda to avoid installation issues with some systems.
 
     ```bash
     conda env create -f environment.yml
     ```
 
-4. Install Cbc.
-   1. If using a Unix machine (not Windows), install a final dependency
-
-        ```bash
-        conda install -y -c conda-forge coin-or-cbc=2.10.8
-        ```
-
-    2. Windows users will have to manually install Cbc: https://github.com/coin-or/Cbc
-
 An additional step can be added if additional dependencies are required, or you plan to use this
 environment for development work.
 
 - Pass `-e` for an editable developer install
 - Use one of the extra flags as needed:
-  - `examples`: allows you to use the Jupyter Notebooks
-  - `develop`: adds developer and documentation tools
-  - `all` simplifies adding all the dependencies
+  - `gis`: adds the iron mapping tools.
+  - `ard`: adds the Ard-based wind models.
+  - `develop`: adds developer and documentation tools, plus optional analysis modifiers `gis` and `ard`.
+  - `examples`: allows you to use the Jupyter Notebooks and all examples (includes `ard` and `gis`).
+  - `all` simplifies adding all the dependencies.
 
 This looks like the following for a developer installation:
 
 
@@ -22,6 +22,15 @@ GitHub repo. Feel free to tackle any existing bugs or enhancement ideas by submi
   [Google style](https://www.sphinx-doc.org/en/master/usage/extensions/example_google.html).
 * When you start working on a pull request, start by creating a new branch pointing at the latest
   commit on [main](https://github.com/NREL/H2Integrate).
+* Code formatting is enforced using pre-commit hooks and is required for any code pushed up to the repository. The pre-commit package is included in the developer install of the repository. The pre-commit hooks can be installed by running
+```bash
+pre-commit install
+```
+in the repository directory. This will automatically run the pre-commit formatting hooks when code changes are committed. If you are having difficulty committing code after it has been reformatted by these hooks, try using the commit command
+```bash
+git commit -am "<Your commit message here>"
+```
+which will re-add the reformatted files to the commit.
 * The H2Integrate copyright policy is detailed in the [`LICENSE`](https://github.com/NREL/H2Integrate/blob/main/LICENSE).
 
 ## Documentation
@@ -46,6 +55,25 @@ If the browser appears to be out of date from what you expected to be built, ple
 3. Delete the `_build` folder and rebuild the docs
 ```
 
+### Writing Executable Content
+
+All executable content, such as Jupyter notebooks, should be converted to the executable markdown
+format used by Jupyter Book. For users that prefer to develop examples in Jupyter notebooks, then
+Jupytext (separate installation required) can be used to convert their work using the following
+command. For more details, please see their documentation:
+https://jupytext.readthedocs.io/en/latest/using-cli.html.
+
+```bash
+jupytext notebook.ipynb --to myst
+```
+
+Similarly, any documentation example that users wish to interact with can be converted to a notebook
+using the following command.
+
+```bash
+jupytext notebook.md --to .ipynb
+```
+
 ## Tests
 
 The test suite can be run using `pytest tests/h2integrate`. Individual test files can be run by specifying them: