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

Updated dmi drivers according to standalone #383

Merged
merged 5 commits into from
Dec 7, 2019

Conversation

TillRasmussen
Copy link
Contributor

@TillRasmussen TillRasmussen commented Dec 1, 2019

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

  • Short (1 sentence) summary of your PR:
    Cleanup, allowed hycom_atm_data to have leap year and update dmi driver to reflect changes in standalone driver
  • Developer(s):
    tar
  • Suggest PR reviewers from list in the column to the right. Tony+Elizabeth
  • Please copy the PR test results link or provide a summary of testing completed below.
    Limited differences in standalone code. This changes dmi driver according to updated standalone driver
  • 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 Unless the addition of leap years to hycom_atm_data should be documented
  • Please provide any additional information or relevant details below:
    This should not change results. I have removed comments from ice_grid related to the calculation of anglet. Mostly added keywords to dmi driver as required by the updated icepack. At last allowed for hycom atm data to use leap years.

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.

what is lal.dat?

@@ -39,12 +39,12 @@ module CICE_RunMod
!
! author Elizabeth C. Hunke, LANL
! Philip W. Jones, LANL
! William H. Lipscomb, LANL
William H. Lipscomb, LANL
Copy link
Contributor

Choose a reason for hiding this comment

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

This looks like an error. You probably need ! in front.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes your are right.

Copy link
Contributor

@apcraig apcraig left a comment

Choose a reason for hiding this comment

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

I'm a little confused what the Icepack change is. Is that supposed to be there and what is it doing?

@apcraig
Copy link
Contributor

apcraig commented Dec 4, 2019

travis is not passing. I believe it cannot find the Icepack submodule version or change that's in this PR. That should be fixed and reset to the current CICE Icepack version, 68bc397. If you need some help with that, let me know.

@TillRasmussen
Copy link
Contributor Author

Yes I needed to add "!"
lal.dat was a file that contained some diffs. (git diff ....). This has been removed
Icepack was the last (hopefully) leftover of my fork being corrupted when linked to icepack.
Pull should be updated. Check is ongoing

@phil-blain
Copy link
Member

@TillRasmussen if you (re)take a look at https://github.com/CICE-Consortium/About-Us/wiki/Git-Workflow-Guidance maybe it will clarify things for you regarding how to deal with icepack. I added more details to that page. Essentially each time you switch branches with git checkout you have to follow with git submodule update for the Icepack submodule to stay in sync with the current branch. Same thing when you git pull, you have to follow with git submodule update.

@TillRasmussen
Copy link
Contributor Author

TillRasmussen commented Dec 5, 2019 via email

@apcraig apcraig merged commit 1adef75 into CICE-Consortium:master Dec 7, 2019
@apcraig apcraig mentioned this pull request Dec 9, 2019
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