Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/CI_WEIS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand All @@ -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
Expand Down
7 changes: 4 additions & 3 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ channels:
dependencies:
- bs4
- dash
- dash-bootstrap-components
- dash-mantine-components
- dill
- jsonmerge
- mat4py
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading