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

Rotation bugfixes #584

Merged
merged 1 commit into from
Mar 16, 2024
Merged

Conversation

marshallward
Copy link
Member

This patch contains several bugfixes associated with the rotational grid testing.

The following checksums are declared as scalar pairs, rather than vectors:

  • eta_[uv] (in porous barrier)
  • por_face_area[UV]
  • por_layer_width[UV]
  • Ray_[uv] (Rayleigh drag velocity)

Fluxes and surface fields are now permitted to contain tracer fluxes (tr_fluxes) when rotation is enabled. The fields are retained in their unrotated form, since these are accessed and handled outside of MOM6.

The rotated p_surf_SSH pointer in forces now correctly points to either p_surf or p_surf_full.

read_netcdf_nc() now correctly uses the unrotated horizontal index struct HI, used to access the contents of the file. Previously, it was using the model HI, which may be rotated.

Reading chlorophyll with time_interp_external now uses rotation to correctly fetch its output.

NOTE: This could be cleaned up so that the rotation details are hidden from users, but there are some unresolved issues around how to approach this.

Copy link

codecov bot commented Mar 15, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 37.14%. Comparing base (a23c7d8) to head (611f8cd).

Additional details and impacted files
@@             Coverage Diff              @@
##           dev/gfdl     #584      +/-   ##
============================================
- Coverage     37.14%   37.14%   -0.01%     
============================================
  Files           271      271              
  Lines         80727    80736       +9     
  Branches      15061    15064       +3     
============================================
- Hits          29989    29988       -1     
- Misses        45142    45150       +8     
- Partials       5596     5598       +2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

This patch contains several bugfixes associated with the rotational grid
testing.

The following checksums are declared as scalar pairs, rather than
vectors:

* eta_[uv] (in porous barrier)
* por_face_area[UV]
* por_layer_width[UV]
* Ray_[uv] (Rayleigh drag velocity)

Fluxes and surface fields are now permitted to contain tracer fluxes
(tr_fluxes) when rotation is enabled.  The fields are retained in their
unrotated form, since these are accessed and handled outside of MOM6.

The rotated p_surf_SSH pointer in forces now correctly points to either
p_surf or p_surf_full.

read_netcdf_nc() now correctly uses the unrotated horizontal index
struct HI, used to access the contents of the file.  Previously, it was
using the model HI, which may be rotated.

Reading chlorophyll with time_interp_external now uses rotation to
correctly fetch its output.

NOTE: This could be cleaned up so that the rotation details are hidden
from users, but there are some unresolved issues around how to approach
this.
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 agree with all of these changes, and they have passed pipeline testing at https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/pipelines/22631.

@Hallberg-NOAA Hallberg-NOAA merged commit 4fd0162 into NOAA-GFDL:dev/gfdl Mar 16, 2024
12 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.

2 participants