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.

Sign up for GitHub

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

Jump to bottom

Label output for TCs #1003

Merged
merged 5 commits into from
Sep 20, 2019
Merged

Label output for TCs #1003

merged 5 commits into from
Sep 20, 2019

Conversation

adcroft
Copy link
Collaborator

@adcroft adcroft commented Sep 19, 2019

  • Resizes tc3 to 10x8 to be same size as other TCs
  • Labels stdout from each TC and test, e.g.
tc2.dim.t: MOM Date      1/01/02 00:00:00     24: En 2.773492E-04, MaxCFL  0.00014, Mass 1.396373904329E+20, Salt  35.00000000000, Temp  13.34855257895
tc2.dim.t:     Total Energy: 436132E673084A4D  3.8728319662969448E+16
tc2.dim.t:     Total Mass:   1.3963739043293897E+20, Change:  -2.3821105957031250E+02 Error: -2.37768E+02 (-1.7E-18)
tc2.dim.t:     Total Salt:   4.8873086651528632E+18, Change:  -2.7443200000000002E+02 Error: -2.74432E+02 (-5.6E-17)
tc2.dim.t:     Total Heat:   7.3160314141103079E+24, Change:   7.6890406992664855E+19 Error:  1.31315E+08 ( 1.8E-17)

See https://travis-ci.org/adcroft/MOM6/jobs/587225628 for complete example

@adcroft
Reshaped tc3 to be 10x8
404cad0 
- Changed shape of tc3 to be 10x8 to be the same size as
  tc1 and tc2. This will allow us to re-use static memory
  executables.
@adcroft
Inserts labels in front of output lines on tty
2be565f 
- Adds <tc>.<test> to all model output on tty so that the log looks like
  `tc1.dim.z:     Total Energy: 43FF5C2A55A02C54  3.6155642564495884E+19`.
  This helps identify where things are happening or going wrong.
- I tested that a failed executable still is detected (error code is
  passed to make appropriately).
@codecov-io
Copy link

codecov-io commented Sep 19, 2019 •
edited
Loading

Codecov Report

Merging #1003 into dev/gfdl will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##           dev/gfdl    #1003   +/-   ##
=========================================
  Coverage     43.16%   43.16%           
=========================================
  Files           213      213           
  Lines         62355    62355           
=========================================
  Hits          26918    26918           
  Misses        35437    35437

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8546837...8f7cb96. Read the comment docs.

marshallward
marshallward reviewed Sep 19, 2019
View reviewed changes
.testing/Makefile Outdated
# $(3) - report to codecov
# $(4) - Parameter line for MOM_override
# $(5) - Environment for MPIRUN
# $(6) - Number of PEs
Copy link
Collaborator

Choose a reason for hiding this comment

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

I had these defined up in line 205, did you also want to remove the other one?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Ha! I didn't see those comments. It doesn't seem right to have an ifeq with it's own comments in between the description and function. I'll delete mine and move yours down?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Yeah I think that works. You can just delete mine if it's easier (or merge them into a grand unified comment)

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I rearranged and combined. PR has been updated.

@adcroft
Combined duplication comments
033cf83 
- Rearranged and combined inadvertent duplication of comments
- Also fixed two spelling mistakes
@adcroft
Merge branch 'dev/gfdl' into make-label-output
709c0e6
@adcroft
Hide new temporary file
8f7cb96
@marshallward marshallward merged commit 978184a into mom-ocean:dev/gfdl Sep 20, 2019
@marshallward
Copy link
Collaborator

No changes to code so no need for regression tests.

@adcroft adcroft deleted the make-label-output branch December 3, 2019 14:42
@adcroft adcroft mentioned this pull request Dec 17, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@marshallward marshallward marshallward approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@adcroft @codecov-io @marshallward