diff --git a/.github/workflows/CI_WEIS.yml b/.github/workflows/CI_WEIS.yml index 08e319630..89e96b5d3 100644 --- a/.github/workflows/CI_WEIS.yml +++ b/.github/workflows/CI_WEIS.yml @@ -50,7 +50,7 @@ jobs: # - name: Add dependencies windows specific # if: contains( matrix.os, 'windows') # run: | - # conda install -y gfortran libpython + # conda install -y gfortran gcc # pip install --no-deps control @@ -62,12 +62,12 @@ jobs: # Don't delete after this - + # Note- could add mpich through conda, but takes forever to resolve the environment in testing - name: Add dependencies ubuntu specific if: contains( matrix.os, 'ubuntu') run: | - sudo apt install -y libglu1-mesa - conda install -c conda-forge -y petsc4py mpi4py pyoptsparse mpich + sudo apt install -y libglu1-mesa mpich + conda install -y petsc4py mpi4py pyoptsparse pip install pygmsh==7.1.17 pip install https://github.com/LHEEA/meshmagick/archive/master.zip which -a mpiexec diff --git a/environment.yml b/environment.yml index 8425dc88b..e4839179c 100644 --- a/environment.yml +++ b/environment.yml @@ -5,6 +5,8 @@ channels: dependencies: - bs4 - dash + - dash-bootstrap-components + - dash-mantine-components - dill - jsonmerge - mat4py @@ -16,20 +18,19 @@ dependencies: - openfast-io==4.2 - pyopenfast==4.2 - openraft>=2.0.3 - - openmdao==3.42 + - openmdao - osqp - pcrunch>=2.1.5 - pip - pyhams>=1.3 - pyvista #- pyoptsparse + - pyvista - rosco>=2.10.1 - trimesh - wisdem>=4.2 - pip: - control - - dash-bootstrap-components - - dash-mantine-components - dash-vtk - dearpygui - smt diff --git a/examples/03_design_with_openfast/iea22_ptfm_opt_analysis.yaml b/examples/03_design_with_openfast/iea22_ptfm_opt_analysis.yaml index 6ec6f8cae..a027eae52 100644 --- a/examples/03_design_with_openfast/iea22_ptfm_opt_analysis.yaml +++ b/examples/03_design_with_openfast/iea22_ptfm_opt_analysis.yaml @@ -73,7 +73,7 @@ constraints: lower_bound: 0.37 floating: survival_heel: - upper_bound: 0.17453292519943295 # 10 deg + upper_bound: 10.0 # deg metacentric_height: flag: False lower_bound: 15.0 diff --git a/examples/04_frequency_domain_analysis_design/iea22_raft_opt_analysis.yaml b/examples/04_frequency_domain_analysis_design/iea22_raft_opt_analysis.yaml index 7f5d77a91..3396a3ed5 100644 --- a/examples/04_frequency_domain_analysis_design/iea22_raft_opt_analysis.yaml +++ b/examples/04_frequency_domain_analysis_design/iea22_raft_opt_analysis.yaml @@ -73,7 +73,7 @@ constraints: lower_bound: 0.37 floating: survival_heel: - upper_bound: 0.17453292519943295 # 10 deg + upper_bound: 10.0 # deg metacentric_height: flag: True lower_bound: 15.0 diff --git a/examples/11_model_creation_process/0_notebooks/chapter2.ipynb b/examples/11_model_creation_process/0_notebooks/chapter2.ipynb index 902698919..8466a34b7 100644 --- a/examples/11_model_creation_process/0_notebooks/chapter2.ipynb +++ b/examples/11_model_creation_process/0_notebooks/chapter2.ipynb @@ -502,7 +502,7 @@ "constraints:\n", " floating:\n", " survival_heel:\n", - " upper_bound: 0.17453292519943295 # 10 deg\n", + " upper_bound: 10.0 # deg\n", " metacentric_height:\n", " flag: True\n", " lower_bound: 1.0 # 15.0 --> Dan's experience\n", diff --git a/examples/11_model_creation_process/1_drivers/stage-3-semisub/stage-3-semisub_of_analysis.yaml b/examples/11_model_creation_process/1_drivers/stage-3-semisub/stage-3-semisub_of_analysis.yaml index 6e1b9f0aa..a5a6cd6e1 100644 --- a/examples/11_model_creation_process/1_drivers/stage-3-semisub/stage-3-semisub_of_analysis.yaml +++ b/examples/11_model_creation_process/1_drivers/stage-3-semisub/stage-3-semisub_of_analysis.yaml @@ -53,7 +53,7 @@ constraints: lower_bound: 0.37 floating: survival_heel: - upper_bound: 0.17453292519943295 # 10 deg + upper_bound: 10.0 # deg metacentric_height: flag: True lower_bound: 15.0 diff --git a/examples/11_model_creation_process/1_drivers/stage-3-semisub/stage-3-semisub_raft_analysis.yaml b/examples/11_model_creation_process/1_drivers/stage-3-semisub/stage-3-semisub_raft_analysis.yaml index 54359d486..13dff2402 100644 --- a/examples/11_model_creation_process/1_drivers/stage-3-semisub/stage-3-semisub_raft_analysis.yaml +++ b/examples/11_model_creation_process/1_drivers/stage-3-semisub/stage-3-semisub_raft_analysis.yaml @@ -53,7 +53,7 @@ constraints: lower_bound: 0.37 floating: survival_heel: - upper_bound: 0.17453292519943295 # 10 deg + upper_bound: 10.0 # deg metacentric_height: flag: True lower_bound: 15.0 diff --git a/examples/11_model_creation_process/1_drivers/stage-3.5-semisubCCD/stage-3.5-semisub_of_analysis.yaml b/examples/11_model_creation_process/1_drivers/stage-3.5-semisubCCD/stage-3.5-semisub_of_analysis.yaml index ceaa36bac..0a2b5e3ca 100644 --- a/examples/11_model_creation_process/1_drivers/stage-3.5-semisubCCD/stage-3.5-semisub_of_analysis.yaml +++ b/examples/11_model_creation_process/1_drivers/stage-3.5-semisubCCD/stage-3.5-semisub_of_analysis.yaml @@ -72,7 +72,7 @@ constraints: lower_bound: 0.37 floating: survival_heel: - upper_bound: 0.17453292519943295 # 10 deg + upper_bound: 10.0 # deg metacentric_height: flag: True lower_bound: 15.0