Vous avez reçu un message "Your GitLab account has been locked ..." ? Pas d'inquiétude : lisez cet article https://docs.gricad-pages.univ-grenoble-alpes.fr/help/unlock/

Commit 772c4c6d authored by Edward Andò's avatar Edward Andò
Browse files

comments cleanup

parent 9fe9cf5f
......@@ -187,7 +187,6 @@ def FfieldRegularGeers(displacementField, nodeSpacing, neighbourRadius=1.5, mask
FfieldFlat = numpy.zeros((nNodes, 3, 3))
#Define field coordinates for KD-tree distance calculation, warning, the top point is at zero
fieldCoordsFlat = numpy.mgrid[0:dims[0],0:dims[1],0:dims[2]].reshape(3, nNodes).T*nodeSpacing
fieldCoordsFlat = numpy.mgrid[nodeSpacing[0]:dims[0]*nodeSpacing[0]+nodeSpacing[0]:nodeSpacing[0],
nodeSpacing[1]:dims[1]*nodeSpacing[1]+nodeSpacing[1]:nodeSpacing[1],
nodeSpacing[2]:dims[2]*nodeSpacing[2]+nodeSpacing[2]:nodeSpacing[2]].reshape(3, nNodes).T
......@@ -211,7 +210,6 @@ def FfieldRegularGeers(displacementField, nodeSpacing, neighbourRadius=1.5, mask
treeCoord = scipy.spatial.KDTree(fieldCoordsFlatGood)
FfieldFlatGood = numpy.zeros_like(FfieldFlat[goodPointsMask])
#for n in pbar(range(nNodes)):
for goodPoint in pbar(range(fieldCoordsFlatGood.shape[0])):
#This is for the linear model, equation 15 in Geers
centralNodePosition = fieldCoordsFlatGood[goodPoint]
......@@ -256,7 +254,7 @@ def FfieldRegularGeers(displacementField, nodeSpacing, neighbourRadius=1.5, mask
for v in range(3):
#sX0X0[u, v] += nodalRelativePositionsRef[neighbour, u] * nodalRelativePositionsRef[neighbour, v]
#sX0Xt[u, v] += nodalRelativePositionsRef[neighbour, u] * nodalRelativePositionsDef[neighbour, v]
# Proposed solution for #142
# Proposed solution for #142 for direction of rotation
sX0X0[v, u] += nodalRelativePositionsRef[neighbour, u] * nodalRelativePositionsRef[neighbour, v]
sX0Xt[v, u] += nodalRelativePositionsRef[neighbour, u] * nodalRelativePositionsDef[neighbour, v]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment