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 ALE sponge diagnostics #188

Merged
merged 18 commits into from
Aug 19, 2022

Conversation

WenhaoChen89
Copy link

This PR is to fix the ALE sponge diagnostics.

In the module MOM_ALE_sponge, the ALE sponge diagnostics of tracers is initialized with a fixed order, i.e., the first one is 'temperature' and the second one is 'salinity' (line 604-609 in subroutine init_ALE_sponge_diags). However, when the data is posted for the diagnostics, it follows the order of how tracer sponges are set up (line 961-997 in subroutine apply_ALE_sponge).

The fix includes:

  1. The set_up_ALE_sponge_field is modified to include the tracer details diagnostics registration, namely name, long name, and unit.
  2. The type p2d is changed to include three extra fields, name, long name, and unit.
  3. The init_ALE_sponge_diags is modified to initialize the ALE sponges of tracers in the order of how set_up_ALE_sponge_field is called.

@codecov
Copy link

codecov bot commented Aug 8, 2022

Codecov Report

Merging #188 (059d8ae) into dev/gfdl (1f1b8ad) will decrease coverage by 0.00%.
The diff coverage is 27.50%.

@@             Coverage Diff              @@
##           dev/gfdl     #188      +/-   ##
============================================
- Coverage     37.22%   37.22%   -0.01%     
============================================
  Files           261      261              
  Lines         72319    72334      +15     
  Branches      13533    13533              
============================================
+ Hits          26921    26925       +4     
- Misses        40407    40417      +10     
- Partials       4991     4992       +1     
Impacted Files Coverage Δ
src/tracer/RGC_tracer.F90 0.00% <0.00%> (ø)
src/user/DOME2d_initialization.F90 0.00% <0.00%> (ø)
src/user/ISOMIP_initialization.F90 0.00% <0.00%> (ø)
src/user/RGC_initialization.F90 0.00% <0.00%> (ø)
src/user/dense_water_initialization.F90 0.00% <0.00%> (ø)
src/user/dumbbell_initialization.F90 0.00% <0.00%> (ø)
src/initialization/MOM_state_initialization.F90 21.65% <50.00%> (ø)
src/parameterizations/vertical/MOM_ALE_sponge.F90 21.64% <56.25%> (+0.32%) ⬆️

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

@WenhaoChen89 WenhaoChen89 changed the title Fix ALE Sponge Diagnostics Fix ALE sponge diagnostics Aug 15, 2022
@marshallward
Copy link
Member

I don't see much structure to these commits, so I will do a squash-merge.

Copy link
Member

@marshallward marshallward left a comment

Choose a reason for hiding this comment

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

A minor style change removing spaces around = in optional. function arguments

Sorry, disregard this comment, was trying to use the editor...

@marshallward
Copy link
Member

@WenhaoChen89 I made a minor change to this PR fixing a style issue (removal of spaces around operators inside function arguments).

(I admit that I also just wanted to try the in-browser editor and see if it would work 😅)

@marshallward
Copy link
Member

marshallward commented Aug 19, 2022

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

@marshallward
Copy link
Member

Gaea regression (v2): https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/pipelines/16476 ✔️

@marshallward marshallward merged commit a22f691 into NOAA-GFDL:dev/gfdl Aug 19, 2022
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