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

Changes to support NUOPC in CESM and OMP bug fixes. #478

Merged
merged 18 commits into from
Jul 3, 2020

Conversation

dabail10
Copy link
Contributor

@dabail10 dabail10 commented Jun 29, 2020

For detailed information about submitting Pull Requests (PRs) to the CICE-Consortium,
please refer to: https://github.com/CICE-Consortium/About-Us/wiki/Resource-Index#information-for-developers

PR checklist

  • [ X] Short (1 sentence) summary of your PR:
    This is the latest NUOPC updates for CESM/CMEPS.
  • Developer(s):
    mvertens (Mariana Vertenstein)
  • Suggest PR reviewers from list in the column to the right.
  • Please copy the PR test results link or provide a summary of testing completed below.
    https://github.com/CICE-Consortium/Test-Results/wiki/cice_by_mach_forks#cheyenne
  • How much do the PR code changes differ from the unmodified code?
    • bit for bit
    • different at roundoff level
    • more substantial
  • Does this PR create or have dependencies on Icepack or any other models?
    • Yes
    • No
  • Does this PR add any new test cases?
    • Yes
    • 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/. A test build of the technical docs will be performed as part of the PR testing.)
    • Yes
    • No, does the documentation need to be updated at a later time?
      • Yes
      • No
  • Please provide any additional information or relevant details below:
    This is only answer changing in CESM with CMEPS/NUOPC. These changes do not affect CICE standalone ... except a print statement in ice_init.F90 and some changes to the Makefile and cice.build file. Please let me know if these were just changes that were removed from CICE standalone and are creeping back in with the NUOPC stuff. It looks suspicious to me, but I'd like you to review it.
    Update: I have tested within standalone CICE and the NUOPC related changes to not impact the rest of the standalone model. However, I have added some OMP bug fixes to this tag. This now allows three PGI BGC tests to run and pass. For some reason, this does not change answers with intel and gnu.

@apcraig
Copy link
Contributor

apcraig commented Jun 30, 2020

Has this been tested in standalone CICE? We want to make sure the Makefile changes (and non cmeps driver changes) don't cause problems in standalone.

@dabail10
Copy link
Contributor Author

I believe the changes to the Makefile and cice.build were introduced by you for UFS? There is also some ufsapps changes.

@apcraig
Copy link
Contributor

apcraig commented Jun 30, 2020

That is correct that I did a bunch of the work, but we should still retest before merging just to be sure there aren't any issues.

@@ -130,6 +141,10 @@ $(DEPGEN): $(OBJS_DEPGEN)
$(EXEC): $(OBJS)
$(LD) -o $(EXEC) $(LDFLAGS) $(OBJS) $(ULIBS) $(SLIBS)

libcice: $(OBJS)
@ echo "$(AR) -r $(EXEC) $(OBJS)"
$(AR) -r $(EXEC) $(OBJS)
Copy link
Member

Choose a reason for hiding this comment

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

usually that's ar -rcs no ?

@dabail10 dabail10 changed the title Changes to support NUOPC in CESM. Changes to support NUOPC in CESM and OMP bug fixes. Jul 1, 2020
@dabail10
Copy link
Contributor Author

dabail10 commented Jul 1, 2020

This is ready to be merged once approved.

Copy link
Contributor

@eclare108213 eclare108213 left a comment

Choose a reason for hiding this comment

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

Maybe this is something that was added in a previous PR and I missed it, but I don't recognize the forapps directory. What is that for? If it's needed, should it be kept under scripts instead of the main directory? Or maybe a driver?

@apcraig
Copy link
Contributor

apcraig commented Jul 2, 2020

I am running a full test suite on gordon now.

The forapps directory is something that I added for UFS. I agree it should be under scripts. @dabail10, could you do the following

git mv forapps scripts/

or similar. We'll need to let UFS know of this change so they can also change their scripts. The forapps area is similar to drivers in the sense that it provides a link between the coupled model and CICE for building and/or running the model. CESM doesn't need it, but other models may depending how they're implemented. I don't think we want this in the source code area under drivers.

@apcraig
Copy link
Contributor

apcraig commented Jul 3, 2020

Test results are all bit-for-bit on gordon with 4 compilers. https://github.com/CICE-Consortium/Test-Results/wiki/cice_by_hash_forks#73e77746d8204c181a311be8e51c6b3edec75dea

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

Successfully merging this pull request may close these issues.

4 participants