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

Jump to bottom

CMIP changes #219

Merged
merged 6 commits into from
Sep 21, 2018
Merged

CMIP changes #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
87b1cf1
Changes for CMIP variables.
dabail10 Sep 5, 2018
8689533
Merge branch 'master' of https://github.com/CICE-Consortium/Icepack i…
dabail10 Sep 5, 2018
9c8eea0
Additional CMIP changes
dabail10 Sep 5, 2018
5505951
CMIP
dabail10 Sep 5, 2018
766a689
CMIP
dabail10 Sep 5, 2018
090bb6a
More CMIP changes
dabail10 Sep 10, 2018
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
13 changes: 13 additions & 0 deletions columnphysics/icepack_flux.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,22 @@ subroutine merge_fluxes (aicen, &
strairxn, strairyn, &
Cdn_atm_ratio_n, &
fsurfn, fcondtopn, &
fcondbotn, &
fsensn, flatn, &
fswabsn, flwoutn, &
evapn, &
evapsn, evapin, &
Trefn, Qrefn, &
freshn, fsaltn, &
fhocnn, fswthrun, &
strairxT, strairyT, &
Cdn_atm_ratio, &
fsurf, fcondtop, &
fcondbot, &
fsens, flat, &
fswabs, flwout, &
evap, &
evaps, evapi, &
Tref, Qref, &
fresh, fsalt, &
fhocn, fswthru, &
Expand All @@ -62,11 +66,14 @@ subroutine merge_fluxes (aicen, &
Cdn_atm_ratio_n, & ! ratio of total drag over neutral drag
fsurfn , & ! net heat flux to top surface (W/m**2)
fcondtopn,& ! downward cond flux at top sfc (W/m**2)
fcondbotn,& ! downward cond flux at bottom sfc (W/m**2)
fsensn , & ! sensible heat flx (W/m**2)
flatn , & ! latent heat flx (W/m**2)
fswabsn , & ! shortwave absorbed heat flx (W/m**2)
flwoutn , & ! upwd lw emitted heat flx (W/m**2)
evapn , & ! evaporation (kg/m2/s)
evapsn , & ! evaporation over snow (kg/m2/s)
evapin , & ! evaporation over ice (kg/m2/s)
Trefn , & ! air tmp reference level (K)
Qrefn , & ! air sp hum reference level (kg/kg)
freshn , & ! fresh water flux to ocean (kg/m2/s)
Expand All @@ -89,11 +96,14 @@ subroutine merge_fluxes (aicen, &
Cdn_atm_ratio, & ! ratio of total drag over neutral drag
fsurf , & ! net heat flux to top surface (W/m**2)
fcondtop, & ! downward cond flux at top sfc (W/m**2)
fcondbot, & ! downward cond flux at bottom sfc (W/m**2)
fsens , & ! sensible heat flx (W/m**2)
flat , & ! latent heat flx (W/m**2)
fswabs , & ! shortwave absorbed heat flx (W/m**2)
flwout , & ! upwd lw emitted heat flx (W/m**2)
evap , & ! evaporation (kg/m2/s)
evaps , & ! evaporation over snow (kg/m2/s)
evapi , & ! evaporation over ice (kg/m2/s)
Tref , & ! air tmp reference level (K)
Qref , & ! air sp hum reference level (kg/kg)
fresh , & ! fresh water flux to ocean (kg/m2/s)
Expand Down Expand Up @@ -126,12 +136,15 @@ subroutine merge_fluxes (aicen, &
Cdn_atm_ratio_n * aicen
fsurf = fsurf + fsurfn * aicen
fcondtop = fcondtop + fcondtopn * aicen
fcondbot = fcondbot + fcondbotn * aicen
fsens = fsens + fsensn * aicen
flat = flat + flatn * aicen
fswabs = fswabs + fswabsn * aicen
flwout = flwout &
+ (flwoutn - (c1-emissivity)*flw) * aicen
evap = evap + evapn * aicen
evaps = evaps + evapsn * aicen
evapi = evapi + evapin * aicen
Tref = Tref + Trefn * aicen
Qref = Qref + Qrefn * aicen

Expand Down
3 changes: 2 additions & 1 deletion columnphysics/icepack_shortwave.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3482,7 +3482,8 @@ subroutine shortwave_dEdd_set_snow(nslyr, R_snw, &
Tsfc , & ! surface temperature
hs0 ! snow depth for transition to bare sea ice (m)

real (kind=dbl_kind), intent(out) :: &
! real (kind=dbl_kind), intent(inout) :: &
real (kind=dbl_kind), intent(out) :: &
fs , & ! horizontal coverage of snow
hs ! snow depth

Expand Down
4 changes: 2 additions & 2 deletions columnphysics/icepack_therm_mushy.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1029,7 +1029,7 @@ subroutine prep_picard(nilyr, nslyr, &
hilyr , & ! ice layer thickness (m)
hslyr ! snow layer thickness (m)

real(kind=dbl_kind), dimension(:), intent(out) :: &
real(kind=dbl_kind), dimension(:), intent(inout) :: &
zTin , & ! ice layer temperature (C)
Sbr , & ! ice layer brine salinity (ppt)
phi , & ! ice layer liquid fraction
Expand Down Expand Up @@ -1971,7 +1971,7 @@ subroutine solve_heat_conduction(lsnow, lcold, &
real(kind=dbl_kind), dimension(:), intent(inout) :: &
zTin ! ice layer temperature (C)

real(kind=dbl_kind), dimension(:), intent(out) :: &
real(kind=dbl_kind), dimension(:), intent(inout) :: &
zTsn ! snow layer temperature (C)

real(kind=dbl_kind), dimension(nilyr+nslyr+1) :: &
Expand Down
Loading