Skip to content

Commit

Permalink
Merge branch 'stable-1.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
daminton committed Sep 10, 2019
2 parents 433c597 + a4a57b4 commit 5b3554b
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/globals/module_globals.f90
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module module_globals
implicit none
public

character(len=*),parameter :: CTEMVER = "1.3 DEVELOPMENT"
character(len=*),parameter :: CTEMVER = "1.4 DEVELOPMENT"

! Symbolic names for kind types of 4-, 2-, and 1-byte integers:
integer, parameter :: I8B = selected_int_kind(17)
Expand Down Expand Up @@ -184,9 +184,9 @@ module module_globals
real(DP) :: regcoh ! target surface regolith layer cohesion

! Crater diffusion input parameters
real(DP) :: Kd1 ! Degradation function coefficient (from Minton et al. (2018))
real(DP) :: psi ! Degradation function exponent (from Minton et al. (2018))
real(DP) :: fe ! Scale factor for size of degradation region (from Minton et al. (2018))
real(DP) :: Kd1 ! Degradation function coefficient (from Minton et al. (2019))
real(DP) :: psi ! Degradation function exponent (from Minton et al. (2019))
real(DP) :: fe ! Scale factor for size of degradation region (from Minton et al. (2019))

! Ejecta softening variables
logical :: dosoftening ! Set T to use the extra crater softening model
Expand Down

0 comments on commit 5b3554b

Please sign in to comment.