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

Jump to bottom

Formatting and linting fixes #77

Merged
merged 19 commits into from
Apr 2, 2021
Merged

Formatting and linting fixes #77

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
8ebf48d
black format
ewu63 Mar 30, 2021
cf08a6e
fixed imports
ewu63 Mar 30, 2021
457b9f8
fixed bare exceptions
ewu63 Mar 30, 2021
ad3e4da
linting fixes
ewu63 Mar 30, 2021
68706c7
fixed F841 unused variable
ewu63 Mar 30, 2021
74ec082
fixed undefined vars
ewu63 Mar 30, 2021
f0e3a34
renamed ambiguous var names
ewu63 Mar 30, 2021
248e7f4
cast numpy bool array to python bool
ewu63 Mar 30, 2021
5405188
minor formatting
ewu63 Mar 30, 2021
7fc53ca
added git blame ignore
ewu63 Mar 30, 2021
495bf84
updated azure yaml file
ewu63 Mar 30, 2021
5205576
addressed comments
ewu63 Mar 31, 2021
b192604
renamed numpy to np
ewu63 Mar 31, 2021
3401e22
another minor reformat
ewu63 Mar 31, 2021
89ca4c3
Merge branch 'master' into refactor
ewu63 Mar 31, 2021
b940962
added back the CompVecPnt01 call
ewu63 Apr 1, 2021
0d245c1
skip parallel test 2 for VSP
ewu63 Apr 1, 2021
0faf9e7
switched to skiptest rather than pass
ewu63 Apr 1, 2021
8820eb9
bugfix and added numpy name change to git revs ignore file
ewu63 Apr 2, 2021
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
12 changes: 8 additions & 4 deletions pygeo/DVGeometry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2832,7 +2832,8 @@ def _finalize(self):
for j in range(self.FFD.vols[iVol].nCtlv):
for k in range(self.FFD.vols[iVol].nCtlw):
ind = self.FFD.topo.lIndex[iVol][i, j, k]
if coefMask[ind] == False and ind not in self.axis[key]["ignoreInd"]:
# we have to cast to bool to compare using "is"
ewu63 marked this conversation as resolved.
Show resolved Hide resolved
if bool(coefMask[ind]) is False and ind not in self.axis[key]["ignoreInd"]:
temp.append(ind)

# Unique the values and append to the master list
Expand Down Expand Up @@ -4278,7 +4279,8 @@ def __init__(self, dvName, lower, upper, scale, axis, coefListIn, mask, config):
coefList = []
# create a new coefficent list that excludes any values that are masked
for i in range(len(coefListIn)):
if mask[coefListIn[i]] == False:
# we have to cast to bool to compare using "is"
if bool(mask[coefListIn[i]]) is False:
coefList.append(coefListIn[i])

N = len(axis)
Expand Down Expand Up @@ -4389,7 +4391,8 @@ def __init__(self, dvName, lower, upper, scale, axis, vol_dv_to_coefs, mask, con

# loop through each of coefs to see if it is masked
for coef in coefs:
if mask[coef] == False:
# we have to cast to bool to compare using "is"
if bool(mask[coef]) is False:
loc_dv_to_coefs.append(coef)

self.dv_to_coefs.append(loc_dv_to_coefs)
Expand Down Expand Up @@ -4473,7 +4476,8 @@ def __init__(self, dvName, lower, upper, scale, axis, coefListIn, mask, config,
self.coefList = []
# create a new coefficent list that excludes any values that are masked
for i in range(len(coefListIn)):
if mask[coefListIn[i]] == False:
# we have to cast to bool to compare using "is"
if bool(mask[coefListIn[i]]) is False:
self.coefList.append(coefListIn[i])

self.nVal = len(self.coefList)
Expand Down