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

Replace cice5 with cice6 in ufs-s2s-model #160

Merged
merged 305 commits into from
Sep 8, 2020

Conversation

DeniseWorthen
Copy link
Collaborator

@DeniseWorthen DeniseWorthen commented Aug 9, 2020

Replaces CICE5 with CICE6: Issue #159

Associated PR: CICE #13
Associated PR: CMEPS #7
Associated PR: NEMS #75

DeniseWorthen and others added 30 commits March 13, 2020 08:38
on filed dumps;also mom6 for restartcontrol and cice5 for
restart repro
required w/ recent changes in mom_cap for restart
fixes
fv3 restart interval used in model_configure
FV3 points to Dom's b4b branch w/ timestamps on
field dumps and field name changes for CMEPS
MOM6 with Mariana's cesm-cleanup
parm to get closer to ufs-s2s after ccpp was added
mediator file failes for cmeps in RT but passes if use nccmp -d
@junwang-noaa
Copy link
Collaborator

junwang-noaa commented Sep 4, 2020 via email

@DeniseWorthen
Copy link
Collaborator Author

I actually deleted the comment. I saw I had no jobs running and thought something had died. So I looked at that job and it looked like it died but I think it was just that the log output hadn't completed. It looked like it just died mid-step. But that job did complete after all.

The reason I had no current jobs is because it was in the compile step for the next job.

@junwang-noaa
Copy link
Collaborator

junwang-noaa commented Sep 4, 2020 via email

@DeniseWorthen
Copy link
Collaborator Author

All jobs that have run have completed. It is now compiling the ww3 test.

@DeniseWorthen
Copy link
Collaborator Author

This PR is ready for final baseline verification and merging; this can be done once NEMS is updated (and after the W3 merge).

@MinsukJi-NOAA
Copy link
Collaborator

NOAA-EMC/NEMS#75 has been merged into develop

@DeniseWorthen
Copy link
Collaborator Author

DeniseWorthen commented Sep 5, 2020

@JessicaMeixner-NOAA I just ran my baseline on dell. All tests pass except one. It failed on one file on one test:

cpld_fv3_ccpp_384_mom6_cice_cmeps_ww3_1d_bmark_rt

Comparing 20130402.000000.out_grd.gwes_30m .........OK
Comparing 20130402.000000.out_pnt.points ............NOT OK
Comparing 20130402.000000.restart.gwes_30m .........OK

All remaining files in the test show OK. Does this make sense to you?

@DeniseWorthen
Copy link
Collaborator Author

DeniseWorthen commented Sep 6, 2020

The same single file fails comparison on both hera and orion also.

I ran a test baseline creation and verification on orion on 9/2. The comparison between that commit and the current commit is here. The changes were:

a) update WW3
b) update to esmfbs27
c) ice and waves were tested on separate PEs on 9/2
d) cold start fixed

@junwang-noaa
Copy link
Collaborator

junwang-noaa commented Sep 6, 2020 via email

@DeniseWorthen
Copy link
Collaborator Author

I will have a new baseline for cice6. I copied in the 20200903 baseline WW3_input_data files since they had been updated.

I created the 20200904 baseline for CICE6; I was running the regression test against that baseline when I got the single file failure. It doesn't make sense to me though---how can a single file no reproduce when all other files do?

In my 0902 test, I had created a baseline for testing purposes and ran against that test baseline just to confirm that I the restart test passed and my changes to the rt.sh etc were good.

@JessicaMeixner-NOAA
Copy link
Collaborator

@DeniseWorthen I'm not sure what happened, but the same thing happened to me and I copied that one file that was wrong into the baseline and now all passed? I don't know if it was just that one test or what? But I only had that happen on dell, not the other platforms.

@DeniseWorthen
Copy link
Collaborator Author

So after you created the baseline, you had to manually copy that one file. Then you ran against the baseline and all passed?

@JessicaMeixner-NOAA
Copy link
Collaborator

JessicaMeixner-NOAA commented Sep 6, 2020 via email

url = https://github.com/NOAA-EMC/CICE.git
branch = emc/develop
[submodule "MOM6-interface/mkmf"]
path = MOM6-interface/mkmf
Copy link
Collaborator

Choose a reason for hiding this comment

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

I assume with mkmf and MOM6 src directly checked out in the app level, the MOM6-interface repo is not needed.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Both MOM-interface and CICE-interface are just subdirectories now. But don't we need to retain MOM6-interface repo in order to maintain the ability to checkout older commits of s2s?

Copy link
Collaborator

Choose a reason for hiding this comment

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

We can keep the MOM6-interface until everybody is switched to the new version. On the other side, from model structure level, I'd think it's good to keep MOM6 related code in MOM6-interface repo and to use git submodule to check them out, this will be consistent with other components (NEMS, FV3). We can discuss this at code manager meeting, the code changes are OK for this commit.

@DeniseWorthen DeniseWorthen merged commit e09ade8 into ufs-community:develop Sep 8, 2020
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.

7 participants