Skip to content

Commit

Permalink
Merge pull request #3123 from ESMCI/jgfouca/branch-for-acme-split-201…
Browse files Browse the repository at this point in the history
…9-05-28

Jgfouca/branch for acme split 2019 05 28

Change List:

Add first stage of ocean/ice shelf coupling
Bring COMPOSE semi-Lagrangian tracer transport code into HOMME and E3SM (required minor changes to build.py)
Add checkpoint of timing data immediately after initialization
bless_test_results: Be able to handle build-only tests
Test suite: scripts_regression_tests
Test baseline:
Test namelist changes:
Test status: BFB

Fixes [CIME Github issue #]

User interface changes?:

Update gh-pages html (Y/N)?:

Code review: @jedwards4b
  • Loading branch information
jgfouca authored Jun 3, 2019
2 parents 24107fc + c45c00d commit ab1c654
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions share/util/shr_const_mod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,17 @@ MODULE shr_const_mod
real(R8),parameter :: SHR_CONST_LATVAP = 2.501e6_R8 ! latent heat of evaporation ~ J/kg
real(R8),parameter :: SHR_CONST_LATSUB = & ! latent heat of sublimation ~ J/kg
SHR_CONST_LATICE + SHR_CONST_LATVAP
real(R8),parameter :: SHR_CONST_CONDICE = 2.1_R8 ! thermal conductivity of ice ~ W/m/K
real(R8),parameter :: SHR_CONST_KAPPA_LAND_ICE = & ! Diffusivity of heat in land ice ~
SHR_CONST_CONDICE / (SHR_CONST_RHOICE*SHR_CONST_CPICE)
real(R8),parameter :: SHR_CONST_TF0 = 6.22e-2_R8 ! The freezing temperature at zero pressure in
! sub-ice-shelf ocean cavities ~ C
real(R8),parameter :: SHR_CONST_DTF_DP = -7.43e-8_R8 ! The coefficient for the term proportional to the (limited)
! pressure in the freezing temperature in sub-ice-shelf ocean cavities. ~ C Pa^{-1}
real(R8),parameter :: SHR_CONST_DTF_DS = -5.63e-2_R8 !The coefficient for the term proportional to salinity in
! the freezing temperature in sub-ice-ice ocean cavities ~ C PSU^{-1}
real(R8),parameter :: SHR_CONST_DTF_DPDS = -1.74e-10_R8 ! The coefficient for the term proportional to salinity times
! pressure in the freezing temperature in sub-ice-shelf ocean cavities ~ C PSU^{-1} Pa^{-1}
real(R8),parameter :: SHR_CONST_OCN_REF_SAL = 34.7_R8 ! ocn ref salinity (psu)
real(R8),parameter :: SHR_CONST_ICE_REF_SAL = 4.0_R8 ! ice ref salinity (psu)

Expand Down

0 comments on commit ab1c654

Please sign in to comment.