-
Notifications
You must be signed in to change notification settings - Fork 131
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
Conversation
Update CICE for coupling with UFS
…l temperature and density are satisfied
changes to satisfy ufsatm and cesm requirements for pot temp and density from atm
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. |
I believe the changes to the Makefile and cice.build were introduced by you for UFS? There is also some ufsapps changes. |
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) |
There was a problem hiding this comment.
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 ?
This is ready to be merged once approved. |
There was a problem hiding this 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?
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. |
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 |
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
This is the latest NUOPC updates for CESM/CMEPS.
mvertens (Mariana Vertenstein)
https://github.com/CICE-Consortium/Test-Results/wiki/cice_by_mach_forks#cheyenne
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.