diff --git a/models/CLIpro_150k_15_1.py b/models/CLIpro_150k_15_1.py index 02f0eeb2ed10a9dd5c8ec6c7524eb5157dc68323..2563091d92306de9a69732adb5162e35844b2c92 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 1b7e27367ce4b1899e737cf465f208b1d739a071..a294c79ba08a91af8f82699c175d3ec5eb8febb4 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 c8b469f8e8edec4add2e09489062946060c43139..6e3100a083aaaeb0d3a5bb1ab9a6c3e3a587cae8 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 7e8fb3c4a967e1a6d3e79a0d294350e9753aa033..a7ad41f82cb25e9b6b02d66dd51d867b46cbe80e 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 f38b546000449ef38aa326f09e1ab39652a1f861..1aaa5d18614c87044168433f2ff63be34a84c32c 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 0d9b96a7863d68f5fce6501cb326d7caefca427d..7c459febe0a7d4819c9d9dbc22175047e67ce913 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 1a09046038401a63a33bc7fdab4b54d8792063d4..9b6809a278e0048fbffff354019280aa21b3cc2c 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 f918ef3fadb6a657d19033d77ad9de2e72570664..5abc6724fbaa69dc6b3b6d5bd93711b291ca5536 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 4005126d3acf844f2a676a15dad40c89a1e747fa..568986140ecb9dabdc2974880ee45f0e53b9fc7a 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 c80b7da7b54d6e0b448d296b65ff6a2ebf01875e..ce1ad3d2350543a10fd4b043a4f9281b13fc0136 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 a77c15d1a4ec426a7c8a3d20bb7a68c9c335591d..de75d071e2ab214157f3dfc7cc18e524bc2174d9 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 b7e7f434eedbea715fbb5ff41115141394543246..5b8f0678b6f9ad7352686bf136dc5b8903167d35 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 b8de6c52bb92249a87f56fbc0b1a4b41640225d3..d2b4eb0d61cd968b3996eaec8bb98879d45115c3 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 89618d892dd6dbc7cc28979afbeeeee577af9740..2a7abcb9a01323d6005a314f11bda2e30c45f570 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 1b55d40fb3debe5255d2eae3d79cf0a994181f1c..5c0eeb1ffa63612ffa2275909c6ad056680efe98 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 04f6ef7832c3045bf4068651ca47c3ea4aa277eb..41cf267bc37aff908f8ced6fa9055af627323cb7 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 298c3ac97e2e09cc4aac148ae331d293bb78f457..8b9ba514fc05d2ce2efbab86119438b29066ad3e 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 be507eb68784d351d4fad6593281cbbbdea74dba..e22fb2345158fb0d020a296ff5e9fb66e767a3be 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 5fde25f6dd42a306b9413840b360b724088ac8e1..c6fbc58c79225c360d00dabf20314e257d8e4a55 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 7af86065f0a71b37657a5f1300874192eabbf71e..1d903ca29ebeeb0a6650a99db2235ebc4a010dc2 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 15a7c98ebc8db613f4a54cf1e2448719275784c0..1ff06227d9ca554f968d5e0fdc31975c05e4d490 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 7f71feb9e1221039f09bc4a6c6ae1dff8353d865..e2c06a8011b4897470e60fde8a6b4a6a7a784813 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 1e965f77bc9cfe3aff338512f0bd7fcb91858354..fa90c9f57d9282a6f30649de389b8df2cd64db06 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 5b1e3f9a8794a5718f42aae1f7155a644623ac65..38a12667ab84ffad6e5bddd8b764cc5e2f6e3463 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 b3fdc51531d9eba23de138b116f5582288e477a6..362847251d5d59c1bd4127913ef8b6f0f993871e 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 6eed651f954b6be2cfdef98c25b3a2d92e351033..e3b413f7c208921f78968b3472bc7d6ee3c23b89 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 afea2e445870acdcc050d7c0c13b2474a78d3df0..e63e70d7378fe0c2e31028cc742bec1ecea8a600 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 279cf542b9265480b146aa191baeee91fb52cd19..5a5174391a61e3589a0cbea2f9b6efca6ab429b2 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 43dbaa24419d0bae920b60cb7f6ab9d0a2805c91..848b1a4a32b3614763659b536d1365a8d9638fbe 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 17ccf6659722ab8a63016d741c790c4d8683f959..58d3718f9133ba6670281944b57528fcf7ca74d4 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 824c9505165d099636cd59c797a9a59058f01c58..e5243a34f56d2f844859cf79a7d7ffce5b59c018 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 ac475bd7b2b27c9af2612b9e7c346f340866f9b2..fc2773f0bff4af9fcd68f5adfe89dcb17e23de3a 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 c84e5b16b6c3324714cddd841da96e9b3c034ba4..1f5ceca173743103c6c4a8dc8ab7fd5d7a22da50 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 679137ae06e2c01f620d351bbb0f4c69c7be0ab9..d4ab0e61c0d7e9215fc0d665005c870526ef62e8 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 7e543d138b39e7656d114ead85f912a1d4578099..e959031b93ccebedd824a42dfe25c0041a8a9c74 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 e4af79afc1258b17f3b5cf2c4b22bbca9e4aa0aa..d15171e2ae65013110f95a825482b20d7612b6cf 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 c91135f5c99a178af44d3dbf33a77e0364e2d0f3..a57addaf84ca5b4fd57fbf986022031f9edc8d95 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 9b4f3e758f8f5033d5254d4fc06bb134475c3559..879cc51014742814010bb5ce79f575800961c3e9 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 bd36c09f9a1830fff1b3ce923e85da8861a84e2d..223a11b1dd5d79cc0b0510d78eac0e724ccedb5d 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 a842db2bd9ccccd9b36ef916cd76519b70733a4b..1ac5047981774695bc9932e74808488dfe22ac26 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 95a8c80920e8f414f662f01016fe4ac3bb212029..72dd0f7337750fb9bba99d689febc35e0c81b70c 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 5b24a8bef08d1c9f5ef1aeae14664e8a6792eccc..d804ca70efc2bee9ccb0e161c78636674ec9752a 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 89574e044102c466450ecf1326a7b98f012f2f1a..28ab17d0923dfea260dad8ca25ac4322773b6daf 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 47d2916604f278e3f826bef445d753138f007832..2e732caae27cb46b0c93f894c7b8466c01fca307 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 8b7f0eb42adff78472da5383c5459565881caa5c..fbe1cc3ce351a46092785c0bcb5c2e9c93296ac8 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 29d490bb3523696d856d04e69aca3a3ef4e0063d..05fa24fef6366e902025282f426936ad777e68e9 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 3393d3971d4ccca6f39bf64992a18fa1e2908c95..f3d2faf5ef6c4ac3038ae1f927c33597b6adc2ed 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 e9537719f62a5681c6714478c2705ed3e8ca7934..05b31dff2fb8f88b51c25abdac4b6bc450d789ec 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 a88bf0ce99ef067a61a92f3e4fff835808edd97f..eaa1a9e3590f33956d9c4577c0c7f64d78b65352 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 82bd277632afdee5978125de0483c2e2d6aee03a..28cdccd956176ee6c10169b50359672b8edecd77 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 a481c6d1b6ae55f2f7093c42ad0694eacebab551..5f0e0db53b4a227677560c09e3c0ab1ca9da73a1 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 023456d2323cb492dab1fa6396abcf5e5bdcb0ae..be38243b6c10c911f5ee113b109bd0f6fe7aa9fc 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 4584db1fe136ba03f1a5d4b851cb383cf2929b47..c580ab731732dabc9f0a40a74aadcff0a1e78d82 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 989440925c9baddf35345fe7c90d58524501544e..b243254cde8b5997ff06e047fa569fc709dcf6b4 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 354220b10aeef724e0cb5812906b0d8b5f856725..5553eb25d5594737893393a03a080a86ad7ef05f 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 ce56c651fb67f890e457d6fd61c825a578a44cc3..63ff44f5c66d625d092f08991e869246f3ba0964 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 e96660f94acff74f924222e0e8522e98f8d8a1b6..967f18157bdbbfa7668357beab145699580296be 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 9542600968b02949968883d28b8f1584cdf7c344..69a7dd1d63ccf5e1855085c8644ab66fe83a5465 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 4424fda7ba3942c60badc873587858990b0b13aa..fc429be0d4e5108cf4c5c6697a9fb2e29933e108 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 63972320ef55d318d56a40cc90e38168546cf234..2f86e556f086bdfdd052ac838064457ce20293e8 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 35e992d5c33e40cba290de7907cf354177fc26a5..7242230f9c13d714ce5f466b692b0d23c2001b43 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 09011b7bf4c4c5c6cf98ddd90dd44ed8f840f72f..97e2469d1f4137de4cace407744932d5f2c2be32 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 13cb6caaeab18f1674f1ac966995971d06a67ed7..64ab348fdd126d7487c0084994f31e2decc3088b 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 7eb3c09d61ef552fd2c871192ba1707ab312f5d4..77030bffad5cd89326666d93107c43727910afcb 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 27abd120318cc6e2c270d59faa7573c3affe752d..02a0cd4ea77bff296ed795ef1eabec12aed8ecf7 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 6c4ff7388d616466546c157fe81bc7029db65d67..e13b0adb576134264f24a743a4b3c07abb220320 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 6d2c048921d57c6427374fcc0ae31dc4567f0b4e..f00ed72ea7f9d13eee9893901525d95caf7a28e6 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 867c8c64bb3c51e78bbda7699bba3a7b0718b71b..e78e5096b52ad5c8b28259c6b1605c6940f8f72f 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 3c2d28fb1a30973a98089e4f01e9f0cccd344c4a..f8c32bda369678a4322d0f1c13a236164771c6b1 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 ed1c668339249785344f3a112ba99fc273f8e80a..4098bd4dbf778e7fd756e8df2b826827a2925f98 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 e9c209a79c9593c52205bc9615420bb3fddcb84e..7c41e63dfbbbafa98764b17c6834c23fc8092639 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 c7fd66a6da9205440a8a3eca1844aa8cc7f92868..b84ae263f6a7482ea49c6c9ef8611b4f5b1118fd 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 c1aec954d0798263c82716726b37eac6cde436a1..aed3d31c080e229f5fdb955c4fa411e07745ebc3 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 cb8300c77d57834bb66ead8759ce797333e04788..85d86c4905c32098366b507f673b28da84491020 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 01b34ace96b0b99a1da0842ce50008c30e52c6ce..be39038e51080a2792335257f0c16f5336bdc86f 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 7248ca1931cbe3199d244bc2d2e3ef53ebf3081f..d0d2305d5a34b0b6ad44ddebfb8416a8a4158092 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 69a014368a0d3ee954bf02b7f2fe58975bc6b463..de505bb758eb5b5fd2725882f78f5b2e9c5b32f3 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 d4f29a2315c6033d3109e62b88178764d44da885..3e2d75742c1a7c4d806db1421b9cdff9c3f2d1a3 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 40977e71a216a50ca137baf83685ddcecb5e4a68..08c5d6d2ec94e38c805475492daaa68f00853f58 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 3809ec95ececb9ccd8dbb37b1d126c4592906bd2..43cb82e9d24897b996202988c024547213ae673d 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 b67990dbfb69b429dc066f7b20e75af629338c80..e1cd5fbec7957fd055d2c4fc98b5090f77a6d603 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 4229f55ea6bf860552896d86a905bb85cadd39ea..f51416ec376d328dec8a296e575742ab06267ab1 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 18b547ada22cc5aca193f22db3cdac69b00d2e1a..5fbfaaf8f96d42595b6b4d9741c552d09679dbaf 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 79427e76bc77c67d3b490e366ed4700d2e9ca316..b66216c5a673c18a838c20f94304f6412293d3c8 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 e63a294367dccf84471a12f7ae5601f72b072407..9d8bd15a8a7208d64e69a73a743e4692ff3831e6 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 0df33c48c8434e108ed99bf2b3e9f9a0d0f2c367..61652d83c84615498501cce1d6fbe698474c607a 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 0d6205f6b2945ef672efb3a1ca503cb54939c93f..3dfb7318af5f4a859c3b1acb9fe0b410693b2ed0 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 279d88b0d2ce6a0d96fc324c578bdbada7366813..5bb47e13d053797ecc15f12667cf9467ac60fa35 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 1e31c43d2ae2c551301f67ae0d23accfea6b5f15..1530fed29a6b3271ce22bf7cfebf5934f3bfea7e 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 9aed0bc19ff4aa63e544c6ba8ed72b640b4a5627..b441998abe301265ae3c6f412c2687bebe94540c 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 86f2c6d7a25763eba3e282ba3036bf8c23542c79..27c024ac165c4068c141db5ee8ca4a2df0592074 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 e17b530ab7b2824b7f70cd53ffdd570846b7994a..62f90907b228f82db57733afedb203f4c8344915 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 cbbfbbc77ed8e3e92db30cdac1fd20ae289fbcde..566c8dac2ecd629fc97c3e99488e2ecbd70d80b7 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 bc838be2306f6caad067b86c0ccfa5950de14f3b..f9b936f73b49931b9ccca79b1f1b6e3c9cafac0e 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 f69510359733ce5d6ffcf5d2180df9853e6407d7..0069675ae915bde27e86fd357c32733d392f7745 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 245b914936ef9a16ff3f337b794a08b7f5574487..fbfa04cdf3a5ca394064457ec7f6ed5734235bde 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 84674dc5f7edc2afb56591779f6d2d9499250177..f16fc6c9b060a72cd88844c21bb4549237bb0a87 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 9202a2451cdb4c371fc7a5cecd15f38310b87a1a..1d32022c4f3fee7cb62cbc71fcb057684abf6c0e 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 465351d94a2eecfee867d3cdb87cddadaa162a5c..049513ca8160829a95c12e7f32fc8004f894f839 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 070e688d9ca4188911b01b3f8c1d81ef9fe3afa2..0a900bfaba9934590dc5be63d8a5e31f6f56b6f7 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 8290499d896ba196c809f853d925b685c14fb7bb..203826c7c7d2832320650e7b4a19ab398670f23a 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 0123c363db8c4f41d3cdfb1eaefdd031542de39f..3f77e09d5f55cae85453e6f759f15e44dd347210 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 b7910e772fc522aa2036b0622b37b45cc4b721de..7450334bee5f3799cf448f65ae72cb75b0b3d65f 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 38e840004a3972cb00d1319acf6266ff1e82a243..5f6475f742615d5228584774a6bf7d8d11d44bf5 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 e9dfa55a7b5e44c6ab2e3b7d744d790f5051c9d9..a4f6d6e6160d46cb62c898fa3044b468ec15ff76 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 9648f1ae86e0808a32266c3aa0fb3d695885c930..ad093cf8778f911110e8a65f4446b9132dac0555 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']: