Skip to content

Commit

Permalink
Merge branch 'chrystalchern:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
claudioperez authored Jun 1, 2024
2 parents acbf068 + 90ee1c8 commit 166788d
Show file tree
Hide file tree
Showing 125 changed files with 34,300 additions and 12,122 deletions.
21 changes: 21 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: run-tests
run-name: Run tests on latest push
on: [push]
jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Set up Python '3.9'
uses: actions/setup-python@v5
with:
python-version: '3.9'

- name: Install dependencies
run: |
python -m pip install --upgrade pip pytest nbmake opensees
python -m pip install -e .
- name: Unit tests
run: python -m pytest
5 changes: 2 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@
.ipynb_checkpoints/
PUBLISHING.md
__pycache__/
#assets/
dist
notebooks/PEERNGARecords_Unscaled/
studies/
tests/
notebooks/figures/figures.pptx
src/ssid/
_build
docs/theory/out/
docs/library/generated/
docs/examples/
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ test:
cp -r ./notebooks/figures/* ./docs/examples/figures
pytest --nbmake $(NOTEBOOKS)

publish:
publish: test
cp -r _build/html/* site/
git.exe add site && git.exe commit -m'cc - rebuild site' && git.exe subtree push --prefix site origin gh-pages

Expand Down
72 changes: 57 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<hr>
<br>

<img align="left" src="https://raw.githubusercontent.com/BRACE2/mdof/master/docs/_static/images/logos/mdof_readmefig.svg" width="250px" alt="mdof logo">
<img align="left" src="https://raw.githubusercontent.com/chrystalchern/mdof/master/docs/_static/images/logos/mdof_readmefig.svg" width="250px" alt="mdof logo">

Fast and friendly system identification for structures. *[Learn More](https://chrystalchern.github.io/mdof/)*

Expand All @@ -15,13 +15,6 @@ Fast and friendly system identification for structures. *[Learn More](https://ch
</div>

<hr>
<br>

**Conventional dynamic eigenanalysis** is well-known to structural engineers -- from system properties and a given excitation, the goal is to determine the system's dynamic response.

```python
output_motion = eigen(M,C,K, input_motion)
```

**The `mdof` system id package** allows structural engineers to solve **inverse eigenanalysis** and related problems -- from structural vibrations, the goal is to identify the system properties.

Expand All @@ -35,38 +28,87 @@ State space system identification:
A,B,C,D = sysid(input_motion, output_motion)
```

**Create beautiful visuals for historical modal property documentation** with integration of the [`osmg`](https://github.com/ioannis-vm/OpenSees_Model_Generator) and [`opensees`](https://pypi.org/project/opensees/) packages.

<table align="center">
<tr>
<td>
<img src="https://raw.githubusercontent.com/chrystalchern/mdof/master/docs/_static/images/gallery/LA_modes_core.png" width="225px" alt="historical mode shape documentation">
</td>
<td>
<img src="https://raw.githubusercontent.com/chrystalchern/mdof/master/docs/_static/images/gallery/LA_FDD_02.png" width="650px" alt="historical spectral density documentation">
</td>
</tr>
</table>




## Getting Started

Click [**JupyterLab on DataHub**](https://datahub.berkeley.edu/hub/user-redirect/git-pull?repo=https%3A%2F%2Fgithub.com%2FBRACE2%2Fmdof&urlpath=lab%2Ftree%2Fmdof%2Fnotebooks%2FREADME.ipynb&branch=master) (UC Berkeley users) or [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/BRACE2/mdof/HEAD?labpath=notebooks%2FREADME.ipynb) (non-UC Berkeley users) to access and experiment with example Jupyter notebooks.
Click [**JupyterLab on DataHub**](https://datahub.berkeley.edu/hub/user-redirect/git-pull?repo=https%3A%2F%2Fgithub.com%2Fchrystalchern%2Fmdof&urlpath=lab%2Ftree%2Fmdof%2Fnotebooks%2FREADME.ipynb&branch=master) (UC Berkeley users) or [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/chrystalchern/mdof/HEAD?labpath=notebooks%2FREADME.ipynb) (non-UC Berkeley users) to access and experiment with example Jupyter notebooks.

-------------------------------------------------

## Support

<table align="center">
<tr>
<td>
<a href="https://peer.berkeley.edu">
Pacific Earthquake Engineering Research Center (PEER)
</a>
</td>

<td>
<a href="https://dot.ca.gov/">
California Department of Transportation (Caltrans)
</a>
</td>

<td>
<a href="https://peer.berkeley.edu">
<img src="https://raw.githubusercontent.com/claudioperez/sdof/master/docs/assets/peer-black-300.png"
alt="PEER Logo" width="120"/>
Bridge Rapid Assessment Center for Extreme Events (BRACE2)
</a>
</td>

<td>
<a href="https://www.nsfgrfp.org/">
National Science Foundation (NSF) Graduate Research Fellowship Program (GRFP)
</a>
</td>

</tr>

<tr>

<td align="center">
<a href="https://peer.berkeley.edu">
<img src="https://raw.githubusercontent.com/chrystalchern/mdof/master/docs/assets/PEER_logo_old.svg"
alt="PEER Logo" height="120px"/>
</a>
</td>

<td align="center">
<a href="https://dot.ca.gov/">
<img src="https://raw.githubusercontent.com/claudioperez/sdof/master/docs/assets/Caltrans.svg.png"
alt="Caltrans Logo" width="120"/>
alt="Caltrans Logo" height="120px"/>
</a>
</td>

<td>
<td align="center">
<a href="https://peer.berkeley.edu">
<img src="https://raw.githubusercontent.com/claudioperez/sdof/master/docs/assets/brace2_logo-new3_ungrouped.svg"
alt="BRACE2 Logo" width="120"/>
alt="BRACE2 Logo" height="120px"/>
</a>
</td>

<td align="center">
<a href="https://www.nsfgrfp.org/">
<img src="https://raw.githubusercontent.com/chrystalchern/mdof/master/docs/_static/images/logos/nsf_logo.jpg"
alt="NSF Logo" height="120px"/>
</a>
</td>

</tr>
</tr>
</table>
Binary file added docs/_static/images/gallery/LA_FDD_02.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_static/images/gallery/LA_modes_core.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_static/images/logos/nsf_logo.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
503 changes: 0 additions & 503 deletions docs/examples/00_Overview.ipynb

This file was deleted.

200 changes: 0 additions & 200 deletions docs/examples/01_SISO_Exercise.ipynb

This file was deleted.

544 changes: 0 additions & 544 deletions docs/examples/01_SISO_Intro.ipynb

This file was deleted.

Loading

0 comments on commit 166788d

Please sign in to comment.