-
Notifications
You must be signed in to change notification settings - Fork 20
revise code and change VBK_seas usage #747
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
base: main
Are you sure you want to change the base?
Conversation
|
I will test with big skate locally to diagnose the run failure |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull request overview
This pull request refactors the growth calculation code in Stock Synthesis, focusing on improving variable naming clarity and revising how seasonal growth adjustments (VBK_seas) are applied. The changes address issues #735 and #156.
Key changes:
- Renamed growth-related variables for clarity (VBK_temp → VBK_work, VBK_temp2 → VBK_by_seas)
- Restructured growth type handling with improved switch statement organization
- Modified VBK_seas usage by removing seasdur(s) multipliers in growth calculations
- Added documentation comments explaining VBK variable purposes
- Removed preprocessor conditionals (#ifdef DO_ONCE) in favor of runtime checks
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
|
@Rick-Methot-NOAA I had copilot review the PR in case there was anything that it might be able to easily identify anything the that might cause the big skate model to fail. There were some suggestions it gave which didn't matter and I closed those but it might be worth looking at some of the other suggestions it made. If they are wrong or you don't agree, feel free to just click the "Resolve conversation" button and they will go away. |
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
|
now investigating the failure with growth time-vary |
e-perl-NOAA
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks good to me in that the tests are now passing. Copilot seems to think that the logic of everything is more consistent than it was.
|
@e-perl-NOAA The Richards and age-specific null values are each 1.0, per the manual. Cessation model (8) is giving unexpected results that need separate attention. Let's leave it out of the current test. |
|
@Rick-Methot-NOAA I have all the run models with growth plots in each of the respective folders (aside from cessation) in this repository. The only thing that I don't have is any sort of table. The values used to make the growth plots are Age_Beg and Len_Beg. I can grab these for males and females or just one sex, etc. or any other values you would like. I just don't know what values and what sort of structure of table would be most useful for you. |
|
I think we need in one text file the following lines from each report.sso file. So all the results that we need will be in one file. I added a line to be the identifier for each run. Growth-1-annual |
|
@Rick-Methot-NOAA And you want this in a text file, not a csv for excel sheet? |
|
space delimited text is read by excel just as easily as csv. |
|
Okay, that output from the report file (as r4ss grabs it) is now in this text file for all of the models. |
Concisely describe what has been changed/addressed in the pull request.
What tests have been done?
Where are the relevant files?
<-- - [x] Test files are in the issue. --> See repo with growth test files
What tests/review still need to be done?
Is there an input change for users to Stock Synthesis?
<-- - [x] No, there was no input change. -->
Additional information (optional).