From dff95d86c8c06830fe251729a9ee6c88793e995a Mon Sep 17 00:00:00 2001 From: Romain Boman <r.boman@uliege.be> Date: Wed, 23 Feb 2022 13:55:25 +0100 Subject: [PATCH] rename LTMJ, RTMJ, teeth into axis_pt1/2 and contact_pts --- models/CLIpro_150k_15_1.py | 12 ++++++------ models/CLIpro_150k_15_2.py | 12 ++++++------ models/CLIpro_150k_7_1.py | 12 ++++++------ models/CLIpro_150k_7_2.py | 12 ++++++------ models/CLIpro_250k_15_1.py | 12 ++++++------ models/CLIpro_250k_15_2.py | 12 ++++++------ models/CLIpro_250k_7_1.py | 12 ++++++------ models/CLIpro_250k_7_2.py | 12 ++++++------ models/CLIpro_500k_15_1.py | 12 ++++++------ models/CLIpro_500k_15_2.py | 12 ++++++------ models/CLIpro_500k_7_1.py | 12 ++++++------ models/CLIpro_500k_7_2.py | 12 ++++++------ models/CLIpro_750k_15_1.py | 12 ++++++------ models/CLIpro_750k_15_2.py | 12 ++++++------ models/CLIpro_750k_7_1.py | 12 ++++++------ models/CLIpro_750k_7_2.py | 12 ++++++------ models/Dolico_bon_150k_15_1.py | 12 ++++++------ models/Dolico_bon_150k_15_2.py | 12 ++++++------ models/Dolico_bon_150k_7_1.py | 12 ++++++------ models/Dolico_bon_150k_7_2.py | 12 ++++++------ models/Dolico_bon_250k_15_1.py | 12 ++++++------ models/Dolico_bon_250k_15_2.py | 12 ++++++------ models/Dolico_bon_250k_7_1.py | 12 ++++++------ models/Dolico_bon_250k_7_2.py | 12 ++++++------ models/Dolico_bon_500k_15_1.py | 12 ++++++------ models/Dolico_bon_500k_15_2.py | 12 ++++++------ models/Dolico_bon_500k_7_1.py | 12 ++++++------ models/Dolico_bon_500k_7_2.py | 12 ++++++------ models/Dolico_bon_750k_15_1.py | 12 ++++++------ models/Dolico_bon_750k_15_2.py | 12 ++++++------ models/Dolico_bon_750k_7_1.py | 12 ++++++------ models/Dolico_bon_750k_7_2.py | 12 ++++++------ models/Dolico_osb_150k_15_1.py | 12 ++++++------ models/Dolico_osb_150k_15_2.py | 12 ++++++------ models/Dolico_osb_150k_7_1.py | 12 ++++++------ models/Dolico_osb_150k_7_2.py | 12 ++++++------ models/Dolico_osb_250k_15_1.py | 12 ++++++------ models/Dolico_osb_250k_15_2.py | 12 ++++++------ models/Dolico_osb_250k_7_1.py | 12 ++++++------ models/Dolico_osb_250k_7_2.py | 12 ++++++------ models/Dolico_osb_500k_15_1.py | 12 ++++++------ models/Dolico_osb_500k_15_2.py | 12 ++++++------ models/Dolico_osb_500k_7_1.py | 12 ++++++------ models/Dolico_osb_500k_7_2.py | 12 ++++++------ models/Dolico_osb_750k_15_1.py | 12 ++++++------ models/Dolico_osb_750k_15_2.py | 12 ++++++------ models/Dolico_osb_750k_7_1.py | 12 ++++++------ models/Dolico_osb_750k_7_2.py | 12 ++++++------ models/PLTtympFranken_150k_15_1.py | 12 ++++++------ models/PLTtympFranken_150k_15_2.py | 12 ++++++------ models/PLTtympFranken_150k_7_1.py | 12 ++++++------ models/PLTtympFranken_150k_7_2.py | 12 ++++++------ models/PLTtympFranken_20k.py | 12 ++++++------ models/PLTtympFranken_250k.py | 12 ++++++------ models/PLTtympFranken_250k_15_1.py | 12 ++++++------ models/PLTtympFranken_250k_15_2.py | 12 ++++++------ models/PLTtympFranken_250k_7_1.py | 12 ++++++------ models/PLTtympFranken_250k_7_2.py | 12 ++++++------ models/PLTtympFranken_500k_15_1.py | 12 ++++++------ models/PLTtympFranken_500k_15_2.py | 12 ++++++------ models/PLTtympFranken_500k_7_1.py | 12 ++++++------ models/PLTtympFranken_500k_7_2.py | 12 ++++++------ models/PLTtympFranken_750k.py | 12 ++++++------ models/PLTtympFranken_750k_15_1.py | 12 ++++++------ models/PLTtympFranken_750k_15_2.py | 12 ++++++------ models/PLTtympFranken_750k_7_1.py | 12 ++++++------ models/PLTtympFranken_750k_7_2.py | 12 ++++++------ models/Panthera_pardus_RC_30.py | 12 ++++++------ models/README.md | 6 +++--- models/TYLber_150k_15_1.py | 12 ++++++------ models/TYLber_150k_15_2.py | 12 ++++++------ models/TYLber_150k_7_1.py | 12 ++++++------ models/TYLber_150k_7_2.py | 12 ++++++------ models/TYLber_250k_15_1.py | 12 ++++++------ models/TYLber_250k_15_2_bad.py | 12 ++++++------ models/TYLber_250k_7_1.py | 12 ++++++------ models/TYLber_250k_7_2_bad.py | 12 ++++++------ models/TYLber_500k_15_1.py | 12 ++++++------ models/TYLber_500k_15_2.py | 12 ++++++------ models/TYLber_500k_7_1.py | 12 ++++++------ models/TYLber_500k_7_2.py | 12 ++++++------ models/TYLber_750k_15_1.py | 12 ++++++------ models/TYLber_750k_15_2.py | 12 ++++++------ models/TYLber_750k_7_1.py | 12 ++++++------ models/TYLber_750k_7_2.py | 12 ++++++------ models/TYLnep_150k_15_1.py | 12 ++++++------ models/TYLnep_150k_15_2.py | 12 ++++++------ models/TYLnep_150k_7_1.py | 12 ++++++------ models/TYLnep_150k_7_2.py | 12 ++++++------ models/TYLnep_250k_15_1.py | 12 ++++++------ models/TYLnep_250k_15_2.py | 12 ++++++------ models/TYLnep_250k_7_1.py | 12 ++++++------ models/TYLnep_250k_7_2.py | 12 ++++++------ models/TYLnep_500k_15_1.py | 12 ++++++------ models/TYLnep_500k_15_2.py | 12 ++++++------ models/TYLnep_500k_7_1.py | 12 ++++++------ models/TYLnep_500k_7_2.py | 12 ++++++------ models/TYLnep_750k_15_1.py | 12 ++++++------ models/TYLnep_750k_15_2.py | 12 ++++++------ models/TYLnep_750k_7_1.py | 12 ++++++------ models/TYLnep_750k_7_2.py | 12 ++++++------ models/bonemodel.py | 24 ++++++++++++------------ models/dolicorhynchops_10k.py | 12 ++++++------ models/dolicorhynchops_10k_contact.py | 12 ++++++------ models/dolicorhynchops_149k.py | 12 ++++++------ models/view_model.py | 6 +++--- 106 files changed, 636 insertions(+), 636 deletions(-) diff --git a/models/CLIpro_150k_15_1.py b/models/CLIpro_150k_15_1.py index 02f0eeb..2563091 100644 --- a/models/CLIpro_150k_15_1.py +++ b/models/CLIpro_150k_15_1.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'CLIpro/150k' p['mandible'] = f'{path}/CLIpro_jaw_150k.stl' - p['teeth'] = [[-13.654129, -90.974480, 4.162612], + p['contact_pts'] = [[-13.654129, -90.974480, 4.162612], [14.185822, -89.850540, 8.610174]] - p['LTMJ'] = [47.751984, 205.253143, 26.247160] - p['RTMJ'] = [-47.122223, 203.473282, 34.349510] + p['axis_pt1'] = [47.751984, 205.253143, 26.247160] + p['axis_pt2'] = [-47.122223, 203.473282, 34.349510] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/CLIpro_150k_15_2.py b/models/CLIpro_150k_15_2.py index 1b7e273..a294c79 100644 --- a/models/CLIpro_150k_15_2.py +++ b/models/CLIpro_150k_15_2.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'CLIpro/150k' p['mandible'] = f'{path}/CLIpro_jaw_150k.stl' - p['teeth'] = [[-34.115112, 21.823414, 10.233394], + p['contact_pts'] = [[-34.115112, 21.823414, 10.233394], [32.383774, 21.721252, 11.580667]] - p['LTMJ'] = [47.751984, 205.253143, 26.247160] - p['RTMJ'] = [-47.122223, 203.473282, 34.349510] + p['axis_pt1'] = [47.751984, 205.253143, 26.247160] + p['axis_pt2'] = [-47.122223, 203.473282, 34.349510] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/CLIpro_150k_7_1.py b/models/CLIpro_150k_7_1.py index c8b469f..6e3100a 100644 --- a/models/CLIpro_150k_7_1.py +++ b/models/CLIpro_150k_7_1.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'CLIpro/150k' p['mandible'] = f'{path}/CLIpro_jaw_150k.stl' - p['teeth'] = [[-13.654129, -90.974480, 4.162612], + p['contact_pts'] = [[-13.654129, -90.974480, 4.162612], [14.185822, -89.850540, 8.610174]] - p['LTMJ'] = [47.751984, 205.253143, 26.247160] - p['RTMJ'] = [-47.122223, 203.473282, 34.349510] + p['axis_pt1'] = [47.751984, 205.253143, 26.247160] + p['axis_pt2'] = [-47.122223, 203.473282, 34.349510] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/CLIpro_150k_7_2.py b/models/CLIpro_150k_7_2.py index 7e8fb3c..a7ad41f 100644 --- a/models/CLIpro_150k_7_2.py +++ b/models/CLIpro_150k_7_2.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'CLIpro/150k' p['mandible'] = f'{path}/CLIpro_jaw_150k.stl' - p['teeth'] = [[-34.115112, 21.823414, 10.233394], + p['contact_pts'] = [[-34.115112, 21.823414, 10.233394], [32.383774, 21.721252, 11.580667]] - p['LTMJ'] = [47.751984, 205.253143, 26.247160] - p['RTMJ'] = [-47.122223, 203.473282, 34.349510] + p['axis_pt1'] = [47.751984, 205.253143, 26.247160] + p['axis_pt2'] = [-47.122223, 203.473282, 34.349510] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/CLIpro_250k_15_1.py b/models/CLIpro_250k_15_1.py index f38b546..1aaa5d1 100644 --- a/models/CLIpro_250k_15_1.py +++ b/models/CLIpro_250k_15_1.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'CLIpro/250k' p['mandible'] = f'{path}/CLIpro_jaw_250k.stl' - p['teeth'] = [[-13.921872, -90.258591, 8.862718], + p['contact_pts'] = [[-13.921872, -90.258591, 8.862718], [13.158182, -91.377449, 7.355043]] - p['LTMJ'] = [47.686401, 205.691238, 26.261269] - p['RTMJ'] = [-50.710445, 204.954971, 26.360205] + p['axis_pt1'] = [47.686401, 205.691238, 26.261269] + p['axis_pt2'] = [-50.710445, 204.954971, 26.360205] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/CLIpro_250k_15_2.py b/models/CLIpro_250k_15_2.py index 0d9b96a..7c459fe 100644 --- a/models/CLIpro_250k_15_2.py +++ b/models/CLIpro_250k_15_2.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'CLIpro/250k' p['mandible'] = f'{path}/CLIpro_jaw_250k.stl' - p['teeth'] = [[-34.058887, 21.742476, 9.846808], + p['contact_pts'] = [[-34.058887, 21.742476, 9.846808], [33.013206, 24.755995, -0.564457]] - p['LTMJ'] = [47.686401, 205.691238, 26.261269] - p['RTMJ'] = [-50.710445, 204.954971, 26.360205] + p['axis_pt1'] = [47.686401, 205.691238, 26.261269] + p['axis_pt2'] = [-50.710445, 204.954971, 26.360205] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/CLIpro_250k_7_1.py b/models/CLIpro_250k_7_1.py index 1a09046..9b6809a 100644 --- a/models/CLIpro_250k_7_1.py +++ b/models/CLIpro_250k_7_1.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'CLIpro/250k' p['mandible'] = f'{path}/CLIpro_jaw_250k.stl' - p['teeth'] = [[-13.921872, -90.258591, 8.862718], + p['contact_pts'] = [[-13.921872, -90.258591, 8.862718], [13.158182, -91.377449, 7.355043]] - p['LTMJ'] = [47.686401, 205.691238, 26.261269] - p['RTMJ'] = [-50.710445, 204.954971, 26.360205] + p['axis_pt1'] = [47.686401, 205.691238, 26.261269] + p['axis_pt2'] = [-50.710445, 204.954971, 26.360205] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/CLIpro_250k_7_2.py b/models/CLIpro_250k_7_2.py index f918ef3..5abc672 100644 --- a/models/CLIpro_250k_7_2.py +++ b/models/CLIpro_250k_7_2.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'CLIpro/250k' p['mandible'] = f'{path}/CLIpro_jaw_250k.stl' - p['teeth'] = [[-34.058887, 21.742476, 9.846808], + p['contact_pts'] = [[-34.058887, 21.742476, 9.846808], [33.013206, 24.755995, -0.564457]] - p['LTMJ'] = [47.686401, 205.691238, 26.261269] - p['RTMJ'] = [-50.710445, 204.954971, 26.360205] + p['axis_pt1'] = [47.686401, 205.691238, 26.261269] + p['axis_pt2'] = [-50.710445, 204.954971, 26.360205] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/CLIpro_500k_15_1.py b/models/CLIpro_500k_15_1.py index 4005126..5689861 100644 --- a/models/CLIpro_500k_15_1.py +++ b/models/CLIpro_500k_15_1.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'CLIpro/500k' p['mandible'] = f'{path}/CLIpro_jaw_500k.stl' - p['teeth'] = [[-12.880455, -92.642342, -0.673375], + p['contact_pts'] = [[-12.880455, -92.642342, -0.673375], [12.990344, -91.013168, 7.432779]] - p['LTMJ'] = [45.043976, 199.899857, 33.671288] - p['RTMJ'] = [-50.729774, 205.098663, 26.440434] + p['axis_pt1'] = [45.043976, 199.899857, 33.671288] + p['axis_pt2'] = [-50.729774, 205.098663, 26.440434] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/CLIpro_500k_15_2.py b/models/CLIpro_500k_15_2.py index c80b7da..ce1ad3d 100644 --- a/models/CLIpro_500k_15_2.py +++ b/models/CLIpro_500k_15_2.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'CLIpro/500k' p['mandible'] = f'{path}/CLIpro_jaw_500k.stl' - p['teeth'] = [[-33.575844, 26.282110, -0.445806], + p['contact_pts'] = [[-33.575844, 26.282110, -0.445806], [32.137966, 22.818340, 7.904116]] - p['LTMJ'] = [45.043976, 199.899857, 33.671288] - p['RTMJ'] = [-50.729774, 205.098663, 26.440434] + p['axis_pt1'] = [45.043976, 199.899857, 33.671288] + p['axis_pt2'] = [-50.729774, 205.098663, 26.440434] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/CLIpro_500k_7_1.py b/models/CLIpro_500k_7_1.py index a77c15d..de75d07 100644 --- a/models/CLIpro_500k_7_1.py +++ b/models/CLIpro_500k_7_1.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'CLIpro/500k' p['mandible'] = f'{path}/CLIpro_jaw_500k.stl' - p['teeth'] = [[-12.880455, -92.642342, -0.673375], + p['contact_pts'] = [[-12.880455, -92.642342, -0.673375], [12.990344, -91.013168, 7.432779]] - p['LTMJ'] = [45.043976, 199.899857, 33.671288] - p['RTMJ'] = [-50.729774, 205.098663, 26.440434] + p['axis_pt1'] = [45.043976, 199.899857, 33.671288] + p['axis_pt2'] = [-50.729774, 205.098663, 26.440434] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/CLIpro_500k_7_2.py b/models/CLIpro_500k_7_2.py index b7e7f43..5b8f067 100644 --- a/models/CLIpro_500k_7_2.py +++ b/models/CLIpro_500k_7_2.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'CLIpro/500k' p['mandible'] = f'{path}/CLIpro_jaw_500k.stl' - p['teeth'] = [[-33.575844, 26.282110, -0.445806], + p['contact_pts'] = [[-33.575844, 26.282110, -0.445806], [32.137966, 22.818340, 7.904116]] - p['LTMJ'] = [45.043976, 199.899857, 33.671288] - p['RTMJ'] = [-50.729774, 205.098663, 26.440434] + p['axis_pt1'] = [45.043976, 199.899857, 33.671288] + p['axis_pt2'] = [-50.729774, 205.098663, 26.440434] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/CLIpro_750k_15_1.py b/models/CLIpro_750k_15_1.py index b8de6c5..d2b4eb0 100644 --- a/models/CLIpro_750k_15_1.py +++ b/models/CLIpro_750k_15_1.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'CLIpro/750k' p['mandible'] = f'{path}/CLIpro_jaw_750k.stl' - p['teeth'] = [[-14.743377, -90.163612, 9.011174], + p['contact_pts'] = [[-14.743377, -90.163612, 9.011174], [13.049115, -90.677956, 7.640814]] - p['LTMJ'] = [46.317547, 203.956772, 35.086609] - p['RTMJ'] = [-50.729774, 205.098663, 26.440434] + p['axis_pt1'] = [46.317547, 203.956772, 35.086609] + p['axis_pt2'] = [-50.729774, 205.098663, 26.440434] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/CLIpro_750k_15_2.py b/models/CLIpro_750k_15_2.py index 89618d8..2a7abcb 100644 --- a/models/CLIpro_750k_15_2.py +++ b/models/CLIpro_750k_15_2.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'CLIpro/750k' p['mandible'] = f'{path}/CLIpro_jaw_750k.stl' - p['teeth'] = [[-34.126896, 21.475969, 10.220996], + p['contact_pts'] = [[-34.126896, 21.475969, 10.220996], [32.139095, 22.748108, 8.446575]] - p['LTMJ'] = [46.317547, 203.956772, 35.086609] - p['RTMJ'] = [-50.729774, 205.098663, 26.440434] + p['axis_pt1'] = [46.317547, 203.956772, 35.086609] + p['axis_pt2'] = [-50.729774, 205.098663, 26.440434] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/CLIpro_750k_7_1.py b/models/CLIpro_750k_7_1.py index 1b55d40..5c0eeb1 100644 --- a/models/CLIpro_750k_7_1.py +++ b/models/CLIpro_750k_7_1.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'CLIpro/750k' p['mandible'] = f'{path}/CLIpro_jaw_750k.stl' - p['teeth'] = [[-14.743377, -90.163612, 9.011174], + p['contact_pts'] = [[-14.743377, -90.163612, 9.011174], [13.049115, -90.677956, 7.640814]] - p['LTMJ'] = [46.317547, 203.956772, 35.086609] - p['RTMJ'] = [-50.729774, 205.098663, 26.440434] + p['axis_pt1'] = [46.317547, 203.956772, 35.086609] + p['axis_pt2'] = [-50.729774, 205.098663, 26.440434] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/CLIpro_750k_7_2.py b/models/CLIpro_750k_7_2.py index 04f6ef7..41cf267 100644 --- a/models/CLIpro_750k_7_2.py +++ b/models/CLIpro_750k_7_2.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'CLIpro/750k' p['mandible'] = f'{path}/CLIpro_jaw_750k.stl' - p['teeth'] = [[-34.126896, 21.475969, 10.220996], + p['contact_pts'] = [[-34.126896, 21.475969, 10.220996], [32.139095, 22.748108, 8.446575]] - p['LTMJ'] = [46.317547, 203.956772, 35.086609] - p['RTMJ'] = [-50.729774, 205.098663, 26.440434] + p['axis_pt1'] = [46.317547, 203.956772, 35.086609] + p['axis_pt2'] = [-50.729774, 205.098663, 26.440434] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/Dolico_bon_150k_15_1.py b/models/Dolico_bon_150k_15_1.py index 298c3ac..8b9ba51 100644 --- a/models/Dolico_bon_150k_15_1.py +++ b/models/Dolico_bon_150k_15_1.py @@ -7,10 +7,10 @@ def parms(d={}): p = {} path = 'Dolico_bon/150k' p['mandible'] = f'{path}/Dolico_bon_150k.stl' - p['teeth'] = [[4.212819, -267.574554, 28.792574], + p['contact_pts'] = [[4.212819, -267.574554, 28.792574], [36.007748, -269.322662, 27.255693]] - p['LTMJ'] = [162.458069, 598.625000, -20.051981] - p['RTMJ'] = [-145.469955, 585.402344, 11.398635] + p['axis_pt1'] = [162.458069, 598.625000, -20.051981] + p['axis_pt2'] = [-145.469955, 585.402344, 11.398635] p['muscles'] = [ { 'file': f'{path}/M_AME_L.stl', @@ -50,9 +50,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/Dolico_bon_150k_15_2.py b/models/Dolico_bon_150k_15_2.py index be507eb..e22fb23 100644 --- a/models/Dolico_bon_150k_15_2.py +++ b/models/Dolico_bon_150k_15_2.py @@ -7,10 +7,10 @@ def parms(d={}): p = {} path = 'Dolico_bon/150k' p['mandible'] = f'{path}/Dolico_bon_150k.stl' - p['teeth'] = [[-14.645494, 62.509026, 23.022108], + p['contact_pts'] = [[-14.645494, 62.509026, 23.022108], [44.984268, 67.347466, -2.159538]] - p['LTMJ'] = [162.458069, 598.625000, -20.051981] - p['RTMJ'] = [-145.469955, 585.402344, 11.398635] + p['axis_pt1'] = [162.458069, 598.625000, -20.051981] + p['axis_pt2'] = [-145.469955, 585.402344, 11.398635] p['muscles'] = [ { 'file': f'{path}/M_AME_L.stl', @@ -50,9 +50,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/Dolico_bon_150k_7_1.py b/models/Dolico_bon_150k_7_1.py index 5fde25f..c6fbc58 100644 --- a/models/Dolico_bon_150k_7_1.py +++ b/models/Dolico_bon_150k_7_1.py @@ -7,10 +7,10 @@ def parms(d={}): p = {} path = 'Dolico_bon/150k' p['mandible'] = f'{path}/Dolico_bon_150k.stl' - p['teeth'] = [[4.212819, -267.574554, 28.792574], + p['contact_pts'] = [[4.212819, -267.574554, 28.792574], [36.007748, -269.322662, 27.255693]] - p['LTMJ'] = [162.458069, 598.625000, -20.051981] - p['RTMJ'] = [-145.469955, 585.402344, 11.398635] + p['axis_pt1'] = [162.458069, 598.625000, -20.051981] + p['axis_pt2'] = [-145.469955, 585.402344, 11.398635] p['muscles'] = [ { 'file': f'{path}/M_AME_L.stl', @@ -50,9 +50,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/Dolico_bon_150k_7_2.py b/models/Dolico_bon_150k_7_2.py index 7af8606..1d903ca 100644 --- a/models/Dolico_bon_150k_7_2.py +++ b/models/Dolico_bon_150k_7_2.py @@ -7,10 +7,10 @@ def parms(d={}): p = {} path = 'Dolico_bon/150k' p['mandible'] = f'{path}/Dolico_bon_150k.stl' - p['teeth'] = [[-14.645494, 62.509026, 23.022108], + p['contact_pts'] = [[-14.645494, 62.509026, 23.022108], [44.984268, 67.347466, -2.159538]] - p['LTMJ'] = [162.458069, 598.625000, -20.051981] - p['RTMJ'] = [-145.469955, 585.402344, 11.398635] + p['axis_pt1'] = [162.458069, 598.625000, -20.051981] + p['axis_pt2'] = [-145.469955, 585.402344, 11.398635] p['muscles'] = [ { 'file': f'{path}/M_AME_L.stl', @@ -50,9 +50,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/Dolico_bon_250k_15_1.py b/models/Dolico_bon_250k_15_1.py index 15a7c98..1ff0622 100644 --- a/models/Dolico_bon_250k_15_1.py +++ b/models/Dolico_bon_250k_15_1.py @@ -7,10 +7,10 @@ def parms(d={}): p = {} path = 'Dolico_bon/250k' p['mandible'] = f'{path}/Dolico_bon_250k.stl' - p['teeth'] = [[4.212819, -267.574554, 28.792574], + p['contact_pts'] = [[4.212819, -267.574554, 28.792574], [36.279472, -269.853271, 26.685869]] - p['LTMJ'] = [168.908783, 603.534424, -17.702827] - p['RTMJ'] = [-147.934631, 590.528931, 14.065274] + p['axis_pt1'] = [168.908783, 603.534424, -17.702827] + p['axis_pt2'] = [-147.934631, 590.528931, 14.065274] p['muscles'] = [ { 'file': f'{path}/M_AME_L.stl', @@ -50,9 +50,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/Dolico_bon_250k_15_2.py b/models/Dolico_bon_250k_15_2.py index 7f71feb..e2c06a8 100644 --- a/models/Dolico_bon_250k_15_2.py +++ b/models/Dolico_bon_250k_15_2.py @@ -7,10 +7,10 @@ def parms(d={}): p = {} path = 'Dolico_bon/250k' p['mandible'] = f'{path}/Dolico_bon_250k.stl' - p['teeth'] = [[-10.472356, 31.800030, -3.685302], + p['contact_pts'] = [[-10.472356, 31.800030, -3.685302], [50.958504, 38.902874, -5.352512]] - p['LTMJ'] = [168.908783, 603.534424, -17.702827] - p['RTMJ'] = [-147.934631, 590.528931, 14.065274] + p['axis_pt1'] = [168.908783, 603.534424, -17.702827] + p['axis_pt2'] = [-147.934631, 590.528931, 14.065274] p['muscles'] = [ { 'file': f'{path}/M_AME_L.stl', @@ -50,9 +50,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/Dolico_bon_250k_7_1.py b/models/Dolico_bon_250k_7_1.py index 1e965f7..fa90c9f 100644 --- a/models/Dolico_bon_250k_7_1.py +++ b/models/Dolico_bon_250k_7_1.py @@ -7,10 +7,10 @@ def parms(d={}): p = {} path = 'Dolico_bon/250k' p['mandible'] = f'{path}/Dolico_bon_250k.stl' - p['teeth'] = [[4.212819, -267.574554, 28.792574], + p['contact_pts'] = [[4.212819, -267.574554, 28.792574], [36.279472, -269.853271, 26.685869]] - p['LTMJ'] = [168.908783, 603.534424, -17.702827] - p['RTMJ'] = [-147.934631, 590.528931, 14.065274] + p['axis_pt1'] = [168.908783, 603.534424, -17.702827] + p['axis_pt2'] = [-147.934631, 590.528931, 14.065274] p['muscles'] = [ { 'file': f'{path}/M_AME_L.stl', @@ -50,9 +50,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/Dolico_bon_250k_7_2.py b/models/Dolico_bon_250k_7_2.py index 5b1e3f9..38a1266 100644 --- a/models/Dolico_bon_250k_7_2.py +++ b/models/Dolico_bon_250k_7_2.py @@ -7,10 +7,10 @@ def parms(d={}): p = {} path = 'Dolico_bon/250k' p['mandible'] = f'{path}/Dolico_bon_250k.stl' - p['teeth'] = [[-10.472356, 31.800030, -3.685302], + p['contact_pts'] = [[-10.472356, 31.800030, -3.685302], [50.958504, 38.902874, -5.352512]] - p['LTMJ'] = [168.908783, 603.534424, -17.702827] - p['RTMJ'] = [-147.934631, 590.528931, 14.065274] + p['axis_pt1'] = [168.908783, 603.534424, -17.702827] + p['axis_pt2'] = [-147.934631, 590.528931, 14.065274] p['muscles'] = [ { 'file': f'{path}/M_AME_L.stl', @@ -50,9 +50,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/Dolico_bon_500k_15_1.py b/models/Dolico_bon_500k_15_1.py index b3fdc51..3628472 100644 --- a/models/Dolico_bon_500k_15_1.py +++ b/models/Dolico_bon_500k_15_1.py @@ -7,10 +7,10 @@ def parms(d={}): p = {} path = 'Dolico_bon/500k' p['mandible'] = f'{path}/Dolico_bon_500k.stl' - p['teeth'] = [[4.858893, -266.720367, 28.316463], + p['contact_pts'] = [[4.858893, -266.720367, 28.316463], [36.279472, -269.853271, 26.685869]] - p['LTMJ'] = [164.323242, 605.580627, -20.302845] - p['RTMJ'] = [-161.191025, 604.899658, -17.039200] + p['axis_pt1'] = [164.323242, 605.580627, -20.302845] + p['axis_pt2'] = [-161.191025, 604.899658, -17.039200] p['muscles'] = [ { 'file': f'{path}/M_AME_L.stl', @@ -50,9 +50,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/Dolico_bon_500k_15_2.py b/models/Dolico_bon_500k_15_2.py index 6eed651..e3b413f 100644 --- a/models/Dolico_bon_500k_15_2.py +++ b/models/Dolico_bon_500k_15_2.py @@ -7,10 +7,10 @@ def parms(d={}): p = {} path = 'Dolico_bon/500k' p['mandible'] = f'{path}/Dolico_bon_500k.stl' - p['teeth'] = [[-16.827028, 42.577381, -1.938522], + p['contact_pts'] = [[-16.827028, 42.577381, -1.938522], [44.807407, 48.136395, -0.112404]] - p['LTMJ'] = [164.323242, 605.580627, -20.302845] - p['RTMJ'] = [-161.191025, 604.899658, -17.039200] + p['axis_pt1'] = [164.323242, 605.580627, -20.302845] + p['axis_pt2'] = [-161.191025, 604.899658, -17.039200] p['muscles'] = [ { 'file': f'{path}/M_AME_L.stl', @@ -50,9 +50,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/Dolico_bon_500k_7_1.py b/models/Dolico_bon_500k_7_1.py index afea2e4..e63e70d 100644 --- a/models/Dolico_bon_500k_7_1.py +++ b/models/Dolico_bon_500k_7_1.py @@ -7,10 +7,10 @@ def parms(d={}): p = {} path = 'Dolico_bon/500k' p['mandible'] = f'{path}/Dolico_bon_500k.stl' - p['teeth'] = [[4.858893, -266.720367, 28.316463], + p['contact_pts'] = [[4.858893, -266.720367, 28.316463], [36.279472, -269.853271, 26.685869]] - p['LTMJ'] = [164.323242, 605.580627, -20.302845] - p['RTMJ'] = [-161.191025, 604.899658, -17.039200] + p['axis_pt1'] = [164.323242, 605.580627, -20.302845] + p['axis_pt2'] = [-161.191025, 604.899658, -17.039200] p['muscles'] = [ { 'file': f'{path}/M_AME_L.stl', @@ -50,9 +50,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/Dolico_bon_500k_7_2.py b/models/Dolico_bon_500k_7_2.py index 279cf54..5a51743 100644 --- a/models/Dolico_bon_500k_7_2.py +++ b/models/Dolico_bon_500k_7_2.py @@ -7,10 +7,10 @@ def parms(d={}): p = {} path = 'Dolico_bon/500k' p['mandible'] = f'{path}/Dolico_bon_500k.stl' - p['teeth'] = [[-16.827028, 42.577381, -1.938522], + p['contact_pts'] = [[-16.827028, 42.577381, -1.938522], [44.807407, 48.136395, -0.112404]] - p['LTMJ'] = [164.323242, 605.580627, -20.302845] - p['RTMJ'] = [-161.191025, 604.899658, -17.039200] + p['axis_pt1'] = [164.323242, 605.580627, -20.302845] + p['axis_pt2'] = [-161.191025, 604.899658, -17.039200] p['muscles'] = [ { 'file': f'{path}/M_AME_L.stl', @@ -50,9 +50,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/Dolico_bon_750k_15_1.py b/models/Dolico_bon_750k_15_1.py index 43dbaa2..848b1a4 100644 --- a/models/Dolico_bon_750k_15_1.py +++ b/models/Dolico_bon_750k_15_1.py @@ -7,10 +7,10 @@ def parms(d={}): p = {} path = 'Dolico_bon/750k' p['mandible'] = f'{path}/Dolico_bon_750k.stl' - p['teeth'] = [[5.189603, -266.977203, 28.278206], + p['contact_pts'] = [[5.189603, -266.977203, 28.278206], [36.279472, -269.853271, 26.685869]] - p['LTMJ'] = [163.730804, 595.499817, -20.042530] - p['RTMJ'] = [-149.361832, 584.256775, 14.424056] + p['axis_pt1'] = [163.730804, 595.499817, -20.042530] + p['axis_pt2'] = [-149.361832, 584.256775, 14.424056] p['muscles'] = [ { 'file': f'{path}/M_AME_L.stl', @@ -50,9 +50,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/Dolico_bon_750k_15_2.py b/models/Dolico_bon_750k_15_2.py index 17ccf66..58d3718 100644 --- a/models/Dolico_bon_750k_15_2.py +++ b/models/Dolico_bon_750k_15_2.py @@ -7,10 +7,10 @@ def parms(d={}): p = {} path = 'Dolico_bon/750k' p['mandible'] = f'{path}/Dolico_bon_750k.stl' - p['teeth'] = [[-18.989965, 40.841747, -1.935307], + p['contact_pts'] = [[-18.989965, 40.841747, -1.935307], [34.655277, 41.826595, -7.642198]] - p['LTMJ'] = [163.730804, 595.499817, -20.042530] - p['RTMJ'] = [-149.361832, 584.256775, 14.424056] + p['axis_pt1'] = [163.730804, 595.499817, -20.042530] + p['axis_pt2'] = [-149.361832, 584.256775, 14.424056] p['muscles'] = [ { 'file': f'{path}/M_AME_L.stl', @@ -50,9 +50,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/Dolico_bon_750k_7_1.py b/models/Dolico_bon_750k_7_1.py index 824c950..e5243a3 100644 --- a/models/Dolico_bon_750k_7_1.py +++ b/models/Dolico_bon_750k_7_1.py @@ -7,10 +7,10 @@ def parms(d={}): p = {} path = 'Dolico_bon/750k' p['mandible'] = f'{path}/Dolico_bon_750k.stl' - p['teeth'] = [[5.189603, -266.977203, 28.278206], + p['contact_pts'] = [[5.189603, -266.977203, 28.278206], [36.279472, -269.853271, 26.685869]] - p['LTMJ'] = [163.730804, 595.499817, -20.042530] - p['RTMJ'] = [-149.361832, 584.256775, 14.424056] + p['axis_pt1'] = [163.730804, 595.499817, -20.042530] + p['axis_pt2'] = [-149.361832, 584.256775, 14.424056] p['muscles'] = [ { 'file': f'{path}/M_AME_L.stl', @@ -50,9 +50,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/Dolico_bon_750k_7_2.py b/models/Dolico_bon_750k_7_2.py index ac475bd..fc2773f 100644 --- a/models/Dolico_bon_750k_7_2.py +++ b/models/Dolico_bon_750k_7_2.py @@ -7,10 +7,10 @@ def parms(d={}): p = {} path = 'Dolico_bon/750k' p['mandible'] = f'{path}/Dolico_bon_750k.stl' - p['teeth'] = [[-18.989965, 40.841747, -1.935307], + p['contact_pts'] = [[-18.989965, 40.841747, -1.935307], [34.655277, 41.826595, -7.642198]] - p['LTMJ'] = [163.730804, 595.499817, -20.042530] - p['RTMJ'] = [-149.361832, 584.256775, 14.424056] + p['axis_pt1'] = [163.730804, 595.499817, -20.042530] + p['axis_pt2'] = [-149.361832, 584.256775, 14.424056] p['muscles'] = [ { 'file': f'{path}/M_AME_L.stl', @@ -50,9 +50,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/Dolico_osb_150k_15_1.py b/models/Dolico_osb_150k_15_1.py index c84e5b1..1f5ceca 100644 --- a/models/Dolico_osb_150k_15_1.py +++ b/models/Dolico_osb_150k_15_1.py @@ -7,10 +7,10 @@ def parms(d={}): p = {} path = 'Dolico_osb/150k' p['mandible'] = f'{path}/Dolico_osb_150k.stl' - p['teeth'] = [[70.939697, -369.730804, 305.997803], + p['contact_pts'] = [[70.939697, -369.730804, 305.997803], [72.499474, -367.223450, 278.139832]] - p['LTMJ'] = [39.231628, 126.756012, 209.439102] - p['RTMJ'] = [40.221886, 126.551155, 385.009644] + p['axis_pt1'] = [39.231628, 126.756012, 209.439102] + p['axis_pt2'] = [40.221886, 126.551155, 385.009644] p['muscles'] = [ { 'file': f'{path}/Dolico_osb_MAME_L.stl', @@ -50,9 +50,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['x'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['x'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/Dolico_osb_150k_15_2.py b/models/Dolico_osb_150k_15_2.py index 679137a..d4ab0e6 100644 --- a/models/Dolico_osb_150k_15_2.py +++ b/models/Dolico_osb_150k_15_2.py @@ -7,10 +7,10 @@ def parms(d={}): p = {} path = 'Dolico_osb/150k' p['mandible'] = f'{path}/Dolico_osb_150k.stl' - p['teeth'] = [[52.009193, -201.873154, 307.677521], + p['contact_pts'] = [[52.009193, -201.873154, 307.677521], [64.623055, -199.101791, 282.517853]] - p['LTMJ'] = [39.231628, 126.756012, 209.439102] - p['RTMJ'] = [40.221886, 126.551155, 385.009644] + p['axis_pt1'] = [39.231628, 126.756012, 209.439102] + p['axis_pt2'] = [40.221886, 126.551155, 385.009644] p['muscles'] = [ { 'file': f'{path}/Dolico_osb_MAME_L.stl', @@ -50,9 +50,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['x'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['x'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/Dolico_osb_150k_7_1.py b/models/Dolico_osb_150k_7_1.py index 7e543d1..e959031 100644 --- a/models/Dolico_osb_150k_7_1.py +++ b/models/Dolico_osb_150k_7_1.py @@ -7,10 +7,10 @@ def parms(d={}): p = {} path = 'Dolico_osb/150k' p['mandible'] = f'{path}/Dolico_osb_150k.stl' - p['teeth'] = [[70.939697, -369.730804, 305.997803], + p['contact_pts'] = [[70.939697, -369.730804, 305.997803], [72.499474, -367.223450, 278.139832]] - p['LTMJ'] = [39.231628, 126.756012, 209.439102] - p['RTMJ'] = [40.221886, 126.551155, 385.009644] + p['axis_pt1'] = [39.231628, 126.756012, 209.439102] + p['axis_pt2'] = [40.221886, 126.551155, 385.009644] p['muscles'] = [ { 'file': f'{path}/Dolico_osb_MAME_L.stl', @@ -50,9 +50,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['x'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['x'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/Dolico_osb_150k_7_2.py b/models/Dolico_osb_150k_7_2.py index e4af79a..d15171e 100644 --- a/models/Dolico_osb_150k_7_2.py +++ b/models/Dolico_osb_150k_7_2.py @@ -7,10 +7,10 @@ def parms(d={}): p = {} path = 'Dolico_osb/150k' p['mandible'] = f'{path}/Dolico_osb_150k.stl' - p['teeth'] = [[52.009193, -201.873154, 307.677521], + p['contact_pts'] = [[52.009193, -201.873154, 307.677521], [64.623055, -199.101791, 282.517853]] - p['LTMJ'] = [39.231628, 126.756012, 209.439102] - p['RTMJ'] = [40.221886, 126.551155, 385.009644] + p['axis_pt1'] = [39.231628, 126.756012, 209.439102] + p['axis_pt2'] = [40.221886, 126.551155, 385.009644] p['muscles'] = [ { 'file': f'{path}/Dolico_osb_MAME_L.stl', @@ -50,9 +50,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['x'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['x'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/Dolico_osb_250k_15_1.py b/models/Dolico_osb_250k_15_1.py index c91135f..a57adda 100644 --- a/models/Dolico_osb_250k_15_1.py +++ b/models/Dolico_osb_250k_15_1.py @@ -7,10 +7,10 @@ def parms(d={}): p = {} path = 'Dolico_osb/250k' p['mandible'] = f'{path}/Dolico_osb_250k.stl' - p['teeth'] = [[71.647064, -367.307281, 303.918365], + p['contact_pts'] = [[71.647064, -367.307281, 303.918365], [71.428085, -366.684906, 278.119751]] - p['LTMJ'] = [25.142067, 117.287262, 198.309219] - p['RTMJ'] = [32.822464, 115.721962, 395.664978] + p['axis_pt1'] = [25.142067, 117.287262, 198.309219] + p['axis_pt2'] = [32.822464, 115.721962, 395.664978] p['muscles'] = [ { 'file': f'{path}/Dolico_osb_MAME_L.stl', @@ -50,9 +50,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['x'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['x'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/Dolico_osb_250k_15_2.py b/models/Dolico_osb_250k_15_2.py index 9b4f3e7..879cc51 100644 --- a/models/Dolico_osb_250k_15_2.py +++ b/models/Dolico_osb_250k_15_2.py @@ -7,10 +7,10 @@ def parms(d={}): p = {} path = 'Dolico_osb/250k' p['mandible'] = f'{path}/Dolico_osb_250k.stl' - p['teeth'] = [[58.887959, -197.486603, 305.862701], + p['contact_pts'] = [[58.887959, -197.486603, 305.862701], [64.476349, -199.363113, 282.813385]] - p['LTMJ'] = [25.142067, 117.287262, 198.309219] - p['RTMJ'] = [32.822464, 115.721962, 395.664978] + p['axis_pt1'] = [25.142067, 117.287262, 198.309219] + p['axis_pt2'] = [32.822464, 115.721962, 395.664978] p['muscles'] = [ { 'file': f'{path}/Dolico_osb_MAME_L.stl', @@ -50,9 +50,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['x'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['x'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/Dolico_osb_250k_7_1.py b/models/Dolico_osb_250k_7_1.py index bd36c09..223a11b 100644 --- a/models/Dolico_osb_250k_7_1.py +++ b/models/Dolico_osb_250k_7_1.py @@ -7,10 +7,10 @@ def parms(d={}): p = {} path = 'Dolico_osb/250k' p['mandible'] = f'{path}/Dolico_osb_250k.stl' - p['teeth'] = [[71.647064, -367.307281, 303.918365], + p['contact_pts'] = [[71.647064, -367.307281, 303.918365], [71.428085, -366.684906, 278.119751]] - p['LTMJ'] = [25.142067, 117.287262, 198.309219] - p['RTMJ'] = [32.822464, 115.721962, 395.664978] + p['axis_pt1'] = [25.142067, 117.287262, 198.309219] + p['axis_pt2'] = [32.822464, 115.721962, 395.664978] p['muscles'] = [ { 'file': f'{path}/Dolico_osb_MAME_L.stl', @@ -50,9 +50,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['x'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['x'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/Dolico_osb_250k_7_2.py b/models/Dolico_osb_250k_7_2.py index a842db2..1ac5047 100644 --- a/models/Dolico_osb_250k_7_2.py +++ b/models/Dolico_osb_250k_7_2.py @@ -7,10 +7,10 @@ def parms(d={}): p = {} path = 'Dolico_osb/250k' p['mandible'] = f'{path}/Dolico_osb_250k.stl' - p['teeth'] = [[58.887959, -197.486603, 305.862701], + p['contact_pts'] = [[58.887959, -197.486603, 305.862701], [64.476349, -199.363113, 282.813385]] - p['LTMJ'] = [25.142067, 117.287262, 198.309219] - p['RTMJ'] = [32.822464, 115.721962, 395.664978] + p['axis_pt1'] = [25.142067, 117.287262, 198.309219] + p['axis_pt2'] = [32.822464, 115.721962, 395.664978] p['muscles'] = [ { 'file': f'{path}/Dolico_osb_MAME_L.stl', @@ -50,9 +50,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['x'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['x'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/Dolico_osb_500k_15_1.py b/models/Dolico_osb_500k_15_1.py index 95a8c80..72dd0f7 100644 --- a/models/Dolico_osb_500k_15_1.py +++ b/models/Dolico_osb_500k_15_1.py @@ -7,10 +7,10 @@ def parms(d={}): p = {} path = 'Dolico_osb/500k' p['mandible'] = f'{path}/Dolico_osb_500k.stl' - p['teeth'] = [[72.492805, -367.768738, 304.363922], + p['contact_pts'] = [[72.492805, -367.768738, 304.363922], [72.060631, -366.996246, 278.112061]] - p['LTMJ'] = [27.536142, 119.829124, 198.032684] - p['RTMJ'] = [27.802645, 116.500870, 394.464966] + p['axis_pt1'] = [27.536142, 119.829124, 198.032684] + p['axis_pt2'] = [27.802645, 116.500870, 394.464966] p['muscles'] = [ { 'file': f'{path}/Dolico_osb_MAME_L.stl', @@ -50,9 +50,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['x'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['x'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/Dolico_osb_500k_15_2.py b/models/Dolico_osb_500k_15_2.py index 5b24a8b..d804ca7 100644 --- a/models/Dolico_osb_500k_15_2.py +++ b/models/Dolico_osb_500k_15_2.py @@ -7,10 +7,10 @@ def parms(d={}): p = {} path = 'Dolico_osb/500k' p['mandible'] = f'{path}/Dolico_osb_500k.stl' - p['teeth'] = [[58.887959, -197.486603, 305.862701], + p['contact_pts'] = [[58.887959, -197.486603, 305.862701], [58.952919, -197.350830, 280.833832]] - p['LTMJ'] = [27.536142, 119.829124, 198.032684] - p['RTMJ'] = [27.802645, 116.500870, 394.464966] + p['axis_pt1'] = [27.536142, 119.829124, 198.032684] + p['axis_pt2'] = [27.802645, 116.500870, 394.464966] p['muscles'] = [ { 'file': f'{path}/Dolico_osb_MAME_L.stl', @@ -50,9 +50,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['x'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['x'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/Dolico_osb_500k_7_1.py b/models/Dolico_osb_500k_7_1.py index 89574e0..28ab17d 100644 --- a/models/Dolico_osb_500k_7_1.py +++ b/models/Dolico_osb_500k_7_1.py @@ -7,10 +7,10 @@ def parms(d={}): p = {} path = 'Dolico_osb/500k' p['mandible'] = f'{path}/Dolico_osb_500k.stl' - p['teeth'] = [[72.492805, -367.768738, 304.363922], + p['contact_pts'] = [[72.492805, -367.768738, 304.363922], [72.060631, -366.996246, 278.112061]] - p['LTMJ'] = [27.536142, 119.829124, 198.032684] - p['RTMJ'] = [27.802645, 116.500870, 394.464966] + p['axis_pt1'] = [27.536142, 119.829124, 198.032684] + p['axis_pt2'] = [27.802645, 116.500870, 394.464966] p['muscles'] = [ { 'file': f'{path}/Dolico_osb_MAME_L.stl', @@ -50,9 +50,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['x'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['x'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/Dolico_osb_500k_7_2.py b/models/Dolico_osb_500k_7_2.py index 47d2916..2e732ca 100644 --- a/models/Dolico_osb_500k_7_2.py +++ b/models/Dolico_osb_500k_7_2.py @@ -7,10 +7,10 @@ def parms(d={}): p = {} path = 'Dolico_osb/500k' p['mandible'] = f'{path}/Dolico_osb_500k.stl' - p['teeth'] = [[58.887959, -197.486603, 305.862701], + p['contact_pts'] = [[58.887959, -197.486603, 305.862701], [58.952919, -197.350830, 280.833832]] - p['LTMJ'] = [27.536142, 119.829124, 198.032684] - p['RTMJ'] = [27.802645, 116.500870, 394.464966] + p['axis_pt1'] = [27.536142, 119.829124, 198.032684] + p['axis_pt2'] = [27.802645, 116.500870, 394.464966] p['muscles'] = [ { 'file': f'{path}/Dolico_osb_MAME_L.stl', @@ -50,9 +50,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['x'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['x'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/Dolico_osb_750k_15_1.py b/models/Dolico_osb_750k_15_1.py index 8b7f0eb..fbe1cc3 100644 --- a/models/Dolico_osb_750k_15_1.py +++ b/models/Dolico_osb_750k_15_1.py @@ -7,10 +7,10 @@ def parms(d={}): p = {} path = 'Dolico_osb/750k' p['mandible'] = f'{path}/Dolico_osb_750k.stl' - p['teeth'] = [[72.896973, -368.044189, 304.529999], + p['contact_pts'] = [[72.896973, -368.044189, 304.529999], [72.543152, -367.867920, 278.888367]] - p['LTMJ'] = [28.769444, 127.225159, 198.837112] - p['RTMJ'] = [28.075665, 116.736336, 394.429504] + p['axis_pt1'] = [28.769444, 127.225159, 198.837112] + p['axis_pt2'] = [28.075665, 116.736336, 394.429504] p['muscles'] = [ { 'file': f'{path}/Dolico_osb_MAME_L.stl', @@ -50,9 +50,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['x'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['x'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/Dolico_osb_750k_15_2.py b/models/Dolico_osb_750k_15_2.py index 29d490b..05fa24f 100644 --- a/models/Dolico_osb_750k_15_2.py +++ b/models/Dolico_osb_750k_15_2.py @@ -7,10 +7,10 @@ def parms(d={}): p = {} path = 'Dolico_osb/750k' p['mandible'] = f'{path}/Dolico_osb_750k.stl' - p['teeth'] = [[58.887959, -197.486603, 305.862701], + p['contact_pts'] = [[58.887959, -197.486603, 305.862701], [58.952919, -197.350830, 280.833832]] - p['LTMJ'] = [28.769444, 127.225159, 198.837112] - p['RTMJ'] = [28.075665, 116.736336, 394.429504] + p['axis_pt1'] = [28.769444, 127.225159, 198.837112] + p['axis_pt2'] = [28.075665, 116.736336, 394.429504] p['muscles'] = [ { 'file': f'{path}/Dolico_osb_MAME_L.stl', @@ -50,9 +50,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['x'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['x'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/Dolico_osb_750k_7_1.py b/models/Dolico_osb_750k_7_1.py index 3393d39..f3d2faf 100644 --- a/models/Dolico_osb_750k_7_1.py +++ b/models/Dolico_osb_750k_7_1.py @@ -7,10 +7,10 @@ def parms(d={}): p = {} path = 'Dolico_osb/750k' p['mandible'] = f'{path}/Dolico_osb_750k.stl' - p['teeth'] = [[72.896973, -368.044189, 304.529999], + p['contact_pts'] = [[72.896973, -368.044189, 304.529999], [72.543152, -367.867920, 278.888367]] - p['LTMJ'] = [28.769444, 127.225159, 198.837112] - p['RTMJ'] = [28.075665, 116.736336, 394.429504] + p['axis_pt1'] = [28.769444, 127.225159, 198.837112] + p['axis_pt2'] = [28.075665, 116.736336, 394.429504] p['muscles'] = [ { 'file': f'{path}/Dolico_osb_MAME_L.stl', @@ -50,9 +50,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['x'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['x'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/Dolico_osb_750k_7_2.py b/models/Dolico_osb_750k_7_2.py index e953771..05b31df 100644 --- a/models/Dolico_osb_750k_7_2.py +++ b/models/Dolico_osb_750k_7_2.py @@ -7,10 +7,10 @@ def parms(d={}): p = {} path = 'Dolico_osb/750k' p['mandible'] = f'{path}/Dolico_osb_750k.stl' - p['teeth'] = [[58.887959, -197.486603, 305.862701], + p['contact_pts'] = [[58.887959, -197.486603, 305.862701], [58.952919, -197.350830, 280.833832]] - p['LTMJ'] = [28.769444, 127.225159, 198.837112] - p['RTMJ'] = [28.075665, 116.736336, 394.429504] + p['axis_pt1'] = [28.769444, 127.225159, 198.837112] + p['axis_pt2'] = [28.075665, 116.736336, 394.429504] p['muscles'] = [ { 'file': f'{path}/Dolico_osb_MAME_L.stl', @@ -50,9 +50,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['x'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['x'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/PLTtympFranken_150k_15_1.py b/models/PLTtympFranken_150k_15_1.py index a88bf0c..eaa1a9e 100644 --- a/models/PLTtympFranken_150k_15_1.py +++ b/models/PLTtympFranken_150k_15_1.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'PLTtymFrankencarpus/150k' p['mandible'] = f'{path}/PLTtym_150k_symph.stl' - p['teeth'] = [[-140.484802, 32.752762, 185.435608], + p['contact_pts'] = [[-140.484802, 32.752762, 185.435608], [-141.219009, -31.436172, 178.064987]] - p['LTMJ'] = [207.172852, -79.520950, 187.358459] - p['RTMJ'] = [205.906677, 112.895256, 190.595184] + p['axis_pt1'] = [207.172852, -79.520950, 187.358459] + p['axis_pt2'] = [205.906677, 112.895256, 190.595184] p['muscles'] = [ { 'file': f'{path}/PLTtym_M_Adductor_externus_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/PLTtympFranken_150k_15_2.py b/models/PLTtympFranken_150k_15_2.py index 82bd277..28cdccd 100644 --- a/models/PLTtympFranken_150k_15_2.py +++ b/models/PLTtympFranken_150k_15_2.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'PLTtymFrankencarpus/150k' p['mandible'] = f'{path}/PLTtym_150k_symph.stl' - p['teeth'] = [[-47.591175, 59.634678, 182.979019], + p['contact_pts'] = [[-47.591175, 59.634678, 182.979019], [-47.909733, -48.301151, 176.236832]] - p['LTMJ'] = [207.172852, -79.520950, 187.358459] - p['RTMJ'] = [205.906677, 112.895256, 190.595184] + p['axis_pt1'] = [207.172852, -79.520950, 187.358459] + p['axis_pt2'] = [205.906677, 112.895256, 190.595184] p['muscles'] = [ { 'file': f'{path}/PLTtym_M_Adductor_externus_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/PLTtympFranken_150k_7_1.py b/models/PLTtympFranken_150k_7_1.py index a481c6d..5f0e0db 100644 --- a/models/PLTtympFranken_150k_7_1.py +++ b/models/PLTtympFranken_150k_7_1.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'PLTtymFrankencarpus/150k' p['mandible'] = f'{path}/PLTtym_150k_symph.stl' - p['teeth'] = [[-140.484802, 32.752762, 185.435608], + p['contact_pts'] = [[-140.484802, 32.752762, 185.435608], [-141.219009, -31.436172, 178.064987]] - p['LTMJ'] = [207.172852, -79.520950, 187.358459] - p['RTMJ'] = [205.906677, 112.895256, 190.595184] + p['axis_pt1'] = [207.172852, -79.520950, 187.358459] + p['axis_pt2'] = [205.906677, 112.895256, 190.595184] p['muscles'] = [ { 'file': f'{path}/PLTtym_M_Adductor_externus_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/PLTtympFranken_150k_7_2.py b/models/PLTtympFranken_150k_7_2.py index 023456d..be38243 100644 --- a/models/PLTtympFranken_150k_7_2.py +++ b/models/PLTtympFranken_150k_7_2.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'PLTtymFrankencarpus/150k' p['mandible'] = f'{path}/PLTtym_150k_symph.stl' - p['teeth'] = [[-47.591175, 59.634678, 182.979019], + p['contact_pts'] = [[-47.591175, 59.634678, 182.979019], [-47.909733, -48.301151, 176.236832]] - p['LTMJ'] = [207.172852, -79.520950, 187.358459] - p['RTMJ'] = [205.906677, 112.895256, 190.595184] + p['axis_pt1'] = [207.172852, -79.520950, 187.358459] + p['axis_pt2'] = [205.906677, 112.895256, 190.595184] p['muscles'] = [ { 'file': f'{path}/PLTtym_M_Adductor_externus_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/PLTtympFranken_20k.py b/models/PLTtympFranken_20k.py index 4584db1..c580ab7 100644 --- a/models/PLTtympFranken_20k.py +++ b/models/PLTtympFranken_20k.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'PLTtymFrankencarpus/20k' p['mandible'] = f'{path}/PLTtym_20k_symph_lfs.stl' - p['teeth'] = [[-139.862946, 34.411610, 186.322037], + p['contact_pts'] = [[-139.862946, 34.411610, 186.322037], [-140.781250, -29.009081, 185.878799]] - p['LTMJ'] = [214.665802, -70.867393, 186.018097] - p['RTMJ'] = [205.800995, 109.939995, 189.537064] + p['axis_pt1'] = [214.665802, -70.867393, 186.018097] + p['axis_pt2'] = [205.800995, 109.939995, 189.537064] p['muscles'] = [ { 'file': f'{path}/PLTtym_M_Adductor_externus_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/PLTtympFranken_250k.py b/models/PLTtympFranken_250k.py index 9894409..b243254 100644 --- a/models/PLTtympFranken_250k.py +++ b/models/PLTtympFranken_250k.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'PLTtymFrankencarpus/250k' p['mandible'] = f'{path}/PLTtym_250k_symph_lfs.stl' - p['teeth'] = [[-140.616379, 34.634388, 178.193710], + p['contact_pts'] = [[-140.616379, 34.634388, 178.193710], [-141.087341, -31.283962, 177.457901]] - p['LTMJ'] = [206.616394, -80.626038, 187.317291] - p['RTMJ'] = [202.435074, 114.139923, 188.697571] + p['axis_pt1'] = [206.616394, -80.626038, 187.317291] + p['axis_pt2'] = [202.435074, 114.139923, 188.697571] p['muscles'] = [ { 'file': f'{path}/PLTtym_M_Adductor_externus_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/PLTtympFranken_250k_15_1.py b/models/PLTtympFranken_250k_15_1.py index 354220b..5553eb2 100644 --- a/models/PLTtympFranken_250k_15_1.py +++ b/models/PLTtympFranken_250k_15_1.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'PLTtymFrankencarpus/250k' p['mandible'] = f'{path}/PLTtym_250k_symph.stl' - p['teeth'] = [[-140.616379, 34.634388, 178.193710], + p['contact_pts'] = [[-140.616379, 34.634388, 178.193710], [-141.087341, -31.283962, 177.457901]] - p['LTMJ'] = [206.616394, -80.626038, 187.317291] - p['RTMJ'] = [202.435074, 114.139923, 188.697571] + p['axis_pt1'] = [206.616394, -80.626038, 187.317291] + p['axis_pt2'] = [202.435074, 114.139923, 188.697571] p['muscles'] = [ { 'file': f'{path}/PLTtym_M_Adductor_externus_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/PLTtympFranken_250k_15_2.py b/models/PLTtympFranken_250k_15_2.py index ce56c65..63ff44f 100644 --- a/models/PLTtympFranken_250k_15_2.py +++ b/models/PLTtympFranken_250k_15_2.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'PLTtymFrankencarpus/250k' p['mandible'] = f'{path}/PLTtym_250k_symph.stl' - p['teeth'] = [[-47.591175, 59.634678, 182.979019], + p['contact_pts'] = [[-47.591175, 59.634678, 182.979019], [-47.556026, -48.933891, 180.280045]] - p['LTMJ'] = [206.616394, -80.626038, 187.317291] - p['RTMJ'] = [202.435074, 114.139923, 188.697571] + p['axis_pt1'] = [206.616394, -80.626038, 187.317291] + p['axis_pt2'] = [202.435074, 114.139923, 188.697571] p['muscles'] = [ { 'file': f'{path}/PLTtym_M_Adductor_externus_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/PLTtympFranken_250k_7_1.py b/models/PLTtympFranken_250k_7_1.py index e96660f..967f181 100644 --- a/models/PLTtympFranken_250k_7_1.py +++ b/models/PLTtympFranken_250k_7_1.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'PLTtymFrankencarpus/250k' p['mandible'] = f'{path}/PLTtym_250k_symph.stl' - p['teeth'] = [[-140.616379, 34.634388, 178.193710], + p['contact_pts'] = [[-140.616379, 34.634388, 178.193710], [-141.087341, -31.283962, 177.457901]] - p['LTMJ'] = [206.616394, -80.626038, 187.317291] - p['RTMJ'] = [202.435074, 114.139923, 188.697571] + p['axis_pt1'] = [206.616394, -80.626038, 187.317291] + p['axis_pt2'] = [202.435074, 114.139923, 188.697571] p['muscles'] = [ { 'file': f'{path}/PLTtym_M_Adductor_externus_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/PLTtympFranken_250k_7_2.py b/models/PLTtympFranken_250k_7_2.py index 9542600..69a7dd1 100644 --- a/models/PLTtympFranken_250k_7_2.py +++ b/models/PLTtympFranken_250k_7_2.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'PLTtymFrankencarpus/250k' p['mandible'] = f'{path}/PLTtym_250k_symph.stl' - p['teeth'] = [[-47.591175, 59.634678, 182.979019], + p['contact_pts'] = [[-47.591175, 59.634678, 182.979019], [-47.556026, -48.933891, 180.280045]] - p['LTMJ'] = [206.616394, -80.626038, 187.317291] - p['RTMJ'] = [202.435074, 114.139923, 188.697571] + p['axis_pt1'] = [206.616394, -80.626038, 187.317291] + p['axis_pt2'] = [202.435074, 114.139923, 188.697571] p['muscles'] = [ { 'file': f'{path}/PLTtym_M_Adductor_externus_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/PLTtympFranken_500k_15_1.py b/models/PLTtympFranken_500k_15_1.py index 4424fda..fc429be 100644 --- a/models/PLTtympFranken_500k_15_1.py +++ b/models/PLTtympFranken_500k_15_1.py @@ -7,10 +7,10 @@ def parms(d={}): p = {} path = 'PLTtymFrankencarpus/500k' p['mandible'] = f'{path}/PLTtym_500k_symph.stl' - p['teeth'] = [[-140.616379, 34.634388, 178.193710], + p['contact_pts'] = [[-140.616379, 34.634388, 178.193710], [-141.554642, -31.049093, 176.841354]] - p['LTMJ'] = [209.550949, -84.342560, 175.265411] - p['RTMJ'] = [202.335129, 113.899513, 188.742447] + p['axis_pt1'] = [209.550949, -84.342560, 175.265411] + p['axis_pt2'] = [202.335129, 113.899513, 188.742447] p['muscles'] = [ { 'file': f'{path}/PLTtym_M_Adductor_externus_L1.stl', @@ -86,9 +86,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/PLTtympFranken_500k_15_2.py b/models/PLTtympFranken_500k_15_2.py index 6397232..2f86e55 100644 --- a/models/PLTtympFranken_500k_15_2.py +++ b/models/PLTtympFranken_500k_15_2.py @@ -7,10 +7,10 @@ def parms(d={}): p = {} path = 'PLTtymFrankencarpus/500k' p['mandible'] = f'{path}/PLTtym_500k_symph.stl' - p['teeth'] = [[-48.250050, 60.041912, 182.285355], + p['contact_pts'] = [[-48.250050, 60.041912, 182.285355], [-47.561031, -48.934483, 180.753647]] - p['LTMJ'] = [209.550949, -84.342560, 175.265411] - p['RTMJ'] = [202.335129, 113.899513, 188.742447] + p['axis_pt1'] = [209.550949, -84.342560, 175.265411] + p['axis_pt2'] = [202.335129, 113.899513, 188.742447] p['muscles'] = [ { 'file': f'{path}/PLTtym_M_Adductor_externus_L1.stl', @@ -86,9 +86,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/PLTtympFranken_500k_7_1.py b/models/PLTtympFranken_500k_7_1.py index 35e992d..7242230 100644 --- a/models/PLTtympFranken_500k_7_1.py +++ b/models/PLTtympFranken_500k_7_1.py @@ -7,10 +7,10 @@ def parms(d={}): p = {} path = 'PLTtymFrankencarpus/500k' p['mandible'] = f'{path}/PLTtym_500k_symph.stl' - p['teeth'] = [[-140.616379, 34.634388, 178.193710], + p['contact_pts'] = [[-140.616379, 34.634388, 178.193710], [-141.554642, -31.049093, 176.841354]] - p['LTMJ'] = [209.550949, -84.342560, 175.265411] - p['RTMJ'] = [202.335129, 113.899513, 188.742447] + p['axis_pt1'] = [209.550949, -84.342560, 175.265411] + p['axis_pt2'] = [202.335129, 113.899513, 188.742447] p['muscles'] = [ { 'file': f'{path}/PLTtym_M_Adductor_externus_L1.stl', @@ -86,9 +86,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/PLTtympFranken_500k_7_2.py b/models/PLTtympFranken_500k_7_2.py index 09011b7..97e2469 100644 --- a/models/PLTtympFranken_500k_7_2.py +++ b/models/PLTtympFranken_500k_7_2.py @@ -7,10 +7,10 @@ def parms(d={}): p = {} path = 'PLTtymFrankencarpus/500k' p['mandible'] = f'{path}/PLTtym_500k_symph.stl' - p['teeth'] = [[-48.250050, 60.041912, 182.285355], + p['contact_pts'] = [[-48.250050, 60.041912, 182.285355], [-47.561031, -48.934483, 180.753647]] - p['LTMJ'] = [209.550949, -84.342560, 175.265411] - p['RTMJ'] = [202.335129, 113.899513, 188.742447] + p['axis_pt1'] = [209.550949, -84.342560, 175.265411] + p['axis_pt2'] = [202.335129, 113.899513, 188.742447] p['muscles'] = [ { 'file': f'{path}/PLTtym_M_Adductor_externus_L1.stl', @@ -86,9 +86,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/PLTtympFranken_750k.py b/models/PLTtympFranken_750k.py index 13cb6ca..64ab348 100644 --- a/models/PLTtympFranken_750k.py +++ b/models/PLTtympFranken_750k.py @@ -7,10 +7,10 @@ def parms(d={}): p = {} path = 'PLTtymFrankencarpus/750k' p['mandible'] = f'{path}/PLTtym_750k_symph_lfs.stl' - p['teeth'] = [[-140.392929, 34.519073, 177.620209], + p['contact_pts'] = [[-140.392929, 34.519073, 177.620209], [-141.554642, -31.049093, 176.841354]] - p['LTMJ'] = [207.311279, -80.298553, 187.387451] - p['RTMJ'] = [202.485397, 112.689812, 189.151352] + p['axis_pt1'] = [207.311279, -80.298553, 187.387451] + p['axis_pt2'] = [202.485397, 112.689812, 189.151352] p['muscles'] = [ { 'file': f'{path}/PLTtym_M_Adductor_externus_L1_lfs.stl', @@ -86,9 +86,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/PLTtympFranken_750k_15_1.py b/models/PLTtympFranken_750k_15_1.py index 7eb3c09..77030bf 100644 --- a/models/PLTtympFranken_750k_15_1.py +++ b/models/PLTtympFranken_750k_15_1.py @@ -7,10 +7,10 @@ def parms(d={}): p = {} path = 'PLTtymFrankencarpus/750k' p['mandible'] = f'{path}/PLTtym_750k_symph.stl' - p['teeth'] = [[-140.392929, 34.519073, 177.620209], + p['contact_pts'] = [[-140.392929, 34.519073, 177.620209], [-141.554642, -31.049093, 176.841354]] - p['LTMJ'] = [207.311279, -80.298553, 187.387451] - p['RTMJ'] = [202.485397, 112.689812, 189.151352] + p['axis_pt1'] = [207.311279, -80.298553, 187.387451] + p['axis_pt2'] = [202.485397, 112.689812, 189.151352] p['muscles'] = [ { 'file': f'{path}/PLTtym_M_Adductor_externus_L1.stl', @@ -86,9 +86,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/PLTtympFranken_750k_15_2.py b/models/PLTtympFranken_750k_15_2.py index 27abd12..02a0cd4 100644 --- a/models/PLTtympFranken_750k_15_2.py +++ b/models/PLTtympFranken_750k_15_2.py @@ -7,10 +7,10 @@ def parms(d={}): p = {} path = 'PLTtymFrankencarpus/750k' p['mandible'] = f'{path}/PLTtym_750k_symph.stl' - p['teeth'] = [[-48.250050, 60.041912, 182.285355], + p['contact_pts'] = [[-48.250050, 60.041912, 182.285355], [-47.400860, -48.840836, 180.895721]] - p['LTMJ'] = [207.311279, -80.298553, 187.387451] - p['RTMJ'] = [202.485397, 112.689812, 189.151352] + p['axis_pt1'] = [207.311279, -80.298553, 187.387451] + p['axis_pt2'] = [202.485397, 112.689812, 189.151352] p['muscles'] = [ { 'file': f'{path}/PLTtym_M_Adductor_externus_L1.stl', @@ -86,9 +86,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/PLTtympFranken_750k_7_1.py b/models/PLTtympFranken_750k_7_1.py index 6c4ff73..e13b0ad 100644 --- a/models/PLTtympFranken_750k_7_1.py +++ b/models/PLTtympFranken_750k_7_1.py @@ -7,10 +7,10 @@ def parms(d={}): p = {} path = 'PLTtymFrankencarpus/750k' p['mandible'] = f'{path}/PLTtym_750k_symph.stl' - p['teeth'] = [[-140.392929, 34.519073, 177.620209], + p['contact_pts'] = [[-140.392929, 34.519073, 177.620209], [-141.554642, -31.049093, 176.841354]] - p['LTMJ'] = [207.311279, -80.298553, 187.387451] - p['RTMJ'] = [202.485397, 112.689812, 189.151352] + p['axis_pt1'] = [207.311279, -80.298553, 187.387451] + p['axis_pt2'] = [202.485397, 112.689812, 189.151352] p['muscles'] = [ { 'file': f'{path}/PLTtym_M_Adductor_externus_L1.stl', @@ -86,9 +86,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/PLTtympFranken_750k_7_2.py b/models/PLTtympFranken_750k_7_2.py index 6d2c048..f00ed72 100644 --- a/models/PLTtympFranken_750k_7_2.py +++ b/models/PLTtympFranken_750k_7_2.py @@ -7,10 +7,10 @@ def parms(d={}): p = {} path = 'PLTtymFrankencarpus/750k' p['mandible'] = f'{path}/PLTtym_750k_symph.stl' - p['teeth'] = [[-48.250050, 60.041912, 182.285355], + p['contact_pts'] = [[-48.250050, 60.041912, 182.285355], [-47.400860, -48.840836, 180.895721]] - p['LTMJ'] = [207.311279, -80.298553, 187.387451] - p['RTMJ'] = [202.485397, 112.689812, 189.151352] + p['axis_pt1'] = [207.311279, -80.298553, 187.387451] + p['axis_pt2'] = [202.485397, 112.689812, 189.151352] p['muscles'] = [ { 'file': f'{path}/PLTtym_M_Adductor_externus_L1.stl', @@ -86,9 +86,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/Panthera_pardus_RC_30.py b/models/Panthera_pardus_RC_30.py index 867c8c6..e78e509 100644 --- a/models/Panthera_pardus_RC_30.py +++ b/models/Panthera_pardus_RC_30.py @@ -8,9 +8,9 @@ def parms(d={}): p = {} path = 'Panthera_pardus/150k' p['mandible'] = f'{path}/Panthera_pardus_AMNH_113745_mandible.stl' - p['teeth'] = [16.4418, 17.3567, -53.2842] - p['LTMJ'] = [-37.433147, -7.689619, 48.622185] - p['RTMJ'] = [37.795021, -7.337307, 49.882557] + 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['muscles'] = [ { @@ -51,9 +51,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['x', 'z','y'], - 'LTMJ': ['z','y'], - 'RTMJ': ['z','y'] + 'contact_pts': ['x', 'z','y'], + 'axis_pt1': ['z','y'], + 'axis_pt2': ['z','y'] } # material properties diff --git a/models/README.md b/models/README.md index 3c2d28f..f8c32bd 100644 --- a/models/README.md +++ b/models/README.md @@ -31,9 +31,9 @@ The mesh files are specified in the input file: ``` path = 'dolicorhynchops/10k' p['mandible'] = f'{path}/mandible.ply' -p['teeth'] = f'{path}/teeth.off' -p['LTMJ'] = f'{path}/LTMJ.off' -p['RTMJ'] = f'{path}/RTMJ.off' +p['contact_pts'] = f'{path}/teeth.off' +p['axis_pt1'] = f'{path}/LTMJ.off' +p['axis_pt2'] = f'{path}/RTMJ.off' p['muscles'] = [ { 'file': f'{path}/Lmuscle.ply', diff --git a/models/TYLber_150k_15_1.py b/models/TYLber_150k_15_1.py index ed1c668..4098bd4 100644 --- a/models/TYLber_150k_15_1.py +++ b/models/TYLber_150k_15_1.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'TYLber/150k' p['mandible'] = f'{path}/TYLber_jaw_150k.stl' - p['teeth'] = [[74.470337, 531.928772, 38.113079], + p['contact_pts'] = [[74.470337, 531.928772, 38.113079], [-71.465904, 531.618591, 37.830475]] - p['LTMJ'] = [-232.980133, -518.113647, 14.254566] - p['RTMJ'] = [258.104462, -520.396851, -14.235010] + p['axis_pt1'] = [-232.980133, -518.113647, 14.254566] + p['axis_pt2'] = [258.104462, -520.396851, -14.235010] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/TYLber_150k_15_2.py b/models/TYLber_150k_15_2.py index e9c209a..7c41e63 100644 --- a/models/TYLber_150k_15_2.py +++ b/models/TYLber_150k_15_2.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'TYLber/150k' p['mandible'] = f'{path}/TYLber_jaw_150k.stl' - p['teeth'] = [[159.952377, 145.793655, 10.386530], + p['contact_pts'] = [[159.952377, 145.793655, 10.386530], [-147.823532, 152.052460, 16.779087]] - p['LTMJ'] = [-232.980133, -518.113647, 14.254566] - p['RTMJ'] = [258.104462, -520.396851, -14.235010] + p['axis_pt1'] = [-232.980133, -518.113647, 14.254566] + p['axis_pt2'] = [258.104462, -520.396851, -14.235010] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/TYLber_150k_7_1.py b/models/TYLber_150k_7_1.py index c7fd66a..b84ae26 100644 --- a/models/TYLber_150k_7_1.py +++ b/models/TYLber_150k_7_1.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'TYLber/150k' p['mandible'] = f'{path}/TYLber_jaw_150k.stl' - p['teeth'] = [[74.470337, 531.928772, 38.113079], + p['contact_pts'] = [[74.470337, 531.928772, 38.113079], [-71.465904, 531.618591, 37.830475]] - p['LTMJ'] = [-232.980133, -518.113647, 14.254566] - p['RTMJ'] = [258.104462, -520.396851, -14.235010] + p['axis_pt1'] = [-232.980133, -518.113647, 14.254566] + p['axis_pt2'] = [258.104462, -520.396851, -14.235010] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/TYLber_150k_7_2.py b/models/TYLber_150k_7_2.py index c1aec95..aed3d31 100644 --- a/models/TYLber_150k_7_2.py +++ b/models/TYLber_150k_7_2.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'TYLber/150k' p['mandible'] = f'{path}/TYLber_jaw_150k.stl' - p['teeth'] = [[159.952377, 145.793655, 10.386530], + p['contact_pts'] = [[159.952377, 145.793655, 10.386530], [-147.823532, 152.052460, 16.779087]] - p['LTMJ'] = [-232.980133, -518.113647, 14.254566] - p['RTMJ'] = [258.104462, -520.396851, -14.235010] + p['axis_pt1'] = [-232.980133, -518.113647, 14.254566] + p['axis_pt2'] = [258.104462, -520.396851, -14.235010] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/TYLber_250k_15_1.py b/models/TYLber_250k_15_1.py index cb8300c..85d86c4 100644 --- a/models/TYLber_250k_15_1.py +++ b/models/TYLber_250k_15_1.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'TYLber/250k' p['mandible'] = f'{path}/TYLber_jaw_250k.stl' - p['teeth'] = [[76.895927, 530.584045, 32.612164], + p['contact_pts'] = [[76.895927, 530.584045, 32.612164], [-73.001038, 536.202087, 37.195301]] - p['LTMJ'] = [-249.095215, -528.940735, -12.830746] - p['RTMJ'] = [259.810211, -524.600159, -11.910051] + p['axis_pt1'] = [-249.095215, -528.940735, -12.830746] + p['axis_pt2'] = [259.810211, -524.600159, -11.910051] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/TYLber_250k_15_2_bad.py b/models/TYLber_250k_15_2_bad.py index 01b34ac..be39038 100644 --- a/models/TYLber_250k_15_2_bad.py +++ b/models/TYLber_250k_15_2_bad.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'TYLber/250k' p['mandible'] = f'{path}/TYLber_jaw_250k.stl' - p['teeth'] = [[159.370773, 150.709351, 18.192839], + p['contact_pts'] = [[159.370773, 150.709351, 18.192839], [-152.182220, 150.355057, 22.975760]] - p['LTMJ'] = [-249.095215, -528.940735, -12.830746] - p['RTMJ'] = [259.810211, -524.600159, -11.910051] + p['axis_pt1'] = [-249.095215, -528.940735, -12.830746] + p['axis_pt2'] = [259.810211, -524.600159, -11.910051] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/TYLber_250k_7_1.py b/models/TYLber_250k_7_1.py index 7248ca1..d0d2305 100644 --- a/models/TYLber_250k_7_1.py +++ b/models/TYLber_250k_7_1.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'TYLber/250k' p['mandible'] = f'{path}/TYLber_jaw_250k.stl' - p['teeth'] = [[76.895927, 530.584045, 32.612164], + p['contact_pts'] = [[76.895927, 530.584045, 32.612164], [-73.001038, 536.202087, 37.195301]] - p['LTMJ'] = [-249.095215, -528.940735, -12.830746] - p['RTMJ'] = [259.810211, -524.600159, -11.910051] + p['axis_pt1'] = [-249.095215, -528.940735, -12.830746] + p['axis_pt2'] = [259.810211, -524.600159, -11.910051] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/TYLber_250k_7_2_bad.py b/models/TYLber_250k_7_2_bad.py index 69a0143..de505bb 100644 --- a/models/TYLber_250k_7_2_bad.py +++ b/models/TYLber_250k_7_2_bad.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'TYLber/250k' p['mandible'] = f'{path}/TYLber_jaw_250k.stl' - p['teeth'] = [[159.370773, 150.709351, 18.192839], + p['contact_pts'] = [[159.370773, 150.709351, 18.192839], [-152.182220, 150.355057, 22.975760]] - p['LTMJ'] = [-249.095215, -528.940735, -12.830746] - p['RTMJ'] = [259.810211, -524.600159, -11.910051] + p['axis_pt1'] = [-249.095215, -528.940735, -12.830746] + p['axis_pt2'] = [259.810211, -524.600159, -11.910051] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/TYLber_500k_15_1.py b/models/TYLber_500k_15_1.py index d4f29a2..3e2d757 100644 --- a/models/TYLber_500k_15_1.py +++ b/models/TYLber_500k_15_1.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'TYLber/500k' p['mandible'] = f'{path}/TYLber_jaw_500k.stl' - p['teeth'] = [[77.305153, 544.409424, 30.836790], + p['contact_pts'] = [[77.305153, 544.409424, 30.836790], [-73.187263, 536.783264, 36.419006]] - p['LTMJ'] = [-228.034103, -519.674866, 16.911722] - p['RTMJ'] = [256.089417, -529.891724, -10.076393] + p['axis_pt1'] = [-228.034103, -519.674866, 16.911722] + p['axis_pt2'] = [256.089417, -529.891724, -10.076393] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/TYLber_500k_15_2.py b/models/TYLber_500k_15_2.py index 40977e7..08c5d6d 100644 --- a/models/TYLber_500k_15_2.py +++ b/models/TYLber_500k_15_2.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'TYLber/500k' p['mandible'] = f'{path}/TYLber_jaw_500k.stl' - p['teeth'] = [[153.858017, 155.593140, 17.697323], + p['contact_pts'] = [[153.858017, 155.593140, 17.697323], [-150.512238, 145.369690, 17.743414]] - p['LTMJ'] = [-228.034103, -519.674866, 16.911722] - p['RTMJ'] = [256.089417, -529.891724, -10.076393] + p['axis_pt1'] = [-228.034103, -519.674866, 16.911722] + p['axis_pt2'] = [256.089417, -529.891724, -10.076393] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/TYLber_500k_7_1.py b/models/TYLber_500k_7_1.py index 3809ec9..43cb82e 100644 --- a/models/TYLber_500k_7_1.py +++ b/models/TYLber_500k_7_1.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'TYLber/500k' p['mandible'] = f'{path}/TYLber_jaw_500k.stl' - p['teeth'] = [[77.305153, 544.409424, 30.836790], + p['contact_pts'] = [[77.305153, 544.409424, 30.836790], [-73.187263, 536.783264, 36.419006]] - p['LTMJ'] = [-228.034103, -519.674866, 16.911722] - p['RTMJ'] = [256.089417, -529.891724, -10.076393] + p['axis_pt1'] = [-228.034103, -519.674866, 16.911722] + p['axis_pt2'] = [256.089417, -529.891724, -10.076393] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/TYLber_500k_7_2.py b/models/TYLber_500k_7_2.py index b67990d..e1cd5fb 100644 --- a/models/TYLber_500k_7_2.py +++ b/models/TYLber_500k_7_2.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'TYLber/500k' p['mandible'] = f'{path}/TYLber_jaw_500k.stl' - p['teeth'] = [[153.858017, 155.593140, 17.697323], + p['contact_pts'] = [[153.858017, 155.593140, 17.697323], [-150.512238, 145.369690, 17.743414]] - p['LTMJ'] = [-228.034103, -519.674866, 16.911722] - p['RTMJ'] = [256.089417, -529.891724, -10.076393] + p['axis_pt1'] = [-228.034103, -519.674866, 16.911722] + p['axis_pt2'] = [256.089417, -529.891724, -10.076393] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -88,9 +88,9 @@ def parms(d={}): ] ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/TYLber_750k_15_1.py b/models/TYLber_750k_15_1.py index 4229f55..f51416e 100644 --- a/models/TYLber_750k_15_1.py +++ b/models/TYLber_750k_15_1.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'TYLber/750k' p['mandible'] = f'{path}/TYLber_jaw_750k.stl' - p['teeth'] = [[78.026253, 541.746887, 33.878143], + p['contact_pts'] = [[78.026253, 541.746887, 33.878143], [-73.820549, 540.698853, 33.361473]] - p['LTMJ'] = [-212.512512, -567.425232, -59.523800] - p['RTMJ'] = [257.484497, -534.512878, -6.094533] + p['axis_pt1'] = [-212.512512, -567.425232, -59.523800] + p['axis_pt2'] = [257.484497, -534.512878, -6.094533] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/TYLber_750k_15_2.py b/models/TYLber_750k_15_2.py index 18b547a..5fbfaaf 100644 --- a/models/TYLber_750k_15_2.py +++ b/models/TYLber_750k_15_2.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'TYLber/750k' p['mandible'] = f'{path}/TYLber_jaw_750k.stl' - p['teeth'] = [[196.424347, 90.526627, -41.083321], + p['contact_pts'] = [[196.424347, 90.526627, -41.083321], [-159.784760, 98.047890, 30.349947]] - p['LTMJ'] = [-212.512512, -567.425232, -59.523800] - p['RTMJ'] = [257.484497, -534.512878, -6.094533] + p['axis_pt1'] = [-212.512512, -567.425232, -59.523800] + p['axis_pt2'] = [257.484497, -534.512878, -6.094533] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/TYLber_750k_7_1.py b/models/TYLber_750k_7_1.py index 79427e7..b66216c 100644 --- a/models/TYLber_750k_7_1.py +++ b/models/TYLber_750k_7_1.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'TYLber/750k' p['mandible'] = f'{path}/TYLber_jaw_750k.stl' - p['teeth'] = [[78.026253, 541.746887, 33.878143], + p['contact_pts'] = [[78.026253, 541.746887, 33.878143], [-73.820549, 540.698853, 33.361473]] - p['LTMJ'] = [-212.512512, -567.425232, -59.523800] - p['RTMJ'] = [257.484497, -534.512878, -6.094533] + p['axis_pt1'] = [-212.512512, -567.425232, -59.523800] + p['axis_pt2'] = [257.484497, -534.512878, -6.094533] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/TYLber_750k_7_2.py b/models/TYLber_750k_7_2.py index e63a294..9d8bd15 100644 --- a/models/TYLber_750k_7_2.py +++ b/models/TYLber_750k_7_2.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'TYLber/750k' p['mandible'] = f'{path}/TYLber_jaw_750k.stl' - p['teeth'] = [[196.424347, 90.526627, -41.083321], + p['contact_pts'] = [[196.424347, 90.526627, -41.083321], [-159.784760, 98.047890, 30.349947]] - p['LTMJ'] = [-212.512512, -567.425232, -59.523800] - p['RTMJ'] = [257.484497, -534.512878, -6.094533] + p['axis_pt1'] = [-212.512512, -567.425232, -59.523800] + p['axis_pt2'] = [257.484497, -534.512878, -6.094533] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/TYLnep_150k_15_1.py b/models/TYLnep_150k_15_1.py index 0df33c4..61652d8 100644 --- a/models/TYLnep_150k_15_1.py +++ b/models/TYLnep_150k_15_1.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'TYLnep/150k' p['mandible'] = f'{path}/TYLnep_jaw_150k.stl' - p['teeth'] = [[-411.039917, 227.579102, 43.466621], + p['contact_pts'] = [[-411.039917, 227.579102, 43.466621], [-426.836792, 165.685944, 36.533264]] - p['LTMJ'] = [380.324341, 44.402424, 89.259888] - p['RTMJ'] = [394.083679, 396.327271, 59.939686] + p['axis_pt1'] = [380.324341, 44.402424, 89.259888] + p['axis_pt2'] = [394.083679, 396.327271, 59.939686] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/TYLnep_150k_15_2.py b/models/TYLnep_150k_15_2.py index 0d6205f..3dfb731 100644 --- a/models/TYLnep_150k_15_2.py +++ b/models/TYLnep_150k_15_2.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'TYLnep/150k' p['mandible'] = f'{path}/TYLnep_jaw_150k.stl' - p['teeth'] = [[-87.998215, 318.365540, 63.300953], + p['contact_pts'] = [[-87.998215, 318.365540, 63.300953], [-99.972519, 80.537491, 43.511547]] - p['LTMJ'] = [380.324341, 44.402424, 89.259888] - p['RTMJ'] = [394.083679, 396.327271, 59.939686] + p['axis_pt1'] = [380.324341, 44.402424, 89.259888] + p['axis_pt2'] = [394.083679, 396.327271, 59.939686] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/TYLnep_150k_7_1.py b/models/TYLnep_150k_7_1.py index 279d88b..5bb47e1 100644 --- a/models/TYLnep_150k_7_1.py +++ b/models/TYLnep_150k_7_1.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'TYLnep/150k' p['mandible'] = f'{path}/TYLnep_jaw_150k.stl' - p['teeth'] = [[-411.039917, 227.579102, 43.466621], + p['contact_pts'] = [[-411.039917, 227.579102, 43.466621], [-426.836792, 165.685944, 36.533264]] - p['LTMJ'] = [380.324341, 44.402424, 89.259888] - p['RTMJ'] = [394.083679, 396.327271, 59.939686] + p['axis_pt1'] = [380.324341, 44.402424, 89.259888] + p['axis_pt2'] = [394.083679, 396.327271, 59.939686] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/TYLnep_150k_7_2.py b/models/TYLnep_150k_7_2.py index 1e31c43..1530fed 100644 --- a/models/TYLnep_150k_7_2.py +++ b/models/TYLnep_150k_7_2.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'TYLnep/150k' p['mandible'] = f'{path}/TYLnep_jaw_150k.stl' - p['teeth'] = [[-87.998215, 318.365540, 63.300953], + p['contact_pts'] = [[-87.998215, 318.365540, 63.300953], [-99.972519, 80.537491, 43.511547]] - p['LTMJ'] = [380.324341, 44.402424, 89.259888] - p['RTMJ'] = [394.083679, 396.327271, 59.939686] + p['axis_pt1'] = [380.324341, 44.402424, 89.259888] + p['axis_pt2'] = [394.083679, 396.327271, 59.939686] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/TYLnep_250k_15_1.py b/models/TYLnep_250k_15_1.py index 9aed0bc..b441998 100644 --- a/models/TYLnep_250k_15_1.py +++ b/models/TYLnep_250k_15_1.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'TYLnep/250k' p['mandible'] = f'{path}/TYLnep_jaw_250k.stl' - p['teeth'] = [[-420.489166, 226.380966, 16.269716], + p['contact_pts'] = [[-420.489166, 226.380966, 16.269716], [-426.962891, 159.505264, 35.790138]] - p['LTMJ'] = [384.577301, 39.049088, 84.218117] - p['RTMJ'] = [387.968872, 381.002136, 81.069290] + p['axis_pt1'] = [384.577301, 39.049088, 84.218117] + p['axis_pt2'] = [387.968872, 381.002136, 81.069290] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/TYLnep_250k_15_2.py b/models/TYLnep_250k_15_2.py index 86f2c6d..27c024a 100644 --- a/models/TYLnep_250k_15_2.py +++ b/models/TYLnep_250k_15_2.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'TYLnep/250k' p['mandible'] = f'{path}/TYLnep_jaw_250k.stl' - p['teeth'] = [[-86.279778, 320.183533, 52.348541], + p['contact_pts'] = [[-86.279778, 320.183533, 52.348541], [-96.408920, 78.982399, 52.918877]] - p['LTMJ'] = [384.577301, 39.049088, 84.218117] - p['RTMJ'] = [387.968872, 381.002136, 81.069290] + p['axis_pt1'] = [384.577301, 39.049088, 84.218117] + p['axis_pt2'] = [387.968872, 381.002136, 81.069290] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/TYLnep_250k_7_1.py b/models/TYLnep_250k_7_1.py index e17b530..62f9090 100644 --- a/models/TYLnep_250k_7_1.py +++ b/models/TYLnep_250k_7_1.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'TYLnep/250k' p['mandible'] = f'{path}/TYLnep_jaw_250k.stl' - p['teeth'] = [[-420.489166, 226.380966, 16.269716], + p['contact_pts'] = [[-420.489166, 226.380966, 16.269716], [-426.962891, 159.505264, 35.790138]] - p['LTMJ'] = [384.577301, 39.049088, 84.218117] - p['RTMJ'] = [387.968872, 381.002136, 81.069290] + p['axis_pt1'] = [384.577301, 39.049088, 84.218117] + p['axis_pt2'] = [387.968872, 381.002136, 81.069290] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/TYLnep_250k_7_2.py b/models/TYLnep_250k_7_2.py index cbbfbbc..566c8da 100644 --- a/models/TYLnep_250k_7_2.py +++ b/models/TYLnep_250k_7_2.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'TYLnep/250k' p['mandible'] = f'{path}/TYLnep_jaw_250k.stl' - p['teeth'] = [[-86.279778, 320.183533, 52.348541], + p['contact_pts'] = [[-86.279778, 320.183533, 52.348541], [-96.408920, 78.982399, 52.918877]] - p['LTMJ'] = [384.577301, 39.049088, 84.218117] - p['RTMJ'] = [387.968872, 381.002136, 81.069290] + p['axis_pt1'] = [384.577301, 39.049088, 84.218117] + p['axis_pt2'] = [387.968872, 381.002136, 81.069290] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/TYLnep_500k_15_1.py b/models/TYLnep_500k_15_1.py index bc838be..f9b936f 100644 --- a/models/TYLnep_500k_15_1.py +++ b/models/TYLnep_500k_15_1.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'TYLnep/500k' p['mandible'] = f'{path}/TYLnep_jaw_500k.stl' - p['teeth'] = [[-417.999359, 222.242569, 31.007950], + p['contact_pts'] = [[-417.999359, 222.242569, 31.007950], [-428.224182, 162.031265, 36.896519]] - p['LTMJ'] = [381.261627, 39.182289, 82.731766] - p['RTMJ'] = [391.689667, 381.874176, 81.844215] + p['axis_pt1'] = [381.261627, 39.182289, 82.731766] + p['axis_pt2'] = [391.689667, 381.874176, 81.844215] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/TYLnep_500k_15_2.py b/models/TYLnep_500k_15_2.py index f695103..0069675 100644 --- a/models/TYLnep_500k_15_2.py +++ b/models/TYLnep_500k_15_2.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'TYLnep/500k' p['mandible'] = f'{path}/TYLnep_jaw_500k.stl' - p['teeth'] = [[-88.511429, 320.280304, 40.494282], + p['contact_pts'] = [[-88.511429, 320.280304, 40.494282], [-95.066902, 77.562195, 41.572414]] - p['LTMJ'] = [381.261627, 39.182289, 82.731766] - p['RTMJ'] = [391.689667, 381.874176, 81.844215] + p['axis_pt1'] = [381.261627, 39.182289, 82.731766] + p['axis_pt2'] = [391.689667, 381.874176, 81.844215] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/TYLnep_500k_7_1.py b/models/TYLnep_500k_7_1.py index 245b914..fbfa04c 100644 --- a/models/TYLnep_500k_7_1.py +++ b/models/TYLnep_500k_7_1.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'TYLnep/500k' p['mandible'] = f'{path}/TYLnep_jaw_500k.stl' - p['teeth'] = [[-417.999359, 222.242569, 31.007950], + p['contact_pts'] = [[-417.999359, 222.242569, 31.007950], [-428.224182, 162.031265, 36.896519]] - p['LTMJ'] = [381.261627, 39.182289, 82.731766] - p['RTMJ'] = [391.689667, 381.874176, 81.844215] + p['axis_pt1'] = [381.261627, 39.182289, 82.731766] + p['axis_pt2'] = [391.689667, 381.874176, 81.844215] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/TYLnep_500k_7_2.py b/models/TYLnep_500k_7_2.py index 84674dc..f16fc6c 100644 --- a/models/TYLnep_500k_7_2.py +++ b/models/TYLnep_500k_7_2.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'TYLnep/500k' p['mandible'] = f'{path}/TYLnep_jaw_500k.stl' - p['teeth'] = [[-88.511429, 320.280304, 40.494282], + p['contact_pts'] = [[-88.511429, 320.280304, 40.494282], [-95.066902, 77.562195, 41.572414]] - p['LTMJ'] = [381.261627, 39.182289, 82.731766] - p['RTMJ'] = [391.689667, 381.874176, 81.844215] + p['axis_pt1'] = [381.261627, 39.182289, 82.731766] + p['axis_pt2'] = [391.689667, 381.874176, 81.844215] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/TYLnep_750k_15_1.py b/models/TYLnep_750k_15_1.py index 9202a24..1d32022 100644 --- a/models/TYLnep_750k_15_1.py +++ b/models/TYLnep_750k_15_1.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'TYLnep/750k' p['mandible'] = f'{path}/TYLnep_jaw_750k.stl' - p['teeth'] = [[-440.282074, 226.035706, 8.676176], + p['contact_pts'] = [[-440.282074, 226.035706, 8.676176], [-453.118317, 156.467865, 11.607960]] - p['LTMJ'] = [392.782898, 35.557762, 84.161575] - p['RTMJ'] = [391.689667, 381.874176, 81.844215] + p['axis_pt1'] = [392.782898, 35.557762, 84.161575] + p['axis_pt2'] = [391.689667, 381.874176, 81.844215] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/TYLnep_750k_15_2.py b/models/TYLnep_750k_15_2.py index 465351d..049513c 100644 --- a/models/TYLnep_750k_15_2.py +++ b/models/TYLnep_750k_15_2.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'TYLnep/750k' p['mandible'] = f'{path}/TYLnep_jaw_750k.stl' - p['teeth'] = [[-91.923141, 317.501709, 54.304459], + p['contact_pts'] = [[-91.923141, 317.501709, 54.304459], [-96.786438, 79.207016, 55.289452]] - p['LTMJ'] = [392.782898, 35.557762, 84.161575] - p['RTMJ'] = [391.689667, 381.874176, 81.844215] + p['axis_pt1'] = [392.782898, 35.557762, 84.161575] + p['axis_pt2'] = [391.689667, 381.874176, 81.844215] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/TYLnep_750k_7_1.py b/models/TYLnep_750k_7_1.py index 070e688..0a900bf 100644 --- a/models/TYLnep_750k_7_1.py +++ b/models/TYLnep_750k_7_1.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'TYLnep/750k' p['mandible'] = f'{path}/TYLnep_jaw_750k.stl' - p['teeth'] = [[-440.282074, 226.035706, 8.676176], + p['contact_pts'] = [[-440.282074, 226.035706, 8.676176], [-453.118317, 156.467865, 11.607960]] - p['LTMJ'] = [392.782898, 35.557762, 84.161575] - p['RTMJ'] = [391.689667, 381.874176, 81.844215] + p['axis_pt1'] = [392.782898, 35.557762, 84.161575] + p['axis_pt2'] = [391.689667, 381.874176, 81.844215] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/TYLnep_750k_7_2.py b/models/TYLnep_750k_7_2.py index 8290499..203826c 100644 --- a/models/TYLnep_750k_7_2.py +++ b/models/TYLnep_750k_7_2.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'TYLnep/750k' p['mandible'] = f'{path}/TYLnep_jaw_750k.stl' - p['teeth'] = [[-91.923141, 317.501709, 54.304459], + p['contact_pts'] = [[-91.923141, 317.501709, 54.304459], [-96.786438, 79.207016, 55.289452]] - p['LTMJ'] = [392.782898, 35.557762, 84.161575] - p['RTMJ'] = [391.689667, 381.874176, 81.844215] + p['axis_pt1'] = [392.782898, 35.557762, 84.161575] + p['axis_pt2'] = [391.689667, 381.874176, 81.844215] p['muscles'] = [ { 'file': f'{path}/M_AE_L1.stl', @@ -87,9 +87,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['z'], - 'LTMJ': ['x', 'z','y'], - 'RTMJ': ['x', 'z','y'] + 'contact_pts': ['z'], + 'axis_pt1': ['x', 'z','y'], + 'axis_pt2': ['x', 'z','y'] } # material properties diff --git a/models/bonemodel.py b/models/bonemodel.py index 0123c36..3f77e09 100644 --- a/models/bonemodel.py +++ b/models/bonemodel.py @@ -18,18 +18,18 @@ def parms(d={}): # Geomagic/MeshLab input files path = 'dolicorhynchops/10k' p['mandible'] = f'{path}/mandible.ply' # mandible mesh (.ply/.geo/.msh) - p['teeth'] = f'{path}/teeth.off' # one or several vertices (.ply/.off) (used if p['food']=='fixteeth') - p['LTMJ'] = [0.1458893, -73.13895, 227.3909] # left temporomandibular joint - 1 vertex (.ply/.off/coordinates) - p['RTMJ'] = f'{path}/RTMJ.off' # right temporomandibular joint - 1 vertex (.ply/.off/coordinates) + p['contact_pts'] = f'{path}/teeth.off' # one or several vertices (.ply/.off) (used if p['food']=='fixteeth') + p['axis_pt1'] = [0.1458893, -73.13895, 227.3909] # left temporomandibular joint - 1 vertex (.ply/.off/coordinates) + p['axis_pt2'] = f'{path}/RTMJ.off' # right temporomandibular joint - 1 vertex (.ply/.off/coordinates) p['muscles'] = [ { 'file': f'{path}/Lmuscle.ply', 'force': 100., 'focalpt':f'{path}/LmuscleF.off', 'method':'T'}, { 'file': f'{path}/Rmuscle.off', 'force': 100., 'focalpt':f'{path}/RmuscleF.off', 'method':'T'} ] p['food'] = 'fixteeth' # type of food: 'fixteeth' or 'cylinder' p['fixations'] = { - 'teeth': ['x','y','z'], # constrained degrees of freedom - 'LTMJ': ['x','y','z'], - 'RTMJ': ['x','y','z'] + 'contact_pts': ['x','y','z'], # constrained degrees of freedom + 'axis_pt1': ['x','y','z'], + 'axis_pt2': ['x','y','z'] } # rigid cylinder (used if p['food']=='cylinder') R = 20 @@ -85,8 +85,8 @@ def getMetafor(p={}): groups['surf'].addMeshPointsFromObject(groups['all'], BoundarySelector()) nods_no, nods_pos = extract_nodes_from_group(groups['surf']) - # load other surface meshes => groups['LTMJ'], ... - for meshname in ['LTMJ', 'RTMJ']: + # load other surface meshes => groups['axis_pt1'], ... + for meshname in ['axis_pt1', 'axis_pt2']: create_group(p[meshname], nods_no, nods_pos, domain, groups, meshname) # load muscle groups @@ -134,7 +134,7 @@ def getMetafor(p={}): txt2key = { 'x': TX, 'y':TY, 'z':TZ } # axis of rotation - for gname in ['LTMJ', 'RTMJ']: + for gname in ['axis_pt1', 'axis_pt2']: for d in p['fixations'][gname]: domain.getLoadingSet().define(groups[gname], Field1D(txt2key[d],RE), 0.0) @@ -173,9 +173,9 @@ def getMetafor(p={}): domain.getInteractionSet().add(ci) elif p['food']=='fixteeth': # teeth are fixed along X - create_group(p['teeth'], nods_no, nods_pos, domain, groups, 'teeth') - for d in p['fixations']['teeth']: - domain.getLoadingSet().define(groups['teeth'], Field1D(txt2key[d],RE), 0.0) + create_group(p['contact_pts'], nods_no, nods_pos, domain, groups, 'contact_pts') + for d in p['fixations']['contact_pts']: + domain.getLoadingSet().define(groups['contact_pts'], Field1D(txt2key[d],RE), 0.0) else: # p['food'] is a filename ply2mtf(domain, p['food']) diff --git a/models/dolicorhynchops_10k.py b/models/dolicorhynchops_10k.py index b7910e7..7450334 100644 --- a/models/dolicorhynchops_10k.py +++ b/models/dolicorhynchops_10k.py @@ -8,10 +8,10 @@ def parms(d={}): p = {} path = 'dolicorhynchops/10k' p['mandible'] = f'{path}/mandible.stl' - p['teeth'] = [[-10.20362, -17.46838, -229.9061], + p['contact_pts'] = [[-10.20362, -17.46838, -229.9061], [-11.92466, 26.3042, -229.5354]] - p['LTMJ'] = f'{path}/LTMJ.off' - p['RTMJ'] = [ -8.716309, 79.13171, 233.8385 ] + p['axis_pt1'] = f'{path}/LTMJ.off' + p['axis_pt2'] = [ -8.716309, 79.13171, 233.8385 ] p['muscles'] = [ { 'file': f'{path}/Lmuscle.stl', @@ -28,9 +28,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['x'], - 'LTMJ': ['x', 'y', 'z'], - 'RTMJ': ['x', 'z'] + 'contact_pts': ['x'], + 'axis_pt1': ['x', 'y', 'z'], + 'axis_pt2': ['x', 'z'] } # material properties diff --git a/models/dolicorhynchops_10k_contact.py b/models/dolicorhynchops_10k_contact.py index 38e8400..5f6475f 100644 --- a/models/dolicorhynchops_10k_contact.py +++ b/models/dolicorhynchops_10k_contact.py @@ -8,9 +8,9 @@ def parms(d={}): p = {} path = 'dolicorhynchops/10k' p['mandible'] = f'{path}/mandible.ply' - # p['teeth'] = f'{path}/teeth.off' - p['LTMJ'] = [0.1458893, -73.13895, 227.3909] - p['RTMJ'] = f'{path}/RTMJ.off' + # p['contact_pts'] = f'{path}/teeth.off' + p['axis_pt1'] = [0.1458893, -73.13895, 227.3909] + p['axis_pt2'] = f'{path}/RTMJ.off' p['muscles'] = [ { 'file': f'{path}/Lmuscle.ply', @@ -26,9 +26,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['x','y','z'], - 'LTMJ': ['x','y','z'], - 'RTMJ': ['x','y','z'] + 'contact_pts': ['x','y','z'], + 'axis_pt1': ['x','y','z'], + 'axis_pt2': ['x','y','z'] } p['food'] = 'cylinder' R = 10 diff --git a/models/dolicorhynchops_149k.py b/models/dolicorhynchops_149k.py index e9dfa55..a4f6d6e 100644 --- a/models/dolicorhynchops_149k.py +++ b/models/dolicorhynchops_149k.py @@ -8,9 +8,9 @@ def parms(d={}): p = {} path = 'dolicorhynchops/149k' p['mandible'] = f'{path}/mandible_lfs.ply' - p['teeth'] = f'{path}/teeth.ply' - p['LTMJ'] = f'{path}/LTMJ.ply' - p['RTMJ'] = f'{path}/RTMJ.ply' + p['contact_pts'] = f'{path}/teeth.ply' + p['axis_pt1'] = f'{path}/LTMJ.ply' + p['axis_pt2'] = f'{path}/RTMJ.ply' p['muscles'] = [ { 'file': f'{path}/Lmuscle_lfs.ply', @@ -26,9 +26,9 @@ def parms(d={}): } ] p['fixations'] = { - 'teeth': ['x'], - 'LTMJ': ['x','y','z'], - 'RTMJ': ['x','z'] + 'contact_pts': ['x'], + 'axis_pt1': ['x','y','z'], + 'axis_pt2': ['x','z'] } # material properties diff --git a/models/view_model.py b/models/view_model.py index 9648f1a..ad093cf 100644 --- a/models/view_model.py +++ b/models/view_model.py @@ -13,9 +13,9 @@ if __name__=="__main__": # load meshes surface, _, _ = SurfMesh.load(p['mandible'], vertices=False) - ltmj, _, _ = SurfMesh.load(p['LTMJ']) - rtmj, _, _ = SurfMesh.load(p['RTMJ']) - teeth, _, _ = SurfMesh.load(p['teeth']) + ltmj, _, _ = SurfMesh.load(p['axis_pt1']) + rtmj, _, _ = SurfMesh.load(p['axis_pt2']) + teeth, _, _ = SurfMesh.load(p['contact_pts']) muscles = [] muscleFs = [] for mdata in p['muscles']: -- GitLab