Merge commit '48591304743a32abe370085c7d1c65b0c147f593' into no-leg-i…

…mprovements
AnyBody · Jan 10, 2024 · dc3fe07 · dc3fe07
2 parents f8276ca + 4859130
commit dc3fe07
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 24 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: weekly # or daily, weekly
+    groups:
+      dependencies:
+        patterns:
+          - "*"
diff --git a/.github/workflows/ammr-doc.yaml b/.github/workflows/ammr-doc.yaml
@@ -38,7 +38,7 @@ jobs:
           cd Docs
           pixi run sphinx-build -M html . _build -W --keep-going -a -t draft
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: beta-version
           path: Docs/_build/html
@@ -82,7 +82,7 @@ jobs:
         shell: bash -leo pipefail {0} {0}
         run: sphinx-build -M html Docs Docs/_build -a
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: tagged-version
           path: Docs/_build/html
@@ -92,15 +92,15 @@ jobs:
     needs: [build-latest, build-tagged]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: tagged-version
           path: public
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: beta-version
           path: public/beta
-      - uses: actions/upload-pages-artifact@v2
+      - uses: actions/upload-pages-artifact@v3
         with: 
           path: public
 
@@ -120,5 +120,5 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v2
+        uses: actions/deploy-pages@v4
 
diff --git a/.github/workflows/create-compare-reference-linux.yml b/.github/workflows/create-compare-reference-linux.yml
@@ -38,7 +38,7 @@ jobs:
           echo ${{ github.event.inputs.debug_config }} >> $GITHUB_ENV
 
       - name: Checkout repository at ${{ env.GIT_REFERENCE }}
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ env.GIT_REFERENCE }}
           fetch-depth: 0

diff --git a/.github/workflows/create-compare-reference.yml b/.github/workflows/create-compare-reference.yml
@@ -42,7 +42,7 @@ jobs:
 
 
       - name: Checkout repository at ${{ env.GIT_REFERENCE }}
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ env.GIT_REFERENCE }}
           fetch-depth: 0

diff --git a/.github/workflows/dispatch-ammr-update-triggers.yml b/.github/workflows/dispatch-ammr-update-triggers.yml
@@ -11,7 +11,7 @@ jobs:
 
     steps:
       - name: Trigger private fork updates
-        uses: peter-evans/repository-dispatch@v1
+        uses: peter-evans/repository-dispatch@v2
         with:
           token: ${{ secrets.WORKFLOW_BOT_TOKEN }}
           repository: AnyBody/workflow-bot

diff --git a/.github/workflows/nightly-tests.yml b/.github/workflows/nightly-tests.yml
@@ -54,7 +54,7 @@ jobs:
               --runslow
       
       - name: Upload partial durations
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: test-durations-${{ matrix.test_group }}
           path: | 
@@ -103,7 +103,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Download artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
 
       - name: Combine test-durations
         run: |

diff --git a/Body/AAUHuman/LegTLEM/Mus.any b/Body/AAUHuman/LegTLEM/Mus.any
@@ -78,14 +78,10 @@ AnyMuscleShortestPath GastrocnemiusLateralis1 = {
   AnyRefNode &Ins = ..Seg.Foot.GastrocnemiusLateralis1Node;
   SPLine = {
     StringMesh = 30;
-    AnyMatrix InitWrapPos = {
+    AnyMatrix InitWrapPos1 = {
       transf3D({1.1*.srf.Radius, ...Sign*1.1*.srf.Radius, 0.5*.srf.Length }, &.srf ) ,
-//      transf3D({-1.005*.srf2.Radius, 0, 0.5*.srf2.Length }, &.srf2 )
     };
-    InitWrapPosVecArr = {&InitWrapPos,None,None,None, None};
-  };
-  viewMuscle = {
-    #include "../DrawSettings/MusDrawSettings.any"
+    InitWrapPosVecArr = {&InitWrapPos1,None,None, None, None};
   };
 };
 
@@ -104,7 +100,7 @@ AnyMuscleShortestPath GastrocnemiusMedialis1 = {
   AnyRefNode &Via9 = ..Seg.Shank.GastrocnemiusMedialis9ViaNode;
   AnyRefNode &Ins = ..Seg.Foot.GastrocnemiusMedialis1Node;
   SPLine.StringMesh = 30;
-  SPLine.InitWrapPosVecArr = {None, &.GastrocnemiusLateralis1.SPLine.InitWrapPos, None, None, None, None, None, None};
+  SPLine.InitWrapPosVecArr = {None, &.GastrocnemiusLateralis1.SPLine.InitWrapPos1,None, None, None, None, None};
   viewMuscle = {#include "../DrawSettings/MusDrawSettings.any"};
 };  
 
@@ -1804,14 +1800,13 @@ AnyMuscleShortestPath Plantaris1 = {
   AnySurface &srf = ..Seg.Thigh.GastroWrapSurf.cyl; 
   SPLine = {  
     AnyMatrix InitWrapPos = {
-      transf3D({0.5*.srf.Radius, 1.2*...Sign*.srf.Radius, 0.8*.srf.Length}, &.srf)
-    };  
-    InitWrapPosVecArr = {&InitWrapPos};
+      transf3D({1.1*.srf.Radius, ...Sign*1.1*.srf.Radius, 0.5*.srf.Length }, &.srf ) ,
+    };
     StringMesh = 90;
-  }; 
-  AnyRefNode &Ins = ..Seg.Foot.Plantaris1Node;
-  AnyDrawMuscle DrwMus = {#include "../DrawSettings/MusDrawSettings.any"
+    InitWrapPosVecArr = {&InitWrapPos};
   };
+  AnyRefNode &Ins = ..Seg.Foot.Plantaris1Node;
+  AnyDrawMuscle DrwMus = {#include "../DrawSettings/MusDrawSettings.any"};
 };
 #endif