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 bugs in tracer index in tracer reservoirs #480

Merged
merged 12 commits into from
Oct 12, 2023

Conversation

WenhaoChen89
Copy link

The tracers in the tracer registry (tracer_registry_type), the segment tracer registry (OBC_segment_tracer_type), and the OBC input fields (OBC_segment_data_type) are different. Therefore, they are using different indices and orders. However, in the function update_segment_tracer_reservoirs and tracer advection, all tracers including OBC_segment_tracer_type and OBC_segment_data_typeare looped through the indices and orders of the tracer_registry_type. This pull request is to fix this bug.

@codecov
Copy link

codecov bot commented Sep 7, 2023

Codecov Report

Merging #480 (1e4eda6) into dev/gfdl (bd4c87c) will decrease coverage by 0.02%.
The diff coverage is 0.00%.

❗ Current head 1e4eda6 differs from pull request most recent head 2541f45. Consider uploading reports for the commit 2541f45 to get more accurate results

@@             Coverage Diff              @@
##           dev/gfdl     #480      +/-   ##
============================================
- Coverage     37.79%   37.78%   -0.02%     
============================================
  Files           270      270              
  Lines         78404    78431      +27     
  Branches      14521    14525       +4     
============================================
+ Hits          29636    29638       +2     
- Misses        43364    43389      +25     
  Partials       5404     5404              
Files Coverage Δ
src/user/dyed_channel_initialization.F90 0.00% <0.00%> (ø)
src/user/dyed_obcs_initialization.F90 0.00% <0.00%> (ø)
src/tracer/MOM_tracer_registry.F90 64.12% <0.00%> (-0.41%) ⬇️
src/user/DOME_initialization.F90 0.00% <0.00%> (ø)
src/core/MOM_open_boundary.F90 24.28% <0.00%> (-0.15%) ⬇️
src/tracer/MOM_tracer_advect.F90 58.79% <0.00%> (-0.77%) ⬇️

... and 1 file with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

Copy link

@MJHarrison-GFDL MJHarrison-GFDL left a comment

Choose a reason for hiding this comment

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

Thanks you @WenhaoChen89 for these modifications which allow for the tracer registry and the obc segment tracer registry to function as intended with arbitrary tracer ordering. I agree with the interface modifications as proposed. Given the dependencies involved with other tracer code such as generic_tracers, additional approvals are requested from @nikizadehgfdl

Copy link
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.

I have examined these changes and I am convinced that they are correct.

@marshallward
Copy link
Member

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

Squash-merging due to development commits.

@marshallward
Copy link
Member

Sorry, I think that I accidentally closed this rather than merge it. Handling it now.

@marshallward marshallward merged commit 95d6e93 into NOAA-GFDL:dev/gfdl Oct 12, 2023
10 checks passed
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.

4 participants