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

*Use tv%SpV_avg in non-Boussinesq regridding #421

Merged
merged 2 commits into from
Aug 9, 2023

Conversation

Hallberg-NOAA
Copy link
Member

Use SpV_avg in both hybgen_unmix and regridding_main to estimate the nominal ocean bottom depth in thickness units when in fully non-Boussinesq mode. This change eliminates certain dependencies on the Boussinesq reference density via GV%Z_to_H. Also added a call to calc_derived_thermo in ALE_regrid_accelerated that is necessary for the specific volume to be updated, along with tests for the validity of the specific volume with the 1-point halos that are currently used with ALE regridding and remapping.

Also, use the total thickness place of the nominal depth in build_grid_rho and build_grid_sigma when in fully non-Boussinesq mode. This is mathematically equivalent but changes answers at roundoff.

All answers are bitwise identical in Boussinesq mode, but ALE-based solutions change in fully non-Boussinesq mode with this commit.

@Hallberg-NOAA Hallberg-NOAA added enhancement New feature or request answer-changing A change in results (actual or potential) labels Jul 21, 2023
@codecov
Copy link

codecov bot commented Jul 21, 2023

Codecov Report

Merging #421 (64f575b) into dev/gfdl (8f7cc0e) will decrease coverage by 0.02%.
The diff coverage is 8.88%.

❗ Current head 64f575b differs from pull request most recent head 0ac2cfd. Consider uploading reports for the commit 0ac2cfd to get more accurate results

@@             Coverage Diff              @@
##           dev/gfdl     #421      +/-   ##
============================================
- Coverage     38.07%   38.05%   -0.02%     
============================================
  Files           269      269              
  Lines         76987    77024      +37     
  Branches      14209    14221      +12     
============================================
+ Hits          29310    29314       +4     
- Misses        42364    42394      +30     
- Partials       5313     5316       +3     
Files Changed Coverage Δ
src/ALE/MOM_ALE.F90 44.26% <0.00%> (-0.10%) ⬇️
src/ALE/MOM_hybgen_unmix.F90 0.00% <0.00%> (ø)
src/ALE/MOM_regridding.F90 28.38% <17.39%> (-0.44%) ⬇️

... and 1 file with indirect coverage changes

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

  Use SpV_avg in both hybgen_unmix and regridding_main to estimate the nominal
ocean bottom depth in thickness units when in fully non-Boussinesq mode.  This
change eliminates certain dependencies on the Boussinesq reference density via
GV%Z_to_H.  Also added a call to calc_derived_thermo in ALE_regrid_accelerated
that is necessary for the specific volume to be updated, along with tests for
the validity of the specific volume with the 1-point halos that are currently
used with ALE regridding and remapping.

  Also, use the total thickness place of the nominal depth in build_grid_rho and
build_grid_sigma when in fully non-Boussinesq mode.  This is mathematically
equivalent but changes answers at roundoff.

  All answers are bitwise identical in Boussinesq mode, but ALE-based solutions
change in fully non-Boussinesq mode with this commit.
mesg = "insufficiently large SpV_avg halos of width 0 but 1 is needed."
endif
call MOM_error(FATAL, "Regridding_main called in fully non-Boussinesq mode with "//trim(mesg))
endif
Copy link
Member

Choose a reason for hiding this comment

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

These two if blocks could be merged.

@marshallward
Copy link
Member

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

@marshallward marshallward merged commit 46c5262 into NOAA-GFDL:dev/gfdl Aug 9, 2023
10 checks passed
@Hallberg-NOAA Hallberg-NOAA deleted the nonBous_regridding branch September 27, 2023 16:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
answer-changing A change in results (actual or potential) enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants