Skip to content

Commit ab674fc

Browse files
authored
Release prep (#33)
* Update AMS and AMMR versions, and bump Python and dependency versions in pixi.toml * fix: handle rename of Seg to Segments in AMMR 4 * Update lock file * Don't use python 13
1 parent accf8b5 commit ab674fc

4 files changed

Lines changed: 1137 additions & 1096 deletions

File tree

Finite_element_analysis/Snippets/Lesson1/Model/JointsAndDrivers.any

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ AnyFolder Joints = {
1818
AnyKinEqSimpleDriver RHBoxDriver = {
1919
AnyRevoluteJoint RHBox = {
2020
AnyRefNode &Box = Main.Model.EnvironmentModel.Box.Right;
21-
AnySeg &Hand = ....BodyModel.Right.ShoulderArm.Seg.Glove;
21+
AnySeg &Hand = ....BodyModel.Right.ShoulderArm.Segments.Glove;
2222
Axis = z;
2323
Constraints.Reaction.Type={Off,Off,Off,Off,Off};
2424
};
@@ -30,7 +30,7 @@ AnyFolder Joints = {
3030
AnyKinEqSimpleDriver LHBoxDriver = {
3131
AnyRevoluteJoint LHBox = {
3232
AnyRefNode &Box = Main.Model.EnvironmentModel.Box.Left;
33-
AnySeg &Hand = Main.Model.BodyModel.Left.ShoulderArm.Seg.Glove;
33+
AnySeg &Hand = Main.Model.BodyModel.Left.ShoulderArm.Segments.Glove;
3434
Axis = z;
3535
Constraints.Reaction.Type={Off,Off,Off,Off,Off};
3636
};
@@ -42,14 +42,14 @@ AnyFolder Joints = {
4242
AnyReacForce RHBoxRot ={
4343
AnyKinRotational Rot = {
4444
AnyRefNode &Box = Main.Model.EnvironmentModel.Box.Right;
45-
AnySeg &Hand = Main.Model.BodyModel.Right.ShoulderArm.Seg.Glove;
45+
AnySeg &Hand = Main.Model.BodyModel.Right.ShoulderArm.Segments.Glove;
4646
Type=RotVector; };
4747
};
4848

4949
AnyReacForce LHBoxRot={
5050
AnyKinRotational Rot = {
5151
AnyRefNode &Box = Main.Model.EnvironmentModel.Box.Left;
52-
AnySeg &Hand = Main.Model.BodyModel.Left.ShoulderArm.Seg.Glove;
52+
AnySeg &Hand = Main.Model.BodyModel.Left.ShoulderArm.Segments.Glove;
5353
Type=RotVector;
5454

5555
};
@@ -61,7 +61,7 @@ AnyFolder Joints = {
6161

6262
AnyFolder HandSupportLeft = {
6363
AnyRefNode &StartNode = Main.Model.EnvironmentModel.Box.Left2;
64-
AnySeg &EndNode = Main.Model.BodyModel.Left.ShoulderArm.Seg.Glove; //The terms push and pull are determined wrt. the coordinate system of the StartNode!
64+
AnySeg &EndNode = Main.Model.BodyModel.Left.ShoulderArm.Segments.Glove; //The terms push and pull are determined wrt. the coordinate system of the StartNode!
6565

6666
AnyVector StrengthOfReactionsLin = {.FrictionStrength,.FrictionStrength,.Strength,.FrictionStrength,.FrictionStrength,.FrictionStrength}; //List of strengths for the linear muscles
6767
AnyFolder &DrawRef=Main.DrawSettings;
@@ -78,7 +78,7 @@ AnyFolder Joints = {
7878
AnyFolder HandSupportRight = {
7979
AnyRefNode &StartNode = Main.Model.EnvironmentModel.Box.Right2;
8080

81-
AnySeg &EndNode = Main.Model.BodyModel.Right.ShoulderArm.Seg.Glove; //The terms push and pull are determined wrt. the coordinate system of the StartNode!
81+
AnySeg &EndNode = Main.Model.BodyModel.Right.ShoulderArm.Segments.Glove; //The terms push and pull are determined wrt. the coordinate system of the StartNode!
8282

8383
AnyVector StrengthOfReactionsLin = {.FrictionStrength,.FrictionStrength,.Strength,.FrictionStrength,.FrictionStrength,.FrictionStrength}; //List of strengths for the linear muscles
8484
AnyFolder &DrawRef=Main.DrawSettings;

conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,14 +136,14 @@ def tagged_commit():
136136

137137
current_year = os.environ.get("YEAR", datetime.now().year)
138138

139-
ams_version = os.environ.get("AMS_VERSION", "8.0.3")
139+
ams_version = os.environ.get("AMS_VERSION", "8.1.0")
140140
if not re.match(r"^\d\.\d\.\d", ams_version):
141141
raise ValueError("Wrong format for AMS version, environment variable")
142142
ams_version_short = ams_version.rpartition(".")[0]
143143
ams_version_x = ams_version_short + ".x"
144144

145145

146-
ammr_version = os.environ.get("AMMR_VERSION", "3.0.3")
146+
ammr_version = os.environ.get("AMMR_VERSION", "3.1.0")
147147
if not re.match(r"^\d\.\d\.\d", ammr_version):
148148
raise ValueError("Wrong format for AMMR version, environment variable")
149149
ammr_version_short = ammr_version.rpartition(".")[0]

0 commit comments

Comments
 (0)