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

Implemented fix so that netcdf output works on Ubuntu #425

Merged
merged 1 commit into from
Jan 25, 2023

Conversation

davidclemenssewall
Copy link
Contributor

@davidclemenssewall davidclemenssewall commented Jan 23, 2023

PR checklist

  • [X ] Short (1 sentence) summary of your PR:
    In Macros.conda_linux, add paths to compiled NetCDF module files and libraries.
  • [X ] Developer(s):
    Philippe Blaine provided this fix, David Clemens-Sewall just ran tests and submitted PR.
  • [X ] Suggest PR reviewers from list in the column to the right.
    Philippe Blaine, Dave Bailey, or Tony Craig
  • [X ] Please copy the PR test results link or provide a summary of testing completed below.
    Icepack base_suite 128 of 128 tests passed. CICE quick_suite 16 of 16 tests passed.
  • How much do the PR code changes differ from the unmodified code?
    • [X ] bit for bit
    • different at roundoff level
    • more substantial
  • Does this PR create or have dependencies on CICE or any other models?
    • Yes
    • [X ] No
  • Does this PR add any new test cases?
    • Yes
    • [X ] No
  • Is the documentation being updated? ("Documentation" includes information on the wiki or in the .rst files from doc/source/, which are used to create the online technical docs at https://readthedocs.org/projects/cice-consortium-cice/.)
    • Yes
    • [X ] No, does the documentation need to be updated at a later time?
      • Yes
      • [X ] No
  • Please provide any additional information or relevant details below:

@apcraig apcraig requested review from phil-blain and apcraig January 23, 2023 08:37
@apcraig apcraig changed the title Implemented fix from Philippe Blaine so that netcdf output works on U… Implemented fix so that netcdf output works on Ubuntu Jan 23, 2023
@phil-blain
Copy link
Member

Ideally the commit message would also be changed (since this is a 1 commit PR, the commit message will be used verbatim when squash-merging [1]) to be more descriptive, maybe something like this:

machines: conda_linux: fix NetCDF-enabled build

The Makefile macro file for conda on Linux was not updated when Icepack learned
to do NetCDF output in e1f3574 (Netcdf History Capability (#368), 2021-08-30),
only the macOS one was updated. Tweak the Linux build similarly.

@davidclemenssewall , you could do that with

git commit --amend
# rewrite message, save
git push --force

[1] at least that's the default behaviour, @apcraig I don't know if this setting is changed for the Icepack repo so that the PR title is always used ?...

The Makefile macro file for conda on Linux was not updated when
Icepack learned to do NetCDF output in e1f3574 (Netcdf History
Capability (CICE-Consortium#368), 2021-08-30), on the macOS one was updated.
Tweak the Linux build similarly.
@davidclemenssewall
Copy link
Contributor Author

@phil-blain Done.

@apcraig apcraig merged commit 23a8faf into CICE-Consortium:main Jan 25, 2023
@davidclemenssewall davidclemenssewall deleted the ubuntu_netcdf branch January 25, 2023 14:52
@phil-blain
Copy link
Member

Thank you @davidclemenssewall !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants