From 922e630d4ef393fb773bd2af6d67bb41b3aa2506 Mon Sep 17 00:00:00 2001 From: Romain Boman <r.boman@uliege.be> Date: Wed, 8 May 2024 16:17:41 +0200 Subject: [PATCH] change syntax --- models/CLIpro/CLIpro_150k_15_1.py | 27 +++++++++++------ models/CLIpro/CLIpro_150k_15_2.py | 27 +++++++++++------ models/CLIpro/CLIpro_150k_7_1.py | 27 +++++++++++------ models/CLIpro/CLIpro_150k_7_2.py | 27 +++++++++++------ models/CLIpro/CLIpro_250k_15_1.py | 27 +++++++++++------ models/CLIpro/CLIpro_250k_15_2.py | 27 +++++++++++------ models/CLIpro/CLIpro_250k_7_1.py | 27 +++++++++++------ models/CLIpro/CLIpro_250k_7_2.py | 27 +++++++++++------ models/CLIpro/CLIpro_500k_15_1.py | 27 +++++++++++------ models/CLIpro/CLIpro_500k_15_2.py | 27 +++++++++++------ models/CLIpro/CLIpro_500k_7_1.py | 27 +++++++++++------ models/CLIpro/CLIpro_500k_7_2.py | 27 +++++++++++------ models/CLIpro/CLIpro_750k_15_1.py | 27 +++++++++++------ models/CLIpro/CLIpro_750k_15_2.py | 27 +++++++++++------ models/CLIpro/CLIpro_750k_7_1.py | 27 +++++++++++------ models/CLIpro/CLIpro_750k_7_2.py | 27 +++++++++++------ models/Dolico_bon/Dolico_bon_150k_15_1.py | 27 +++++++++++------ models/Dolico_bon/Dolico_bon_150k_15_2.py | 27 +++++++++++------ models/Dolico_bon/Dolico_bon_150k_7_1.py | 27 +++++++++++------ models/Dolico_bon/Dolico_bon_150k_7_2.py | 27 +++++++++++------ models/Dolico_bon/Dolico_bon_250k_15_1.py | 27 +++++++++++------ models/Dolico_bon/Dolico_bon_250k_15_2.py | 27 +++++++++++------ models/Dolico_bon/Dolico_bon_250k_7_1.py | 22 +++++++++++--- models/Dolico_bon/Dolico_bon_250k_7_2.py | 27 +++++++++++------ models/Dolico_bon/Dolico_bon_500k_15_1.py | 27 +++++++++++------ models/Dolico_bon/Dolico_bon_500k_15_2.py | 27 +++++++++++------ models/Dolico_bon/Dolico_bon_500k_7_1.py | 27 +++++++++++------ models/Dolico_bon/Dolico_bon_500k_7_2.py | 27 +++++++++++------ models/Dolico_bon/Dolico_bon_750k_15_1.py | 27 +++++++++++------ models/Dolico_bon/Dolico_bon_750k_15_2.py | 27 +++++++++++------ models/Dolico_bon/Dolico_bon_750k_7_1.py | 27 +++++++++++------ models/Dolico_bon/Dolico_bon_750k_7_2.py | 27 +++++++++++------ models/Dolico_osb/Dolico_osb_150k_15_1.py | 27 +++++++++++------ models/Dolico_osb/Dolico_osb_150k_15_2.py | 27 +++++++++++------ models/Dolico_osb/Dolico_osb_150k_7_1.py | 27 +++++++++++------ models/Dolico_osb/Dolico_osb_150k_7_2.py | 27 +++++++++++------ models/Dolico_osb/Dolico_osb_250k_15_1.py | 27 +++++++++++------ models/Dolico_osb/Dolico_osb_250k_15_2.py | 27 +++++++++++------ models/Dolico_osb/Dolico_osb_250k_7_1.py | 27 +++++++++++------ models/Dolico_osb/Dolico_osb_250k_7_2.py | 27 +++++++++++------ models/Dolico_osb/Dolico_osb_500k_15_1.py | 27 +++++++++++------ models/Dolico_osb/Dolico_osb_500k_15_2.py | 27 +++++++++++------ models/Dolico_osb/Dolico_osb_500k_7_1.py | 27 +++++++++++------ models/Dolico_osb/Dolico_osb_500k_7_2.py | 27 +++++++++++------ models/Dolico_osb/Dolico_osb_750k_15_1.py | 27 +++++++++++------ models/Dolico_osb/Dolico_osb_750k_15_2.py | 27 +++++++++++------ models/Dolico_osb/Dolico_osb_750k_7_1.py | 27 +++++++++++------ models/Dolico_osb/Dolico_osb_750k_7_2.py | 27 +++++++++++------ .../PLTtympFranken_150k_15_1.py | 27 +++++++++++------ .../PLTtympFranken_150k_15_2.py | 27 +++++++++++------ .../PLTtympFranken_150k_7_1.py | 27 +++++++++++------ .../PLTtympFranken_150k_7_2.py | 27 +++++++++++------ .../PLTtymFrankencarpus/PLTtympFranken_20k.py | 27 +++++++++++------ .../PLTtympFranken_250k.py | 27 +++++++++++------ .../PLTtympFranken_250k_15_1.py | 28 +++++++++++------- .../PLTtympFranken_250k_15_2.py | 28 +++++++++++------- .../PLTtympFranken_250k_7_1.py | 28 +++++++++++------- .../PLTtympFranken_250k_7_2.py | 28 +++++++++++------- .../PLTtympFranken_500k_15_1.py | 28 +++++++++++------- .../PLTtympFranken_500k_15_2.py | 28 +++++++++++------- .../PLTtympFranken_500k_7_1.py | 28 +++++++++++------- .../PLTtympFranken_500k_7_2.py | 28 +++++++++++------- .../PLTtympFranken_750k.py | 27 +++++++++++------ .../PLTtympFranken_750k_15_1.py | 28 +++++++++++------- .../PLTtympFranken_750k_15_2.py | 28 +++++++++++------- .../PLTtympFranken_750k_7_1.py | 28 +++++++++++------- .../PLTtympFranken_750k_7_2.py | 28 +++++++++++------- .../Panthera_pardus/Panthera_pardus_RC_30.py | 26 +++++++++++------ .../LACMHC_2002_L_R_3_30.py | 29 ++++++++++++------- models/TYLber/TYLber_150k_15_1.py | 27 +++++++++++------ models/TYLber/TYLber_150k_15_2.py | 27 +++++++++++------ models/TYLber/TYLber_150k_7_1.py | 27 +++++++++++------ models/TYLber/TYLber_150k_7_2.py | 27 +++++++++++------ models/TYLber/TYLber_250k_15_1.py | 27 +++++++++++------ models/TYLber/TYLber_250k_15_2_bad.py | 27 +++++++++++------ models/TYLber/TYLber_250k_7_1.py | 27 +++++++++++------ models/TYLber/TYLber_250k_7_2_bad.py | 27 +++++++++++------ models/TYLber/TYLber_500k_15_1.py | 27 +++++++++++------ models/TYLber/TYLber_500k_15_2.py | 27 +++++++++++------ models/TYLber/TYLber_500k_7_1.py | 27 +++++++++++------ models/TYLber/TYLber_500k_7_2.py | 28 +++++++++++------- models/TYLber/TYLber_750k_15_1.py | 18 ++++++++++++ models/TYLber/TYLber_750k_15_2.py | 27 +++++++++++------ models/TYLber/TYLber_750k_7_1.py | 27 +++++++++++------ models/TYLber/TYLber_750k_7_2.py | 27 +++++++++++------ models/TYLnep/TYLnep_150k_15_1.py | 27 +++++++++++------ models/TYLnep/TYLnep_150k_15_2.py | 27 +++++++++++------ models/TYLnep/TYLnep_150k_7_1.py | 27 +++++++++++------ models/TYLnep/TYLnep_150k_7_2.py | 27 +++++++++++------ models/TYLnep/TYLnep_250k_15_1.py | 27 +++++++++++------ models/TYLnep/TYLnep_250k_15_2.py | 27 +++++++++++------ models/TYLnep/TYLnep_250k_7_1.py | 27 +++++++++++------ models/TYLnep/TYLnep_250k_7_2.py | 27 +++++++++++------ models/TYLnep/TYLnep_500k_15_1.py | 27 +++++++++++------ models/TYLnep/TYLnep_500k_15_2.py | 27 +++++++++++------ models/TYLnep/TYLnep_500k_7_1.py | 27 +++++++++++------ models/TYLnep/TYLnep_500k_7_2.py | 27 +++++++++++------ models/TYLnep/TYLnep_750k_15_1.py | 27 +++++++++++------ models/TYLnep/TYLnep_750k_15_2.py | 27 +++++++++++------ models/TYLnep/TYLnep_750k_7_1.py | 27 +++++++++++------ models/TYLnep/TYLnep_750k_7_2.py | 27 +++++++++++------ .../Tapirus_indicus/T_indicus_shoulder50k.py | 26 +++++++++++------ .../dolicorhynchops_10k_extloads.py | 2 -- .../dolicorhynchops/dolicorhynchops_149k.py | 25 +++++++++++----- 104 files changed, 1852 insertions(+), 928 deletions(-) diff --git a/models/CLIpro/CLIpro_150k_15_1.py b/models/CLIpro/CLIpro_150k_15_1.py index 98e634d..df3df65 100644 --- a/models/CLIpro/CLIpro_150k_15_1.py +++ b/models/CLIpro/CLIpro_150k_15_1.py @@ -9,10 +9,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'150k') p['bone'] = f'{path}/CLIpro_jaw_150k.stl' - p['contact_pts'] = [[-13.654129, -90.974480, 4.162612], - [14.185822, -89.850540, 8.610174]] - p['axis_pt1'] = [47.751984, 205.253143, 26.247160] - p['axis_pt2'] = [-47.122223, 203.473282, 34.349510] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-13.654129, -90.974480, 4.162612], + [14.185822, -89.850540, 8.610174]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [47.751984, 205.253143, 26.247160], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [-47.122223, 203.473282, 34.349510], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,11 +101,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/CLIpro/CLIpro_150k_15_2.py b/models/CLIpro/CLIpro_150k_15_2.py index d865591..df3df65 100644 --- a/models/CLIpro/CLIpro_150k_15_2.py +++ b/models/CLIpro/CLIpro_150k_15_2.py @@ -9,10 +9,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'150k') p['bone'] = f'{path}/CLIpro_jaw_150k.stl' - p['contact_pts'] = [[-34.115112, 21.823414, 10.233394], - [32.383774, 21.721252, 11.580667]] - p['axis_pt1'] = [47.751984, 205.253143, 26.247160] - p['axis_pt2'] = [-47.122223, 203.473282, 34.349510] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-13.654129, -90.974480, 4.162612], + [14.185822, -89.850540, 8.610174]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [47.751984, 205.253143, 26.247160], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [-47.122223, 203.473282, 34.349510], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,11 +101,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/CLIpro/CLIpro_150k_7_1.py b/models/CLIpro/CLIpro_150k_7_1.py index 8445ecb..56e4aa4 100644 --- a/models/CLIpro/CLIpro_150k_7_1.py +++ b/models/CLIpro/CLIpro_150k_7_1.py @@ -9,10 +9,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'150k') p['bone'] = f'{path}/CLIpro_jaw_150k.stl' - p['contact_pts'] = [[-13.654129, -90.974480, 4.162612], - [14.185822, -89.850540, 8.610174]] - p['axis_pt1'] = [47.751984, 205.253143, 26.247160] - p['axis_pt2'] = [-47.122223, 203.473282, 34.349510] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-13.654129, -90.974480, 4.162612], + [14.185822, -89.850540, 8.610174]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [47.751984, 205.253143, 26.247160], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [-47.122223, 203.473282, 34.349510], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,11 +101,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/CLIpro/CLIpro_150k_7_2.py b/models/CLIpro/CLIpro_150k_7_2.py index 8b3ce04..56e4aa4 100644 --- a/models/CLIpro/CLIpro_150k_7_2.py +++ b/models/CLIpro/CLIpro_150k_7_2.py @@ -9,10 +9,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'150k') p['bone'] = f'{path}/CLIpro_jaw_150k.stl' - p['contact_pts'] = [[-34.115112, 21.823414, 10.233394], - [32.383774, 21.721252, 11.580667]] - p['axis_pt1'] = [47.751984, 205.253143, 26.247160] - p['axis_pt2'] = [-47.122223, 203.473282, 34.349510] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-13.654129, -90.974480, 4.162612], + [14.185822, -89.850540, 8.610174]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [47.751984, 205.253143, 26.247160], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [-47.122223, 203.473282, 34.349510], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,11 +101,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/CLIpro/CLIpro_250k_15_1.py b/models/CLIpro/CLIpro_250k_15_1.py index 9246f0d..6a41ec4 100644 --- a/models/CLIpro/CLIpro_250k_15_1.py +++ b/models/CLIpro/CLIpro_250k_15_1.py @@ -9,10 +9,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'250k') p['bone'] = f'{path}/CLIpro_jaw_250k.stl' - p['contact_pts'] = [[-13.921872, -90.258591, 8.862718], - [13.158182, -91.377449, 7.355043]] - p['axis_pt1'] = [47.686401, 205.691238, 26.261269] - p['axis_pt2'] = [-50.710445, 204.954971, 26.360205] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-13.921872, -90.258591, 8.862718], + [13.158182, -91.377449, 7.355043]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [47.686401, 205.691238, 26.261269], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [-50.710445, 204.954971, 26.360205], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,11 +101,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/CLIpro/CLIpro_250k_15_2.py b/models/CLIpro/CLIpro_250k_15_2.py index 2fabddd..6a41ec4 100644 --- a/models/CLIpro/CLIpro_250k_15_2.py +++ b/models/CLIpro/CLIpro_250k_15_2.py @@ -9,10 +9,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'250k') p['bone'] = f'{path}/CLIpro_jaw_250k.stl' - p['contact_pts'] = [[-34.058887, 21.742476, 9.846808], - [33.013206, 24.755995, -0.564457]] - p['axis_pt1'] = [47.686401, 205.691238, 26.261269] - p['axis_pt2'] = [-50.710445, 204.954971, 26.360205] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-13.921872, -90.258591, 8.862718], + [13.158182, -91.377449, 7.355043]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [47.686401, 205.691238, 26.261269], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [-50.710445, 204.954971, 26.360205], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,11 +101,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/CLIpro/CLIpro_250k_7_1.py b/models/CLIpro/CLIpro_250k_7_1.py index a3089b7..6806606 100644 --- a/models/CLIpro/CLIpro_250k_7_1.py +++ b/models/CLIpro/CLIpro_250k_7_1.py @@ -9,10 +9,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'250k') p['bone'] = f'{path}/CLIpro_jaw_250k.stl' - p['contact_pts'] = [[-13.921872, -90.258591, 8.862718], - [13.158182, -91.377449, 7.355043]] - p['axis_pt1'] = [47.686401, 205.691238, 26.261269] - p['axis_pt2'] = [-50.710445, 204.954971, 26.360205] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-13.921872, -90.258591, 8.862718], + [13.158182, -91.377449, 7.355043]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [47.686401, 205.691238, 26.261269], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [-50.710445, 204.954971, 26.360205], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,11 +101,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/CLIpro/CLIpro_250k_7_2.py b/models/CLIpro/CLIpro_250k_7_2.py index ab25a9e..6806606 100644 --- a/models/CLIpro/CLIpro_250k_7_2.py +++ b/models/CLIpro/CLIpro_250k_7_2.py @@ -9,10 +9,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'250k') p['bone'] = f'{path}/CLIpro_jaw_250k.stl' - p['contact_pts'] = [[-34.058887, 21.742476, 9.846808], - [33.013206, 24.755995, -0.564457]] - p['axis_pt1'] = [47.686401, 205.691238, 26.261269] - p['axis_pt2'] = [-50.710445, 204.954971, 26.360205] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-13.921872, -90.258591, 8.862718], + [13.158182, -91.377449, 7.355043]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [47.686401, 205.691238, 26.261269], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [-50.710445, 204.954971, 26.360205], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,11 +101,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/CLIpro/CLIpro_500k_15_1.py b/models/CLIpro/CLIpro_500k_15_1.py index 135b4aa..2ec33bf 100644 --- a/models/CLIpro/CLIpro_500k_15_1.py +++ b/models/CLIpro/CLIpro_500k_15_1.py @@ -9,10 +9,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'500k') p['bone'] = f'{path}/CLIpro_jaw_500k.stl' - p['contact_pts'] = [[-12.880455, -92.642342, -0.673375], - [12.990344, -91.013168, 7.432779]] - p['axis_pt1'] = [45.043976, 199.899857, 33.671288] - p['axis_pt2'] = [-50.729774, 205.098663, 26.440434] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-12.880455, -92.642342, -0.673375], + [12.990344, -91.013168, 7.432779]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [45.043976, 199.899857, 33.671288], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [-50.729774, 205.098663, 26.440434], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,11 +101,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/CLIpro/CLIpro_500k_15_2.py b/models/CLIpro/CLIpro_500k_15_2.py index 7bd6137..2ec33bf 100644 --- a/models/CLIpro/CLIpro_500k_15_2.py +++ b/models/CLIpro/CLIpro_500k_15_2.py @@ -9,10 +9,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'500k') p['bone'] = f'{path}/CLIpro_jaw_500k.stl' - p['contact_pts'] = [[-33.575844, 26.282110, -0.445806], - [32.137966, 22.818340, 7.904116]] - p['axis_pt1'] = [45.043976, 199.899857, 33.671288] - p['axis_pt2'] = [-50.729774, 205.098663, 26.440434] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-12.880455, -92.642342, -0.673375], + [12.990344, -91.013168, 7.432779]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [45.043976, 199.899857, 33.671288], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [-50.729774, 205.098663, 26.440434], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,11 +101,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/CLIpro/CLIpro_500k_7_1.py b/models/CLIpro/CLIpro_500k_7_1.py index 0acbf7b..620f605 100644 --- a/models/CLIpro/CLIpro_500k_7_1.py +++ b/models/CLIpro/CLIpro_500k_7_1.py @@ -9,10 +9,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'500k') p['bone'] = f'{path}/CLIpro_jaw_500k.stl' - p['contact_pts'] = [[-12.880455, -92.642342, -0.673375], - [12.990344, -91.013168, 7.432779]] - p['axis_pt1'] = [45.043976, 199.899857, 33.671288] - p['axis_pt2'] = [-50.729774, 205.098663, 26.440434] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-12.880455, -92.642342, -0.673375], + [12.990344, -91.013168, 7.432779]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [45.043976, 199.899857, 33.671288], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [-50.729774, 205.098663, 26.440434], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,11 +101,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/CLIpro/CLIpro_500k_7_2.py b/models/CLIpro/CLIpro_500k_7_2.py index dfa226d..620f605 100644 --- a/models/CLIpro/CLIpro_500k_7_2.py +++ b/models/CLIpro/CLIpro_500k_7_2.py @@ -9,10 +9,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'500k') p['bone'] = f'{path}/CLIpro_jaw_500k.stl' - p['contact_pts'] = [[-33.575844, 26.282110, -0.445806], - [32.137966, 22.818340, 7.904116]] - p['axis_pt1'] = [45.043976, 199.899857, 33.671288] - p['axis_pt2'] = [-50.729774, 205.098663, 26.440434] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-12.880455, -92.642342, -0.673375], + [12.990344, -91.013168, 7.432779]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [45.043976, 199.899857, 33.671288], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [-50.729774, 205.098663, 26.440434], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,11 +101,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/CLIpro/CLIpro_750k_15_1.py b/models/CLIpro/CLIpro_750k_15_1.py index b175d08..11553ce 100644 --- a/models/CLIpro/CLIpro_750k_15_1.py +++ b/models/CLIpro/CLIpro_750k_15_1.py @@ -9,10 +9,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'750k') p['bone'] = f'{path}/CLIpro_jaw_750k.stl' - p['contact_pts'] = [[-14.743377, -90.163612, 9.011174], - [13.049115, -90.677956, 7.640814]] - p['axis_pt1'] = [46.317547, 203.956772, 35.086609] - p['axis_pt2'] = [-50.729774, 205.098663, 26.440434] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-14.743377, -90.163612, 9.011174], + [13.049115, -90.677956, 7.640814]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [46.317547, 203.956772, 35.086609], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [-50.729774, 205.098663, 26.440434], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,11 +101,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/CLIpro/CLIpro_750k_15_2.py b/models/CLIpro/CLIpro_750k_15_2.py index c3dfdb4..11553ce 100644 --- a/models/CLIpro/CLIpro_750k_15_2.py +++ b/models/CLIpro/CLIpro_750k_15_2.py @@ -9,10 +9,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'750k') p['bone'] = f'{path}/CLIpro_jaw_750k.stl' - p['contact_pts'] = [[-34.126896, 21.475969, 10.220996], - [32.139095, 22.748108, 8.446575]] - p['axis_pt1'] = [46.317547, 203.956772, 35.086609] - p['axis_pt2'] = [-50.729774, 205.098663, 26.440434] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-14.743377, -90.163612, 9.011174], + [13.049115, -90.677956, 7.640814]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [46.317547, 203.956772, 35.086609], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [-50.729774, 205.098663, 26.440434], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,11 +101,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/CLIpro/CLIpro_750k_7_1.py b/models/CLIpro/CLIpro_750k_7_1.py index 0708d75..f5a78c6 100644 --- a/models/CLIpro/CLIpro_750k_7_1.py +++ b/models/CLIpro/CLIpro_750k_7_1.py @@ -9,10 +9,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'750k') p['bone'] = f'{path}/CLIpro_jaw_750k.stl' - p['contact_pts'] = [[-14.743377, -90.163612, 9.011174], - [13.049115, -90.677956, 7.640814]] - p['axis_pt1'] = [46.317547, 203.956772, 35.086609] - p['axis_pt2'] = [-50.729774, 205.098663, 26.440434] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-14.743377, -90.163612, 9.011174], + [13.049115, -90.677956, 7.640814]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [46.317547, 203.956772, 35.086609], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [-50.729774, 205.098663, 26.440434], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,11 +101,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/CLIpro/CLIpro_750k_7_2.py b/models/CLIpro/CLIpro_750k_7_2.py index 006d0a5..f5a78c6 100644 --- a/models/CLIpro/CLIpro_750k_7_2.py +++ b/models/CLIpro/CLIpro_750k_7_2.py @@ -9,10 +9,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'750k') p['bone'] = f'{path}/CLIpro_jaw_750k.stl' - p['contact_pts'] = [[-34.126896, 21.475969, 10.220996], - [32.139095, 22.748108, 8.446575]] - p['axis_pt1'] = [46.317547, 203.956772, 35.086609] - p['axis_pt2'] = [-50.729774, 205.098663, 26.440434] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-14.743377, -90.163612, 9.011174], + [13.049115, -90.677956, 7.640814]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [46.317547, 203.956772, 35.086609], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [-50.729774, 205.098663, 26.440434], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,11 +101,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/Dolico_bon/Dolico_bon_150k_15_1.py b/models/Dolico_bon/Dolico_bon_150k_15_1.py index 3a23803..9f5b0a9 100644 --- a/models/Dolico_bon/Dolico_bon_150k_15_1.py +++ b/models/Dolico_bon/Dolico_bon_150k_15_1.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'150k') p['bone'] = f'{path}/Dolico_bon_150k.stl' - p['contact_pts'] = [[4.212819, -267.574554, 28.792574], - [36.007748, -269.322662, 27.255693]] - p['axis_pt1'] = [162.458069, 598.625000, -20.051981] - p['axis_pt2'] = [-145.469955, 585.402344, 11.398635] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[4.212819, -267.574554, 28.792574], + [36.007748, -269.322662, 27.255693]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [162.458069, 598.625000, -20.051981], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [-145.469955, 585.402344, 11.398635], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AME_L.stl', @@ -50,11 +64,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/Dolico_bon/Dolico_bon_150k_15_2.py b/models/Dolico_bon/Dolico_bon_150k_15_2.py index 8f47b82..1577114 100644 --- a/models/Dolico_bon/Dolico_bon_150k_15_2.py +++ b/models/Dolico_bon/Dolico_bon_150k_15_2.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'150k') p['bone'] = f'{path}/Dolico_bon_150k.stl' - p['contact_pts'] = [[-14.645494, 62.509026, 23.022108], - [44.984268, 67.347466, -2.159538]] - p['axis_pt1'] = [162.458069, 598.625000, -20.051981] - p['axis_pt2'] = [-145.469955, 585.402344, 11.398635] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-14.645494, 62.509026, 23.022108], + [44.984268, 67.347466, -2.159538]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [162.458069, 598.625000, -20.051981], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [-145.469955, 585.402344, 11.398635], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AME_L.stl', @@ -50,11 +64,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/Dolico_bon/Dolico_bon_150k_7_1.py b/models/Dolico_bon/Dolico_bon_150k_7_1.py index 6ac47c9..72b546a 100644 --- a/models/Dolico_bon/Dolico_bon_150k_7_1.py +++ b/models/Dolico_bon/Dolico_bon_150k_7_1.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'150k') p['bone'] = f'{path}/Dolico_bon_150k.stl' - p['contact_pts'] = [[4.212819, -267.574554, 28.792574], - [36.007748, -269.322662, 27.255693]] - p['axis_pt1'] = [162.458069, 598.625000, -20.051981] - p['axis_pt2'] = [-145.469955, 585.402344, 11.398635] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[4.212819, -267.574554, 28.792574], + [36.007748, -269.322662, 27.255693]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [162.458069, 598.625000, -20.051981], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [-145.469955, 585.402344, 11.398635], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AME_L.stl', @@ -50,11 +64,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/Dolico_bon/Dolico_bon_150k_7_2.py b/models/Dolico_bon/Dolico_bon_150k_7_2.py index 150f5d9..707c7f7 100644 --- a/models/Dolico_bon/Dolico_bon_150k_7_2.py +++ b/models/Dolico_bon/Dolico_bon_150k_7_2.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'150k') p['bone'] = f'{path}/Dolico_bon_150k.stl' - p['contact_pts'] = [[-14.645494, 62.509026, 23.022108], - [44.984268, 67.347466, -2.159538]] - p['axis_pt1'] = [162.458069, 598.625000, -20.051981] - p['axis_pt2'] = [-145.469955, 585.402344, 11.398635] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-14.645494, 62.509026, 23.022108], + [44.984268, 67.347466, -2.159538]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [162.458069, 598.625000, -20.051981], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [-145.469955, 585.402344, 11.398635], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AME_L.stl', @@ -50,11 +64,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/Dolico_bon/Dolico_bon_250k_15_1.py b/models/Dolico_bon/Dolico_bon_250k_15_1.py index bcce403..de09747 100644 --- a/models/Dolico_bon/Dolico_bon_250k_15_1.py +++ b/models/Dolico_bon/Dolico_bon_250k_15_1.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'250k') p['bone'] = f'{path}/Dolico_bon_250k.stl' - p['contact_pts'] = [[4.212819, -267.574554, 28.792574], - [36.279472, -269.853271, 26.685869]] - p['axis_pt1'] = [168.908783, 603.534424, -17.702827] - p['axis_pt2'] = [-147.934631, 590.528931, 14.065274] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[4.212819, -267.574554, 28.792574], + [36.279472, -269.853271, 26.685869]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [168.908783, 603.534424, -17.702827], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [-147.934631, 590.528931, 14.065274], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AME_L.stl', @@ -50,11 +64,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/Dolico_bon/Dolico_bon_250k_15_2.py b/models/Dolico_bon/Dolico_bon_250k_15_2.py index c7528d5..de09747 100644 --- a/models/Dolico_bon/Dolico_bon_250k_15_2.py +++ b/models/Dolico_bon/Dolico_bon_250k_15_2.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'250k') p['bone'] = f'{path}/Dolico_bon_250k.stl' - p['contact_pts'] = [[-10.472356, 31.800030, -3.685302], - [50.958504, 38.902874, -5.352512]] - p['axis_pt1'] = [168.908783, 603.534424, -17.702827] - p['axis_pt2'] = [-147.934631, 590.528931, 14.065274] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[4.212819, -267.574554, 28.792574], + [36.279472, -269.853271, 26.685869]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [168.908783, 603.534424, -17.702827], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [-147.934631, 590.528931, 14.065274], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AME_L.stl', @@ -50,11 +64,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/Dolico_bon/Dolico_bon_250k_7_1.py b/models/Dolico_bon/Dolico_bon_250k_7_1.py index d5e4ab8..3cc5533 100644 --- a/models/Dolico_bon/Dolico_bon_250k_7_1.py +++ b/models/Dolico_bon/Dolico_bon_250k_7_1.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'250k') p['bone'] = f'{path}/Dolico_bon_250k.stl' - p['contact_pts'] = [[4.212819, -267.574554, 28.792574], - [36.279472, -269.853271, 26.685869]] - p['axis_pt1'] = [168.908783, 603.534424, -17.702827] - p['axis_pt2'] = [-147.934631, 590.528931, 14.065274] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[4.212819, -267.574554, 28.792574], + [36.279472, -269.853271, 26.685869]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [168.908783, 603.534424, -17.702827], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [-147.934631, 590.528931, 14.065274], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AME_L.stl', diff --git a/models/Dolico_bon/Dolico_bon_250k_7_2.py b/models/Dolico_bon/Dolico_bon_250k_7_2.py index 0725381..7706c77 100644 --- a/models/Dolico_bon/Dolico_bon_250k_7_2.py +++ b/models/Dolico_bon/Dolico_bon_250k_7_2.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'250k') p['bone'] = f'{path}/Dolico_bon_250k.stl' - p['contact_pts'] = [[-10.472356, 31.800030, -3.685302], - [50.958504, 38.902874, -5.352512]] - p['axis_pt1'] = [168.908783, 603.534424, -17.702827] - p['axis_pt2'] = [-147.934631, 590.528931, 14.065274] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[4.212819, -267.574554, 28.792574], + [36.279472, -269.853271, 26.685869]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [168.908783, 603.534424, -17.702827], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [-147.934631, 590.528931, 14.065274], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AME_L.stl', @@ -50,11 +64,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/Dolico_bon/Dolico_bon_500k_15_1.py b/models/Dolico_bon/Dolico_bon_500k_15_1.py index d505ce3..8cd0ed8 100644 --- a/models/Dolico_bon/Dolico_bon_500k_15_1.py +++ b/models/Dolico_bon/Dolico_bon_500k_15_1.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'500k') p['bone'] = f'{path}/Dolico_bon_500k.stl' - p['contact_pts'] = [[4.858893, -266.720367, 28.316463], - [36.279472, -269.853271, 26.685869]] - p['axis_pt1'] = [164.323242, 605.580627, -20.302845] - p['axis_pt2'] = [-161.191025, 604.899658, -17.039200] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[4.858893, -266.720367, 28.316463], + [36.279472, -269.853271, 26.685869]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [164.323242, 605.580627, -20.302845], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [-161.191025, 604.899658, -17.039200], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AME_L.stl', @@ -50,11 +64,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/Dolico_bon/Dolico_bon_500k_15_2.py b/models/Dolico_bon/Dolico_bon_500k_15_2.py index 7ea291c..8cd0ed8 100644 --- a/models/Dolico_bon/Dolico_bon_500k_15_2.py +++ b/models/Dolico_bon/Dolico_bon_500k_15_2.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'500k') p['bone'] = f'{path}/Dolico_bon_500k.stl' - p['contact_pts'] = [[-16.827028, 42.577381, -1.938522], - [44.807407, 48.136395, -0.112404]] - p['axis_pt1'] = [164.323242, 605.580627, -20.302845] - p['axis_pt2'] = [-161.191025, 604.899658, -17.039200] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[4.858893, -266.720367, 28.316463], + [36.279472, -269.853271, 26.685869]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [164.323242, 605.580627, -20.302845], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [-161.191025, 604.899658, -17.039200], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AME_L.stl', @@ -50,11 +64,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/Dolico_bon/Dolico_bon_500k_7_1.py b/models/Dolico_bon/Dolico_bon_500k_7_1.py index 8019cbe..8f21f7d 100644 --- a/models/Dolico_bon/Dolico_bon_500k_7_1.py +++ b/models/Dolico_bon/Dolico_bon_500k_7_1.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'500k') p['bone'] = f'{path}/Dolico_bon_500k.stl' - p['contact_pts'] = [[4.858893, -266.720367, 28.316463], - [36.279472, -269.853271, 26.685869]] - p['axis_pt1'] = [164.323242, 605.580627, -20.302845] - p['axis_pt2'] = [-161.191025, 604.899658, -17.039200] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[4.858893, -266.720367, 28.316463], + [36.279472, -269.853271, 26.685869]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [164.323242, 605.580627, -20.302845], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [-161.191025, 604.899658, -17.039200], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AME_L.stl', @@ -50,11 +64,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/Dolico_bon/Dolico_bon_500k_7_2.py b/models/Dolico_bon/Dolico_bon_500k_7_2.py index bba38c9..8f21f7d 100644 --- a/models/Dolico_bon/Dolico_bon_500k_7_2.py +++ b/models/Dolico_bon/Dolico_bon_500k_7_2.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'500k') p['bone'] = f'{path}/Dolico_bon_500k.stl' - p['contact_pts'] = [[-16.827028, 42.577381, -1.938522], - [44.807407, 48.136395, -0.112404]] - p['axis_pt1'] = [164.323242, 605.580627, -20.302845] - p['axis_pt2'] = [-161.191025, 604.899658, -17.039200] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[4.858893, -266.720367, 28.316463], + [36.279472, -269.853271, 26.685869]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [164.323242, 605.580627, -20.302845], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [-161.191025, 604.899658, -17.039200], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AME_L.stl', @@ -50,11 +64,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/Dolico_bon/Dolico_bon_750k_15_1.py b/models/Dolico_bon/Dolico_bon_750k_15_1.py index 88abe9a..da3b26a 100644 --- a/models/Dolico_bon/Dolico_bon_750k_15_1.py +++ b/models/Dolico_bon/Dolico_bon_750k_15_1.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'750k') p['bone'] = f'{path}/Dolico_bon_750k.stl' - p['contact_pts'] = [[5.189603, -266.977203, 28.278206], - [36.279472, -269.853271, 26.685869]] - p['axis_pt1'] = [163.730804, 595.499817, -20.042530] - p['axis_pt2'] = [-149.361832, 584.256775, 14.424056] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[5.189603, -266.977203, 28.278206], + [36.279472, -269.853271, 26.685869]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [163.730804, 595.499817, -20.042530], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [-149.361832, 584.256775, 14.424056], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AME_L.stl', @@ -50,11 +64,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/Dolico_bon/Dolico_bon_750k_15_2.py b/models/Dolico_bon/Dolico_bon_750k_15_2.py index c306743..da3b26a 100644 --- a/models/Dolico_bon/Dolico_bon_750k_15_2.py +++ b/models/Dolico_bon/Dolico_bon_750k_15_2.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'750k') p['bone'] = f'{path}/Dolico_bon_750k.stl' - p['contact_pts'] = [[-18.989965, 40.841747, -1.935307], - [34.655277, 41.826595, -7.642198]] - p['axis_pt1'] = [163.730804, 595.499817, -20.042530] - p['axis_pt2'] = [-149.361832, 584.256775, 14.424056] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[5.189603, -266.977203, 28.278206], + [36.279472, -269.853271, 26.685869]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [163.730804, 595.499817, -20.042530], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [-149.361832, 584.256775, 14.424056], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AME_L.stl', @@ -50,11 +64,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/Dolico_bon/Dolico_bon_750k_7_1.py b/models/Dolico_bon/Dolico_bon_750k_7_1.py index f7ff3ec..cc2296d 100644 --- a/models/Dolico_bon/Dolico_bon_750k_7_1.py +++ b/models/Dolico_bon/Dolico_bon_750k_7_1.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'750k') p['bone'] = f'{path}/Dolico_bon_750k.stl' - p['contact_pts'] = [[5.189603, -266.977203, 28.278206], - [36.279472, -269.853271, 26.685869]] - p['axis_pt1'] = [163.730804, 595.499817, -20.042530] - p['axis_pt2'] = [-149.361832, 584.256775, 14.424056] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[5.189603, -266.977203, 28.278206], + [36.279472, -269.853271, 26.685869]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [163.730804, 595.499817, -20.042530], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [-149.361832, 584.256775, 14.424056], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AME_L.stl', @@ -50,11 +64,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/Dolico_bon/Dolico_bon_750k_7_2.py b/models/Dolico_bon/Dolico_bon_750k_7_2.py index 4f2fb0d..cc2296d 100644 --- a/models/Dolico_bon/Dolico_bon_750k_7_2.py +++ b/models/Dolico_bon/Dolico_bon_750k_7_2.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'750k') p['bone'] = f'{path}/Dolico_bon_750k.stl' - p['contact_pts'] = [[-18.989965, 40.841747, -1.935307], - [34.655277, 41.826595, -7.642198]] - p['axis_pt1'] = [163.730804, 595.499817, -20.042530] - p['axis_pt2'] = [-149.361832, 584.256775, 14.424056] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[5.189603, -266.977203, 28.278206], + [36.279472, -269.853271, 26.685869]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [163.730804, 595.499817, -20.042530], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [-149.361832, 584.256775, 14.424056], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AME_L.stl', @@ -50,11 +64,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/Dolico_osb/Dolico_osb_150k_15_1.py b/models/Dolico_osb/Dolico_osb_150k_15_1.py index b7321bc..76ea3e2 100644 --- a/models/Dolico_osb/Dolico_osb_150k_15_1.py +++ b/models/Dolico_osb/Dolico_osb_150k_15_1.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'150k') p['bone'] = f'{path}/Dolico_osb_150k.stl' - p['contact_pts'] = [[70.939697, -369.730804, 305.997803], - [72.499474, -367.223450, 278.139832]] - p['axis_pt1'] = [39.231628, 126.756012, 209.439102] - p['axis_pt2'] = [40.221886, 126.551155, 385.009644] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[70.939697, -369.730804, 305.997803], + [72.499474, -367.223450, 278.139832]], + 'direction': 'x' + }, + { + 'name': 'axis_pt1', + 'nodes': [39.231628, 126.756012, 209.439102], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [40.221886, 126.551155, 385.009644], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/Dolico_osb_MAME_L.stl', @@ -50,11 +64,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['x'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/Dolico_osb/Dolico_osb_150k_15_2.py b/models/Dolico_osb/Dolico_osb_150k_15_2.py index 30ac1f2..76ea3e2 100644 --- a/models/Dolico_osb/Dolico_osb_150k_15_2.py +++ b/models/Dolico_osb/Dolico_osb_150k_15_2.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'150k') p['bone'] = f'{path}/Dolico_osb_150k.stl' - p['contact_pts'] = [[52.009193, -201.873154, 307.677521], - [64.623055, -199.101791, 282.517853]] - p['axis_pt1'] = [39.231628, 126.756012, 209.439102] - p['axis_pt2'] = [40.221886, 126.551155, 385.009644] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[70.939697, -369.730804, 305.997803], + [72.499474, -367.223450, 278.139832]], + 'direction': 'x' + }, + { + 'name': 'axis_pt1', + 'nodes': [39.231628, 126.756012, 209.439102], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [40.221886, 126.551155, 385.009644], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/Dolico_osb_MAME_L.stl', @@ -50,11 +64,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['x'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/Dolico_osb/Dolico_osb_150k_7_1.py b/models/Dolico_osb/Dolico_osb_150k_7_1.py index ce7ece3..57d34e7 100644 --- a/models/Dolico_osb/Dolico_osb_150k_7_1.py +++ b/models/Dolico_osb/Dolico_osb_150k_7_1.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'150k') p['bone'] = f'{path}/Dolico_osb_150k.stl' - p['contact_pts'] = [[70.939697, -369.730804, 305.997803], - [72.499474, -367.223450, 278.139832]] - p['axis_pt1'] = [39.231628, 126.756012, 209.439102] - p['axis_pt2'] = [40.221886, 126.551155, 385.009644] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[70.939697, -369.730804, 305.997803], + [72.499474, -367.223450, 278.139832]], + 'direction': 'x' + }, + { + 'name': 'axis_pt1', + 'nodes': [39.231628, 126.756012, 209.439102], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [40.221886, 126.551155, 385.009644], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/Dolico_osb_MAME_L.stl', @@ -50,11 +64,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['x'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/Dolico_osb/Dolico_osb_150k_7_2.py b/models/Dolico_osb/Dolico_osb_150k_7_2.py index fe8001d..57d34e7 100644 --- a/models/Dolico_osb/Dolico_osb_150k_7_2.py +++ b/models/Dolico_osb/Dolico_osb_150k_7_2.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'150k') p['bone'] = f'{path}/Dolico_osb_150k.stl' - p['contact_pts'] = [[52.009193, -201.873154, 307.677521], - [64.623055, -199.101791, 282.517853]] - p['axis_pt1'] = [39.231628, 126.756012, 209.439102] - p['axis_pt2'] = [40.221886, 126.551155, 385.009644] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[70.939697, -369.730804, 305.997803], + [72.499474, -367.223450, 278.139832]], + 'direction': 'x' + }, + { + 'name': 'axis_pt1', + 'nodes': [39.231628, 126.756012, 209.439102], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [40.221886, 126.551155, 385.009644], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/Dolico_osb_MAME_L.stl', @@ -50,11 +64,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['x'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/Dolico_osb/Dolico_osb_250k_15_1.py b/models/Dolico_osb/Dolico_osb_250k_15_1.py index 9e28214..399ccbf 100644 --- a/models/Dolico_osb/Dolico_osb_250k_15_1.py +++ b/models/Dolico_osb/Dolico_osb_250k_15_1.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'250k') p['bone'] = f'{path}/Dolico_osb_250k.stl' - p['contact_pts'] = [[71.647064, -367.307281, 303.918365], - [71.428085, -366.684906, 278.119751]] - p['axis_pt1'] = [25.142067, 117.287262, 198.309219] - p['axis_pt2'] = [32.822464, 115.721962, 395.664978] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[71.647064, -367.307281, 303.918365], + [71.428085, -366.684906, 278.119751]], + 'direction': 'x' + }, + { + 'name': 'axis_pt1', + 'nodes': [25.142067, 117.287262, 198.309219], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [32.822464, 115.721962, 395.664978], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/Dolico_osb_MAME_L.stl', @@ -50,11 +64,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['x'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/Dolico_osb/Dolico_osb_250k_15_2.py b/models/Dolico_osb/Dolico_osb_250k_15_2.py index 5aa17c6..399ccbf 100644 --- a/models/Dolico_osb/Dolico_osb_250k_15_2.py +++ b/models/Dolico_osb/Dolico_osb_250k_15_2.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'250k') p['bone'] = f'{path}/Dolico_osb_250k.stl' - p['contact_pts'] = [[58.887959, -197.486603, 305.862701], - [64.476349, -199.363113, 282.813385]] - p['axis_pt1'] = [25.142067, 117.287262, 198.309219] - p['axis_pt2'] = [32.822464, 115.721962, 395.664978] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[71.647064, -367.307281, 303.918365], + [71.428085, -366.684906, 278.119751]], + 'direction': 'x' + }, + { + 'name': 'axis_pt1', + 'nodes': [25.142067, 117.287262, 198.309219], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [32.822464, 115.721962, 395.664978], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/Dolico_osb_MAME_L.stl', @@ -50,11 +64,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['x'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/Dolico_osb/Dolico_osb_250k_7_1.py b/models/Dolico_osb/Dolico_osb_250k_7_1.py index 863e8ed..f39c5f2 100644 --- a/models/Dolico_osb/Dolico_osb_250k_7_1.py +++ b/models/Dolico_osb/Dolico_osb_250k_7_1.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'250k') p['bone'] = f'{path}/Dolico_osb_250k.stl' - p['contact_pts'] = [[71.647064, -367.307281, 303.918365], - [71.428085, -366.684906, 278.119751]] - p['axis_pt1'] = [25.142067, 117.287262, 198.309219] - p['axis_pt2'] = [32.822464, 115.721962, 395.664978] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[71.647064, -367.307281, 303.918365], + [71.428085, -366.684906, 278.119751]], + 'direction': 'x' + }, + { + 'name': 'axis_pt1', + 'nodes': [25.142067, 117.287262, 198.309219], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [32.822464, 115.721962, 395.664978], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/Dolico_osb_MAME_L.stl', @@ -50,11 +64,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['x'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/Dolico_osb/Dolico_osb_250k_7_2.py b/models/Dolico_osb/Dolico_osb_250k_7_2.py index 3cc552a..1ad4d47 100644 --- a/models/Dolico_osb/Dolico_osb_250k_7_2.py +++ b/models/Dolico_osb/Dolico_osb_250k_7_2.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'250k') p['bone'] = f'{path}/Dolico_osb_250k.stl' - p['contact_pts'] = [[58.887959, -197.486603, 305.862701], - [64.476349, -199.363113, 282.813385]] - p['axis_pt1'] = [25.142067, 117.287262, 198.309219] - p['axis_pt2'] = [32.822464, 115.721962, 395.664978] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[71.647064, -367.307281, 303.918365], + [71.428085, -366.684906, 278.119751]], + 'direction': 'x' + }, + { + 'name': 'axis_pt1', + 'nodes': [25.142067, 117.287262, 198.309219], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [32.822464, 115.721962, 395.664978], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/Dolico_osb_MAME_L.stl', @@ -50,11 +64,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['x'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/Dolico_osb/Dolico_osb_500k_15_1.py b/models/Dolico_osb/Dolico_osb_500k_15_1.py index 3c2136e..6b234eb 100644 --- a/models/Dolico_osb/Dolico_osb_500k_15_1.py +++ b/models/Dolico_osb/Dolico_osb_500k_15_1.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'500k') p['bone'] = f'{path}/Dolico_osb_500k.stl' - p['contact_pts'] = [[72.492805, -367.768738, 304.363922], - [72.060631, -366.996246, 278.112061]] - p['axis_pt1'] = [27.536142, 119.829124, 198.032684] - p['axis_pt2'] = [27.802645, 116.500870, 394.464966] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[72.492805, -367.768738, 304.363922], + [72.060631, -366.996246, 278.112061]], + 'direction': 'x' + }, + { + 'name': 'axis_pt1', + 'nodes': [27.536142, 119.829124, 198.032684], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [27.802645, 116.500870, 394.464966], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/Dolico_osb_MAME_L.stl', @@ -50,11 +64,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['x'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/Dolico_osb/Dolico_osb_500k_15_2.py b/models/Dolico_osb/Dolico_osb_500k_15_2.py index b04f0a9..9776233 100644 --- a/models/Dolico_osb/Dolico_osb_500k_15_2.py +++ b/models/Dolico_osb/Dolico_osb_500k_15_2.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'500k') p['bone'] = f'{path}/Dolico_osb_500k.stl' - p['contact_pts'] = [[58.887959, -197.486603, 305.862701], - [58.952919, -197.350830, 280.833832]] - p['axis_pt1'] = [27.536142, 119.829124, 198.032684] - p['axis_pt2'] = [27.802645, 116.500870, 394.464966] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[72.492805, -367.768738, 304.363922], + [72.060631, -366.996246, 278.112061]], + 'direction': 'x' + }, + { + 'name': 'axis_pt1', + 'nodes': [27.536142, 119.829124, 198.032684], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [27.802645, 116.500870, 394.464966], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/Dolico_osb_MAME_L.stl', @@ -50,11 +64,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['x'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/Dolico_osb/Dolico_osb_500k_7_1.py b/models/Dolico_osb/Dolico_osb_500k_7_1.py index a844223..da907e8 100644 --- a/models/Dolico_osb/Dolico_osb_500k_7_1.py +++ b/models/Dolico_osb/Dolico_osb_500k_7_1.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'500k') p['bone'] = f'{path}/Dolico_osb_500k.stl' - p['contact_pts'] = [[72.492805, -367.768738, 304.363922], - [72.060631, -366.996246, 278.112061]] - p['axis_pt1'] = [27.536142, 119.829124, 198.032684] - p['axis_pt2'] = [27.802645, 116.500870, 394.464966] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[72.492805, -367.768738, 304.363922], + [72.060631, -366.996246, 278.112061]], + 'direction': 'x' + }, + { + 'name': 'axis_pt1', + 'nodes': [27.536142, 119.829124, 198.032684], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [27.802645, 116.500870, 394.464966], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/Dolico_osb_MAME_L.stl', @@ -50,11 +64,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['x'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/Dolico_osb/Dolico_osb_500k_7_2.py b/models/Dolico_osb/Dolico_osb_500k_7_2.py index 4e0b51e..da907e8 100644 --- a/models/Dolico_osb/Dolico_osb_500k_7_2.py +++ b/models/Dolico_osb/Dolico_osb_500k_7_2.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'500k') p['bone'] = f'{path}/Dolico_osb_500k.stl' - p['contact_pts'] = [[58.887959, -197.486603, 305.862701], - [58.952919, -197.350830, 280.833832]] - p['axis_pt1'] = [27.536142, 119.829124, 198.032684] - p['axis_pt2'] = [27.802645, 116.500870, 394.464966] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[72.492805, -367.768738, 304.363922], + [72.060631, -366.996246, 278.112061]], + 'direction': 'x' + }, + { + 'name': 'axis_pt1', + 'nodes': [27.536142, 119.829124, 198.032684], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [27.802645, 116.500870, 394.464966], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/Dolico_osb_MAME_L.stl', @@ -50,11 +64,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['x'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/Dolico_osb/Dolico_osb_750k_15_1.py b/models/Dolico_osb/Dolico_osb_750k_15_1.py index 0d7f41d..4396aa5 100644 --- a/models/Dolico_osb/Dolico_osb_750k_15_1.py +++ b/models/Dolico_osb/Dolico_osb_750k_15_1.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'750k') p['bone'] = f'{path}/Dolico_osb_750k.stl' - p['contact_pts'] = [[72.896973, -368.044189, 304.529999], - [72.543152, -367.867920, 278.888367]] - p['axis_pt1'] = [28.769444, 127.225159, 198.837112] - p['axis_pt2'] = [28.075665, 116.736336, 394.429504] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[72.896973, -368.044189, 304.529999], + [72.543152, -367.867920, 278.888367]], + 'direction': 'x' + }, + { + 'name': 'axis_pt1', + 'nodes': [28.769444, 127.225159, 198.837112], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [28.075665, 116.736336, 394.429504], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/Dolico_osb_MAME_L.stl', @@ -50,11 +64,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['x'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/Dolico_osb/Dolico_osb_750k_15_2.py b/models/Dolico_osb/Dolico_osb_750k_15_2.py index 2e44fd0..5486b7a 100644 --- a/models/Dolico_osb/Dolico_osb_750k_15_2.py +++ b/models/Dolico_osb/Dolico_osb_750k_15_2.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'750k') p['bone'] = f'{path}/Dolico_osb_750k.stl' - p['contact_pts'] = [[58.887959, -197.486603, 305.862701], - [58.952919, -197.350830, 280.833832]] - p['axis_pt1'] = [28.769444, 127.225159, 198.837112] - p['axis_pt2'] = [28.075665, 116.736336, 394.429504] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[72.896973, -368.044189, 304.529999], + [72.543152, -367.867920, 278.888367]], + 'direction': 'x' + }, + { + 'name': 'axis_pt1', + 'nodes': [28.769444, 127.225159, 198.837112], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [28.075665, 116.736336, 394.429504], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/Dolico_osb_MAME_L.stl', @@ -50,11 +64,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['x'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/Dolico_osb/Dolico_osb_750k_7_1.py b/models/Dolico_osb/Dolico_osb_750k_7_1.py index 8351126..cd40d9f 100644 --- a/models/Dolico_osb/Dolico_osb_750k_7_1.py +++ b/models/Dolico_osb/Dolico_osb_750k_7_1.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'750k') p['bone'] = f'{path}/Dolico_osb_750k.stl' - p['contact_pts'] = [[72.896973, -368.044189, 304.529999], - [72.543152, -367.867920, 278.888367]] - p['axis_pt1'] = [28.769444, 127.225159, 198.837112] - p['axis_pt2'] = [28.075665, 116.736336, 394.429504] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[72.896973, -368.044189, 304.529999], + [72.543152, -367.867920, 278.888367]], + 'direction': 'x' + }, + { + 'name': 'axis_pt1', + 'nodes': [28.769444, 127.225159, 198.837112], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [28.075665, 116.736336, 394.429504], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/Dolico_osb_MAME_L.stl', @@ -50,11 +64,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['x'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/Dolico_osb/Dolico_osb_750k_7_2.py b/models/Dolico_osb/Dolico_osb_750k_7_2.py index 42f4e08..cfb38d4 100644 --- a/models/Dolico_osb/Dolico_osb_750k_7_2.py +++ b/models/Dolico_osb/Dolico_osb_750k_7_2.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'750k') p['bone'] = f'{path}/Dolico_osb_750k.stl' - p['contact_pts'] = [[58.887959, -197.486603, 305.862701], - [58.952919, -197.350830, 280.833832]] - p['axis_pt1'] = [28.769444, 127.225159, 198.837112] - p['axis_pt2'] = [28.075665, 116.736336, 394.429504] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[72.896973, -368.044189, 304.529999], + [72.543152, -367.867920, 278.888367]], + 'direction': 'x' + }, + { + 'name': 'axis_pt1', + 'nodes': [28.769444, 127.225159, 198.837112], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [28.075665, 116.736336, 394.429504], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/Dolico_osb_MAME_L.stl', @@ -50,11 +64,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['x'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/PLTtymFrankencarpus/PLTtympFranken_150k_15_1.py b/models/PLTtymFrankencarpus/PLTtympFranken_150k_15_1.py index a593e9b..c99f746 100644 --- a/models/PLTtymFrankencarpus/PLTtympFranken_150k_15_1.py +++ b/models/PLTtymFrankencarpus/PLTtympFranken_150k_15_1.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'150k') p['bone'] = f'{path}/PLTtym_150k_symph.stl' - p['contact_pts'] = [[-140.484802, 32.752762, 185.435608], - [-141.219009, -31.436172, 178.064987]] - p['axis_pt1'] = [207.172852, -79.520950, 187.358459] - p['axis_pt2'] = [205.906677, 112.895256, 190.595184] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-140.484802, 32.752762, 185.435608], + [-141.219009, -31.436172, 178.064987]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [207.172852, -79.520950, 187.358459], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [205.906677, 112.895256, 190.595184], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/PLTtym_M_Adductor_externus_L1.stl', @@ -86,11 +100,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/PLTtymFrankencarpus/PLTtympFranken_150k_15_2.py b/models/PLTtymFrankencarpus/PLTtympFranken_150k_15_2.py index 16fe330..670673e 100644 --- a/models/PLTtymFrankencarpus/PLTtympFranken_150k_15_2.py +++ b/models/PLTtymFrankencarpus/PLTtympFranken_150k_15_2.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'150k') p['bone'] = f'{path}/PLTtym_150k_symph.stl' - p['contact_pts'] = [[-47.591175, 59.634678, 182.979019], - [-47.909733, -48.301151, 176.236832]] - p['axis_pt1'] = [207.172852, -79.520950, 187.358459] - p['axis_pt2'] = [205.906677, 112.895256, 190.595184] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-140.484802, 32.752762, 185.435608], + [-141.219009, -31.436172, 178.064987]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [207.172852, -79.520950, 187.358459], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [205.906677, 112.895256, 190.595184], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/PLTtym_M_Adductor_externus_L1.stl', @@ -86,11 +100,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/PLTtymFrankencarpus/PLTtympFranken_150k_7_1.py b/models/PLTtymFrankencarpus/PLTtympFranken_150k_7_1.py index f7b38aa..485a909 100644 --- a/models/PLTtymFrankencarpus/PLTtympFranken_150k_7_1.py +++ b/models/PLTtymFrankencarpus/PLTtympFranken_150k_7_1.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'150k') p['bone'] = f'{path}/PLTtym_150k_symph.stl' - p['contact_pts'] = [[-140.484802, 32.752762, 185.435608], - [-141.219009, -31.436172, 178.064987]] - p['axis_pt1'] = [207.172852, -79.520950, 187.358459] - p['axis_pt2'] = [205.906677, 112.895256, 190.595184] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-140.484802, 32.752762, 185.435608], + [-141.219009, -31.436172, 178.064987]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [207.172852, -79.520950, 187.358459], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [205.906677, 112.895256, 190.595184], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/PLTtym_M_Adductor_externus_L1.stl', @@ -86,11 +100,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/PLTtymFrankencarpus/PLTtympFranken_150k_7_2.py b/models/PLTtymFrankencarpus/PLTtympFranken_150k_7_2.py index 7b82628..485a909 100644 --- a/models/PLTtymFrankencarpus/PLTtympFranken_150k_7_2.py +++ b/models/PLTtymFrankencarpus/PLTtympFranken_150k_7_2.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'150k') p['bone'] = f'{path}/PLTtym_150k_symph.stl' - p['contact_pts'] = [[-47.591175, 59.634678, 182.979019], - [-47.909733, -48.301151, 176.236832]] - p['axis_pt1'] = [207.172852, -79.520950, 187.358459] - p['axis_pt2'] = [205.906677, 112.895256, 190.595184] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-140.484802, 32.752762, 185.435608], + [-141.219009, -31.436172, 178.064987]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [207.172852, -79.520950, 187.358459], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [205.906677, 112.895256, 190.595184], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/PLTtym_M_Adductor_externus_L1.stl', @@ -86,11 +100,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/PLTtymFrankencarpus/PLTtympFranken_20k.py b/models/PLTtymFrankencarpus/PLTtympFranken_20k.py index 3a1addc..2ca9424 100644 --- a/models/PLTtymFrankencarpus/PLTtympFranken_20k.py +++ b/models/PLTtymFrankencarpus/PLTtympFranken_20k.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'20k') p['bone'] = f'{path}/PLTtym_20k_symph_lfs.stl' - p['contact_pts'] = [[-139.862946, 34.411610, 186.322037], - [-140.781250, -29.009081, 185.878799]] - p['axis_pt1'] = [214.665802, -70.867393, 186.018097] - p['axis_pt2'] = [205.800995, 109.939995, 189.537064] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-139.862946, 34.411610, 186.322037], + [-140.781250, -29.009081, 185.878799]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [214.665802, -70.867393, 186.018097], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [205.800995, 109.939995, 189.537064], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/PLTtym_M_Adductor_externus_L1.stl', @@ -86,11 +100,6 @@ def parms(d={}): 'method': 'T' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.850e-9 # [T/mm³] diff --git a/models/PLTtymFrankencarpus/PLTtympFranken_250k.py b/models/PLTtymFrankencarpus/PLTtympFranken_250k.py index 352bcac..3e0ec62 100644 --- a/models/PLTtymFrankencarpus/PLTtympFranken_250k.py +++ b/models/PLTtymFrankencarpus/PLTtympFranken_250k.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'250k') p['bone'] = f'{path}/PLTtym_250k_symph_lfs.stl' - p['contact_pts'] = [[-140.616379, 34.634388, 178.193710], - [-141.087341, -31.283962, 177.457901]] - p['axis_pt1'] = [206.616394, -80.626038, 187.317291] - p['axis_pt2'] = [202.435074, 114.139923, 188.697571] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-140.616379, 34.634388, 178.193710], + [-141.087341, -31.283962, 177.457901]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [206.616394, -80.626038, 187.317291], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [202.435074, 114.139923, 188.697571], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/PLTtym_M_Adductor_externus_L1.stl', @@ -86,11 +100,6 @@ def parms(d={}): 'method': 'T' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.850e-9 # [T/mm³] diff --git a/models/PLTtymFrankencarpus/PLTtympFranken_250k_15_1.py b/models/PLTtymFrankencarpus/PLTtympFranken_250k_15_1.py index 84893b7..fc39445 100644 --- a/models/PLTtymFrankencarpus/PLTtympFranken_250k_15_1.py +++ b/models/PLTtymFrankencarpus/PLTtympFranken_250k_15_1.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'250k') p['bone'] = f'{path}/PLTtym_250k_symph.stl' - p['contact_pts'] = [[-140.616379, 34.634388, 178.193710], - [-141.087341, -31.283962, 177.457901]] - p['axis_pt1'] = [206.616394, -80.626038, 187.317291] - p['axis_pt2'] = [202.435074, 114.139923, 188.697571] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-140.616379, 34.634388, 178.193710], + [-141.087341, -31.283962, 177.457901]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [206.616394, -80.626038, 187.317291], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [202.435074, 114.139923, 188.697571], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/PLTtym_M_Adductor_externus_L1.stl', @@ -86,18 +100,12 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] p['Young'] = 15000. # [MPa] p['Poisson'] = 0.3 # [-] - p.update(d) return p diff --git a/models/PLTtymFrankencarpus/PLTtympFranken_250k_15_2.py b/models/PLTtymFrankencarpus/PLTtympFranken_250k_15_2.py index 9d3fb40..fc39445 100644 --- a/models/PLTtymFrankencarpus/PLTtympFranken_250k_15_2.py +++ b/models/PLTtymFrankencarpus/PLTtympFranken_250k_15_2.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'250k') p['bone'] = f'{path}/PLTtym_250k_symph.stl' - p['contact_pts'] = [[-47.591175, 59.634678, 182.979019], - [-47.556026, -48.933891, 180.280045]] - p['axis_pt1'] = [206.616394, -80.626038, 187.317291] - p['axis_pt2'] = [202.435074, 114.139923, 188.697571] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-140.616379, 34.634388, 178.193710], + [-141.087341, -31.283962, 177.457901]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [206.616394, -80.626038, 187.317291], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [202.435074, 114.139923, 188.697571], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/PLTtym_M_Adductor_externus_L1.stl', @@ -86,18 +100,12 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] p['Young'] = 15000. # [MPa] p['Poisson'] = 0.3 # [-] - p.update(d) return p diff --git a/models/PLTtymFrankencarpus/PLTtympFranken_250k_7_1.py b/models/PLTtymFrankencarpus/PLTtympFranken_250k_7_1.py index 049b78c..30b60bb 100644 --- a/models/PLTtymFrankencarpus/PLTtympFranken_250k_7_1.py +++ b/models/PLTtymFrankencarpus/PLTtympFranken_250k_7_1.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'250k') p['bone'] = f'{path}/PLTtym_250k_symph.stl' - p['contact_pts'] = [[-140.616379, 34.634388, 178.193710], - [-141.087341, -31.283962, 177.457901]] - p['axis_pt1'] = [206.616394, -80.626038, 187.317291] - p['axis_pt2'] = [202.435074, 114.139923, 188.697571] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-140.616379, 34.634388, 178.193710], + [-141.087341, -31.283962, 177.457901]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [206.616394, -80.626038, 187.317291], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [202.435074, 114.139923, 188.697571], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/PLTtym_M_Adductor_externus_L1.stl', @@ -86,18 +100,12 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] p['Young'] = 15000. # [MPa] p['Poisson'] = 0.3 # [-] - p.update(d) return p diff --git a/models/PLTtymFrankencarpus/PLTtympFranken_250k_7_2.py b/models/PLTtymFrankencarpus/PLTtympFranken_250k_7_2.py index 5484e68..30b60bb 100644 --- a/models/PLTtymFrankencarpus/PLTtympFranken_250k_7_2.py +++ b/models/PLTtymFrankencarpus/PLTtympFranken_250k_7_2.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'250k') p['bone'] = f'{path}/PLTtym_250k_symph.stl' - p['contact_pts'] = [[-47.591175, 59.634678, 182.979019], - [-47.556026, -48.933891, 180.280045]] - p['axis_pt1'] = [206.616394, -80.626038, 187.317291] - p['axis_pt2'] = [202.435074, 114.139923, 188.697571] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-140.616379, 34.634388, 178.193710], + [-141.087341, -31.283962, 177.457901]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [206.616394, -80.626038, 187.317291], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [202.435074, 114.139923, 188.697571], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/PLTtym_M_Adductor_externus_L1.stl', @@ -86,18 +100,12 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] p['Young'] = 15000. # [MPa] p['Poisson'] = 0.3 # [-] - p.update(d) return p diff --git a/models/PLTtymFrankencarpus/PLTtympFranken_500k_15_1.py b/models/PLTtymFrankencarpus/PLTtympFranken_500k_15_1.py index 37fb7f6..8009cdc 100644 --- a/models/PLTtymFrankencarpus/PLTtympFranken_500k_15_1.py +++ b/models/PLTtymFrankencarpus/PLTtympFranken_500k_15_1.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'500k') p['bone'] = f'{path}/PLTtym_500k_symph.stl' - p['contact_pts'] = [[-140.616379, 34.634388, 178.193710], - [-141.554642, -31.049093, 176.841354]] - p['axis_pt1'] = [209.550949, -84.342560, 175.265411] - p['axis_pt2'] = [202.335129, 113.899513, 188.742447] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-140.616379, 34.634388, 178.193710], + [-141.554642, -31.049093, 176.841354]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [209.550949, -84.342560, 175.265411], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [202.335129, 113.899513, 188.742447], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/PLTtym_M_Adductor_externus_L1.stl', @@ -86,18 +100,12 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] p['Young'] = 15000. # [MPa] p['Poisson'] = 0.3 # [-] - p.update(d) return p diff --git a/models/PLTtymFrankencarpus/PLTtympFranken_500k_15_2.py b/models/PLTtymFrankencarpus/PLTtympFranken_500k_15_2.py index 52f288d..8009cdc 100644 --- a/models/PLTtymFrankencarpus/PLTtympFranken_500k_15_2.py +++ b/models/PLTtymFrankencarpus/PLTtympFranken_500k_15_2.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'500k') p['bone'] = f'{path}/PLTtym_500k_symph.stl' - p['contact_pts'] = [[-48.250050, 60.041912, 182.285355], - [-47.561031, -48.934483, 180.753647]] - p['axis_pt1'] = [209.550949, -84.342560, 175.265411] - p['axis_pt2'] = [202.335129, 113.899513, 188.742447] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-140.616379, 34.634388, 178.193710], + [-141.554642, -31.049093, 176.841354]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [209.550949, -84.342560, 175.265411], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [202.335129, 113.899513, 188.742447], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/PLTtym_M_Adductor_externus_L1.stl', @@ -86,18 +100,12 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] p['Young'] = 15000. # [MPa] p['Poisson'] = 0.3 # [-] - p.update(d) return p diff --git a/models/PLTtymFrankencarpus/PLTtympFranken_500k_7_1.py b/models/PLTtymFrankencarpus/PLTtympFranken_500k_7_1.py index e777645..d517c09 100644 --- a/models/PLTtymFrankencarpus/PLTtympFranken_500k_7_1.py +++ b/models/PLTtymFrankencarpus/PLTtympFranken_500k_7_1.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'500k') p['bone'] = f'{path}/PLTtym_500k_symph.stl' - p['contact_pts'] = [[-140.616379, 34.634388, 178.193710], - [-141.554642, -31.049093, 176.841354]] - p['axis_pt1'] = [209.550949, -84.342560, 175.265411] - p['axis_pt2'] = [202.335129, 113.899513, 188.742447] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-140.616379, 34.634388, 178.193710], + [-141.554642, -31.049093, 176.841354]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [209.550949, -84.342560, 175.265411], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [202.335129, 113.899513, 188.742447], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/PLTtym_M_Adductor_externus_L1.stl', @@ -86,18 +100,12 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] p['Young'] = 15000. # [MPa] p['Poisson'] = 0.3 # [-] - p.update(d) return p diff --git a/models/PLTtymFrankencarpus/PLTtympFranken_500k_7_2.py b/models/PLTtymFrankencarpus/PLTtympFranken_500k_7_2.py index a5e1f54..d517c09 100644 --- a/models/PLTtymFrankencarpus/PLTtympFranken_500k_7_2.py +++ b/models/PLTtymFrankencarpus/PLTtympFranken_500k_7_2.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'500k') p['bone'] = f'{path}/PLTtym_500k_symph.stl' - p['contact_pts'] = [[-48.250050, 60.041912, 182.285355], - [-47.561031, -48.934483, 180.753647]] - p['axis_pt1'] = [209.550949, -84.342560, 175.265411] - p['axis_pt2'] = [202.335129, 113.899513, 188.742447] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-140.616379, 34.634388, 178.193710], + [-141.554642, -31.049093, 176.841354]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [209.550949, -84.342560, 175.265411], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [202.335129, 113.899513, 188.742447], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/PLTtym_M_Adductor_externus_L1.stl', @@ -86,18 +100,12 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] p['Young'] = 15000. # [MPa] p['Poisson'] = 0.3 # [-] - p.update(d) return p diff --git a/models/PLTtymFrankencarpus/PLTtympFranken_750k.py b/models/PLTtymFrankencarpus/PLTtympFranken_750k.py index 406573a..dace08a 100644 --- a/models/PLTtymFrankencarpus/PLTtympFranken_750k.py +++ b/models/PLTtymFrankencarpus/PLTtympFranken_750k.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'750k') p['bone'] = f'{path}/PLTtym_750k_symph_lfs.stl' - p['contact_pts'] = [[-140.392929, 34.519073, 177.620209], - [-141.554642, -31.049093, 176.841354]] - p['axis_pt1'] = [207.311279, -80.298553, 187.387451] - p['axis_pt2'] = [202.485397, 112.689812, 189.151352] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-140.392929, 34.519073, 177.620209], + [-141.554642, -31.049093, 176.841354]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [207.311279, -80.298553, 187.387451], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [202.485397, 112.689812, 189.151352], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/PLTtym_M_Adductor_externus_L1_lfs.stl', @@ -86,11 +100,6 @@ def parms(d={}): 'method': 'T' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.850e-9 # [T/mm³] diff --git a/models/PLTtymFrankencarpus/PLTtympFranken_750k_15_1.py b/models/PLTtymFrankencarpus/PLTtympFranken_750k_15_1.py index cc1fea2..2669347 100644 --- a/models/PLTtymFrankencarpus/PLTtympFranken_750k_15_1.py +++ b/models/PLTtymFrankencarpus/PLTtympFranken_750k_15_1.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'750k') p['bone'] = f'{path}/PLTtym_750k_symph.stl' - p['contact_pts'] = [[-140.392929, 34.519073, 177.620209], - [-141.554642, -31.049093, 176.841354]] - p['axis_pt1'] = [207.311279, -80.298553, 187.387451] - p['axis_pt2'] = [202.485397, 112.689812, 189.151352] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-140.392929, 34.519073, 177.620209], + [-141.554642, -31.049093, 176.841354]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [207.311279, -80.298553, 187.387451], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [202.485397, 112.689812, 189.151352], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/PLTtym_M_Adductor_externus_L1.stl', @@ -86,18 +100,12 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] p['Young'] = 15000. # [MPa] p['Poisson'] = 0.3 # [-] - p.update(d) return p diff --git a/models/PLTtymFrankencarpus/PLTtympFranken_750k_15_2.py b/models/PLTtymFrankencarpus/PLTtympFranken_750k_15_2.py index 109309f..2669347 100644 --- a/models/PLTtymFrankencarpus/PLTtympFranken_750k_15_2.py +++ b/models/PLTtymFrankencarpus/PLTtympFranken_750k_15_2.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'750k') p['bone'] = f'{path}/PLTtym_750k_symph.stl' - p['contact_pts'] = [[-48.250050, 60.041912, 182.285355], - [-47.400860, -48.840836, 180.895721]] - p['axis_pt1'] = [207.311279, -80.298553, 187.387451] - p['axis_pt2'] = [202.485397, 112.689812, 189.151352] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-140.392929, 34.519073, 177.620209], + [-141.554642, -31.049093, 176.841354]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [207.311279, -80.298553, 187.387451], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [202.485397, 112.689812, 189.151352], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/PLTtym_M_Adductor_externus_L1.stl', @@ -86,18 +100,12 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] p['Young'] = 15000. # [MPa] p['Poisson'] = 0.3 # [-] - p.update(d) return p diff --git a/models/PLTtymFrankencarpus/PLTtympFranken_750k_7_1.py b/models/PLTtymFrankencarpus/PLTtympFranken_750k_7_1.py index 78c5464..4f4b2c4 100644 --- a/models/PLTtymFrankencarpus/PLTtympFranken_750k_7_1.py +++ b/models/PLTtymFrankencarpus/PLTtympFranken_750k_7_1.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'750k') p['bone'] = f'{path}/PLTtym_750k_symph.stl' - p['contact_pts'] = [[-140.392929, 34.519073, 177.620209], - [-141.554642, -31.049093, 176.841354]] - p['axis_pt1'] = [207.311279, -80.298553, 187.387451] - p['axis_pt2'] = [202.485397, 112.689812, 189.151352] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-140.392929, 34.519073, 177.620209], + [-141.554642, -31.049093, 176.841354]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [207.311279, -80.298553, 187.387451], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [202.485397, 112.689812, 189.151352], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/PLTtym_M_Adductor_externus_L1.stl', @@ -86,18 +100,12 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] p['Young'] = 15000. # [MPa] p['Poisson'] = 0.3 # [-] - p.update(d) return p diff --git a/models/PLTtymFrankencarpus/PLTtympFranken_750k_7_2.py b/models/PLTtymFrankencarpus/PLTtympFranken_750k_7_2.py index 43ff571..4f4b2c4 100644 --- a/models/PLTtymFrankencarpus/PLTtympFranken_750k_7_2.py +++ b/models/PLTtymFrankencarpus/PLTtympFranken_750k_7_2.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'750k') p['bone'] = f'{path}/PLTtym_750k_symph.stl' - p['contact_pts'] = [[-48.250050, 60.041912, 182.285355], - [-47.400860, -48.840836, 180.895721]] - p['axis_pt1'] = [207.311279, -80.298553, 187.387451] - p['axis_pt2'] = [202.485397, 112.689812, 189.151352] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-140.392929, 34.519073, 177.620209], + [-141.554642, -31.049093, 176.841354]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [207.311279, -80.298553, 187.387451], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [202.485397, 112.689812, 189.151352], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/PLTtym_M_Adductor_externus_L1.stl', @@ -86,18 +100,12 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] p['Young'] = 15000. # [MPa] p['Poisson'] = 0.3 # [-] - p.update(d) return p diff --git a/models/Panthera_pardus/Panthera_pardus_RC_30.py b/models/Panthera_pardus/Panthera_pardus_RC_30.py index 31b3e6e..0726ed9 100644 --- a/models/Panthera_pardus/Panthera_pardus_RC_30.py +++ b/models/Panthera_pardus/Panthera_pardus_RC_30.py @@ -8,10 +8,23 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'150k') p['bone'] = f'{path}/Panthera_pardus_AMNH_113745_mandible.stl' - p['contact_pts'] = [16.4418, 17.3567, -53.2842] - p['axis_pt1'] = [-37.433147, -7.689619, 48.622185] - p['axis_pt2'] = [37.795021, -7.337307, 49.882557] - + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [16.4418, 17.3567, -53.2842], + 'direction': ['x', 'z', 'y'] + }, + { + 'name': 'axis_pt1', + 'nodes': [-37.433147, -7.689619, 48.622185], + 'direction': ['z', 'y'] + }, + { + 'name': 'axis_pt2', + 'nodes': [37.795021, -7.337307, 49.882557], + 'direction': ['z', 'y'] + } + ] p['muscles'] = [ { 'file': f'{path}/m. masseter left.stl', @@ -50,11 +63,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['x', 'z','y'], - 'axis_pt1': ['z','y'], - 'axis_pt2': ['z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/Smilodon_fatalis_juvenile/LACMHC_2002_L_R_3_30.py b/models/Smilodon_fatalis_juvenile/LACMHC_2002_L_R_3_30.py index e3f4119..d413a09 100644 --- a/models/Smilodon_fatalis_juvenile/LACMHC_2002_L_R_3_30.py +++ b/models/Smilodon_fatalis_juvenile/LACMHC_2002_L_R_3_30.py @@ -8,12 +8,26 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'500k') p['bone'] = f'{path}\Smilodon_fatalis_juvenile_LACMHC2002LR3_mandible_500k_lfs.ply' - p['contact_pts'] = [ - [-3.128700, 44.665501, -9.424970] , + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [ + [-3.128700, 44.665501, -9.424970], [3.667650, 45.900398, -8.284160], - [9.765930, 44.752102, -6.164700]] - p['axis_pt1'] = [-27.858801, -35.784000, -1.227750] - p['axis_pt2'] = [22.619600, -43.196201, 4.224330] + [9.765930, 44.752102, -6.164700]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [-27.858801, -35.784000, -1.227750], + 'direction': ['y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [22.619600, -43.196201, 4.224330], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}\m. masseter left.stl', @@ -52,11 +66,6 @@ def parms(d={}): 'method': 'T+N' # 'U', 'T', 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['z','y'], - 'axis_pt2': ['z','y','x'] - } # material properties p['density'] = 1.662e-9 # [T\mm³] diff --git a/models/TYLber/TYLber_150k_15_1.py b/models/TYLber/TYLber_150k_15_1.py index 63296cd..8c38752 100644 --- a/models/TYLber/TYLber_150k_15_1.py +++ b/models/TYLber/TYLber_150k_15_1.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'150k') p['bone'] = f'{path}/TYLber_jaw_150k.stl' - p['contact_pts'] = [[74.470337, 531.928772, 38.113079], - [-71.465904, 531.618591, 37.830475]] - p['axis_pt1'] = [-232.980133, -518.113647, 14.254566] - p['axis_pt2'] = [258.104462, -520.396851, -14.235010] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[74.470337, 531.928772, 38.113079], + [-71.465904, 531.618591, 37.830475]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [-232.980133, -518.113647, 14.254566], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [258.104462, -520.396851, -14.235010], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -86,11 +100,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/TYLber/TYLber_150k_15_2.py b/models/TYLber/TYLber_150k_15_2.py index ce405a1..8c38752 100644 --- a/models/TYLber/TYLber_150k_15_2.py +++ b/models/TYLber/TYLber_150k_15_2.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'150k') p['bone'] = f'{path}/TYLber_jaw_150k.stl' - p['contact_pts'] = [[159.952377, 145.793655, 10.386530], - [-147.823532, 152.052460, 16.779087]] - p['axis_pt1'] = [-232.980133, -518.113647, 14.254566] - p['axis_pt2'] = [258.104462, -520.396851, -14.235010] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[74.470337, 531.928772, 38.113079], + [-71.465904, 531.618591, 37.830475]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [-232.980133, -518.113647, 14.254566], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [258.104462, -520.396851, -14.235010], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -86,11 +100,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/TYLber/TYLber_150k_7_1.py b/models/TYLber/TYLber_150k_7_1.py index 1064cfd..3bdcb46 100644 --- a/models/TYLber/TYLber_150k_7_1.py +++ b/models/TYLber/TYLber_150k_7_1.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'150k') p['bone'] = f'{path}/TYLber_jaw_150k.stl' - p['contact_pts'] = [[74.470337, 531.928772, 38.113079], - [-71.465904, 531.618591, 37.830475]] - p['axis_pt1'] = [-232.980133, -518.113647, 14.254566] - p['axis_pt2'] = [258.104462, -520.396851, -14.235010] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[74.470337, 531.928772, 38.113079], + [-71.465904, 531.618591, 37.830475]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [-232.980133, -518.113647, 14.254566], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [258.104462, -520.396851, -14.235010], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -86,11 +100,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/TYLber/TYLber_150k_7_2.py b/models/TYLber/TYLber_150k_7_2.py index 753edca..3bdcb46 100644 --- a/models/TYLber/TYLber_150k_7_2.py +++ b/models/TYLber/TYLber_150k_7_2.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'150k') p['bone'] = f'{path}/TYLber_jaw_150k.stl' - p['contact_pts'] = [[159.952377, 145.793655, 10.386530], - [-147.823532, 152.052460, 16.779087]] - p['axis_pt1'] = [-232.980133, -518.113647, 14.254566] - p['axis_pt2'] = [258.104462, -520.396851, -14.235010] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[74.470337, 531.928772, 38.113079], + [-71.465904, 531.618591, 37.830475]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [-232.980133, -518.113647, 14.254566], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [258.104462, -520.396851, -14.235010], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -86,11 +100,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/TYLber/TYLber_250k_15_1.py b/models/TYLber/TYLber_250k_15_1.py index 0ecee26..51c78d0 100644 --- a/models/TYLber/TYLber_250k_15_1.py +++ b/models/TYLber/TYLber_250k_15_1.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'250k') p['bone'] = f'{path}/TYLber_jaw_250k.stl' - p['contact_pts'] = [[76.895927, 530.584045, 32.612164], - [-73.001038, 536.202087, 37.195301]] - p['axis_pt1'] = [-249.095215, -528.940735, -12.830746] - p['axis_pt2'] = [259.810211, -524.600159, -11.910051] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[76.895927, 530.584045, 32.612164], + [-73.001038, 536.202087, 37.195301]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [-249.095215, -528.940735, -12.830746], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [259.810211, -524.600159, -11.910051], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -86,11 +100,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/TYLber/TYLber_250k_15_2_bad.py b/models/TYLber/TYLber_250k_15_2_bad.py index b81af70..51c78d0 100644 --- a/models/TYLber/TYLber_250k_15_2_bad.py +++ b/models/TYLber/TYLber_250k_15_2_bad.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'250k') p['bone'] = f'{path}/TYLber_jaw_250k.stl' - p['contact_pts'] = [[159.370773, 150.709351, 18.192839], - [-152.182220, 150.355057, 22.975760]] - p['axis_pt1'] = [-249.095215, -528.940735, -12.830746] - p['axis_pt2'] = [259.810211, -524.600159, -11.910051] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[76.895927, 530.584045, 32.612164], + [-73.001038, 536.202087, 37.195301]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [-249.095215, -528.940735, -12.830746], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [259.810211, -524.600159, -11.910051], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -86,11 +100,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/TYLber/TYLber_250k_7_1.py b/models/TYLber/TYLber_250k_7_1.py index dcef18b..ae7982e 100644 --- a/models/TYLber/TYLber_250k_7_1.py +++ b/models/TYLber/TYLber_250k_7_1.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'250k') p['bone'] = f'{path}/TYLber_jaw_250k.stl' - p['contact_pts'] = [[76.895927, 530.584045, 32.612164], - [-73.001038, 536.202087, 37.195301]] - p['axis_pt1'] = [-249.095215, -528.940735, -12.830746] - p['axis_pt2'] = [259.810211, -524.600159, -11.910051] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[76.895927, 530.584045, 32.612164], + [-73.001038, 536.202087, 37.195301]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [-249.095215, -528.940735, -12.830746], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [259.810211, -524.600159, -11.910051], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -86,11 +100,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/TYLber/TYLber_250k_7_2_bad.py b/models/TYLber/TYLber_250k_7_2_bad.py index f2e7fa0..ae7982e 100644 --- a/models/TYLber/TYLber_250k_7_2_bad.py +++ b/models/TYLber/TYLber_250k_7_2_bad.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'250k') p['bone'] = f'{path}/TYLber_jaw_250k.stl' - p['contact_pts'] = [[159.370773, 150.709351, 18.192839], - [-152.182220, 150.355057, 22.975760]] - p['axis_pt1'] = [-249.095215, -528.940735, -12.830746] - p['axis_pt2'] = [259.810211, -524.600159, -11.910051] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[76.895927, 530.584045, 32.612164], + [-73.001038, 536.202087, 37.195301]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [-249.095215, -528.940735, -12.830746], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [259.810211, -524.600159, -11.910051], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -86,11 +100,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/TYLber/TYLber_500k_15_1.py b/models/TYLber/TYLber_500k_15_1.py index f664fc3..e19c4b2 100644 --- a/models/TYLber/TYLber_500k_15_1.py +++ b/models/TYLber/TYLber_500k_15_1.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'500k') p['bone'] = f'{path}/TYLber_jaw_500k.stl' - p['contact_pts'] = [[77.305153, 544.409424, 30.836790], - [-73.187263, 536.783264, 36.419006]] - p['axis_pt1'] = [-228.034103, -519.674866, 16.911722] - p['axis_pt2'] = [256.089417, -529.891724, -10.076393] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[77.305153, 544.409424, 30.836790], + [-73.187263, 536.783264, 36.419006]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [-228.034103, -519.674866, 16.911722], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [256.089417, -529.891724, -10.076393], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -86,11 +100,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/TYLber/TYLber_500k_15_2.py b/models/TYLber/TYLber_500k_15_2.py index 17c423f..e19c4b2 100644 --- a/models/TYLber/TYLber_500k_15_2.py +++ b/models/TYLber/TYLber_500k_15_2.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'500k') p['bone'] = f'{path}/TYLber_jaw_500k.stl' - p['contact_pts'] = [[153.858017, 155.593140, 17.697323], - [-150.512238, 145.369690, 17.743414]] - p['axis_pt1'] = [-228.034103, -519.674866, 16.911722] - p['axis_pt2'] = [256.089417, -529.891724, -10.076393] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[77.305153, 544.409424, 30.836790], + [-73.187263, 536.783264, 36.419006]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [-228.034103, -519.674866, 16.911722], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [256.089417, -529.891724, -10.076393], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -86,11 +100,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/TYLber/TYLber_500k_7_1.py b/models/TYLber/TYLber_500k_7_1.py index 007b7e1..6c90ec3 100644 --- a/models/TYLber/TYLber_500k_7_1.py +++ b/models/TYLber/TYLber_500k_7_1.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'500k') p['bone'] = f'{path}/TYLber_jaw_500k.stl' - p['contact_pts'] = [[77.305153, 544.409424, 30.836790], - [-73.187263, 536.783264, 36.419006]] - p['axis_pt1'] = [-228.034103, -519.674866, 16.911722] - p['axis_pt2'] = [256.089417, -529.891724, -10.076393] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[77.305153, 544.409424, 30.836790], + [-73.187263, 536.783264, 36.419006]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [-228.034103, -519.674866, 16.911722], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [256.089417, -529.891724, -10.076393], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -86,11 +100,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/TYLber/TYLber_500k_7_2.py b/models/TYLber/TYLber_500k_7_2.py index eb2cdaf..6c90ec3 100644 --- a/models/TYLber/TYLber_500k_7_2.py +++ b/models/TYLber/TYLber_500k_7_2.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'500k') p['bone'] = f'{path}/TYLber_jaw_500k.stl' - p['contact_pts'] = [[153.858017, 155.593140, 17.697323], - [-150.512238, 145.369690, 17.743414]] - p['axis_pt1'] = [-228.034103, -519.674866, 16.911722] - p['axis_pt2'] = [256.089417, -529.891724, -10.076393] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[77.305153, 544.409424, 30.836790], + [-73.187263, 536.783264, 36.419006]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [-228.034103, -519.674866, 16.911722], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [256.089417, -529.891724, -10.076393], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -86,12 +100,6 @@ def parms(d={}): 'method': 'T+N' } ] - - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/TYLber/TYLber_750k_15_1.py b/models/TYLber/TYLber_750k_15_1.py index 478acf9..07a7fbd 100644 --- a/models/TYLber/TYLber_750k_15_1.py +++ b/models/TYLber/TYLber_750k_15_1.py @@ -12,6 +12,24 @@ def parms(d={}): [-73.820549, 540.698853, 33.361473]] p['axis_pt1'] = [-212.512512, -567.425232, -59.523800] p['axis_pt2'] = [257.484497, -534.512878, -6.094533] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[77.305153, 544.409424, 30.836790], + [-73.187263, 536.783264, 36.419006]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [-228.034103, -519.674866, 16.911722], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [256.089417, -529.891724, -10.076393], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', diff --git a/models/TYLber/TYLber_750k_15_2.py b/models/TYLber/TYLber_750k_15_2.py index 7ec71ac..e4ac65a 100644 --- a/models/TYLber/TYLber_750k_15_2.py +++ b/models/TYLber/TYLber_750k_15_2.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'750k') p['bone'] = f'{path}/TYLber_jaw_750k.stl' - p['contact_pts'] = [[196.424347, 90.526627, -41.083321], - [-159.784760, 98.047890, 30.349947]] - p['axis_pt1'] = [-212.512512, -567.425232, -59.523800] - p['axis_pt2'] = [257.484497, -534.512878, -6.094533] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[77.305153, 544.409424, 30.836790], + [-73.187263, 536.783264, 36.419006]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [-228.034103, -519.674866, 16.911722], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [256.089417, -529.891724, -10.076393], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -86,11 +100,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/TYLber/TYLber_750k_7_1.py b/models/TYLber/TYLber_750k_7_1.py index c65f227..e88916e 100644 --- a/models/TYLber/TYLber_750k_7_1.py +++ b/models/TYLber/TYLber_750k_7_1.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'750k') p['bone'] = f'{path}/TYLber_jaw_750k.stl' - p['contact_pts'] = [[78.026253, 541.746887, 33.878143], - [-73.820549, 540.698853, 33.361473]] - p['axis_pt1'] = [-212.512512, -567.425232, -59.523800] - p['axis_pt2'] = [257.484497, -534.512878, -6.094533] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[77.305153, 544.409424, 30.836790], + [-73.187263, 536.783264, 36.419006]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [-228.034103, -519.674866, 16.911722], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [256.089417, -529.891724, -10.076393], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -86,11 +100,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/TYLber/TYLber_750k_7_2.py b/models/TYLber/TYLber_750k_7_2.py index bcdcbb7..e88916e 100644 --- a/models/TYLber/TYLber_750k_7_2.py +++ b/models/TYLber/TYLber_750k_7_2.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'750k') p['bone'] = f'{path}/TYLber_jaw_750k.stl' - p['contact_pts'] = [[196.424347, 90.526627, -41.083321], - [-159.784760, 98.047890, 30.349947]] - p['axis_pt1'] = [-212.512512, -567.425232, -59.523800] - p['axis_pt2'] = [257.484497, -534.512878, -6.094533] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[77.305153, 544.409424, 30.836790], + [-73.187263, 536.783264, 36.419006]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [-228.034103, -519.674866, 16.911722], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [256.089417, -529.891724, -10.076393], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -86,11 +100,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/TYLnep/TYLnep_150k_15_1.py b/models/TYLnep/TYLnep_150k_15_1.py index 6cf6e73..4663716 100644 --- a/models/TYLnep/TYLnep_150k_15_1.py +++ b/models/TYLnep/TYLnep_150k_15_1.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'150k') p['bone'] = f'{path}/TYLnep_jaw_150k.stl' - p['contact_pts'] = [[-411.039917, 227.579102, 43.466621], - [-426.836792, 165.685944, 36.533264]] - p['axis_pt1'] = [380.324341, 44.402424, 89.259888] - p['axis_pt2'] = [394.083679, 396.327271, 59.939686] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-411.039917, 227.579102, 43.466621], + [-426.836792, 165.685944, 36.533264]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [380.324341, 44.402424, 89.259888], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [394.083679, 396.327271, 59.939686], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -86,11 +100,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/TYLnep/TYLnep_150k_15_2.py b/models/TYLnep/TYLnep_150k_15_2.py index 6ad72d9..4663716 100644 --- a/models/TYLnep/TYLnep_150k_15_2.py +++ b/models/TYLnep/TYLnep_150k_15_2.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'150k') p['bone'] = f'{path}/TYLnep_jaw_150k.stl' - p['contact_pts'] = [[-87.998215, 318.365540, 63.300953], - [-99.972519, 80.537491, 43.511547]] - p['axis_pt1'] = [380.324341, 44.402424, 89.259888] - p['axis_pt2'] = [394.083679, 396.327271, 59.939686] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-411.039917, 227.579102, 43.466621], + [-426.836792, 165.685944, 36.533264]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [380.324341, 44.402424, 89.259888], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [394.083679, 396.327271, 59.939686], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -86,11 +100,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/TYLnep/TYLnep_150k_7_1.py b/models/TYLnep/TYLnep_150k_7_1.py index 819e199..68e1eed 100644 --- a/models/TYLnep/TYLnep_150k_7_1.py +++ b/models/TYLnep/TYLnep_150k_7_1.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'150k') p['bone'] = f'{path}/TYLnep_jaw_150k.stl' - p['contact_pts'] = [[-411.039917, 227.579102, 43.466621], - [-426.836792, 165.685944, 36.533264]] - p['axis_pt1'] = [380.324341, 44.402424, 89.259888] - p['axis_pt2'] = [394.083679, 396.327271, 59.939686] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-411.039917, 227.579102, 43.466621], + [-426.836792, 165.685944, 36.533264]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [380.324341, 44.402424, 89.259888], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [394.083679, 396.327271, 59.939686], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -86,11 +100,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/TYLnep/TYLnep_150k_7_2.py b/models/TYLnep/TYLnep_150k_7_2.py index f396b6e..68e1eed 100644 --- a/models/TYLnep/TYLnep_150k_7_2.py +++ b/models/TYLnep/TYLnep_150k_7_2.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'150k') p['bone'] = f'{path}/TYLnep_jaw_150k.stl' - p['contact_pts'] = [[-87.998215, 318.365540, 63.300953], - [-99.972519, 80.537491, 43.511547]] - p['axis_pt1'] = [380.324341, 44.402424, 89.259888] - p['axis_pt2'] = [394.083679, 396.327271, 59.939686] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-411.039917, 227.579102, 43.466621], + [-426.836792, 165.685944, 36.533264]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [380.324341, 44.402424, 89.259888], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [394.083679, 396.327271, 59.939686], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -86,11 +100,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/TYLnep/TYLnep_250k_15_1.py b/models/TYLnep/TYLnep_250k_15_1.py index 0dfe9fa..d813ea0 100644 --- a/models/TYLnep/TYLnep_250k_15_1.py +++ b/models/TYLnep/TYLnep_250k_15_1.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'250k') p['bone'] = f'{path}/TYLnep_jaw_250k.stl' - p['contact_pts'] = [[-420.489166, 226.380966, 16.269716], - [-426.962891, 159.505264, 35.790138]] - p['axis_pt1'] = [384.577301, 39.049088, 84.218117] - p['axis_pt2'] = [387.968872, 381.002136, 81.069290] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-420.489166, 226.380966, 16.269716], + [-426.962891, 159.505264, 35.790138]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [384.577301, 39.049088, 84.218117], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [387.968872, 381.002136, 81.069290], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -86,11 +100,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/TYLnep/TYLnep_250k_15_2.py b/models/TYLnep/TYLnep_250k_15_2.py index f420494..d813ea0 100644 --- a/models/TYLnep/TYLnep_250k_15_2.py +++ b/models/TYLnep/TYLnep_250k_15_2.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'250k') p['bone'] = f'{path}/TYLnep_jaw_250k.stl' - p['contact_pts'] = [[-86.279778, 320.183533, 52.348541], - [-96.408920, 78.982399, 52.918877]] - p['axis_pt1'] = [384.577301, 39.049088, 84.218117] - p['axis_pt2'] = [387.968872, 381.002136, 81.069290] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-420.489166, 226.380966, 16.269716], + [-426.962891, 159.505264, 35.790138]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [384.577301, 39.049088, 84.218117], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [387.968872, 381.002136, 81.069290], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -86,11 +100,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/TYLnep/TYLnep_250k_7_1.py b/models/TYLnep/TYLnep_250k_7_1.py index 14f65db..d1fa105 100644 --- a/models/TYLnep/TYLnep_250k_7_1.py +++ b/models/TYLnep/TYLnep_250k_7_1.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'250k') p['bone'] = f'{path}/TYLnep_jaw_250k.stl' - p['contact_pts'] = [[-420.489166, 226.380966, 16.269716], - [-426.962891, 159.505264, 35.790138]] - p['axis_pt1'] = [384.577301, 39.049088, 84.218117] - p['axis_pt2'] = [387.968872, 381.002136, 81.069290] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-420.489166, 226.380966, 16.269716], + [-426.962891, 159.505264, 35.790138]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [384.577301, 39.049088, 84.218117], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [387.968872, 381.002136, 81.069290], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -86,11 +100,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/TYLnep/TYLnep_250k_7_2.py b/models/TYLnep/TYLnep_250k_7_2.py index 9be95c5..d1fa105 100644 --- a/models/TYLnep/TYLnep_250k_7_2.py +++ b/models/TYLnep/TYLnep_250k_7_2.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'250k') p['bone'] = f'{path}/TYLnep_jaw_250k.stl' - p['contact_pts'] = [[-86.279778, 320.183533, 52.348541], - [-96.408920, 78.982399, 52.918877]] - p['axis_pt1'] = [384.577301, 39.049088, 84.218117] - p['axis_pt2'] = [387.968872, 381.002136, 81.069290] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-420.489166, 226.380966, 16.269716], + [-426.962891, 159.505264, 35.790138]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [384.577301, 39.049088, 84.218117], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [387.968872, 381.002136, 81.069290], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -86,11 +100,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/TYLnep/TYLnep_500k_15_1.py b/models/TYLnep/TYLnep_500k_15_1.py index 6ed9d15..5c48ebd 100644 --- a/models/TYLnep/TYLnep_500k_15_1.py +++ b/models/TYLnep/TYLnep_500k_15_1.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'500k') p['bone'] = f'{path}/TYLnep_jaw_500k.stl' - p['contact_pts'] = [[-417.999359, 222.242569, 31.007950], - [-428.224182, 162.031265, 36.896519]] - p['axis_pt1'] = [381.261627, 39.182289, 82.731766] - p['axis_pt2'] = [391.689667, 381.874176, 81.844215] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-417.999359, 222.242569, 31.007950], + [-428.224182, 162.031265, 36.896519]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [381.261627, 39.182289, 82.731766], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [391.689667, 381.874176, 81.844215], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -86,11 +100,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/TYLnep/TYLnep_500k_15_2.py b/models/TYLnep/TYLnep_500k_15_2.py index e529b5a..0bdc476 100644 --- a/models/TYLnep/TYLnep_500k_15_2.py +++ b/models/TYLnep/TYLnep_500k_15_2.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'500k') p['bone'] = f'{path}/TYLnep_jaw_500k.stl' - p['contact_pts'] = [[-88.511429, 320.280304, 40.494282], - [-95.066902, 77.562195, 41.572414]] - p['axis_pt1'] = [381.261627, 39.182289, 82.731766] - p['axis_pt2'] = [391.689667, 381.874176, 81.844215] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-417.999359, 222.242569, 31.007950], + [-428.224182, 162.031265, 36.896519]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [381.261627, 39.182289, 82.731766], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [391.689667, 381.874176, 81.844215], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -86,11 +100,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/TYLnep/TYLnep_500k_7_1.py b/models/TYLnep/TYLnep_500k_7_1.py index 634ca3b..f5060af 100644 --- a/models/TYLnep/TYLnep_500k_7_1.py +++ b/models/TYLnep/TYLnep_500k_7_1.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'500k') p['bone'] = f'{path}/TYLnep_jaw_500k.stl' - p['contact_pts'] = [[-417.999359, 222.242569, 31.007950], - [-428.224182, 162.031265, 36.896519]] - p['axis_pt1'] = [381.261627, 39.182289, 82.731766] - p['axis_pt2'] = [391.689667, 381.874176, 81.844215] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-417.999359, 222.242569, 31.007950], + [-428.224182, 162.031265, 36.896519]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [381.261627, 39.182289, 82.731766], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [391.689667, 381.874176, 81.844215], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -86,11 +100,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/TYLnep/TYLnep_500k_7_2.py b/models/TYLnep/TYLnep_500k_7_2.py index 3cb3d11..f5060af 100644 --- a/models/TYLnep/TYLnep_500k_7_2.py +++ b/models/TYLnep/TYLnep_500k_7_2.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'500k') p['bone'] = f'{path}/TYLnep_jaw_500k.stl' - p['contact_pts'] = [[-88.511429, 320.280304, 40.494282], - [-95.066902, 77.562195, 41.572414]] - p['axis_pt1'] = [381.261627, 39.182289, 82.731766] - p['axis_pt2'] = [391.689667, 381.874176, 81.844215] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-417.999359, 222.242569, 31.007950], + [-428.224182, 162.031265, 36.896519]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [381.261627, 39.182289, 82.731766], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [391.689667, 381.874176, 81.844215], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -86,11 +100,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/TYLnep/TYLnep_750k_15_1.py b/models/TYLnep/TYLnep_750k_15_1.py index ad6806c..26f90bd 100644 --- a/models/TYLnep/TYLnep_750k_15_1.py +++ b/models/TYLnep/TYLnep_750k_15_1.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'750k') p['bone'] = f'{path}/TYLnep_jaw_750k.stl' - p['contact_pts'] = [[-440.282074, 226.035706, 8.676176], - [-453.118317, 156.467865, 11.607960]] - p['axis_pt1'] = [392.782898, 35.557762, 84.161575] - p['axis_pt2'] = [391.689667, 381.874176, 81.844215] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-440.282074, 226.035706, 8.676176], + [-453.118317, 156.467865, 11.607960]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [392.782898, 35.557762, 84.161575], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [391.689667, 381.874176, 81.844215], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -86,11 +100,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/TYLnep/TYLnep_750k_15_2.py b/models/TYLnep/TYLnep_750k_15_2.py index dfe4fa8..26f90bd 100644 --- a/models/TYLnep/TYLnep_750k_15_2.py +++ b/models/TYLnep/TYLnep_750k_15_2.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'750k') p['bone'] = f'{path}/TYLnep_jaw_750k.stl' - p['contact_pts'] = [[-91.923141, 317.501709, 54.304459], - [-96.786438, 79.207016, 55.289452]] - p['axis_pt1'] = [392.782898, 35.557762, 84.161575] - p['axis_pt2'] = [391.689667, 381.874176, 81.844215] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-440.282074, 226.035706, 8.676176], + [-453.118317, 156.467865, 11.607960]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [392.782898, 35.557762, 84.161575], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [391.689667, 381.874176, 81.844215], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -86,11 +100,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/TYLnep/TYLnep_750k_7_1.py b/models/TYLnep/TYLnep_750k_7_1.py index a2da277..4cf091c 100644 --- a/models/TYLnep/TYLnep_750k_7_1.py +++ b/models/TYLnep/TYLnep_750k_7_1.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'750k') p['bone'] = f'{path}/TYLnep_jaw_750k.stl' - p['contact_pts'] = [[-440.282074, 226.035706, 8.676176], - [-453.118317, 156.467865, 11.607960]] - p['axis_pt1'] = [392.782898, 35.557762, 84.161575] - p['axis_pt2'] = [391.689667, 381.874176, 81.844215] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-440.282074, 226.035706, 8.676176], + [-453.118317, 156.467865, 11.607960]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [392.782898, 35.557762, 84.161575], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [391.689667, 381.874176, 81.844215], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -86,11 +100,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/TYLnep/TYLnep_750k_7_2.py b/models/TYLnep/TYLnep_750k_7_2.py index ce3e36d..4cf091c 100644 --- a/models/TYLnep/TYLnep_750k_7_2.py +++ b/models/TYLnep/TYLnep_750k_7_2.py @@ -8,10 +8,24 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'750k') p['bone'] = f'{path}/TYLnep_jaw_750k.stl' - p['contact_pts'] = [[-91.923141, 317.501709, 54.304459], - [-96.786438, 79.207016, 55.289452]] - p['axis_pt1'] = [392.782898, 35.557762, 84.161575] - p['axis_pt2'] = [391.689667, 381.874176, 81.844215] + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [[-440.282074, 226.035706, 8.676176], + [-453.118317, 156.467865, 11.607960]], + 'direction': 'z' + }, + { + 'name': 'axis_pt1', + 'nodes': [392.782898, 35.557762, 84.161575], + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [391.689667, 381.874176, 81.844215], + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -86,11 +100,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['z'], - 'axis_pt1': ['x', 'z','y'], - 'axis_pt2': ['x', 'z','y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/Tapirus_indicus/T_indicus_shoulder50k.py b/models/Tapirus_indicus/T_indicus_shoulder50k.py index 0dd5e04..902ae6e 100644 --- a/models/Tapirus_indicus/T_indicus_shoulder50k.py +++ b/models/Tapirus_indicus/T_indicus_shoulder50k.py @@ -8,10 +8,23 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'50k') p['bone'] = f'{path}/TAPind901 humerus.ply' - p['contact_pts'] = [40.7833, 86.7345, -207.319] # Distal humerus - p['axis_pt1'] = [14.49, -11.3946, -24.7092] #Humeral head - p['axis_pt2'] = [-6.88301, 6.4703, -18.073] #Humeral head - + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': [40.7833, 86.7345, -207.319], # Distal humerus + 'direction': ['x', 'z'] + }, + { + 'name': 'axis_pt1', + 'nodes': [14.49, -11.3946, -24.7092], # Humeral head + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': [-6.88301, 6.4703, -18.073], # Humeral head + 'direction': ['x', 'y', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/TAPind901 deltoideus_insert.ply', @@ -44,11 +57,6 @@ def parms(d={}): 'method': 'T+N' # 'U', 'T', 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['x', 'z'], - 'axis_pt1': ['x', 'z', 'y'], - 'axis_pt2': ['x', 'z', 'y'] - } # material properties p['density'] = 1.662e-9 # [T/mm³] diff --git a/models/dolicorhynchops/dolicorhynchops_10k_extloads.py b/models/dolicorhynchops/dolicorhynchops_10k_extloads.py index 4812b39..a68ed67 100644 --- a/models/dolicorhynchops/dolicorhynchops_10k_extloads.py +++ b/models/dolicorhynchops/dolicorhynchops_10k_extloads.py @@ -56,8 +56,6 @@ def parms(d={}): } ] - - # material properties p['density'] = 1.850e-9 # [T/mm³] p['Young'] = 20000. # [MPa] diff --git a/models/dolicorhynchops/dolicorhynchops_149k.py b/models/dolicorhynchops/dolicorhynchops_149k.py index bb4824a..4a1e3cd 100644 --- a/models/dolicorhynchops/dolicorhynchops_149k.py +++ b/models/dolicorhynchops/dolicorhynchops_149k.py @@ -9,9 +9,23 @@ def parms(d={}): import os path = os.path.join(os.path.dirname(__file__),'149k') p['bone'] = f'{path}/mandible_lfs.ply' - p['contact_pts'] = f'{path}/teeth.ply' - p['axis_pt1'] = f'{path}/LTMJ.ply' - p['axis_pt2'] = f'{path}/RTMJ.ply' + p['fixations'] = [ + { + 'name': 'contact_pts', + 'nodes': f'{path}/teeth.ply', + 'direction': 'x' + }, + { + 'name': 'axis_pt1', + 'nodes': f'{path}/LTMJ.ply', + 'direction': ['x', 'y', 'z'] + }, + { + 'name': 'axis_pt2', + 'nodes': f'{path}/RTMJ.ply', + 'direction': ['x', 'z'] + } + ] p['muscles'] = [ { 'file': f'{path}/Lmuscle_lfs.ply', @@ -26,11 +40,6 @@ def parms(d={}): 'method': 'T+N' } ] - p['fixations'] = { - 'contact_pts': ['x'], - 'axis_pt1': ['x','y','z'], - 'axis_pt2': ['x','z'] - } # material properties p['density'] = 1.850e-9 # [T/mm³] -- GitLab