-
Notifications
You must be signed in to change notification settings - Fork 16
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
191 spawner recruitment with a b formulation #442
191 spawner recruitment with a b formulation #442
Conversation
create example with time-vary growth (Linf increase by 5 cm). See impact on SPB/R in expanded output to SPAWN_RECR table; but very little impact on estimated recruitments. Implied steepness move from 0.6 to 0.63 with the change in SPB/R. |
e166f2e
to
d6316c4
Compare
example file here and in the Issue. |
To use r4ss with the SS3 version in this 191-spawner-recruitment-with-a-b-formulation branch, it necessary to install the expanded_SR branch of r4ss via |
Two notes on failing github actions:
@Rick-Methot-NOAA do you have a preference on the SPR0 flag used in the test models? I'm not yet familiar with the options and don't know how much difference any would make for the test models. |
Ian, |
Thanks @Rick-Methot-NOAA. |
|
add S-R option 10 for a,b formulation
95be4a1
to
27d4095
Compare
@Rick-Methot-NOAA please review to make sure that everything was implemented in the rebase correctly. For everything but the updated ss3-build.yml workflow I went with the changes that you made in this branch when merge conflicts occurred. |
After going through the rebase I keep getting this error on the build: |
that error must be me. Let me s33 if the ab branch compiles locally. Possible that I had not pushed a fix. |
This branch has been open for a while which made the rebase challenging so it might have been an error introduced there. I should have rebased this branch earlier in the process and rebased it frequently throughout but I didn't know how long this was going to take initially. |
OK. It does compile locally. VS Code says that there are 40 incoming changes from origin and 30 outgoing changes. |
Locally, I pulled in the 40 changes and saved to a new branch. That branch fails to compile because in the ss_param.tpl file there are numerous lines that have lost the required initial indent. |
Well. I did a pull(rebase) and now my local is messed up also. There are many lines where the initial 2 spaces are missing. In SS_param.tpl is seems to occur right after clang-format on. Then elsewhere I see that the {} than delineate a FUNCTION is not indented. |
Sorry about the troubles. I won't touch my local version. I'm guessing that someone more skilled with rebasing or merging could help us sort this out next week. The git history should also all be recoverable from github. |
@iantaylor-NOAA can you make a branch off your untouched local version (maybe even 2 just to have an extra around in case we need it) and publish that, then rick and I can go through the rebase together? |
I just pushed the 191-spawner-recruitment-backup branch. It does not include the "latest update" commit 27d4095 but that should be too hard to add back manually if necessary. |
OK. I have your backup locally and verified that it compiles. I also see this branch with "cherrypick" and don't know what to do with that. |
I just deleted it. Any branch you see created after Ian's just ignore. I'm troubleshooting ways to try to merge things. Ultimately Rick, you and I are going to need to go through certain merge conflicts together because with many of them, you will know what the code should best look like. I'll schedule that when I figure out the best way to proceed. |
switching to rebased branch |
Concisely (20 words or less) describe the issue
create new spawner-recruitment with a,b formulation
Please Link issue(s)
#191
resolves #191 #341 #625
What tests have been done? Upload any model input files created for testing in a zip file, if possible.
produces exact match to SRR=3 when tested without time-varying biology.
What tests/review still need to be done? Who can do it, and by when is it needed (ideally)?
Need to test with time-varying biology then add more output to show consequences of implied steepness changing over time.
Has any new code been documented?
is there an input change for users to Stock Synthesis?
If so, please provide an example of the new inputs needed.
Check which is true. This PR requires:
Describe any changes in r4ss/SS3 manual/SSI that are needed (if not checked):
If changes are needed in the change log, please fill in the table here:
Additional information (optional):