Merge branch 'dev' of https://github.com/sandialabs/WecOptTool into pr/377

Author: jtgrasb

docs/build_docs.py

@@ -78,9 +78,15 @@ def build_doc(version, tag, home_branch, build):
             f"git checkout {home_branch}", shell=True)
 
 
-def move_pages():
-    print(f"Moving HTML pages to {os.path.join(docs_dir, 'pages')}...")
-    shutil.copytree(html_dir, os.path.join(docs_dir, 'pages'))
+def move_pages(dest_dir=None):
+    if dest_dir is None:
+        print(f"Moving HTML pages to {os.path.join(docs_dir, 'pages')}...")
+        shutil.copytree(
+            html_dir, os.path.join(docs_dir, 'pages'))
+    else:
+        print(f"Moving HTML pages to {os.path.join(docs_dir, 'pages', dest_dir)}...")
+        shutil.copytree(
+            html_dir, os.path.join(docs_dir, 'pages', dest_dir))
     print('Done.')
 
 
@@ -100,6 +106,6 @@ def move_pages():
         move_pages()
         for name, tag in versions.items():
             if name != home_name:
-                build_doc(name, tag, home_branch)
-                move_pages()
+                build_doc(name, tag, home_branch, build)
+                move_pages(dest_dir=name)
     shutil.rmtree(html_dir)

docs/source/references.rst

@@ -21,4 +21,5 @@ Bibliography
     Grasberger:2023aa
     Strofer:2023vw
     Coe2020Initial
-    Coe:2024aa
+    DEVIN2024119124
+    Coe:2024aa

docs/source/wecopttool_refs.bib

@@ -100,11 +100,21 @@ @article{Bacelli2014Numerical
 	volume = {6},
 	year = {2014}}
 
+@article{DEVIN2024119124,
+	title = {High-dimensional control co-design of a wave energy converter with a novel pitch resonator power takeoff system},
+	author = {Michael C. Devin and Daniel T. Gaebele and Carlos A. Michelén Ströfer and Jeff T. Grasberger and Jantzen Lee and Ryan G. Coe and Giorgio Bacelli},
+	journal = {Ocean Engineering},
+	volume = {312},
+	pages = {119124},
+	year = {2024},
+	issn = {0029-8018},
+	doi = {10.1016/j.oceaneng.2024.119124}}
+
 @inproceedings{Coe:2024aa,
 	address = {Blacksburg, VA},
 	author = {Ryan G. Coe and Michael C. Devin and Carlos A. {Michel{\'e}n Str{\"o}fer} and Jantzen Lee and Giorgio Bacelli and Alicia Keow and Daniel T. Gaebele and Jeff Grasberger and Steven J. Spencer and Johannes Spinneken and Vincent S. Neary and Brek Meuris},
 	booktitle = {15th IFAC Conference on Control Applications in Marine Systems, Robotics and Vehicles (IFAC-CAMS)},
 	month = {September},
 	organization = {IFAC},
 	title = {Co-design of a wave energy converter for autonomous power},
-	year = {2024}}
+	year = {2024}}

examples/tutorial_4_Pioneer.ipynb

@@ -306,6 +306,7 @@
     "datafile = 'data/pioneer_empirical_data.nc'\n",
     "empirical_data = xr.load_dataset(datafile)\n",
     "\n",
+    "omega_data = empirical_data.omega\n",
     "exc_coeff_data = empirical_data.exc_coeff_data_real + 1j*empirical_data.exc_coeff_data_imag\n",
     "Zi_data = empirical_data.Zi_data_real + 1j*empirical_data.Zi_data_imag\n",
     "Zi_stiffness = empirical_data.Zi_stiffness\n",