Merge branch 'main' into stickfig_fix

MIT-LAE · Feb 5, 2024 · e6b012a · e6b012a
2 parents 44346db + 0b8c91e
commit e6b012a
Show file tree

Hide file tree

Showing 18 changed files with 2,864 additions and 629 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,4 +18,5 @@ Manifest.toml
 *.DS_Store
 docs/build/*
 .VSCodeCounter/*
-.vscode/*
+.vscode/*
+
diff --git a/Project.toml b/Project.toml
@@ -16,6 +16,7 @@ Roots = "f2b01f46-fcfa-551c-844a-d8ac1e96c665"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+Trapz = "592b5752-818d-11e9-1e9a-2b8ca4a44cd1"
 Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
 
 [compat]

diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ The easiest way to run `TASOPT.jl` would be to add the package using the julia p
 
 You can do this by starting a Julia session and then activating the package manager by typing `]` and then entering:
 ```julia-repl
-pkg> add "git@github.mit.edu:LAE/TAESOPT.jl.git"
+pkg> add git@github.com:MIT-LAE/TASOPT.jl.git
 ```
 
 You can then import `TASOPT` as you would with any Julia package:

diff --git a/docs/make.jl b/docs/make.jl
@@ -31,8 +31,9 @@ makedocs(
         ],
     "Propulsion systems" => Any[
             "propulsion/propsys.md",
+            "propulsion/gascalc.md",
             "propulsion/hxfun.md",
-            "propulsion/gascalc.md"
+            "propulsion/PEMfuelcell.md"
         ],
     "Stability" => "balance/balance.md",
     "Mission and sizing" => Any[