flight state to parsing #139
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bqpd
approved these changes
Nov 16, 2017
|
|
||
| return [Re == (state["V"]*state["\\rho"]*l/state["\\mu"]), | ||
| return [Re == (V*rho*l/mu), |
gpkitmodels/GP/aircraft/wing/wing.py
Outdated
|
|
||
| if fd["d"] == 2: | ||
| independentvars = [self.CL, self.Re] | ||
| elif fd["d"] == 3: | ||
| independentvars = [self.CL, self.Re, static.planform.tau] | ||
|
|
||
| return [Cd >= cdp + CL**2/np.pi/AR/e, | ||
| Re == (state["\\rho"]*state["V"]*cmac/state["\\mu"]), | ||
| Re == (rho*V*cmac/mu), |
| @@ -1,21 +1,22 @@ | |||
| " wing test " | |||
| from gpkitmodels.GP.aircraft.wing.wing import Wing | |||
| from gpkitmodels.GP.aircraft.wing.boxspar import BoxSpar | |||
| from gpkit import Variable, Model | |||
| from gpkit import Variable, Model, parse_variables | |||
There was a problem hiding this comment.
does Variable still need to be imported?
| path = os.path.dirname(__file__) | ||
| fd = pd.read_csv(path + os.sep + "tail_dragfit.csv").to_dict( | ||
| orient="records")[0] | ||
|
|
||
| constraints = [ | ||
| Re == (state["V"]*state["\\rho"]*S/b | ||
| / state["\\mu"]), | ||
| Re == (V*rho*S/b/mu), |
|
test this please |
|
test models please |
This was referenced Nov 16, 2017
bqpd
approved these changes
Nov 20, 2017
|
test models please |
|
@mjburton11 ready to merge this if it passes model tests |
|
@bqpd they won't pass unfortunately until I get convexengineering/solar#13 to pass |
|
merging now, will fix solar, gassolar and jho after. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.