Skip to content

Commit 31afb46

Browse files
committed
Merge commit '48591304743a32abe370085c7d1c65b0c147f593' into no-leg-improvements
2 parents f8276ca + 4859130 commit 31afb46

7 files changed

+29
-24
lines changed

.github/dependabot.yml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: github-actions
4+
directory: /
5+
schedule:
6+
interval: weekly # or daily, weekly
7+
groups:
8+
dependencies:
9+
patterns:
10+
- "*"

.github/workflows/ammr-doc.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
cd Docs
3939
pixi run sphinx-build -M html . _build -W --keep-going -a -t draft
4040
41-
- uses: actions/upload-artifact@v3
41+
- uses: actions/upload-artifact@v4
4242
with:
4343
name: beta-version
4444
path: Docs/_build/html
@@ -82,7 +82,7 @@ jobs:
8282
shell: bash -leo pipefail {0} {0}
8383
run: sphinx-build -M html Docs Docs/_build -a
8484

85-
- uses: actions/upload-artifact@v3
85+
- uses: actions/upload-artifact@v4
8686
with:
8787
name: tagged-version
8888
path: Docs/_build/html
@@ -92,15 +92,15 @@ jobs:
9292
needs: [build-latest, build-tagged]
9393
runs-on: ubuntu-latest
9494
steps:
95-
- uses: actions/download-artifact@v3
95+
- uses: actions/download-artifact@v4
9696
with:
9797
name: tagged-version
9898
path: public
99-
- uses: actions/download-artifact@v3
99+
- uses: actions/download-artifact@v4
100100
with:
101101
name: beta-version
102102
path: public/beta
103-
- uses: actions/upload-pages-artifact@v2
103+
- uses: actions/upload-pages-artifact@v3
104104
with:
105105
path: public
106106

@@ -120,5 +120,5 @@ jobs:
120120
steps:
121121
- name: Deploy to GitHub Pages
122122
id: deployment
123-
uses: actions/deploy-pages@v2
123+
uses: actions/deploy-pages@v4
124124

.github/workflows/create-compare-reference-linux.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
echo ${{ github.event.inputs.debug_config }} >> $GITHUB_ENV
3939
4040
- name: Checkout repository at ${{ env.GIT_REFERENCE }}
41-
uses: actions/checkout@v3
41+
uses: actions/checkout@v4
4242
with:
4343
ref: ${{ env.GIT_REFERENCE }}
4444
fetch-depth: 0

.github/workflows/create-compare-reference.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
4343
4444
- name: Checkout repository at ${{ env.GIT_REFERENCE }}
45-
uses: actions/checkout@v3
45+
uses: actions/checkout@v4
4646
with:
4747
ref: ${{ env.GIT_REFERENCE }}
4848
fetch-depth: 0

.github/workflows/dispatch-ammr-update-triggers.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111

1212
steps:
1313
- name: Trigger private fork updates
14-
uses: peter-evans/repository-dispatch@v1
14+
uses: peter-evans/repository-dispatch@v2
1515
with:
1616
token: ${{ secrets.WORKFLOW_BOT_TOKEN }}
1717
repository: AnyBody/workflow-bot

.github/workflows/nightly-tests.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
--runslow
5555
5656
- name: Upload partial durations
57-
uses: actions/upload-artifact@v3
57+
uses: actions/upload-artifact@v4
5858
with:
5959
name: test-durations-${{ matrix.test_group }}
6060
path: |
@@ -103,7 +103,7 @@ jobs:
103103
- uses: actions/checkout@v4
104104

105105
- name: Download artifacts
106-
uses: actions/download-artifact@v3
106+
uses: actions/download-artifact@v4
107107

108108
- name: Combine test-durations
109109
run: |

Body/AAUHuman/LegTLEM/Mus.any

+8-13
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,10 @@ AnyMuscleShortestPath GastrocnemiusLateralis1 = {
7878
AnyRefNode &Ins = ..Seg.Foot.GastrocnemiusLateralis1Node;
7979
SPLine = {
8080
StringMesh = 30;
81-
AnyMatrix InitWrapPos = {
81+
AnyMatrix InitWrapPos1 = {
8282
transf3D({1.1*.srf.Radius, ...Sign*1.1*.srf.Radius, 0.5*.srf.Length }, &.srf ) ,
83-
// transf3D({-1.005*.srf2.Radius, 0, 0.5*.srf2.Length }, &.srf2 )
8483
};
85-
InitWrapPosVecArr = {&InitWrapPos,None,None,None, None};
86-
};
87-
viewMuscle = {
88-
#include "../DrawSettings/MusDrawSettings.any"
84+
InitWrapPosVecArr = {&InitWrapPos1,None,None, None, None};
8985
};
9086
};
9187

@@ -104,7 +100,7 @@ AnyMuscleShortestPath GastrocnemiusMedialis1 = {
104100
AnyRefNode &Via9 = ..Seg.Shank.GastrocnemiusMedialis9ViaNode;
105101
AnyRefNode &Ins = ..Seg.Foot.GastrocnemiusMedialis1Node;
106102
SPLine.StringMesh = 30;
107-
SPLine.InitWrapPosVecArr = {None, &.GastrocnemiusLateralis1.SPLine.InitWrapPos, None, None, None, None, None, None};
103+
SPLine.InitWrapPosVecArr = {None, &.GastrocnemiusLateralis1.SPLine.InitWrapPos1,None, None, None, None, None, None};
108104
viewMuscle = {#include "../DrawSettings/MusDrawSettings.any"};
109105
};
110106

@@ -1804,14 +1800,13 @@ AnyMuscleShortestPath Plantaris1 = {
18041800
AnySurface &srf = ..Seg.Thigh.GastroWrapSurf.cyl;
18051801
SPLine = {
18061802
AnyMatrix InitWrapPos = {
1807-
transf3D({0.5*.srf.Radius, 1.2*...Sign*.srf.Radius, 0.8*.srf.Length}, &.srf)
1808-
};
1809-
InitWrapPosVecArr = {&InitWrapPos};
1803+
transf3D({1.1*.srf.Radius, ...Sign*1.1*.srf.Radius, 0.5*.srf.Length }, &.srf ) ,
1804+
};
18101805
StringMesh = 90;
1811-
};
1812-
AnyRefNode &Ins = ..Seg.Foot.Plantaris1Node;
1813-
AnyDrawMuscle DrwMus = {#include "../DrawSettings/MusDrawSettings.any"
1806+
InitWrapPosVecArr = {&InitWrapPos};
18141807
};
1808+
AnyRefNode &Ins = ..Seg.Foot.Plantaris1Node;
1809+
AnyDrawMuscle DrwMus = {#include "../DrawSettings/MusDrawSettings.any"};
18151810
};
18161811
#endif
18171812

0 commit comments

Comments
 (0)