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

Updates for RASM compatibility #253

Merged
merged 3 commits into from
Nov 27, 2018
Merged

Conversation

apcraig
Copy link
Contributor

@apcraig apcraig commented Nov 22, 2018

Update CICE to support RASM integration.

  • Developer(s): tcraig

  • Are the code changes bit for bit, different at roundoff level, or more substantial? bit-for-bit

  • Does this PR create or have dependencies on Icepack or any other models? RASM needs updated Icepack as well, does not affect CICE standalone though.

  • Is the documentation being updated with this PR? (Y/N) N
    If not, does the documentation need to be updated separately at a later time? (Y/N) N

  • Other Relevant Details:

Synchronize CICE6 in RASM and in Consortium for pre release testing. Mostly impacts either cesm driver code or code inside CESMCOUPLED cpp. A couple minor changes were made to the cice driver code for consistency. The cice and cesm driver codes are now well aligned.

Tested full suites on conrad with 4 compilers against current trunk and everything is bit-for-bit. See 925e299 https://github.com/CICE-Consortium/Test-Results/wiki/cice_by_hash_forks.

Copy link
Contributor

@dabail10 dabail10 left a comment

Choose a reason for hiding this comment

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

Did you add some unused variables back into cice_init? I'm not sure istep, istep1 are used here for example.

@dabail10
Copy link
Contributor

I will run this through the NAG compiler on hobart.

@apcraig
Copy link
Contributor Author

apcraig commented Nov 23, 2018

@dabail10, It's possible the istep stuff was changed, are you seeing something in particular because I don't see anything in the diffs? This implementation seems to work in rasm which is based on cesm1.x. cesm2 might have some differences, not sure. We might actually have to eventually implement a cesm1 and cesm2 driver. maybe even a cesm2_nuopc as well. But we'll take that when it comes.

@dabail10
Copy link
Contributor

In the model CICE_InitMod.F90 there is diffs in the declarations. These do not cause problems. Just unused variable messages. I will run it through NAG.

@apcraig
Copy link
Contributor Author

apcraig commented Nov 23, 2018

Good point. I did a few things comparing old and new versions of the code. Basically, I took the cice driver and modified it as needed for RASM and dropped it into the cesm driver directory. I think it's handy for the two files to be as much alike as possible and only have needed differences. It could be that I got something wrong or that there are some things from the cice driver that are not needed in the cesm driver. I guess my preference is to keep them the same as much as possible because I think it will make them easier to keep synchronized.

@dabail10
Copy link
Contributor

It occurred to me that I can't really run the RASM driver through NAG. I'll eventually have to work on the CESM driver as well. So, this is probably fine as is.

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.

There is a change to one Icepack file in this PR. Has that been made in the Icepack repo? Otherwise this looks fine.

@apcraig
Copy link
Contributor Author

apcraig commented Nov 27, 2018

Yes, this includes an update to the icepack code. I pushed a one line change over the weekend to the icepack master.

@eclare108213
Copy link
Contributor

@dabail10 are you satisfied with this PR or do we still need to clean up some variables?

@dabail10
Copy link
Contributor

I'm fine with this. I can't run the CESM driver changes through the NAG compiler yet.

@eclare108213 eclare108213 merged commit 2d88626 into CICE-Consortium:master Nov 27, 2018
@apcraig apcraig mentioned this pull request Dec 1, 2018
@apcraig apcraig deleted the rasmB branch August 17, 2022 20:59
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.

3 participants