Esmg docs

[kshedstrom]

Some more vertical mixing documentation.

Also updated the copyright notice to include 2021.

[codecov]

Codecov Report

Merging #1510 (71d9ba9) into dev/gfdl (ce5595f) will decrease coverage by 0.00%.
The diff coverage is 100.00%.

❗ Current head 71d9ba9 differs from pull request most recent head 5adf763. Consider uploading reports for the commit 5adf763 to get more accurate results

@@             Coverage Diff              @@
##           dev/gfdl    #1510      +/-   ##
============================================
- Coverage     29.07%   29.06%   -0.01%     
============================================
  Files           239      237       -2     
  Lines         71678    71643      -35     
============================================
- Hits          20837    20823      -14     
+ Misses        50841    50820      -21     

Impacted Files	Coverage Δ
...arameterizations/vertical/MOM_bulk_mixed_layer.F90	32.11% <ø> (ø)
...c/parameterizations/vertical/MOM_energetic_PBL.F90	45.60% <ø> (ø)
src/core/MOM_barotropic.F90	37.10% <100.00%> (-0.16%)	⬇️
config_src/external/drifters/MOM_particles.F90
...nfig_src/external/drifters/MOM_particles_types.F90
src/core/MOM.F90	59.00% <0.00%> (+0.03%)	⬆️
src/parameterizations/lateral/MOM_MEKE.F90	50.51% <0.00%> (+0.29%)	⬆️

---

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 ce5595f...5adf763. Read the comment docs.

[marshallward]

Rebased Gaea regression: https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/pipelines/13773

[marshallward]

@kshedstrom Your last commit undid some of the recent patches, so I am going to remove it in the rebase.

That is OK with you, right?

[marshallward]

Also, @adcroft pointed out that you should rebase and remove this commit from your PR, or we'll have to continuously remove it from every submission.

Can you do a git rebase -i dev/gfdl and clean up these commits?

[kshedstrom]

Sorry, sorry, I'm trying to get better at this. I think it should work now, yes? I don't think a rebase is a good idea now that I've pushed things, is it?

[marshallward]

It's all good, nothing that we can't sort out :).

The issue is commit 71d9ba9 which removes the older content. Your PR includes commits which both add and remove this code. We already have the commits which add the content, but not your removal.

If we merge this PR, then it will skip the part that adds code (because we already did it), but will apply the part which removes the code. If we can remove that final commit, then there is no problem.

From our perspective (i.e. dev/gfdl), there is no danger to removing this commit, because we have not seen it yet. We can reshape the commits in this PR any way that you like. git rebase is one way to do that.

But if this commit is already a part of your main branch, then that would require changing your history. If that's a problem for you, then we can talk about some options. Worst case is we just re-add the content in yet another commit, but let's try to avoid that.

[kshedstrom]

Had to do a "git push -f" to get it to not include that unwanted commit. It really wants to hang onto stuff!

[marshallward]

Yes, yes... feel the power of the --force, embrace the dark side. ⚡

Thanks for doing that, I will try to get this in ASAP.

[marshallward]

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

Parameter update required due to a typo fix.