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

Esmg docs #57

Merged
merged 91 commits into from
Jan 26, 2022
Merged

Esmg docs #57

merged 91 commits into from
Jan 26, 2022

Conversation

kshedstrom
Copy link

Updated copyright years, a little more vertical mixing documentation.

pjpegion and others added 30 commits May 5, 2020 08:22
@pjpegion
Merge pull request #1 from NOAA-EMC/dev/emc
671c714 
update with NOAA-EMC fork
additions for stochastic physics and ePBL perts
182ef34
updates from dev/emc
c2aa2a8
@pjpegion
Merge pull request #8 from NOAA-EMC/dev/emc
3cad1ba 
update my fork
@pjpegion
Merge branch 'ocn_stoch' into dev/emc_merge
0a62737
@pjpegion
Merge pull request #9 from pjpegion/dev/emc_merge
9896d61 
Update ocn_stoch branch with dev/emc
@pjpegion
Merge pull request #11 from NOAA-EMC/dev/emc
cd06356 
update with EMC's fork
@pjpegion
cleanup of code and enhancement of ePBL perts
7de295c
@pjpegion
Update MOM_diabatic_driver.F90
7212400 
remove conflict with dev/emc
@pjpegion
Update MOM_diabatic_driver.F90
bd477a9 
further resolve conflict
@pjpegion
Merge pull request #12 from pjpegion/dev/emc
167a62e 
merge dev/emc into ocean stochastic branch
@pjpegion
Update MOM_diabatic_driver.F90
0c15f4c 
put id_sppt_wts, etc back.
@pjpegion
add stochy_restart writing to mom_cap
a2a374b
@pjpegion
additions for stochy restarts
25ed5ef
@pjpegion
clean up debug statements
4bd9b9e
@pjpegion
Merge remote-tracking branch 'upstream/dev/emc' into dev/emc
1dc0f4f
@pjpegion
Merge branch 'dev/emc' into ocn_stoch
2cba995
@pjpegion
Merge pull request #13 from NOAA-EMC/dev/emc
040e1f1 
Merge with EMC fork
@pjpegion
clean up code
1d7ffa3
@pjpegion
fix non stochastic ePBL calculation
6bb9d0b
@pjpegion
Merge remote-tracking branch 'upstream/dev/emc' into ocn_stoch
600ebf9
@pjpegion
re-write of stochastic code to remove CPP directives
1727d9a
@pjpegion
remove blank link in MOM_diagnostics
5443f8e
@pjpegion
clean up MOM_domains
80f9f44
@pjpegion
Merge remote-tracking branch 'upstream/dev/emc' into ocn_stoch
85023f8
@pjpegion
make stochastics optional
0b99c1f
@pjpegion
correct coupled_driver/ocean_model_MOM.F90 and other cleanup
6e3ea1b
@pjpegion
clean up of code for MOM6 coding standards
eb88219
@pjpegion
remove stochastics container
d984a7e
@pjpegion
place stochastic array in fluxes container and make SPPT specific arr…
b8d9888 
…ays allocatable
kshedstrom and others added 22 commits October 14, 2021 09:27
@kshedstrom
Merge remote-tracking branch 'gfdl/dev-gfdl-main-candidate-2021-10-04…
9c8af0b 
…' into dev/esmg
@kshedstrom
Merge remote-tracking branch 'gfdl/dev/gfdl' into dev/esmg
9c0651f
@jiandewang
Merge remote-tracking branch 'GFDL/main' into feature/update-to-GFDL-…
fd02017 
…20211019
@kshedstrom
Merge remote-tracking branch 'gfdl/dev/gfdl' into dev/esmg
3fd09aa
@kshedstrom
Merge branch 'esmg-docs' of github.com:ESMG/MOM6 into esmg-docs
d5ac205
@jiandewang
Merge pull request #78 from jiandewang/feature/update-to-GFDL-20211019
90d5961 
update to MOM6 main branch 20211019 commit
@jiandewang
correction on type in directory name
8e80a13
@kshedstrom
Merge remote-tracking branch 'jiande/EMC-stochastic-candidate-2021102…
da0ed0d 
…8' into dev/esmg
@kshedstrom
Merge remote-tracking branch 'gfdl/dev/gfdl' into dev/esmg
3c69c06
@kshedstrom
Added some to vertical viscisity doc.
8b65f4a
@kshedstrom
Merge branch 'esmg-docs' of github.com:ESMG/MOM6 into esmg-docs
3d4e4cf
@kshedstrom
Merge remote-tracking branch 'gfdl/dev/gfdl' into dev/esmg
a97cbed
@kshedstrom
Merge remote-tracking branch 'gfdl/dev/gfdl' into dev/esmg
fd29765
@adcroft
Cleaned up whitespace leftover from porous topomerge.
d73870f 
- Spacing within expressions was uneven and made multiplation look like
  POW functions. Leftover from merging #3.
- No answer changes.
@adcroft
Fix out-of-bounds k index in PPM flux
4f2b1e0 
- An errant use of the porous face area led to an out-of-bounds k-index
  reported in #19.
- Closes #19
@kshedstrom
Merge remote-tracking branch 'adcroft/fix-issue-19-porous-face-OOB' i…
b29cef3 
…nto dev/esmg
@kshedstrom
Merge remote-tracking branch 'gfdl/dev/gfdl' into dev/esmg
dc491a8
@kshedstrom
Adding Channel drag figure
a325440
@kshedstrom
Merge branch 'dev/esmg' into esmg-docs
6417769
@kshedstrom
Take cite out of figure caption.
f9942e9
@kshedstrom
Copyright year 2022
7f44791
@kshedstrom
Merge remote-tracking branch 'gfdl/dev/gfdl' into esmg-docs
d256fdb
@codecov
Copy link

codecov bot commented Jan 24, 2022

Codecov Report

Merging #57 (678a03e) into dev/gfdl (df46be4) will not change coverage.
The diff coverage is n/a.

❗ Current head 678a03e differs from pull request most recent head d256fdb. Consider uploading reports for the commit d256fdb to get more accurate results
Impacted file tree graph

@@            Coverage Diff            @@
##           dev/gfdl      #57   +/-   ##
=========================================
  Coverage     28.82%   28.82%           
=========================================
  Files           242      242           
  Lines         71495    71495           
=========================================
  Hits          20612    20612           
  Misses        50883    50883
Impacted Files Coverage Δ
src/parameterizations/vertical/MOM_CVMix_conv.F90 9.47% <ø> (ø)
...c/parameterizations/vertical/MOM_set_viscosity.F90 47.41% <ø> (ø)

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 df46be4...d256fdb. Read the comment docs.

@marshallward
Copy link
Member

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

@marshallward marshallward merged commit 65998cd into NOAA-GFDL:dev/gfdl Jan 26, 2022
@marshallward
Copy link
Member

@kshedstrom I squash-merged this since it had some tangled history (possibly due to some rebases of PRs which you independently merged into the ESMG branch). Hopefully no issues on your end, but you may need to revise your history.

This was referenced Jan 29, 2022
Closed
Merged
@Hallberg-NOAA Hallberg-NOAA added the documentation Improvements or additions to documentation label Feb 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adcroft adcroft adcroft approved these changes

Assignees
No one assigned
Labels
documentation Improvements or additions to documentation
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@kshedstrom @marshallward @adcroft @Hallberg-NOAA @pjpegion @jiandewang