Merge pull request #112 from rchristie/derivative_bugfix

Fix boundary derivative smoothing
ABI-Software · Dec 9, 2020 · 618e7cd · 618e7cd
2 parents a7310c9 + e8a2ec9
commit 618e7cd
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/src/scaffoldmaker/utils/derivativemoothing.py b/src/scaffoldmaker/utils/derivativemoothing.py
@@ -347,10 +347,10 @@ def smooth(self, updateDirections=False, maxIterations=10, arcLengthTolerance=1.
                     if edgeCount == 1:
                         # boundary smoothing over single edge
                         nodeIdentifier, nodeValueLabel, nodeVersion = derivativeKey
-                        fieldcache.setNode(self._nodes.findNodeByIdentifier(nodeIdentifier))
                         edge, expressionIndex, totalScaleFactor = derivativeEdges[0]
                         # re-evaluate arc length so parameters are up-to-date for other end
                         arcLength = edge.evaluateArcLength(self._nodes, self._field, fieldcache)
+                        fieldcache.setNode(self._nodes.findNodeByIdentifier(nodeIdentifier))  # since changed by evaluateArcLength
                         otherExpressionIndex = 3 if (expressionIndex == 1) else 1
                         otherd = edge.getParameter(otherExpressionIndex)
                         if updateDirections:
@@ -376,12 +376,11 @@ def smooth(self, updateDirections=False, maxIterations=10, arcLengthTolerance=1.
                             x = [ d/totalScaleFactor for d in x ]
                         else:
                             result, x = self._field.getNodeParameters(fieldcache, -1, nodeValueLabel, nodeVersion, componentsCount)
-                            othermag = magnitude(otherd)
-                            mag = (2.0*arcLength - othermag)/totalScaleFactor
-                            if (mag <= 0.0):
-                                print('Node', nodeIdentifier, 'label', nodeValueLabel, 'version', nodeVersion, 'has negative mag', mag)
-                            x = setMagnitude(x, mag)
-                        fieldcache.setNode(self._nodes.findNodeByIdentifier(nodeIdentifier))  # need to set again as changed node in edge.evaluateArcLength
+                        othermag = magnitude(otherd)
+                        mag = (2.0*arcLength - othermag)/math.fabs(totalScaleFactor)
+                        if (mag <= 0.0):
+                            print('Derivative smoothing: Node', nodeIdentifier, 'label', nodeValueLabel, 'version', nodeVersion, 'has negative magnitude', mag)
+                        x = setMagnitude(x, mag)
                         result = self._field.setNodeParameters(fieldcache, -1, nodeValueLabel, nodeVersion, x)
             # record modified nodes while ChangeManager is in effect
             if self._editNodesetGroup: