sora-ryu · sora-ryu · Feb 19, 2025 · Aug 27, 2024 · Aug 28, 2024 · Aug 28, 2024
diff --git a/.coverageac b/.coverageac
diff --git a/.github/workflows/CI_WEIS.yml b/.github/workflows/CI_WEIS.yml
@@ -17,13 +17,13 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest", "macOS-13", "macOS-latest", "windows-latest"] # mac13 is intel, mac-14 arm
-        python-version: ["3.9","3.10","3.11","3.12"]
+        python-version: ["3.10","3.11","3.12"]
 
     steps:
       - uses: actions/checkout@v4
 
       - name: Install conda/mamba
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@v3
         # https://github.com/marketplace/actions/setup-miniconda
         with:
           # To use mamba, uncomment here, comment out the miniforge line
@@ -43,11 +43,11 @@ jobs:
       - name: Add dependencies ubuntu specific
         if: false == contains( matrix.os, 'windows')
         run: |
-          conda install -y petsc4py mpi4py openmpi pyoptsparse
+          conda install -y petsc4py=3.22.2 mpi4py pyoptsparse
 
       - name: Add test packages
         run: |
-          conda install -y pytest pytest-cov coveralls 
+          conda install -y pytest pytest-cov coveralls treon gdown
 
       - name: Show custom environment
         run: |
@@ -80,17 +80,67 @@ jobs:
       #- name: List tests
       #  run: |
       #    pytest --collect-only weis 
+
+      # Test walkthrough notebook
+      - name: Test postprocessing notebooks
+        if: contains( matrix.os, 'ubuntu') && contains( github.event_name, 'pull_request')
+        env:
+            RUN_EXHAUSTIVE: 1
+        run: |
+          cd examples/16_postprocessing
+          gdown --no-check-certificate 1AtLjjX5xpPqlHkfwDqeUj6VBMOYWcjmV
+          unzip outputs
+          treon plot_FAST.ipynb
+          treon rev_DLCs_WEIS.ipynb
+          treon rev_Opt.ipynb
+          treon rev_WEIS_CSV.ipynb
 
       # Run all tests within WEIS, but not computationally expensive examples
       - name: Run tests within WEIS
+        if: false == contains( matrix.os, 'ubuntu') || contains( github.event_name, 'push')
         run: |
-          pytest --cov-config=.coverageac --cov=weis -p no:warnings --disable-warnings weis 
-
+          pytest -p no:warnings --disable-warnings --cov=weis weis
+
+      # Run long tests in on pull request
+      - name: Run exhaustive
+        if: contains( matrix.os, 'ubuntu') && contains( github.event_name, 'pull_request')
+        env:
+            RUN_EXHAUSTIVE: 1
+        run: |
+            pytest  -p no:warnings -s --disable-warnings  weis
+
+      # Run parallel script calling OpenFAST
+      - name: Run parallel cases
+        if: contains( matrix.os, 'ubuntu') && contains( github.event_name, 'pull_request')
+        env:
+            RUN_EXHAUSTIVE: 1
+        run: |
+          cd examples/02_run_openfast_cases
+          mpiexec -np 2 python weis_driver_loads.py
+          cd ../03_NREL5MW_OC3_spar
+          mpiexec -np 2 python weis_driver.py
+          cd ../05_IEA-3.4-130-RWT
+          mpiexec -np 2 python weis_driver.py
+          cd ../09_design_of_experiments
+          mpiexec -n 2 python DOE_raft.py
+          mpiexec -n 2 --bind-to core python DOE_openfast.py
+          python postprocess_results.py
+          cd ../17_IEA22_Optimization
+          mpiexec -n 2 python driver_weis_raft_opt.py
+
+      # Run scripts within dac folder
+      # - name: Run examples distributed aerodynamic control
+      #  run: |
+      #    cd examples/dac_flaps
+      #    python dac_driver.py
+
       # Run coveralls
       - name: Run coveralls
         if: contains( matrix.os, 'ubuntu') && contains( matrix.python-version, '3.11')
-        #uses: coverallsapp/github-action@v2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        #uses: coverallsapp/github-action@v2
+        #with:
+        #    github-token:  ${{ secrets.GITHUB_TOKEN }}
         run: |
           coveralls --service=github
diff --git a/.github/workflows/run_exhaustive_examples.yml b/.github/workflows/run_exhaustive_examples.yml
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -9,11 +9,12 @@ version: 2
 build:
   os: ubuntu-22.04
   tools:
-    python: "mambaforge-4.10"
+    python: "mambaforge-22.9"
   jobs:
     # Read the docs needs a couple packages not in the environment file
     pre_install:
-      - conda install cmake compilers
+      - conda install -y cmake compilers sphinx sphinxcontrib-bibtex sphinx-jsonschema
+      - conda install sphinx_rtd_theme>=1.3
 
 
 # Shouldn't need conda for building the docs, but it is an option

diff --git a/README.md b/README.md
@@ -57,7 +57,7 @@ The installation instructions below use the environment name, "weis-env," but an
 
 2. Add in final packages and install the software
 
-        conda install -y petsc4py mpi4py pyoptsparse     # (Mac / Linux only)
+        conda install -y petsc4py=3.22.2 mpi4py pyoptsparse     # (Mac / Linux only, sometimes Windows users may need to install mpi4py)
         pip install -e .
 
 3. Instructions specific for DOE HPC system Eagle.  Before executing the setup script, do:

diff --git a/docs/_static/custom.css b/docs/_static/custom.css
@@ -0,0 +1,65 @@
+/* dl.class, dl.method, dl.attribute {
+    display: inline-block;
+    padding-top: 15px;
+    padding-bottom: 15px;
+}
+
+dl.class, dl.method, dl.attribute {
+    border-top: groove;
+    border-top-color: darkgrey;
+} */
+
+dl.class::before {
+    content: ' ';
+    width: auto;
+    display: block;
+    border-top: 4px solid black;
+    margin-top: 35px;
+    margin-left: -30px;
+    padding-bottom: 35px;
+}
+
+dl.method::before {
+    content: ' ';
+    width: auto;
+    display: block;
+    border-top: 1px solid black;
+    margin-top: 15px;
+    margin-left: -30px;
+    padding-bottom: 15px;
+}
+
+dl.function::before {
+    content: ' ';
+    width: auto;
+    display: block;
+    border-top: 1px solid black;
+    margin-top: 15px;
+    margin-left: -30px;
+    padding-bottom: 15px;
+}
+
+dl.attribute::before {
+    content: ' ';
+    width: auto;
+    display: block;
+    border-top: 1px solid black;
+    margin-top: 15px;
+    margin-left: -30px;
+    padding-bottom: 15px;
+}
+
+
+.wy-nav-content {
+    max-width: 1100px !important;
+}
+
+.wy-table-responsive td,
+.wy-table-responsive th {
+    white-space: normal;
+}
+
+.wy-table-responsive table.word-wrap td,
+.wy-table-responsive table.word-wrap th {
+    white-space: inherit;
+}
diff --git a/docs/_static/main.js b/docs/_static/main.js
@@ -0,0 +1,3 @@
+$(document).ready( function () {
+    $('table.datatable').DataTable();
+} );
diff --git a/docs/conf.py b/docs/conf.py
@@ -44,6 +44,7 @@
               'sphinxcontrib.bibtex',
               'sphinx.ext.intersphinx',
               'sphinx_rtd_theme',
+              'sphinx-jsonschema',
               # 'autoapi.extension',
               # 'embed-n2',
 ]
@@ -106,3 +107,22 @@
         'searchbox.html'        
     ]
 }
+
+html_css_files = [
+    'https://cdn.datatables.net/1.10.23/css/jquery.dataTables.min.css',
+    "custom.css",
+]
+
+html_js_files = [
+    'https://cdn.datatables.net/1.10.23/js/jquery.dataTables.min.js',
+    'main.js',
+]
+
+# Bibtex configuration
+bibtex_bibfiles = ["references.bib"]
+
+jsonschema_options = {
+    'lift_title': True,
+    'lift_description': True,
+    'lift_definitions': True,
+}