Merge pull request #109 from mlin865/wedge

Wedge
ABI-Software · Dec 6, 2020 · e5cdfb4 · e5cdfb4
2 parents 3f54323 + 10fa23c
commit e5cdfb4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/scaffoldmaker/meshtypes/meshtype_3d_bladderurethra1.py b/src/scaffoldmaker/meshtypes/meshtype_3d_bladderurethra1.py
@@ -646,12 +646,7 @@ def generateBaseMesh(cls, region, options):
         xTexture = d1Texture = d2Texture = d3Texture = []
 
         # Obtain elements count along body and neck of the bladder for defining annotation groups
-        if includeUrethra:
-            # bladderLength = length - urethraLength
-            bodyLength = ureterPositionDown * bladderLength
-        else:
-            bodyLength = ureterPositionDown * length
-        elementsCountAlongBody = int(bodyLength / bladderSegmentLength)
+        elementsCountAlongBody = round(ureterPositionDown * elementsCountAlongBladder - 1)
         elementsCountAlongNeck = elementsCountAlongBladder - elementsCountAlongBody
 
         # Create annotation groups for bladder and urethra

diff --git a/src/scaffoldmaker/utils/eftfactory_tricubichermite.py b/src/scaffoldmaker/utils/eftfactory_tricubichermite.py
@@ -885,7 +885,6 @@ def createEftWedgeCollapseXi1Quadrant(self, collapseNodes):
         # zero cross derivative parameters
         remapEftNodeValueLabel(eft, nodes, Node.VALUE_LABEL_D2_DS1DS2, [])
         remapEftNodeValueLabel(eft, nodes, Node.VALUE_LABEL_D2_DS1DS3, [])
-        remapEftNodeValueLabel(eft, nodes, Node.VALUE_LABEL_D2_DS2DS3, [])
         remapEftNodeValueLabel(eft, nodes, Node.VALUE_LABEL_D3_DS1DS2DS3, [])
 
         remapEftLocalNodes(eft, 6, ln_map)
@@ -925,6 +924,11 @@ def createEftWedgeCollapseXi2Quadrant(self, collapseNodes):
             else:
                 valid = False
             ln_map = [1, 2, 3, 4, 5, 6, 5, 6]
+        elif collapseNodes in [[4, 8]]:
+            nodes = [2, 4, 6, 8]
+            remapEftNodeValueLabel(eft, nodes, Node.VALUE_LABEL_D_DS2, [])
+            remapEftNodeValueLabel(eft, [2, 6], Node.VALUE_LABEL_D_DS1, [(Node.VALUE_LABEL_D_DS2, [])])
+            ln_map = [1, 2, 3, 2, 4, 5, 6, 5]
         else:
             valid = False
 
@@ -933,7 +937,6 @@ def createEftWedgeCollapseXi2Quadrant(self, collapseNodes):
 
         # zero cross derivative parameters
         remapEftNodeValueLabel(eft, nodes, Node.VALUE_LABEL_D2_DS1DS2, [])
-        remapEftNodeValueLabel(eft, nodes, Node.VALUE_LABEL_D2_DS1DS3, [])
         remapEftNodeValueLabel(eft, nodes, Node.VALUE_LABEL_D2_DS2DS3, [])
         remapEftNodeValueLabel(eft, nodes, Node.VALUE_LABEL_D3_DS1DS2DS3, [])