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

Corrects thin ice/snow treatment of enthalpy and other tracers #454

Merged
merged 2 commits into from
Aug 30, 2023
Merged

Corrects thin ice/snow treatment of enthalpy and other tracers #454

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e0821d
Corrects thin ice/snow treatment of enthalpy and other tracers
apcraig Aug 28, 2023
ff8666c
Clean up modifications
apcraig Aug 29, 2023
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
76 changes: 48 additions & 28 deletions columnphysics/icepack_therm_shared.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,8 @@ subroutine adjust_enthalpy (nlyr, &
hovlp ! overlap between old and new layers (m)

real (kind=dbl_kind) :: &
rhlyr ! 1./hlyr
rhlyr, & ! 1./hlyr
qtot ! total h*q in the column

real (kind=dbl_kind), dimension (nlyr) :: &
hq ! h * q for a layer
Expand All @@ -509,36 +510,55 @@ subroutine adjust_enthalpy (nlyr, &
!-----------------------------------------------------------------

rhlyr = c0
if (hn > puny) rhlyr = c1 / hlyr

!-----------------------------------------------------------------
! Compute h*q for new layers (k2) given overlap with old layers (k1)
!-----------------------------------------------------------------

do k2 = 1, nlyr
hq(k2) = c0
enddo ! k
k1 = 1
k2 = 1
do while (k1 <= nlyr .and. k2 <= nlyr)
hovlp = min (z1(k1+1), z2(k2+1)) &
- max (z1(k1), z2(k2))
hovlp = max (hovlp, c0)
hq(k2) = hq(k2) + hovlp*qn(k1)
if (z1(k1+1) > z2(k2+1)) then
k2 = k2 + 1
if (hn > puny) then
rhlyr = c1 / hlyr

!-----------------------------------------------------------------
! Compute h*q for new layers (k2) given overlap with old layers (k1)
!-----------------------------------------------------------------

do k2 = 1, nlyr
hq(k2) = c0
enddo ! k
k1 = 1
k2 = 1
do while (k1 <= nlyr .and. k2 <= nlyr)
hovlp = min (z1(k1+1), z2(k2+1)) &
- max (z1(k1), z2(k2))
hovlp = max (hovlp, c0)
hq(k2) = hq(k2) + hovlp*qn(k1)
if (z1(k1+1) > z2(k2+1)) then
k2 = k2 + 1
else
k1 = k1 + 1
endif
enddo ! while

!-----------------------------------------------------------------
! Compute new enthalpies.
!-----------------------------------------------------------------

do k = 1, nlyr
qn(k) = hq(k) * rhlyr
enddo ! k

else

qtot = c0
do k = 1, nlyr
qtot = qtot + qn(k) * (z1(k+1)-z1(k))
enddo
if (hn > c0) then
do k = 1, nlyr
qn(k) = qtot/hn
enddo
else
k1 = k1 + 1
do k = 1, nlyr
qn(k) = c0
enddo
endif
enddo ! while

!-----------------------------------------------------------------
! Compute new enthalpies.
!-----------------------------------------------------------------

do k = 1, nlyr
qn(k) = hq(k) * rhlyr
enddo ! k
endif

end subroutine adjust_enthalpy

Expand Down
14 changes: 13 additions & 1 deletion columnphysics/icepack_therm_vertical.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1706,17 +1706,29 @@ subroutine thickness_changes (nilyr, nslyr, &
!-----------------------------------------------------------------

if (ktherm == 2) then
if (hsn <= puny) then
if (hsn <= puny .or. hin <= c0) then
do k = 1, nslyr
fhocnn = fhocnn &
+ zqsn(k)*hsn/(real(nslyr,kind=dbl_kind)*dt)
zqsn(k) = -rhos*Lfresh
!tcx, tcraig, in columnphysics, this is
! is it correct that now everything is "if snwgrain"?
Copy link
Contributor

Choose a reason for hiding this comment

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

Yes, I think snwgrain is the correct wrapper for these variables.

! if (tr_snow) then
! meltsliq = meltsliq + smicetot(k) ! add to meltponds
! smice(k) = rhos
! smliq(k) = c0
! endif
! if (tr_rsnw) rsnw(k) = rsnw_fall
if (snwgrain) then
meltsliq = meltsliq + massice(k) ! add to meltponds
smice(k) = rhos
smliq(k) = c0
rsnw(k) = rsnw_fall
endif
!tcx
enddo
melts = melts + hsn
hsn = c0
hslyr = c0
endif
endif
Expand Down