Skip to content

Commit

Permalink
Merge branch 'master' into update-video-template
Browse files Browse the repository at this point in the history
  • Loading branch information
melund authored Feb 18, 2025
2 parents 540ef70 + 8b7d41a commit 0adb326
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ammr-doc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: prefix-dev/[email protected].1
- uses: prefix-dev/[email protected].2
with:
environments: docs
cache-write: ${{ github.event_name == 'push' && github.ref_name == 'master' }}
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:
run: |
git checkout $(git describe --tags `git rev-list --tags=ammr* --max-count=1`);
- uses: prefix-dev/[email protected].1
- uses: prefix-dev/[email protected].2
with:
environments: docs
cache-write: ${{ github.event_name == 'push' && github.ref_name == 'master' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create-compare-reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
ref: ${{ env.GIT_REFERENCE }}
fetch-depth: 0

- uses: prefix-dev/[email protected].1
- uses: prefix-dev/[email protected].2
with:
environments: test
cache-write: ${{ github.event_name == 'push' && github.ref_name == 'master' }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/nightly-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: prefix-dev/[email protected].1
- uses: prefix-dev/[email protected].2
with:
environments: test
cache-write: ${{ github.event_name == 'push' && github.ref_name == 'master' }}
Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:
test-linux:
if: github.repository == 'anybody/ammr'
runs-on: ubuntu-latest
container: ghcr.io/anybody/anybodycon-github-actions:8.0.5rc1
container: ghcr.io/anybody/anybodycon-github-actions:8.1.0beta2
env:
ANYBODY_SUPPRESS_DEPRECATION_MESSAGES: "Off"

Expand All @@ -82,7 +82,7 @@ jobs:
- name: Set debug env vars
run: echo ${{ github.event.inputs.debug_config }} >> $GITHUB_ENV

- uses: prefix-dev/[email protected].1
- uses: prefix-dev/[email protected].2
with:
environments: test
cache-write: ${{ github.event_name == 'push' && github.ref_name == 'master' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-forks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
with:
ref: ${{ github.event.pull_request.head.sha }}

- uses: prefix-dev/[email protected].1
- uses: prefix-dev/[email protected].2
id: pixi
continue-on-error: true
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-self-hosted.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: prefix-dev/[email protected].1
- uses: prefix-dev/[email protected].2
with:
environments: test
pixi-bin-path: ${{ runner.temp }}\Scripts\pixi.exe
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:

- uses: actions/checkout@v4

- uses: prefix-dev/[email protected].1
- uses: prefix-dev/[email protected].2
with:
environments: test
cache-write: ${{ github.event_name == 'push' && github.ref_name == 'master' }}
Expand Down
6 changes: 3 additions & 3 deletions Application/Examples/KneeSimulator/Model/AnyKneeSimulator.any
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Main = {

AnyBodyStudy KneeSimulatorStudy = {
// A low kinematic tolerance will help FDK optimization to converge
Kinematics.KinematicTol = 1e-8;
Kinematics.KinematicTol ??= 1e-8;

AnyFolder& Parameters = .Parameters;
AnyFolder& Model = .Model;
Expand All @@ -46,8 +46,8 @@ Main = {
InverseDynamics.ForceDepKin.LocalSearchMaxSteps ??= 15; // Reduced from default 25. Speeds up convergense.


InverseDynamics.ForceDepKin.MaxNewtonStep = FDK_MaxNewtonStep;
InverseDynamics.ForceDepKin.LocalSearchOnOff = FDK_LocalSearchOnOff;
InverseDynamics.ForceDepKin.MaxNewtonStep ??= FDK_MaxNewtonStep;
InverseDynamics.ForceDepKin.LocalSearchOnOff ??= FDK_LocalSearchOnOff;

#ifdef TOOLS_MODELUTILITIES_VIDEO_CAMERACLASSTEMPLATE
// Include functions to generate a video:
Expand Down
2 changes: 1 addition & 1 deletion Tests/Applications/test_KneeSimulator.any
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//pytest_markers=["slow"]
//# Ignore a specific a specific quirk in the model, where sigle time step was not converging
//# to the specified tolerance (AB#2486)
//ignore_errors = ['Too many iterations used (final force error = 0.121916)']
//ignore_errors = ['causes looping of Newton method (final force error = 0.']
//save_study=[
// "Main.KneeSimulatorStudy",
//]
Expand Down

0 comments on commit 0adb326

Please sign in to comment.