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

Resolution to Issue #336 - updated nc_check #587

Merged
merged 4 commits into from
Dec 13, 2023

Conversation

c-merchant
Copy link
Collaborator

@c-merchant c-merchant commented Dec 2, 2023

Description:

This PR replaces utilities_mod::nc_check with netcdf_utilities_mod::nc_check in:
models/mpas_atm/mpas_dart_obs_preprocess.f90
models/mpas_atm/update_bc.f90
models/wrf_hydro/create_identity_streamflow_obs.f90
assimilation_code/programs/compute_error/compute_error.f90
observations/forward_operators/obs_def_GRACE_mod.f90
observations/obs_converters/utilities/obs_seq_utilities_mod.f90
observations/obs_converters/USGS/convert_streamflow.f90
models/pe2lyr/model_mod.f90
models/mpas_ocn/model_mod_check.f90
models/pe2lyr/model_mod.f90
models/mpas_ocn/model_mod_check.f90
models/am2/model_mod.f90
models/forced_barot/obs/obs_mod.f90
models/NCOMMAS/model_mod.f90
models/rose/model_mod.f90

Fixes issue

fixes #336

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation update

Documentation changes needed?

  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.

Tests

Please describe any tests you ran to verify your changes.
I compiled DART and ran ./quickbuild.sh for Lorenz-63

Checklist for merging

  • Updated changelog entry
  • Documentation updated
  • Update conf.py

Checklist for release

  • Merge into main
  • Create release from the main branch with appropriate tag
  • Delete feature-branch

Testing Datasets

  • Dataset needed for testing available upon request
  • Dataset download instructions included
  • No dataset needed

@hkershaw-brown
Copy link
Member

Thanks for this, I've not reviewed this closely, but one thing that is missing from the pull request is to
remove the nc_check subroutine from utilities_mod.f90

https://github.com/c-merchant/DART/blob/c8b8d49ded09b472e5bd1cfeeeb8a9db387a40ac/assimilation_code/modules/utilities/utilities_mod.f90#L1326-L1329

@hkershaw-brown hkershaw-brown self-requested a review December 4, 2023 20:13
Copy link
Member

@hkershaw-brown hkershaw-brown left a comment

Choose a reason for hiding this comment

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

Thanks for this, I've not reviewed this closely, but one thing that is missing from the pull request is to
remove the nc_check subroutine from utilities_mod.f90

https://github.com/c-merchant/DART/blob/c8b8d49ded09b472e5bd1cfeeeb8a9db387a40ac/assimilation_code/modules/utilities/utilities_mod.f90#L1326-L1329

Copy link
Contributor

@mjs2369 mjs2369 left a comment

Choose a reason for hiding this comment

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

@c-merchant @hkershaw-brown

The following files do not actually call nc_check in the code and therefore do not need to include the line use netcdf_utilities_mod, only : nc_check

models/mpas_atm/mpas_dart_obs_preprocess.f90
models/mpas_atm/update_bc.f90
observations/forward_operators/obs_def_GRACE_mod.f90
observations/obs_converters/utilities/obs_seq_utilities_mod.f90
models/forced_barot/obs/obs_mod.f90

Simply removing nc_check from the list of subroutines to use from utilities_mod is sufficient.

Copy link
Contributor

@mjs2369 mjs2369 left a comment

Choose a reason for hiding this comment

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

This looks great @c-merchant

I’ve compiled all relevant and Manhattan compatible models, as well as the following:
update_bc and mpas_dart_obs_preprocess for mpas_atm
filter for models/noah (which uses the obs_def_GRACE_mod.f90 file)
assimilation_code/programs/compute_error
Ameriflux obs_converter (to test changes to observations/obs_converters/utilities/obs_seq_utilities_mod.f90)
convert_streamflow in observations/obs_converters/USGS/
create_identity_streamflow_obs in models/wrf_hydro/

Approved

@hkershaw-brown
Copy link
Member

@mjs2369 we'll bundle this with #593 for the next release

@hkershaw-brown hkershaw-brown added the release! bundle with next release label Dec 11, 2023
@hkershaw-brown hkershaw-brown changed the base branch from main to quickbuild_tests December 13, 2023 15:38
@hkershaw-brown hkershaw-brown merged commit 707fe9a into NCAR:quickbuild_tests Dec 13, 2023
3 checks passed
@c-merchant c-merchant deleted the nc_check_subroutine branch July 3, 2024 20:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release! bundle with next release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

subroutine nc_check in utilities_mod and in netcdf_utilities_mod
3 participants