-
Notifications
You must be signed in to change notification settings - Fork 7
Cea integration #7
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.
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
Open
AliGangeh
wants to merge
54
commits into
master
Choose a base branch
from
CEA-integration
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains hidden or 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
…CEA new parser in progress
… max and min thrust.
added max fuel heat calculation in thrustLevel class in order to see if a design can be made regenerative
…cs to thrustlevel.py
…e frozen default. also expanded chemistryCEA functionality
…o variable display CEA raw output was in exponential form only for rho and because of how it was printed I couldn't make a parser that worked for everything so I made rho its own. isp is not getting parsed correctly but it's less important at the moments so I left it as is.
…able displays. also commented out debug prints so it is currently more usable
mostly fixes to graphs and data viewing capabilities
…ebugging still needed
fixed mu to phi calculation
…njectorCalculator. testing openrocket wrapper Rewrote code so parser uses built in rocketcea functions by replacing chemistryCEA.py with runCEA.py. changed isp calculation and working on integrating flow separation calculator from rocketcea. improved engine prints. added fac_CR variable for cintraction ration for finite area combustor calculations(needs edits). added openrocket.jar and started testing orhelper wrapper. ongoing bug fixes to injector calculator, still outputting incorrect values.
fixed some bugs that resulted from improper merge
…le levels can be calculated. also other small changes changed throttle from max min to an array called throttles. still bug fixing. currently a bug where any more than 2 throttle levels cause an infinite loop in CEArun. other changes to prints and some cooling calculations now check if the variables are given before calculating.
bug fixed thrust calculator and reduced solveMach runtime by 15% by adding extra condition to if statement to make guess machs better after the throat. also added runtime prints.
…nd film cooling calculations to improve runtime added the ability to turn off contour generation and film cooling calculations. in ThrustLevel class took film cooling calcs out of heatCalcs and made new filmCoolingCalcs function. commented out file write to dims.txt to improve runtime.
…tput functions in engine for CEArun and ceafulloutput fixed most unit problems with runCEA(mu still an issue). made test output functions in engine for CEArun and ceafulloutput. discovered that the current bartz function assumes a constant mu. need to review bartz calculations in the future.
fixed viscosity issue by adding argument show_transport=1 to setupCards. Did a quick check and it looks like it didn't break anything else and runtime is not noticeably effected.
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.
hello