Skip to content

Merge dev/cpt as of 14 Feb 2022#69

Merged
Hallberg-NOAA merged 7 commits into
NOAA-GFDL:dev/gfdlfrom
gustavo-marques:merge_dev_gfdl_14feb2022
Feb 20, 2022
Merged

Merge dev/cpt as of 14 Feb 2022#69
Hallberg-NOAA merged 7 commits into
NOAA-GFDL:dev/gfdlfrom
gustavo-marques:merge_dev_gfdl_14feb2022

Conversation

@gustavo-marques
Copy link
Copy Markdown
Member

Adding a few contribution from dev/cpt that have not been merged yet:

  • Fix units of the *_visc_rem terms (7868fdd);
  • Remove hard-wired parameter in adjustEtaToFitBathymetry(70056f4).

…6nov2021

(*) Merge dev/gfdl as of 06 Nov 2021
Subroutine adjustEtaToFitBathymetry had a hard-wired parameter
(hTolerance = 0.1) controlling the tolerance when adjusting the
thickness to fit the bathymetry. This patch adds an user-controlled
parameter (THICKNESS_TOLERANCE), which replaces hTolerance.
THICKNESS_TOLERANCE is only activated when ADJUST_THICKNESS=True.
…d_tolerance2

Remove hard-wired parameter in adjustEtaToFitBathymetry
@codecov
Copy link
Copy Markdown

codecov Bot commented Feb 14, 2022

Codecov Report

Merging #69 (069f57a) into dev/gfdl (32e1ecf) will decrease coverage by 0.00%.
The diff coverage is 9.09%.

❗ Current head 069f57a differs from pull request most recent head eda9554. Consider uploading reports for the commit eda9554 to get more accurate results

Impacted file tree graph

@@             Coverage Diff              @@
##           dev/gfdl      #69      +/-   ##
============================================
- Coverage     29.00%   29.00%   -0.01%     
============================================
  Files           244      244              
  Lines         71880    71885       +5     
============================================
+ Hits          20851    20852       +1     
- Misses        51029    51033       +4     
Impacted Files Coverage Δ
src/initialization/MOM_state_initialization.F90 19.83% <9.09%> (+<0.01%) ⬆️

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 32e1ecf...eda9554. Read the comment docs.

Copy link
Copy Markdown
Member

@Hallberg-NOAA Hallberg-NOAA left a comment

Choose a reason for hiding this comment

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

This commit is very nice improvement to the code! It has passed the TC testing, and it has passed the pipeline testing at https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/pipelines/14806.

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