Skip to content

Commit

Permalink
Test fixes + green_steel_cleanup merge (#198)
Browse files Browse the repository at this point in the history
* Added ORBIT citation and references. Commented each function, citing section/equations used or repurposed from this analysis.

* last comment changes

* reformat plots, generate paths for plots, add onshore substation to plots

* on-turbine pressure vessel visualization. updates to grid only

* fix plot. fix grid-only

* correct power, correct technology usage

* Added Floating Platform Model and testsl

* initial code for custom orbit layout

* use custome layout for ORBIT and FLORIS - IN PROGRESS

* correct visualization given different h2 storage types on turbine

* updates to example simulation file

* Updated Floating Platform Model and tests

* Update to fixed and floating platform models, Add test for Floating, Add example yaml file for floating

* Updated test section to work with ORBIT 1.06

* Fixed equation ref. comment

* Call to SemiTaut Branch in Orbit to pull mooring costs, Update to the variable names to match Orbit Nomenclature in yamls in .py

* Added new plotting script to show all years and locations on the same figure

* Add sources to test files, Update floating cost to match ORBIT Technical report and update to test file

* Added a script to plot regional sensitivity

* Improved regional sensitivity plotting script

* Update to source information for test files

* minor modifications to example

* Remove Project code

* working on refactor... broken scripts.

* examples/H2_Analysis removed, replaced with temp hopp/to_organize submodules.

pushed along to the point that green_steel_ammonia_define_scenarios.py
runs.

* Move LCA_green_steel and ProFAST files to Project repo

* changes induced by move to project repo

* improved project/software splits, coupled with greensteel commit: c9f1eb729dfc824e35e717feb518e902fd0387c1

* Add clarity to depth limitation on example_floating_project.yaml and floating_platform.py

* Remove project codes and move software codes into HOPP/hopp/to_organize or respective directories

* Update import statements and import files that other files depend on

* removing duplicate base.py

* reinstante hopp_for_h2_floris.py

* hotfix to make refactored floris compatible with old run scripts.

* fix hopp_tools_steel

* Update import statements to paths already in repo

* Restore LCA_single_scenario_Profast.py as run_profast_for_hydrogen.py needs it

* Remove Duplicates, update import statements

* Test file restore with history

* Delete Test move

* Rename of Test file move

* Test

* Test 2

* Test

* Move H2_Analysis files to this branch with history

* Test

* Test

* test

* Move H2_Analysis files that keep history from feature/green_steel_ammonia branch

* Test

* Restore run_profast scripts with history

* Move LCA_single_scenario files into to organize and keep history

* Removed files that had no history and replaced them in commit before this

* Updated import statments to restored files with history

* Deleted duplicate files that had no history with them/Replaced in to_organize2

* Update import statements to direct to files in to_organize2

* comments

* moving towards better separation.

* correct how the fixed platform is being used

* check ORBIT for already registered FlexPlatformDesign and FixedPlatformInstallation phases

* Update CI Action to run on PRs (#151)

* Update CI Action to run on PRs

* Add CI Badge to README.md

* Fix failing hybrid test

* correct typo

* remove old print statements

* i think green steel openmdao version is working.

* Revised comments on floating project depth limitations

* sanitizing my branch to match upstream

* restore run rodeo

* move run rodeo

* break out distributed pipe cost.

* mv dist pipe cost.

* working on getting tests running

* working toward reconciliation w/ ckiefer

* removed all of to_organize2, history preserved in to_organize with .

* trying to get tests to run under pytest

* typo fix

* getting more tests running

* improved nrel api handling, trailing whitespace removal.

* add orbit to requirements

* working on getting Avangrid code to run

* correct orbit requirement line

* add pyaml-include to requirements

* adding charles's fix.

* update hopp for h2 floris

* enable scaling wind farm costs to expected wind farm capex

* ignore all pycache directories at all levels

* remove obsolete shapely version spec

* change which desal model is being called

* allow expected_plant_costs to be missing in plant_config

* added option for run_h2_PEM model to use IVcurve model.

* fix conflict w/ pull

* update .gitignore

* less some plots, eco example working.

* remove comments

* Added and changed some files to get green steel code to work

* Fixed an issue with storage ITC in run_profast_for_hydrogen.py

* Cleanup + test fixes (#189)

* Remove redundant resource files

* Fix clustering tests

* Remove unneeded tests

We determined in our last Refactor meeting that these are not real tests and should be removed.

* Limit shapely version

There's currently a range of shapely versions that work for HOPP, and this is reflected in `master`. If we want to loosen this constraint, we'll need to figure out why the tests fail on current versions of the package.

* Fix test_csp imports

* Revert PySAM to 3.0.0

This change broke tests in tests/hopp/test_hybrid, I'm not sure why, but we'll need to revisit if we want to upgrade.

* Fix documentation build

* Disable test_pressure_vessel

* Fix test_custom_financial

* Reorganize tests into tests/hopp

* Disable analysis tests

Met with Kaitlin Brunik (@kbrunik) today to discuss these particular analysis tests. These are based on outdated examples, and need to be re-assessed alongside the code in the holdover `to_organize` directory, which contains a number of files that likely belong as project code rather than usage examples for the repository.

* Update Custom Financial Model (#195)

* pull in changes from pysam_update_capacity

* fix import

* update tests

* undo a commenting

* BatteryStateless (#196)

* pull in changes from pysam_update_capacity

* fix import

* update tests

* add batttery_stateless

* break out create_max_gross_profit_objective by tech

* fix tests

* fix minor comments

* update .gitignore

* Remove more resource files

Another attempt at removing files that are not explicitly used in the code.

* Re-add clobbered changes and fix imports

---------

Co-authored-by: Darice L Guittet <[email protected]>
Co-authored-by: Jared Thomas <[email protected]>

* Revert "Update __init__.py (#194)"

This reverts commit 12ba476.

---------

Co-authored-by: nriccobo <[email protected]>
Co-authored-by: Jared Thomas <[email protected]>
Co-authored-by: Kiefer <[email protected]>
Co-authored-by: Charles Kiefer <[email protected]>
Co-authored-by: Evan <[email protected]>
Co-authored-by: Cory Frontin <[email protected]>
Co-authored-by: Jared Thomas <[email protected]>
Co-authored-by: bayc <[email protected]>
Co-authored-by: Darice L Guittet <[email protected]>
  • Loading branch information
10 people authored Aug 21, 2023
1 parent 12ba476 commit 3452dd8
Show file tree
Hide file tree
Showing 7,736 changed files with 6,240 additions and 16,809,197 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Testing

on: [ push ]
on: [ push, pull_request ]

jobs:
build:
Expand All @@ -20,7 +20,6 @@ jobs:
env:
SKLEARN_ALLOW_DEPRECATED_SKLEARN_PACKAGE_INSTALL: True
run: |
pip install scikit-learn
sudo apt-get update && sudo apt-get install -y libglpk-dev glpk-utils coinor-cbc
python -m pip install --upgrade pip
pip install scikit-learn
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,23 +1,26 @@
# Created by .ignore support plugin (hsz.mobi)
### Python template
# Byte-compiled / optimized / DLL files
__pycache__/
*__pycache__/*
*.py[cod]
*$py.class
*.pyc

log/
examples/HOPP_examples/
HOPP_examples/
HOPP-demos/
# needed for h2 test inputs: tests/analysis/results/
examples/H2 Analysis/results/reopt_precomputes/
*_disp.txt

tests/hybrid/REoptResultsNoExportAboveLoad.json

# Results
examples/analysis/results/*.csv
resource_files/wind
resource_files/solar
resource_files/grid

# clean up after merge
examples/Powerflow Analysis
Expand Down
30 changes: 30 additions & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# .readthedocs.yaml
# Read the Docs configuration file
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

# Required
version: 2

# Set the version of Python and other tools you might need
build:
os: ubuntu-22.04
tools:
python: "3.8"
# You can also specify other tool versions:
# nodejs: "19"
# rust: "1.64"
# golang: "1.19"

# Build documentation in the docs/ directory with Sphinx
sphinx:
configuration: docs/conf.py
fail_on_warning: true

# If using Sphinx, optionally build your docs in additional formats such as PDF
# formats:
# - pdf

# Optionally declare the Python requirements required to build your docs
python:
install:
- requirements: requirements-dev.txt
9 changes: 0 additions & 9 deletions .readthedocs.yml

This file was deleted.

Loading

0 comments on commit 3452dd8

Please sign in to comment.