Merge pull request NREL#89 from nikhar-abbas/develop

v2.4.1
Ben-Mertz · Nov 10, 2021 · 08a8c9f · 08a8c9f
2 parents 2821f72 + feb5048
commit 08a8c9f
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -35,14 +35,14 @@ Please help us better understand the ROSCO user-base and how we can improve rosc
 If the ROSCO Toolbox played a role in your research, please cite it. This software can be
 cited as:
 
-   NREL: ROSCO. Version 2.4.0, https://github.com/NREL/ROSCO, 2021.
+   NREL: ROSCO. Version 2.4.1, https://github.com/NREL/ROSCO, 2021.
 
 For LaTeX users:
 
 ```
 @misc{ROSCO_toolbox_2021,
     author = {NREL},
-    title = {{ROSCO. Version 2.4.0}},
+    title = {{ROSCO. Version 2.4.1}},
     year = {2021},
     publisher = {GitHub},
     journal = {GitHub repository},

diff --git a/ROSCO/CMakeLists.txt b/ROSCO/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.6)
-project(ROSCO VERSION 2.4.0 LANGUAGES Fortran)
+project(ROSCO VERSION 2.4.1 LANGUAGES Fortran)
 
 set(CMAKE_Fortran_MODULE_DIRECTORY "${CMAKE_BINARY_DIR}/ftnmods")
 

diff --git a/ROSCO/src/Constants.f90 b/ROSCO/src/Constants.f90
@@ -10,7 +10,7 @@
 ! specific language governing permissions and limitations under the License.
 
 MODULE Constants
-    Character(*), PARAMETER     :: rosco_version = 'v2.4.0'             ! ROSCO version
+    Character(*), PARAMETER     :: rosco_version = 'v2.4.1'             ! ROSCO version
     REAL(8), PARAMETER          :: RPS2RPM = 9.5492966                  ! Factor to convert radians per second to revolutions per minute.
     REAL(8), PARAMETER          :: R2D = 57.295780                      ! Factor to convert radians to degrees.
     REAL(8), PARAMETER          :: D2R = 0.0175                         ! Factor to convert degrees to radians.

diff --git a/ROSCO_toolbox/__init__.py b/ROSCO_toolbox/__init__.py
@@ -3,4 +3,4 @@
 
 __author__ = """Nikhar J. Abbas and Daniel S. Zalkind"""
 __email__ = 'nikhar.abbas@nrel.gov'
-__version__ = '2.4.0'
+__version__ = '2.4.1'
diff --git a/Tune_Cases/BAR.yaml b/Tune_Cases/BAR.yaml
@@ -44,4 +44,4 @@ controller_params:
   omega_vs:           0.1                     # Torque controller desired natural frequency [rad/s]
   # Only needed if Flp_Mode > 0
   zeta_flp:           0.7                     # Flap controller desired damping ratio [-]
-  omega_flp:          2.63                    # Flap controller desired natural frequency [rad/s]
+  omega_flp:          2.63                    # Flap controller desired natural frequency [rad/s]
diff --git a/Tune_Cases/DTU10MW.yaml b/Tune_Cases/DTU10MW.yaml
@@ -46,4 +46,4 @@ controller_params:
   zeta_pc:            [0.8]                  # Pitch controller desired damping ratio [-]
   omega_pc:           [0.3]                   # Pitch controller desired natural frequency [rad/s]
   zeta_vs:            0.7                   # Torque controller desired damping ratio [-]
-  omega_vs:           0.2                   # Torque controller desired natural frequency [rad/s]
+  omega_vs:           0.2                   # Torque controller desired natural frequency [rad/s]
diff --git a/Tune_Cases/NREL5MW.yaml b/Tune_Cases/NREL5MW.yaml
@@ -47,4 +47,4 @@ controller_params:
   ptfm_freq:          0.2325                # Platform natural frequency [rad/s]  (OC4Hywind Parameters, here)   
   # Optional         
   ps_percent:         0.80                  # Percent peak shaving  [%, <= 1 ], {default = 80%}
-  sd_maxpit:          0.4363                # Maximum blade pitch angle to initiate shutdown [rad], {default = bld pitch at v_max}
+  sd_maxpit:          0.4363                # Maximum blade pitch angle to initiate shutdown [rad], {default = bld pitch at v_max}
diff --git a/docs/source/install.rst b/docs/source/install.rst
@@ -200,11 +200,7 @@ Please follow the following steps to install the ROSCO tool-chain. You should do
 .. code-block:: bash
 
     git clone https://github.com/NREL/ROSCO.git
-    cd ROSCO_toolbox
     python setup.py install
-
-
-Getting Started
 ----------------
 Please see :ref:`standard_use` for several example scripts using ROSCO and the ROSCO_toolbox.
 

diff --git a/environment.yml b/environment.yml
@@ -11,4 +11,4 @@ dependencies:
   - pandas
   - wisdem
   - cmake
-  - pyparsing==2.4.7 
+  - pyparsing==2.4.7 
diff --git a/setup.py b/setup.py
@@ -36,7 +36,7 @@
 EMAIL = 'nikhar.abbas@nrel.gov'
 AUTHOR = 'NREL, National Wind Technology Center'
 REQUIRES_PYTHON = '>=3.4'
-VERSION = '2.4.0'
+VERSION = '2.4.1'
 
 # These packages are required for all of the code to be executed. 
 # - Maybe you can get away with older versions...
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,4 +11,4 @@ dependencies: @@
       - pandas
       - wisdem
       - cmake
-      - pyparsing==2.4.7
+      - pyparsing==2.4.7