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

(*)Correct salinity rescaling in OBCs from files #161

Merged
merged 2 commits into from
Jul 12, 2022

Conversation

Hallberg-NOAA
Copy link
Member

Copy scaling factors for tracers in scale_factor_from_name, to accommodate the
possibility that calls to register_segment_tracer might occur before calls to
initialize_segment_data, as they do for temperature and salinity, or afterwards
as they do for many user-defined tracers. This commit addresses the issue with
the dumbbell subdomain test case not exhibiting proper rescaling for salinity as
described in #148. Some incorrect unit
descriptions in comments were also corrected, and the tracer name comparisons
for setting rescaling were made case-insensitive to handle some inconsistently
cased name declarations. All answers without dimensional rescaling are bitwise
identical.

  Copy scaling factors for tracers in scale_factor_from_name, to accommodate the
possibility that calls to register_segment_tracer might occur before calls to
initialize_segment_data, as they do for temperature and salinity, or afterwards
as they do for many user-defined tracers.  This commit addresses the issue with
the dumbbell subdomain test case not exhibiting proper rescaling for salinity as
described in NOAA-GFDL#148.  Some incorrect unit
descriptions in comments were also corrected, and the tracer name comparisons
for setting rescaling were made case-insensitive to handle some inconsistently
cased name declarations.  All answers without dimensional rescaling are bitwise
identical.
@Hallberg-NOAA Hallberg-NOAA added the bug Something isn't working label Jul 8, 2022
@Hallberg-NOAA Hallberg-NOAA linked an issue Jul 8, 2022 that may be closed by this pull request
@codecov
Copy link

codecov bot commented Jul 8, 2022

Codecov Report

Merging #161 (309d159) into dev/gfdl (58d704b) will decrease coverage by 0.00%.
The diff coverage is 27.27%.

@@             Coverage Diff              @@
##           dev/gfdl     #161      +/-   ##
============================================
- Coverage     34.02%   34.01%   -0.01%     
============================================
  Files           259      259              
  Lines         70204    70209       +5     
  Branches      13013    13015       +2     
============================================
  Hits          23884    23884              
- Misses        41822    41826       +4     
- Partials       4498     4499       +1     
Impacted Files Coverage Δ
src/core/MOM_open_boundary.F90 22.96% <27.27%> (-0.05%) ⬇️

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 58d704b...309d159. Read the comment docs.

@kshedstrom
Copy link

Yes, this now works for me. I approve!

@marshallward
Copy link
Member

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

@marshallward marshallward merged commit 43771d8 into NOAA-GFDL:dev/gfdl Jul 12, 2022
@Hallberg-NOAA Hallberg-NOAA deleted the OBC_tracer_scale_fix branch July 16, 2022 09:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Salinity OBC scaling trouble
3 participants