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

Oda use framework #1291

Merged
merged 8 commits into from
Jan 20, 2021
Merged

Conversation

MJHarrison-GFDL
Copy link
Contributor

@MJHarrison-GFDL MJHarrison-GFDL commented Jan 15, 2021

*This commit removes dependencies within the ocean data assimilation
driver on FMS infrastructure code. Additionally, the increment to the assimilation
time is made before the DA call instead of after. This will change answers for test
cases which are using the DA interfaces, but aligns answers with SPEAR.

@codecov-io
Copy link

Codecov Report

Merging #1291 (776a815) into dev/gfdl (0bd16f4) will decrease coverage by 0.00%.
The diff coverage is 0.00%.

Impacted file tree graph

@@             Coverage Diff              @@
##           dev/gfdl    #1291      +/-   ##
============================================
- Coverage     45.82%   45.82%   -0.01%     
============================================
  Files           227      227              
  Lines         71552    71558       +6     
============================================
  Hits          32791    32791              
- Misses        38761    38767       +6     
Impacted Files Coverage Δ
src/core/MOM.F90 65.70% <0.00%> (ø)
src/framework/MOM_coms.F90 68.38% <ø> (ø)
src/framework/MOM_domains.F90 39.31% <0.00%> (-0.44%) ⬇️
src/ocean_data_assim/MOM_oda_driver.F90 0.00% <0.00%> (ø)

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 0bd16f4...776a815. Read the comment docs.

Copy link
Collaborator

@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.

These changes will be acceptable after the conflicts have been resolved.

Resolve conflicts between ODA use framework mom-ocean#1291 and dev/gfdl
@Hallberg-NOAA
Copy link
Collaborator

The updated PR has passed pipeline testing at https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/pipelines/11888.

@Hallberg-NOAA Hallberg-NOAA merged commit 263d355 into mom-ocean:dev/gfdl Jan 20, 2021
@MJHarrison-GFDL MJHarrison-GFDL deleted the oda_use_framework branch December 29, 2021 19:59
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.

3 participants