Merge escape2 branch to master #140
Conversation
… a fair comparison (had to set H2O initial bar = 30 bar bc get too low pressure in 1st loop)
…idProteus.py : failed
…ed to be improved
start_proteus.py
Outdated
| @@ -462,8 +462,8 @@ def main(): | |||
| solvevol_target[e] = esc_m | |||
|
|
|||
| # print info to user | |||
| log.debug(" escape %s: m=%.2e kg, dm=%.2e (%.3f%%)"% | |||
| (e, esc_m, esc_dm, 100*esc_dm/esc_m)) | |||
| #log.debug(" escape %s: m=%.2e kg, dm=%.2e (%.3f%%)"% | |||
There was a problem hiding this comment.
These two lines could remain uncommented.
There was a problem hiding this comment.
The issue here was that this line lead to a runtime error when remaining in. Can you confirm this @lsoucasse?
There was a problem hiding this comment.
I agree but I did it because otherwise I got an error when running start_porteus.py which stopped the simulation completely. I can't run a new simulation right now because my PROTEUS version is having some conflict with the merging process I guess.
There was a problem hiding this comment.
Hi @EmmaPostolec, the escape.py file looks good. However, it seems to me there are some unvoluntary changes in the config files, because there is a lot of renaming and/or deletion. Could you answer my comments to confirm what you want to modify or not? I can take care of reverting the files accordingly. Thanks.
|
Hi @EmmaPostolec, I reverted some additional changes and I think we are ready now. As I did the last commit, we did an external reviewer to finally approve and merge, could you do that @timlichtenberg? |
|
Hi Laurent, thanks a lot for all of your comments and your help on this :) |
|
Ok, should I still merge it now despite the commented part in start_proteus.py @timlichtenberg ? |
If it crashes the simulation the lines should be deleted, not commented. Sorry I did not understand why it was commented. |
Lines 501 and 502 in start_proteus.py : log.debug(" escape %s: m=%.2e kg, dm=%.2e (%.3f%%)"% |
lsoucasse
dismissed stale reviews from timlichtenberg and themself
via
2d23c35
|
Deleted the bugging lines. But it needs new approval @timlichtenberg. |
|
Hi @timlichtenberg and @lsoucasse should I do a squash and merge now ? :) |
|
Yes, "Squash and merge" using the arrow on the green "Merge pull request" button. :) |
Hi, I would like to merge the escape2 branch to master. The difference with the master branch is a change for 2 variables (Fxuv_star_SI_full and age_star_mors) in utils/escape.py to global variables to avoid loading the entire Mors Fxuv track at each iteration. I also modified the configuration files a bit to make them consistent for comparison (dummy2.cfg and escape.cfg.) I deleted all the new files/folders created to validate the escape calculations in PROTEUS and I put them in my private repository, as discussed in the last meeting.