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

Fixing bug in local DVs #138

Merged
merged 2 commits into from
May 3, 2022
Merged

Fixing bug in local DVs #138

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54ebac3
fixing local DV typos
hajdik May 3, 2022
0ab2d77
Merge branch 'main' into dv-bugfix
hajdik May 3, 2022
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
10 changes: 2 additions & 8 deletions pygeo/parameterization/designVars.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def __init__(self, name, lower, upper, scale, axis, coefListIn, mask, config):

N = len(axis)
nVal = len(coefList) * N
super().__init__(name=name, value=np.zeros(nVal, "D"), nVal=nVal * N, lower=lower, upper=lower, scale=scale)
super().__init__(name=name, value=np.zeros(nVal, "D"), nVal=nVal, lower=lower, upper=upper, scale=scale)

self.config = config
self.coefList = np.zeros((self.nVal, 2), "intc")
Expand Down Expand Up @@ -155,7 +155,7 @@ def __init__(self, name, lower, upper, scale, axis, vol_dv_to_coefs, mask, confi
self.dv_to_coefs.append(loc_dv_to_coefs)

nVal = len(self.dv_to_coefs)
super().__init__(name=name, value=np.zeros(nVal, "D"), nVal=nVal, lower=lower, upper=lower, scale=scale)
super().__init__(name=name, value=np.zeros(nVal, "D"), nVal=nVal, lower=lower, upper=upper, scale=scale)

if "x" == axis.lower():
self.axis = 0
Expand Down Expand Up @@ -229,12 +229,6 @@ def __init__(self, name, lower, upper, scale, axis, coefListIn, mask, config, se
super().__init__(name=name, value=np.zeros(nVal, "D"), nVal=nVal, lower=None, upper=None, scale=scale)

self.config = config
if lower is not None:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why are you removing these lines?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That portion is duplicated in the class it inherits from, geoDV, so it shouldn't be necessary here.

self.lower = convertTo1D(lower, self.nVal)
if upper is not None:
self.upper = convertTo1D(upper, self.nVal)
if scale is not None:
self.scale = convertTo1D(scale, self.nVal)

self.sectionTransform = sectionTransform
self.sectionLink = sectionLink
Expand Down