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

Move sw_redist, sw_frac, sw_dtemp from thermo to shortwave namelist #540

Merged
merged 4 commits into from
Dec 11, 2020

Conversation

apcraig
Copy link
Contributor

@apcraig apcraig commented Dec 7, 2020

PR checklist

  • Short (1 sentence) summary of your PR:
    Move sw_redist, sw_frac, sw_dtemp from thermo to shortwave namelist
  • Developer(s):
    apcraig
  • 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.
    Full test suite run on cheyenne, all tests pass and are bit-for-bit. https://github.com/CICE-Consortium/Test-Results/wiki/cice_by_hash_forks#402a58564017fcce82318982a3e09f92a654a2bc
  • 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:

Move sw_redist, sw_frac, sw_dtemp from thermo to shortwave namelist #537

Update verbose diagnostic output #534

Update icepack to also include sw_redist, sw_frac, sw_dtemp changes in icepack driver (not required)

Update version number in prep for next minor release

Update verbose diagnostic output

Update icepack to also include sw_redist, sw_frac, sw_dtemp changes in icepack driver (not required)

Update version number in prep for next minor release
@apcraig
Copy link
Contributor Author

apcraig commented Dec 8, 2020

The test suite is complete and all tests pass. I am reviewing the model output now to confirm changes related to #534.

@apcraig apcraig self-assigned this Dec 8, 2020
@apcraig
Copy link
Contributor Author

apcraig commented Dec 9, 2020

I just pushed a new update. I spent a little time with the verbose output and did some cleanup, maybe I went a bit overboard. Mostly I just updated the spacing of the output. I attach sample output. Let me know if there are any comments. I think we can also change to "non-draft" now. I think it's ready for review and merge.

cice.runlog.201208-170313.txt

@apcraig apcraig marked this pull request as ready for review December 9, 2020 01:42
@eclare108213
Copy link
Contributor

Wow. This looks great. We should probably check the output for the tests where the changes are significant (not just changes to alignment), to make sure the logic came through correctly. It's hard to tell, looking at the code diff.

@apcraig
Copy link
Contributor Author

apcraig commented Dec 9, 2020

If you look at this commit, 402a585, you'll see the diffs before my "cleanup". That represents most of the fixes outside formatting.

cicecore/cicedynB/general/ice_init.F90 Show resolved Hide resolved
Comment on lines -1386 to -1387
endif
write(nu_diag,1007) ' hfrazilmin = ', hfrazilmin,' minimum new frazil ice thickness'
Copy link
Member

Choose a reason for hiding this comment

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

Ok, so basically this makes the 'Radiation' section only show up if ktherm > 0, right ? I agree with @eclare108213 that the diff is kind of hard to read, even in commit view...

It's a little easier on the command line, where we can tell Git to color moved lines in a different color, and also to detect moved lines even if indentation changes:

git show 402a585 --color-moved --color-moved-ws=allow-indentation-change

We can also ask to ignore changes in the amount of whitespace, this also helps:

git show 402a585 --ignore-space-change --color-moved --color-moved-ws=allow-indentation-change

cicecore/cicedynB/general/ice_init.F90 Outdated Show resolved Hide resolved
cicecore/cicedynB/general/ice_init.F90 Outdated Show resolved Hide resolved
cicecore/cicedynB/general/ice_init.F90 Outdated Show resolved Hide resolved
cicecore/cicedynB/general/ice_init.F90 Show resolved Hide resolved
cicecore/cicedynB/general/ice_init.F90 Outdated Show resolved Hide resolved
@eclare108213
Copy link
Contributor

I want to look at the output again before we release with this one. I'll submit a suite.

@eclare108213
Copy link
Contributor

I've done a sanity check on the verbose diagnostic output, skimming each of the cice.run files from base_suite. Looks good. Test results show 4 failures:
FAIL badger_intel_restart_tx1_40x4_dsectrobin_medium run
FAIL badger_intel_restart_tx1_40x4_dsectrobin_medium test
FAIL badger_intel_restart_gbox128_2x2_boxadv_short run
FAIL badger_intel_restart_gbox128_2x2_boxadv_short test
The first two are expected. The second two also showed up in #533 and seem unrelated to this PR. I'll take that discussion to a separate issue.

@eclare108213 eclare108213 merged commit 8d9352d into CICE-Consortium:master Dec 11, 2020
@apcraig apcraig deleted the swnml branch August 17, 2022 21:00
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