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

Main to dev (2024-05-13) #630

Merged
merged 8 commits into from
May 14, 2024
Merged

Main to dev (2024-05-13) #630

merged 8 commits into from
May 14, 2024

Conversation

marshallward
Copy link
Member

Update the contents of mom-ocean#1623 into dev/gfdl.

(This is a bookkeeping PR; the merge will be done externally.)

jiandewang and others added 8 commits March 4, 2024 14:33
This patch clears out many errors detected by Intel Fortran.

Most are false positives from stub functions which would normally be
replaced in production and report unset output.  These variables are now
assigned dummy values in order to pacify the compiler.

The `stat` function in POSIX was incorrectly passing its `buf` object to
the C `stat` function as `intent(in)`, causing the compiler to believe
that the contents were unset.  Oddly, this was already working
correctly, and perhaps warrants further investigation, but it has now
been correctly set to `intent(inout)`.

The `ppoly_*` variables in `check_reconstruction_1d` appear to have been
incorrectly declared as `out`, when they are clearly used as `in` to
validate the values.  This has been corrected.

`register_diag_field` in the ice shelf diag manager was incorrectly
declared and the function appeared to return nothing.  Perhaps this
function was not used for anything.

An IO statement in MOM_open_boundary had a syntax error; this has been
fixed.

`get_dataset` returns a `dataset_type`, so some compilers expect the
stub function to also return a valid `dataset`.  Since the stub
`dataset_type` contains no fields, any locally declared instance should
be sufficient as a return value.
The default values for the database transfer functions were incorrectly
assiged as integer literals, recast to types using real32/64 but
actually corresponding to whatever integer kind equals real32/64.

We now simply assign it a literal value of -1. and rely on the compiler
to handle the recasting.

Although none of these functions were intended to be used, and -1 would
probably be eventually cast into an appropriate real type, it is better
to get this correct.

Thanks to Keith Lindsay for suggesting this change.
Replace db array default values with real literals
Copy link

codecov bot commented May 13, 2024

Codecov Report

Attention: Patch coverage is 0% with 37 lines in your changes are missing coverage. Please review.

Project coverage is 37.19%. Comparing base (5e34f48) to head (129e1bd).
Report is 36 commits behind head on dev/gfdl.

Files Patch % Lines
...c/external/GFDL_ocean_BGC/generic_tracer_utils.F90 0.00% 19 Missing ⚠️
...ernal/database_comms/database_client_interface.F90 0.00% 14 Missing ⚠️
src/framework/MOM_io_file.F90 0.00% 2 Missing ⚠️
src/core/MOM_open_boundary.F90 0.00% 1 Missing ⚠️
src/ice_shelf/MOM_ice_shelf_diag_mediator.F90 0.00% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##           dev/gfdl     #630      +/-   ##
============================================
+ Coverage     37.12%   37.19%   +0.06%     
============================================
  Files           271      541     +270     
  Lines         80794   161145   +80351     
  Branches      15082    30005   +14923     
============================================
+ Hits          29998    59938   +29940     
- Misses        45195    90030   +44835     
- Partials       5601    11177    +5576     

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

@marshallward
Copy link
Member Author

Gaea regression: https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/jobs/127929 ✔️

(diag diff is due to updates during regression testing)

@marshallward marshallward merged commit e253883 into dev/gfdl May 14, 2024
20 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