-
Notifications
You must be signed in to change notification settings - Fork 135
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
Merge E3SM Icepack cice-consortium/E3SM-icepack-initial-integration to Consortium #460
Merged
eclare108213
merged 120 commits into
CICE-Consortium:main
from
E3SM-Project:cice-consortium/E3SM-icepack-initial-integration
Oct 4, 2023
Merged
Changes from 1 commit
Commits
Show all changes
120 commits
Select commit
Hold shift + click to select a range
604d0ad
initial implementation of SNICAR-AD in Icepack, not tested but BFB in…
eclare108213 60fc58d
adding use_snicar flag (true if shortwave=dEdd_snicar)
eclare108213 e264065
initializing use_snicar based on shortwave namelist value
eclare108213 8109ebf
adding a few more arguments to the calling tree
eclare108213 4ff4e28
Merge pull request #5 from CICE-Consortium/main
eclare108213 49d1294
Merge branch 'main' of https://github.com/cice-consortium/icepack int…
eclare108213 3c65376
remove repeat ridging warnings for niter=1
eclare108213 2bd3504
use 5-band wghtns for snicar
eclare108213 56a2ccd
basic initialization for snicar tables
eclare108213 d2f3870
clean up trailing blanks
apcraig f03e228
Merge pull request #4 from apcraig/snicar-clean01
eclare108213 cd31ec2
interim commit with some snicar initialization, unconnected and not t…
eclare108213 a2bbd1d
Add data_dEdd_3band to icepack_init_radiation
apcraig d2ea5ed
Add ability to set SNICAR SSP data via icepack_parameters
apcraig 4bf19c6
Add reading of SNICAR SSP file in Icepack driver including
apcraig 8cb547a
rebase, update, and test
apcraig 258f623
Merge pull request #5 from apcraig/snwtable
eclare108213 4e2d90b
Update ssp output
apcraig e569c4c
Reorder SNICAR SSP test data arrays to be consistent with source code
apcraig 1d6eaa6
Merge pull request #6 from apcraig/sspoutput
eclare108213 f88b03c
move 5band data to subroutine; enable snicar testing on 1 no-ice grid…
eclare108213 6d68ee9
move more data to 3- and 5-band initialization routines, use module d…
eclare108213 b3ca79c
change snicar coefficient names and use module data for them
eclare108213 8ad73dd
cleaning up argument lists
eclare108213 89e0d9a
Add additional SNICAR SSP fields
apcraig 93f9f3c
Merge pull request #7 from apcraig/moresspio
eclare108213 ef37585
set tmask=0 only for land cell
eclare108213 3e636b2
interim compute_dEdd_5bd subroutine (runs)
eclare108213 914130b
separate 3-band and 5-band compute_dEdd routines
eclare108213 0fabd24
Fix errors in calls to compute_dEdd. Some cleanup.
eclare108213 20d7e03
Remove duplicate Iabs calculation. More cleanup.
eclare108213 fe21d1f
- Add icepack_shortwave_data
apcraig a0f0e49
- Add USE_SNICARHC (snicar ssp hard coded tables) to reduce compile time
apcraig 247a8ce
- Remove ssp_bcerad, ssp_bcgrerad from implementation
apcraig 147201a
remove trailing blanks
apcraig 2274b8e
Merge pull request #9 from apcraig/swdata
eclare108213 f270c73
Cleanup icepack_shortwave_data
apcraig 631816e
update test suite and icepack_in
apcraig 1395476
update scripts if md5sum not available
apcraig 9766cff
Merge pull request #10 from apcraig/swdata1
eclare108213 0a9d6e7
Clean up shortwave data variable names
apcraig 8f74768
Merge pull request #11 from apcraig/swaero
eclare108213 045e353
Clean up icepack_shortwave
apcraig 69ed788
- Remove ncat, nilyr, nslyr, nblyr from interface arguments
apcraig 6a46237
Merge pull request #12 from apcraig/swclean
eclare108213 44d377b
Update implementation of g(k), w0(k) in icepack_shortwave
apcraig 6f8f21b
Get rid of use_snicar flag, redundant with shortwave setting
apcraig 4256d9b
update documentation
eclare108213 34e5555
updating documentation
eclare108213 95fb567
use module data rather than hardcoded rhoi
eclare108213 9178ede
cleanup
apcraig e0b3292
update namelist and settings documentation
eclare108213 ee97eab
Merge pull request #13 from apcraig/aerclean
eclare108213 1a089e8
make icepack_warnings_getall public, snw_ssp_table=unknown, update us…
eclare108213 b7d7c16
add icepack_warnings_getall to interface module
eclare108213 64ab4a1
Major cleanup of dEdd module, mainly white space and standard alignme…
eclare108213 9ae618c
bug fixes for ice/snow layer reciprocal, missing lines as in consorti…
eclare108213 8aef3f7
Merge pull request #7 from eclare108213/snicar
eclare108213 20d4a94
mpassi options files
eclare108213 6704225
remove namelist entries that are the same as the defaults to avoid po…
eclare108213 d86c54e
Merge pull request #8 from eclare108213/testconfig1
apcraig 90dbfe6
Minor updates consistent with E3SM columnphysics modifications
apcraig 5efe8b7
Update spacing and documentation
apcraig 6b7b63a
Merge branch 'main' of https://github.com/cice-consortium/icepack int…
apcraig 86d414c
First step in adding Tf
dabail10 ef314e2
Fix some spacing and logic
dabail10 1b84132
Fix some documentation
dabail10 cf64956
Fix documentation formatting
dabail10 19d61e6
Merge pull request #12 from dabail10/tfrz2
apcraig 125b40b
Merge pull request #10 from apcraig/e3smfix1
apcraig 635f1c4
Merge branch 'cice-consortium/E3SM-icepack-initial-integration' into …
apcraig 881db9a
Merge pull request #11 from apcraig/upd01a
apcraig 1c502fa
namelist parameter to set maximum liquidus temperature
eclare108213 7cdacdb
Merge branch 'cice-consortium/E3SM-icepack-initial-integration' into …
eclare108213 93ada33
Merge pull request #13 from E3SM-Project/Tliquidus_limit
eclare108213 e4d987e
Modifications for bit-for-bit with current main in CICE
apcraig 6a4533b
Merge pull request #14 from apcraig/Tffix
eclare108213 6211458
merge Icepack main to #5bf584f6b7f Nov 17, 2022
apcraig 5a1b9e3
Merge branch 'main' of https://github.com/cice-consortium/icepack int…
apcraig 64a27d3
Remove redundancy in public declaration
apcraig 8944646
recover main bit-for-bit
apcraig ae5a4ef
update tfrz_option
apcraig 0899390
Merge branch 'main' of https://github.com/cice-consortium/icepack int…
apcraig 4d131da
Merge pull request #16 from apcraig/e3smup1
apcraig bec84e4
Merge branch 'main' of https://github.com/cice-consortium/icepack int…
apcraig 941e3c5
Merge branch 'main' of https://github.com/cice-consortium/icepack int…
apcraig 9d08355
Merge pull request #17 from apcraig/snowbrinebugs
eclare108213 8be0af0
Merge branch 'main' of https://github.com/cice-consortium/icepack int…
apcraig a9fc4fa
Merge pull request #18 from apcraig/e3sm_upd133
eclare108213 c9abc27
Merge branch 'main' of https://github.com/cice-consortium/icepack int…
apcraig ef7491f
Merge pull request #19 from apcraig/e3smicep230125
eclare108213 47e1791
Merge branch 'main' of https://github.com/cice-consortium/icepack int…
apcraig 87db73b
Merge pull request #20 from apcraig/icep230202
apcraig 7d42edb
Merge branch 'main' of https://github.com/cice-consortium/icepack int…
apcraig 5f4cd19
Merge pull request #21 from apcraig/icep230317
eclare108213 dd24d9f
Merge branch 'main' of https://github.com/cice-consortium/icepack int…
eclare108213 6ca316f
Merge pull request #22 from E3SM-Project/ibranch3
eclare108213 e5a95e4
Merge branch 'main' of https://github.com/cice-consortium/icepack int…
apcraig e3e36a7
Merge pull request #23 from apcraig/icep230418
eclare108213 c0719d8
Merge branch 'main' of https://github.com/cice-consortium/icepack int…
apcraig 2fc81b4
Merge pull request #24 from apcraig/icep230524
eclare108213 dfb8e2c
Merge branch 'main' of https://github.com/cice-consortium/icepack int…
eclare108213 b2b8066
Merge pull request #25 from E3SM-Project/ibranch4
eclare108213 d3b0ecc
Merge branch 'main' of https://github.com/cice-consortium/icepack int…
apcraig e8e7d7d
Merge pull request #26 from apcraig/main230718
eclare108213 a5804b0
Merge branch 'main' of https://github.com/cice-consortium/icepack int…
apcraig dd48a38
clean up merge
apcraig e751022
Merge pull request #27 from apcraig/main230819
eclare108213 5789cb5
Merge branch 'main' of https://github.com/cice-consortium/icepack int…
apcraig 393b072
Merge branch 'main' of https://github.com/cice-consortium/icepack int…
apcraig 586b5e5
Merge pull request #28 from apcraig/e3sm230830
eclare108213 cb0d946
Merge pull request #29 from apcraig/e3sm230914
eclare108213 baaa3f4
bring some mushy functions into icepack interface
eclare108213 1f0b307
elevate snow/mush enthalpy and salinity profile to interface
eclare108213 78286bf
Merge pull request #31 from E3SM-Project/E3SMrefactor
eclare108213 636fcbf
Update documentation
apcraig adcf436
Update documentation
apcraig e33cc75
Merge pull request #32 from apcraig/e3smdocs1
eclare108213 6a64845
Merge branch 'main' of https://github.com/cice-consortium/icepack int…
apcraig 96f2fc7
Merge pull request #33 from apcraig/upd230930
eclare108213 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
First step in adding Tf
- Loading branch information
commit 86d414caae2a3a2ccba5de06c73cf15b55935e8b
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
Didn't we fix something like this in Icepack already?
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.
No. The Tf/Tocnfrz was implemented on the E3SM side, and we have not moved any of those changes over to the Consortium. In hindsight, it probably should have been done on the Consortium side and moved to the E3SM side. I think that was early days of the E3SM Icepack version, and we probably hadn't realized that we should do changes, when possible, in the Consortium. That approach was adopted later.