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

Fix non-standard white space #109

Merged
merged 3 commits into from
Apr 14, 2022

Conversation

Hallberg-NOAA
Copy link
Member

Made widespread corrections to indentation and other white space issues to
conform to the MOM6 standards, as documented in the white space section of the
MOM6 style guide, at https://github.com/mom-ocean/MOM6/wiki/Code-style-guide.

  • MOM6 code uses a 2-point indent scheme.

  • There should be a space around all assignment (" = ") operators.

  • The names of optional arguments do not use whitespace, to differentiate them
    from assignments.

  • There is a space around the semicolons for stacked enddo statements.

After this change, greping for '^ [a-zA-Z]', '^ [a-zA-Z]' or '^ [a-zA-Z]'
does not find any lines in the MOM6 src or config_src/infra code. All answers
and output are bitwise identical.

  Made widespread corrections to indentation and other white space issues to
conform to the MOM6 standards, as documented in the white space section of the
MOM6 style guide, at https://github.com/mom-ocean/MOM6/wiki/Code-style-guide.

- MOM6 code uses a 2-point indent scheme.

- There should be a space around all assignment (" = ") operators.

- The names of optional arguments do not use whitespace, to differentiate them
  from assignments.

- There is a space around the semicolons for stacked enddo statements.

After this change, greping for '^ [a-zA-Z]', '^   [a-zA-Z]' or '^     [a-zA-Z]'
does not find any lines in the MOM6 src or config_src/infra code.  All answers
and output are bitwise identical.
@codecov
Copy link

codecov bot commented Apr 11, 2022

Codecov Report

Merging #109 (dc60cca) into dev/gfdl (d729c67) will increase coverage by 0.00%.
The diff coverage is 6.85%.

@@            Coverage Diff            @@
##           dev/gfdl     #109   +/-   ##
=========================================
  Coverage     28.76%   28.76%           
=========================================
  Files           248      248           
  Lines         72968    72967    -1     
=========================================
  Hits          20990    20990           
+ Misses        51978    51977    -1     
Impacted Files Coverage Δ
config_src/infra/FMS1/MOM_domain_infra.F90 37.76% <0.00%> (ø)
src/ALE/MOM_hybgen_remap.F90 0.00% <0.00%> (ø)
src/ALE/MOM_remapping.F90 45.97% <ø> (ø)
src/core/MOM_barotropic.F90 37.70% <ø> (ø)
src/core/MOM_forcing_type.F90 42.68% <ø> (ø)
src/diagnostics/MOM_diagnostics.F90 75.57% <0.00%> (ø)
src/equation_of_state/MOM_EOS_NEMO.F90 0.00% <ø> (ø)
src/equation_of_state/MOM_TFreeze.F90 0.00% <ø> (ø)
src/framework/MOM_diag_mediator.F90 54.40% <ø> (ø)
src/framework/MOM_domains.F90 50.84% <ø> (ø)
... and 26 more

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 d729c67...dc60cca. Read the comment docs.

@marshallward
Copy link
Member

Gaea regression: https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/pipelines/15237 ✔️

Rebase is not possible, but I think squash-merge is OK here since the second commit looks very minor.

@marshallward marshallward merged commit f54338a into NOAA-GFDL:dev/gfdl Apr 14, 2022
@Hallberg-NOAA Hallberg-NOAA deleted the whitespace_cleanup branch July 16, 2022 10:08
marshallward pushed a commit that referenced this pull request Mar 2, 2023
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