Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve rat heart after scale fix #75

Merged
merged 1 commit into from
May 16, 2020
Merged

Improve rat heart after scale fix #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 40 additions & 40 deletions src/scaffoldmaker/meshtypes/meshtype_3d_heartatria1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,14 @@ class MeshType_3d_heartatria1(Scaffold_base):
'Number of elements through wall' : 1,
'Unit scale' : 1.0,
'Outlet' : False,
'Ostium diameter' : 0.15,
'Ostium diameter' : 0.16,
'Ostium length' : 0.08,
'Ostium wall thickness' : 0.04,
'Ostium inter-vessel distance' : 0.1,
'Ostium inter-vessel distance' : 0.13,
'Ostium inter-vessel height' : 0.01,
'Use linear through ostium wall' : False,
'Vessel end length factor' : 1.5,
'Vessel inner diameter' : 0.09,
'Vessel inner diameter' : 0.1,
'Vessel wall thickness' : 0.01,
'Vessel angle 1 degrees' : 0.0,
'Vessel angle 1 spread degrees' : 0.0,
Expand All @@ -113,14 +113,14 @@ class MeshType_3d_heartatria1(Scaffold_base):
'Number of elements through wall' : 1,
'Unit scale' : 1.0,
'Outlet' : False,
'Ostium diameter' : 0.15,
'Ostium diameter' : 0.16,
'Ostium length' : 0.1,
'Ostium wall thickness' : 0.04,
'Ostium inter-vessel distance' : 0.1,
'Ostium inter-vessel distance' : 0.13,
'Ostium inter-vessel height' : 0.01,
'Use linear through ostium wall' : False,
'Vessel end length factor' : 1.5,
'Vessel inner diameter' : 0.09,
'Vessel inner diameter' : 0.1,
'Vessel wall thickness' : 0.01,
'Vessel angle 1 degrees' : 0.0,
'Vessel angle 1 spread degrees' : 0.0,
Expand Down Expand Up @@ -314,69 +314,69 @@ def getDefaultOptions(cls, parameterSetName='Default'):
options['Unit scale'] = 6.0 if isMouse else 12.0
options['Atria base inner major axis length'] = 0.32
options['Atria base inner minor axis length'] = 0.26
options['Atria major axis rotation degrees'] = 50.0
options['Atria outer height'] = 0.38
options['Atria major axis rotation degrees'] = 30.0
options['Atria outer height'] = 0.4
options['Atria venous anterior over'] = 0.75
options['Atria venous midpoint over'] = 0.4
options['Atria venous midpoint over'] = 0.45
options['Atrial base back incline degrees'] = 0.0
options['Atrial base front incline degrees'] = 10.0
options['Atrial base front incline degrees'] = 15.0
options['Atrial base side incline degrees'] = 20.0
options['Atrial base slope degrees'] = 20.0
options['Atrial base wall thickness'] = 0.06
options['Atrial septum height'] = 0.21
options['Atrial septum length'] = 0.15
options['Atrial base wall thickness'] = 0.04
options['Atrial septum height'] = 0.25
options['Atrial septum length'] = 0.14
options['Atrial septum thickness'] = 0.05
options['Atrial vestibule outer height'] = 0.06
options['Common left-right pulmonary vein ostium'] = True
options['Crista terminalis thickness'] = 0.03
options['Fossa ovalis height'] = 0.08
options['Fossa ovalis length'] = 0.08
options['Fossa ovalis midpoint height'] = 0.13
options['Fossa ovalis height'] = 0.07
options['Fossa ovalis length'] = 0.07
options['Fossa ovalis midpoint height'] = 0.15
options['Fossa ovalis thickness'] = options['Atrial septum thickness']
options['Inferior vena cava inlet angle left degrees'] = 0.0
options['Inferior vena cava inlet angle over degrees'] = -20.0
options['Inferior vena cava inlet derivative factor'] = 2.0
options['Inferior vena cava inlet inner diameter'] = 0.14
options['Inferior vena cava inlet length'] = 0.12
options['Inferior vena cava inlet inner diameter'] = 0.16
options['Inferior vena cava inlet length'] = 0.2
options['Inferior vena cava inlet position over'] = 0.2
options['Inferior vena cava inlet position right'] = 0.25
options['Inferior vena cava inlet position right'] = 0.28
options['Inferior vena cava inlet wall thickness'] = 0.012
options['Left atrial appendage angle axial degrees'] = 0.0
options['Left atrial appendage angle left degrees'] = 20.0
options['Left atrial appendage angle axial degrees'] = -10.0
options['Left atrial appendage angle left degrees'] = 0.0
options['Left atrial appendage angle up degrees'] = -60.0
options['Left atrial appendage arc length'] = 0.6
options['Left atrial appendage arc radius'] = 0.25
options['Left atrial appendage arc length'] = 0.5
options['Left atrial appendage arc radius'] = 0.35
options['Left atrial appendage base length'] = 0.35
options['Left atrial appendage left'] = 0.99
options['Left atrial appendage midpoint left'] = 0.75
options['Left atrial appendage midpoint over'] = 0.9
options['Left atrial appendage midpoint left'] = 0.78
options['Left atrial appendage midpoint over'] = 1.0
options['Left atrial appendage wall thickness'] = 0.025
options['Left atrial appendage wedge angle degrees'] = 90.0
options['Left atrial appendage wedge angle degrees'] = 80.0
options['Left atrium venous free wall thickness'] = 0.04
options['Left atrium venous midpoint left'] = 0.45
options['Left pulmonary vein ostium angle degrees'] = 30.0
options['Left pulmonary vein ostium position left'] = 0.3
options['Left pulmonary vein ostium position over'] = 0.32
options['Right atrial appendage angle axial degrees'] = 25.0
options['Right atrial appendage angle left degrees'] = 0.0
options['Left pulmonary vein ostium position left'] = 0.32
options['Left pulmonary vein ostium position over'] = 0.36
options['Right atrial appendage angle axial degrees'] = 35.0
options['Right atrial appendage angle left degrees'] = 20.0
options['Right atrial appendage angle up degrees'] = 0.0
options['Right atrial appendage arc length'] = 0.6
options['Right atrial appendage arc radius'] = 0.25
options['Right atrial appendage base length'] = 0.4
options['Right atrial appendage arc radius'] = 0.35
options['Right atrial appendage base length'] = 0.35
options['Right atrial appendage midpoint right'] = 0.45
options['Right atrial appendage midpoint over'] = 0.75
options['Right atrial appendage pouch right'] = 0.95
options['Right atrial appendage wall thickness'] = 0.025
options['Right atrial appendage wedge angle degrees'] = 90.0
options['Right atrium venous free wall thickness'] = 0.03
options['Right atrium venous right'] = 0.45
options['Superior vena cava inlet angle left degrees'] = 0.0
options['Right atrium venous right'] = 0.5
options['Superior vena cava inlet angle left degrees'] = 15.0
options['Superior vena cava inlet angle over degrees'] = -5.0
options['Superior vena cava inlet derivative factor'] = 2.0
options['Superior vena cava inlet inner diameter'] = 0.14
options['Superior vena cava inlet length'] = 0.12
options['Superior vena cava inlet position over'] = 0.6
options['Superior vena cava inlet position right'] = 0.2
options['Superior vena cava inlet inner diameter'] = 0.15
options['Superior vena cava inlet length'] = 0.2
options['Superior vena cava inlet position over'] = 0.62
options['Superior vena cava inlet position right'] = 0.14
options['Superior vena cava inlet wall thickness'] = 0.012
elif 'Pig' in parameterSetName:
if notUnitScale:
Expand Down Expand Up @@ -2993,7 +2993,7 @@ def generateBaseMesh(cls, region, options):
forceMidLinearXi3 = True, forceEndLinearXi3 = True,
maxStartThickness = laaWallThickness,
elementsCountRadial = elementsCountLaaRadial,
meshGroups = [ laaMeshGroup ]) # was laMeshGroup, laaMeshGroup
meshGroups = [ laMeshGroup, laaMeshGroup ])

# create right atrium plain elements
# Anderson considers these part of the right atrial appendage:
Expand Down Expand Up @@ -3187,7 +3187,7 @@ def generateBaseMesh(cls, region, options):
forceMidLinearXi3 = True, forceEndLinearXi3 = True,
maxStartThickness = raaWallThickness,
elementsCountRadial = elementsCountRaaRadial,
meshGroups = [ raaMeshGroup ]) # was raMeshGroup, raaMeshGroup
meshGroups = [ raMeshGroup, raaMeshGroup ])

if drawLaTrackSurface:
mesh2d = fm.findMeshByDimension(2)
Expand Down
10 changes: 5 additions & 5 deletions src/scaffoldmaker/meshtypes/meshtype_3d_heartventricles1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,17 +83,17 @@ def getDefaultOptions(parameterSetName='Default'):
if notUnitScale:
options['Unit scale'] = 5.0 if isMouse else 12.0
options['Interventricular sulcus derivative factor'] = 0.8
options['LV outer height'] = 0.8
options['LV outer height'] = 0.85
options['LV outer diameter'] = 0.85
options['LV free wall thickness'] = 0.15
options['LV free wall thickness'] = 0.12
options['LV apex thickness'] = 0.05
options['RV inner height fraction'] = 0.9
options['RV arc around degrees'] = 150.0
options['RV arc apex fraction'] = 0.7
options['RV arc around degrees'] = 140.0
options['RV arc apex fraction'] = 0.5
options['RV free wall thickness'] = 0.05
options['RV width'] = 0.28
options['RV width growth factor'] = 0.8
options['RV side extension'] = 0.07
options['RV side extension'] = 0.05
options['RV side extension growth factor'] = 0.1
options['Ventricular septum thickness'] = 0.15
options['Ventricular septum base radial displacement'] = 0.0
Expand Down
6 changes: 3 additions & 3 deletions src/scaffoldmaker/meshtypes/meshtype_3d_heartventriclesbase1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ def getDefaultOptions(parameterSetName='Default'):
if isHuman:
options['LV outer height'] = 0.9
elif isMouse or isRat:
options['LV outer height'] = 0.8
options['Base height'] = 0.2
options['LV outer height'] = 0.85
options['Base height'] = 0.23
options['Base thickness'] = 0.08
options['Fibrous ring thickness'] = 0.005
options['LV outlet inner diameter'] = 0.21
Expand All @@ -110,7 +110,7 @@ def getDefaultOptions(parameterSetName='Default'):
options['RV outlet wall thickness'] = 0.018
options['Ventricles outlet element length'] = 0.1
options['Ventricles outlet spacing y'] = 0.01
options['Ventricles outlet spacing z'] = 0.12
options['Ventricles outlet spacing z'] = 0.08
options['Ventricles rotation degrees'] = 10.0
options['Ventricles translation x'] = -0.14
options['Ventricles translation y'] = -0.18
Expand Down