Skip to content

Comments

fix(report:47): Adds space#305

Merged
k-doering-NOAA merged 2 commits intomainfrom
fix-sexratioreport
May 5, 2022
Merged

fix(report:47): Adds space#305
k-doering-NOAA merged 2 commits intomainfrom
fix-sexratioreport

Conversation

@kellijohnson-NOAA
Copy link
Contributor

What issue(s) does this PR address? Describe and add issue numbers, if applicable.

No space in report:47 between Mat_F_natage and sex_ratio
as reported by @hgerritsen and @iagomosqueira via email.
No issue was filed.

What tests have been done? Upload any model input files created for testing in a zip file, if possible.

Compiled the fix locally and reran the input files
provided by @hgerritsen.
Old output looked like

in_endyr_with_CV=f(LAA)
Seas Morph Bio_Pattern Sex Settlement Platoon int_Age Real_Age Age_Beg Age_Mid M Len_Beg Len_Mid SD_Beg SD_Mid Wt_Beg Wt_Mid Len_Mat Age_Mat Mat*Fecund Mat_F_wtatage Mat_F_Natage sex_ratio  Len:_1 SelWt:_1 RetWt:_1 Len:_2 SelWt:_2 RetWt:_2 Len:_3 SelWt:_3 RetWt:_3 Len:_4 SelWt:_4 RetWt:_4
1 1 1 1 1 1 0 0 0 0.5 1 2 7.25 0.488 1.769 0.00045239 0.00726627 9.14165e-05 1 0 4.1357e-08 9.14165e-050.5  11.2114 0.0228134 0.0270803 11.0197 0.021725 0.0249928 8.46216 0.0107888 0.0107888 10.3363 0.0186514 0.0186514
1 1 1 1 1 1 1 1 1 1.5 0.72 12.5 18.2372 3.05 4.32054 0.0358695 0.1081 0.000423436 1 0 2.035e-05 0.0004234360.5  18.9061 0.115601 0.300048 18.877 0.115244 0.25438 18.7087 0.113465 0.113465 19.2836 0.121024 0.121024
1 1 1 1 1 1 2 2 2 2.5 0.44 23.6918 28.8778 5.45306 6.46159 0.231866 0.412542 0.0028412 1 0.00105532 0.00105532 0.00284120.500309  28.9676 0.414439 0.72752 28.9637 0.414352 0.715147 28.9464 0.414014 0.414014 29.0429 0.41631 0.41631

New output looks like

Biology_at_age_in_endyr report:47
in_endyr_with_CV=f(LAA)
Seas Morph Bio_Pattern Sex Settlement Platoon int_Age Real_Age Age_Beg Age_Mid M Len_Beg Len_Mid SD_Beg SD_Mid Wt_Beg Wt_Mid Len_Mat Age_Mat Mat*Fecund Mat_F_wtatage Mat_F_Natage sex_ratio  Len:_1 SelWt:_1 RetWt:_1 Len:_2 SelWt:_2 RetWt:_2 Len:_3 SelWt:_3 RetWt:_3 Len:_4 SelWt:_4 RetWt:_4
1 1 1 1 1 1 0 0 0 0.5 1 2 7.25 0.488 1.769 0.00045239 0.00726627 9.14165e-05 1 0 4.1357e-08 9.14165e-05 0.5  11.2157 0.0228242 0.0269853 11.0225 0.0217266 0.0248688 8.3892 0.0105617 0.0105617 10.5443 0.0196706 0.0196706
1 1 1 1 1 1 1 1 1 1.5 0.72 12.5 18.2372 3.05 4.32054 0.0358695 0.1081 0.000423436 1 0 2.035e-05 0.000423436 0.5  18.8997 0.115516 0.216139 18.87 0.115151 0.250957 18.773 0.11437 0.11437 19.2568 0.120582 0.120582
1 1 1 1 1 1 2 2 2 2.5 0.44 23.6918 28.8778 5.45306 6.46159 0.231866 0.412542 0.0028412 1 0.00105534 0.00105534 0.0028412 0.501151  28.9665 0.414414 0.515485 28.9625 0.414325 0.715421 28.9596 0.414334 0.414334 29.0348 0.416094 0.416094

What tests/review still need to be done? Who can do it, and by when is it needed (ideally)?

Confirm that automated tests pass.

Check which is true. This PR requires:

  • no further changes to r4ss
  • no further changes to the manual
  • no further changes to SSI (the SS3 GUI)
  • no further changes to the stock synthesis change log (new features, bug reports)

Describe any changes in r4ss/SS3 manual/SSI/change log that are needed (if not checked):

I am uncertain if this would actually need to go in the change log?

No space in report:47 between Mat_F_natage and sex_ratio
as reported by @hgerritsen and @iagomosqueira
@k-doering-NOAA k-doering-NOAA added this to the 3.30.20 milestone May 5, 2022
Copy link
Contributor

@k-doering-NOAA k-doering-NOAA left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @kellijohnson-NOAA for fixing this! I confirmed using the Simple model, too that this change fixes the space issue.

Also, some accidental .sso files snuck into the commit; I pushed a commit to delete them so the only changes in the PR are to SS_write_report.tpl.

This is ready to merge in; I think I'll let @Rick-Methot-NOAA merge it in when ready.

@kellijohnson-NOAA
Copy link
Contributor Author

ahh, I should of checked and not just blindly done git add -A. Thank you @k-doering-NOAA for cleaning up my mess. And, @Rick-Methot-NOAA feel free to do a squash and merge to clean up the commit history or I can clean it up locally to make it just one commit if you want.

@Rick-Methot-NOAA
Copy link
Collaborator

This looks good. I'm deeply into another development branch right now, so will leave the cleanup and merging to Kelli and Kathryn

@k-doering-NOAA k-doering-NOAA merged commit 4c92b31 into main May 5, 2022
@k-doering-NOAA k-doering-NOAA deleted the fix-sexratioreport branch May 5, 2022 15:57
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.

3 participants