Merge pull request NREL#9 from NREL/f/processing

F/processing
dzalkind · Apr 21, 2020 · a7b714a · a7b714a
2 parents e352d1d + cab719e
commit a7b714a
Show file tree

Hide file tree

Showing 4 changed files with 284 additions and 121 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,4 @@
 [submodule "ROSCO"]
 	path = ROSCO
 	url = https://github.com/NREL/ROSCO.git
+	branch = develop
diff --git a/README.md b/README.md
@@ -116,7 +116,7 @@ cited as:
 For LaTeX users:
 
 ```
-    @misc{ROSCO_toolbox_2019,
+@misc{ROSCO_toolbox_2019,
     author = {NREL},
     title = {{ROSCO Toolbox. Version 0.1.0}},
     year = {2019},

diff --git a/ROSCO b/ROSCO