From 5bee4f5cd987f58249708d1dee34a8c1b20e6fc0 Mon Sep 17 00:00:00 2001
From: Romain Boman <r.boman@uliege.be>
Date: Mon, 12 Apr 2021 18:20:28 +0200
Subject: [PATCH] add focalpt as an array or tuple
---
models/dolicorhynchops_10k.py | 3 +--
models/mandiblemodel.py | 8 ++++++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/models/dolicorhynchops_10k.py b/models/dolicorhynchops_10k.py
index fb8dcbf..ec590e0 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 ff962f6..85cba33 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)
--
GitLab