diff --git a/models/dolicorhynchops_10k.py b/models/dolicorhynchops_10k.py index fb8dcbfebfc029b119cb832de399cb07e18ae8bc..ec590e06290fbce4611c9635b3ca8870c2c29708 100644 --- a/models/dolicorhynchops_10k.py +++ b/models/dolicorhynchops_10k.py @@ -3,7 +3,6 @@ # Dolicorhynchops osborni FHSM VP404 # 10k faces on the mandible surface - def parms(d={}): p = {} path = 'dolicorhynchops/10k' @@ -15,7 +14,7 @@ def parms(d={}): { 'file': f'{path}/Lmuscle.ply', 'force': 100., - 'focalpt': f'{path}/LmuscleF.off', + 'focalpt': [-100.1458893, -173.13895, 227.3909], #f'{path}/LmuscleF.off', 'method': 'U' # 'U', 'T', 'T+N' }, { diff --git a/models/mandiblemodel.py b/models/mandiblemodel.py index ff962f6f5076d52075e26889db29c459b0932b82..85cba3355f9c4b0e04b8b5621e934e0431c76334 100644 --- a/models/mandiblemodel.py +++ b/models/mandiblemodel.py @@ -93,8 +93,12 @@ def getMetafor(p={}): mgroups = {} # stores muscle group data and loads for muscle in p['muscles']: # load focal point - fullpath = os.path.join(os.path.dirname(__file__), muscle['focalpt']) - focalnodes, _ = boneload.load_msh(fullpath) + if isinstance(muscle['focalpt'], str): + fullpath = os.path.join(os.path.dirname(__file__), muscle['focalpt']) + focalnodes, _ = boneload.load_msh(fullpath) + else: # coordinates in array or tuple + focalnodes = [ muscle['focalpt'] ] + # load surface mesh => groups[name (from filename)] name, nodes, tris, ntags = \ create_group(muscle['file'], nods_no, nods_pos, domain, groups)