Merge branch 'develop' into main

jfrederik-nrel · Apr 18, 2024 · e804096 · e804096
2 parents 93aeb68 + 7f2d024
commit e804096
Show file tree

Hide file tree

Showing 24 changed files with 41,953 additions and 637 deletions.
diff --git a/.github/workflows/deploy-pages.yaml b/.github/workflows/deploy-pages.yaml
@@ -29,9 +29,10 @@ jobs:
         mkdir -vp docs/examples
         cp -v example_case_folders/05_floris_wind_standin_and_electrolyzer/README.md docs/examples/05_floris_wind_standin_and_electrolyzer.md
         cp -v example_case_folders/06_amr_wind_standin_and_battery/README.md docs/examples/06_amr_wind_standin_and_battery.md
-        cp -v example_case_folders/07_amr_wind_standin_and_solar_pysam/README.md docs/examples/07_amr_wind_standin_and_solar_pysam.md
+        cp -v example_case_folders/07_floris_wind_standin_and_solar_pysam/README.md docs/examples/07_floris_wind_standin_and_solar_pysam.md
         cp -v example_case_folders/08_floris_only/README.md docs/examples/08_floris_only.md
         cp -v example_case_folders/09_amr_wind_openfast/README.md docs/examples/09_amr_wind_openfast.md
+
         ls -l docs/examples
 
     # Build the book

diff --git a/docs/install_local.md b/docs/install_local.md
@@ -68,13 +68,6 @@ NREL's PySAM software is also required for hercules. To install, use
 pip install nrel-pysam==4.2.0
 ```
 
-You may also want to run the FLORIS standin for AMR-Wind for a steady-state representation 
-of wind farm flows. In this case, run
-```
-pip install git+https://github.com/NREL/floris.git@v4
-```
-to get the correct branch of FLORIS installed.
-
 If you run hercules and get an error that `pyyaml` is missing, you may also need to install it using
 ```
 conda install -c conda-forge pyyaml

diff --git a/docs/install_on_kestrel.md b/docs/install_on_kestrel.md
@@ -98,16 +98,6 @@ If you run hercules and get an error that `pyyaml` is missing, you may also need
 ```
 conda install -c conda-forge pyyaml
 ```
-### Install FLORIS 
-You may also want to run the FLORIS standin for AMR-Wind for a steady-state representation  of wind farm flows. 
-In this case, go back to herc_root,
-Then run
-```
-pip install git+https://github.com/NREL/floris.git@v4
-```
-to get the correct branch of FLORIS installed.
-
-Note that that pyyaml package is also required for FLORIS. 
 
 ### Install the NREL Wind Hybrid Open Controller (WHOC)
 

diff --git a/docs/solar_pv.md b/docs/solar_pv.md
@@ -15,7 +15,7 @@ The `SolarPySAM` module uses [PySAM](https://nrel-pysam.readthedocs.io/en/main/o
 2.  A JSON file that specifies the PV plant system design (e.g. 100MW_1axis_pvsamv1.json).
 The system location (latitude, longitude, and elevation) is specified in the input `yaml` file.
 
-The example folder `07_amr_wind_standin_and_solar_pysam` specifies:
+The example folder `07_floris_standin_and_solar_pysam` specifies:
 - weather conditions on May 10, 2018 (from [this PySAM example](https://github.com/NREL/pysam/blob/main/Examples/NonAnnualSimulation.ipynb))
 - latitude, longitude, and elevation of Golden, CO
 - system design information for a 100 MW single-axis PV tracking system generated using the SAM GUI

diff --git a/example_case_folders/07_amr_wind_standin_and_solar_pysam/README.md b/example_case_folders/07_amr_wind_standin_and_solar_pysam/README.md
diff --git a/example_case_folders/07_amr_wind_standin_and_solar_pysam/hercules_runscript_amr_standin.py b/example_case_folders/07_amr_wind_standin_and_solar_pysam/hercules_runscript_amr_standin.py