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.

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

Increase cyclefactor for region ai_TM1 SPW33 #305

Merged
merged 2 commits into from
Mar 1, 2023

Conversation

d-l-walker
Copy link
Contributor

SPW 33 for Sgr_A_st_ai_03_TM1 (#130) diverged with default values. I reprocessed changing only cyclefactor=1.0 -> cyclefactor=2.0, which is reflected in this PR.

@keflavich
Copy link
Contributor

@d-l-walker could you check what happened here - I merged this, but it claimed that there was a conflict because something else added in a lot of custom parameters.

@d-l-walker
Copy link
Contributor Author

@keflavich I'm not sure why ... in my initial commit I literally changed 1.0 -> 2.0 for the cyclefactor. I'll look at this more carefully to see if I can figure out what's happened, but I don't know off the top of my head

@keflavich
Copy link
Contributor

it looks like something I did (automatically) that caused the conflict. But, I don't quite understand the order of operations.

@keflavich keflavich merged commit 5f69393 into ACES-CMZ:main Mar 1, 2023
@d-l-walker d-l-walker deleted the update_ai_TM1_SPW33_params branch July 6, 2023 12:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants