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.

Sign up for GitHub

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

Saltflux option for CICE #799

Merged
merged 24 commits into from
Dec 7, 2022
Merged

Saltflux option for CICE #799

Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
c489483
Bring Consortium main into CESM
dabail10 Oct 24, 2022
9db5da4
Comment out OMP initialization
dabail10 Oct 24, 2022
490b259
Update wave-ice coupling in NUOPC/CMEPS driver
dabail10 Nov 8, 2022
0d23ccd
Update to Consortium main
dabail10 Nov 30, 2022
675670d
Update saltflux option to be constant and use ice_ref_salinity
dabail10 Nov 30, 2022
758d2ac
Fix a couple inconsistencies with CICE Consortium master
dabail10 Nov 30, 2022
853b6ec
Fix some issues
dabail10 Nov 30, 2022
df51c68
Fix some merge issues
dabail10 Nov 30, 2022
b13b728
Fix some merge issues
dabail10 Nov 30, 2022
9bb0281
Fix ACC directive
dabail10 Nov 30, 2022
33ea462
Bug fixes with eap initialization
dabail10 Nov 30, 2022
842d5c6
Fix evp initialization
dabail10 Nov 30, 2022
fbf9d59
Add warning when ktherm=1 and saltflux_option not constant
dabail10 Dec 1, 2022
d88e71e
Comment out Tair initialization
dabail10 Dec 1, 2022
ba6fe8a
Add CESMCOUPLED around OMP initialization
dabail10 Dec 1, 2022
71cf0fb
CESM File unit handling
dabail10 Dec 1, 2022
df5573f
Change icepack hash for PR
dabail10 Dec 2, 2022
4f8cf7e
Some cleanup things
dabail10 Dec 2, 2022
8b1c232
Move nu_diag_set to CESMCOUPLED region
dabail10 Dec 2, 2022
f19faa7
Put Tair initialization in a CESMCOUPLED
dabail10 Dec 2, 2022
3363e83
New saltflux tests
dabail10 Dec 5, 2022
34dbeed
Update icepack for saltflux option
dabail10 Dec 6, 2022
6201214
Update icepack
dabail10 Dec 6, 2022
38103c5
Merge branch 'main' of https://github.com/ESCOMP/CICE into cesm_updates2
dabail10 Dec 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Put Tair initialization in a CESMCOUPLED
  • Loading branch information
@dabail10
dabail10 committed Dec 2, 2022
commit f19faa770d7e06903bbae621687adadc0bce42ba
7 changes: 5 additions & 2 deletions cicecore/cicedyn/general/ice_init.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3089,9 +3089,12 @@ subroutine set_state_var (nx_block, ny_block, &
do i = ilo, ihi
if (tmask(i,j)) then
! place ice in high latitudes where ocean sfc is cold
#ifdef CESMCOUPLED
! Option to use Tair instead.
if ( (Tair (i,j) <= Tffresh) .and. &
#else
if ( (sst (i,j) <= Tf(i,j)+p2) .and. &
! Option to use Tair instead.
! if ( (Tair (i,j) <= Tffresh) .and. &
#endif
(TLAT(i,j) < edge_init_sh/rad_to_deg .or. &
TLAT(i,j) > edge_init_nh/rad_to_deg) ) then
icells = icells + 1
Expand Down