Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
SteveMaas1978 committed Dec 12, 2022
2 parents 8d9e54b + e9b60fe commit 343cd90
Show file tree
Hide file tree
Showing 136 changed files with 3,150 additions and 903 deletions.
119 changes: 119 additions & 0 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
on:
#schedule:
# - cron: '30 6 * * *' #0630 UTC kick off full build and regression
#push:
# branches: [ ci/* ]
workflow_dispatch:
inputs:
runTests:
description: "Run tests?"
required: false
type: boolean
default: false

env:
AWS_REGION: us-east-1
AWS_SUBNET_ID: subnet-097642e5c610e7583
AWS_SG_ID: sg-0ca7912782cf1538b
AMI_ID: ami-03a6eb9ec6101d323
AWS_INSTANCE_TYPE: c5a.16xlarge
OS: linux
KEY_PAIR: win
jobs:
start-runner:
name: Start self-hosted EC2 runner
runs-on: ubuntu-latest
outputs:
label: ${{ steps.start-ec2-runner.outputs.label }}
ec2-instance-id: ${{ steps.start-ec2-runner.outputs.ec2-instance-id }}
steps:
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: ${{ env.AWS_REGION }}
- name: Start EC2 runner
id: start-ec2-runner
uses: tundranerd/ec2-multiple-github-runners@multi-os-multi-runner
with:
mode: start
key-pair: ${{ env.KEY_PAIR }}
os: ${{ env.OS }}
github-token: ${{ secrets.GH_TOKEN}}
ec2-image-id: ${{ env.AMI_ID}}
ec2-instance-type: ${{ env.AWS_INSTANCE_TYPE }}
subnet-id: ${{ env.AWS_SUBNET_ID }}
security-group-id: ${{ env.AWS_SG_ID }}
wait-for-registry-timeout: 2
aws-resource-tags: > # optional, requires additional permissions
[
{"Key": "Name", "Value": "ec2-github-runner"},
{"Key": "GitHubRepository", "Value": "${{ github.repository }}"},
{"Key": "os", "Value": "${{ env.OS }}"}
]
build:
name: Clone and build
needs:
- start-runner # required to get output from the start-runner job
runs-on: ${{ needs.start-runner.outputs.label }} # run the job on the newly created runner
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Build
run: |
ci/linux.sh
- name: Upload Artifacts
uses: actions/upload-artifact@v3
with:
name: febio3-${{runner.os}}-${{runner.arch}}
path: cmbuild/bin
tests:
if: ${{inputs.runTests}}
name: Run test suite
needs:
- start-runner # required to get output from the start-runner job
- build
runs-on: ${{ needs.start-runner.outputs.label }} # run the job on the newly created runner
steps:
- name: Checkout
uses: actions/checkout@v2
with:
submodules: 'true'
- uses: actions/download-artifact@v3
with:
name: febio3-${{runner.os}}-${{runner.arch}}
path: cmbuild/bin
- name: Run test suite
run: |
ci/linux-test.sh
- name: Upload Artifacts
uses: actions/upload-artifact@v3
with:
name: testsuite-${{runner.os}}-${{runner.arch}}-logs
path: |
TestSuite/Verify3/*.log
TestSuite/Logs*.txt
stop-runner:
name: Stop self-hosted EC2 runner
needs:
- start-runner # required to get output from the start-runner job
- tests # required to wait when the main job is done
runs-on: ubuntu-latest
if: ${{ always() }} # required to stop the runner even if the error happened in the previous jobs
steps:
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: ${{ env.AWS_REGION }}
- name: Stop EC2 runner
uses: tundranerd/ec2-multiple-github-runners@multi-os-multi-runner
with:
mode: stop
os: ${{ env.OS }}
wait-for-deregistry-timeout: 5
github-token: ${{ secrets.GH_TOKEN}}
label: ${{ needs.start-runner.outputs.label }}
ec2-instance-id: ${{ needs.start-runner.outputs.ec2-instance-id }}
118 changes: 118 additions & 0 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
on:
# schedule:
# - cron: '00 7 * * *' #0630 UTC kick off full build and regression
# push:
# branches: [ ci/* ]
workflow_dispatch:
inputs:
runTests:
description: "Run tests?"
required: false
type: boolean
default: false
env:
AWS_REGION: us-east-1
AWS_SUBNET_ID: subnet-097642e5c610e7583
AWS_SG_ID: sg-0ca7912782cf1538b
AMI_ID: ami-04bb42ae8c0b24120
AWS_INSTANCE_TYPE: c5a.16xlarge
OS: windows
KEY_PAIR: win
jobs:
start-runner:
name: Start self-hosted EC2 runner
runs-on: ubuntu-latest
outputs:
label: ${{ steps.start-ec2-runner.outputs.label }}
ec2-instance-id: ${{ steps.start-ec2-runner.outputs.ec2-instance-id }}
steps:
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: ${{ env.AWS_REGION }}
- name: Start EC2 runner
id: start-ec2-runner
uses: tundranerd/ec2-multiple-github-runners@multi-os-multi-runner
with:
mode: start
key-pair: ${{ env.KEY_PAIR }}
os: ${{ env.OS }}
github-token: ${{ secrets.GH_TOKEN}}
ec2-image-id: ${{ env.AMI_ID}}
ec2-instance-type: ${{ env.AWS_INSTANCE_TYPE }}
subnet-id: ${{ env.AWS_SUBNET_ID }}
security-group-id: ${{ env.AWS_SG_ID }}
wait-for-registry-timeout: 5
aws-resource-tags: > # optional, requires additional permissions
[
{"Key": "Name", "Value": "ec2-github-runner"},
{"Key": "GitHubRepository", "Value": "${{ github.repository }}"},
{"Key": "os", "Value": "${{ env.OS }}"}
]
build:
name: Clone and build
needs:
- start-runner # required to get output from the start-runner job
runs-on: ${{ needs.start-runner.outputs.label }} # run the job on the newly created runner
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Build
run: |
ci/windows.bat
- name: Upload Artifacts
uses: actions/upload-artifact@v3
with:
name: febio3-${{runner.os}}-${{runner.arch}}
path: cmbuild/bin
tests:
if: ${{inputs.runTests}}
name: Run test suite
needs:
- start-runner # required to get output from the start-runner job
- build
runs-on: ${{ needs.start-runner.outputs.label }} # run the job on the newly created runner
steps:
- name: Checkout
uses: actions/checkout@v2
with:
submodules: 'true'
- uses: actions/download-artifact@v3
with:
name: febio3-${{runner.os}}-${{runner.arch}}
path: cmbuild/bin
- name: Run test suite
run: |
ci/windows-test.bat
- name: Upload Artifacts
uses: actions/upload-artifact@v3
with:
name: testsuite-${{runner.os}}-${{runner.arch}}-logs
path: |
TestSuite/Verify3/*.log
TestSuite/Logs*.txt
stop-runner:
name: Stop self-hosted EC2 runner
needs:
- start-runner # required to get output from the start-runner job
- tests # required to wait when the main job is done
runs-on: ubuntu-latest
if: ${{ always() }} # required to stop the runner even if the error happened in the previous jobs
steps:
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: ${{ env.AWS_REGION }}
- name: Stop EC2 runner
uses: tundranerd/ec2-multiple-github-runners@multi-os-multi-runner
with:
mode: stop
os: ${{ env.OS }}
wait-for-deregistry-timeout: 5
github-token: ${{ secrets.GH_TOKEN}}
label: ${{ needs.start-runner.outputs.label }}
ec2-instance-id: ${{ needs.start-runner.outputs.ec2-instance-id }}
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,10 @@ bld/
build/


# Visual Studio 2015/2017 cache/options directory
# Visual Studio cache/options directory
.vs/
VS2019/
VS2022/
# Uncomment if you have tasks that create the project's static files in wwwroot
#wwwroot/

Expand Down
19 changes: 10 additions & 9 deletions Documentation/FEBio3.bib
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%% This BibTeX bibliography file was created using BibDesk.
%% http://bibdesk.sourceforge.net/
%% Created for Gerard Ateshian at 2022-04-16 18:28:43 -0400
%% Created for Gerard Ateshian at 2022-07-20 20:08:16 -0400
%% Saved with string encoding Unicode (UTF-8)
Expand Down Expand Up @@ -2127,11 +2127,12 @@ @article{BALZANI2012139
bdsk-url-1 = {https://www.sciencedirect.com/science/article/pii/S0045782511003616},
bdsk-url-2 = {https://doi.org/10.1016/j.cma.2011.11.015}}

@article{Birzle2019,
title={A coupled approach for identification of nonlinear and compressible material models for soft tissue based on different experimental setups – exemplified and detailed for Lung Parenchyma},
volume={94},
DOI={10.1016/j.jmbbm.2019.02.019},
journal={Journal of the Mechanical Behavior of Biomedical Materials},
author={Birzle, Anna M. and Martin, Christian and Uhlig, Stefan and Wall, Wolfgang A.},
year={2019},
pages={126–143}}
@article{Birzle2019,
author = {Birzle, Anna M. and Martin, Christian and Uhlig, Stefan and Wall, Wolfgang A.},
date-modified = {2022-07-20 20:08:15 -0400},
journal = {Journal of the Mechanical Behavior of Biomedical Materials},
pages = {126--143},
title = {A coupled approach for identification of nonlinear and compressible material models for soft tissue based on different experimental setups - exemplified and detailed for Lung Parenchyma},
volume = {94},
year = {2019},
bdsk-url-1 = {https://doi.org/10.1016/j.jmbbm.2019.02.019}}
Loading

0 comments on commit 343cd90

Please sign in to comment.