Skip to content

Commit

Permalink
Merge branch 'ESMG-dev/master' into dev/master
Browse files Browse the repository at this point in the history
  • Loading branch information
adcroft committed May 13, 2016
2 parents 2f54286 + 67cdd1a commit d22c2b8
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions src/initialization/MOM_coord_initialization.F90
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ subroutine MOM_initialize_coord(G, GV, PF, write_geom, output_dir, tv)

nz = GV%ke

call callTree_enter("MOM_initialize_coord(), MOM_fixed_initialization.F90")
call callTree_enter("MOM_initialize_coord(), MOM_coord_initialization.F90")
! call log_version(PF, mod, version)
call get_param(PF, mod, "DEBUG", debug, default=.false.)

Expand Down Expand Up @@ -132,7 +132,7 @@ subroutine set_coord_from_gprime(Rlay, g_prime, G, GV, param_file)
integer :: k, nz
nz = G%ke

call callTree_enter(trim(mod)//"(), MOM_fixed_initialization.F90")
call callTree_enter(trim(mod)//"(), MOM_coord_initialization.F90")

call get_param(param_file, mod, "GFS" , g_fs, &
"The reduced gravity at the free surface.", units="m s-2", &
Expand Down Expand Up @@ -173,7 +173,7 @@ subroutine set_coord_from_layer_density(Rlay, g_prime, G, GV, param_file)
integer :: k, nz
nz = G%ke

call callTree_enter(trim(mod)//"(), MOM_fixed_initialization.F90")
call callTree_enter(trim(mod)//"(), MOM_coord_initialization.F90")

call get_param(param_file, mod, "GFS", g_fs, &
"The reduced gravity at the free surface.", units="m s-2", &
Expand Down Expand Up @@ -227,7 +227,7 @@ subroutine set_coord_from_TS_ref(Rlay, g_prime, G, GV, param_file, eqn_of_state,
integer :: k, nz
nz = G%ke

call callTree_enter(trim(mod)//"(), MOM_fixed_initialization.F90")
call callTree_enter(trim(mod)//"(), MOM_coord_initialization.F90")

call get_param(param_file, mod, "T_REF", T_Ref, &
"The initial temperature of the lightest layer.", units="degC", &
Expand Down Expand Up @@ -284,7 +284,7 @@ subroutine set_coord_from_TS_profile(Rlay, g_prime, G, GV, param_file, &
character(len=200) :: filename, coord_file, inputdir ! Strings for file/path
nz = G%ke

call callTree_enter(trim(mod)//"(), MOM_fixed_initialization.F90")
call callTree_enter(trim(mod)//"(), MOM_coord_initialization.F90")

call get_param(param_file, mod, "GFS", g_fs, &
"The reduced gravity at the free surface.", units="m s-2", &
Expand Down Expand Up @@ -346,7 +346,7 @@ subroutine set_coord_from_TS_range(Rlay, g_prime, G, GV, param_file, &
character(len=200) :: filename, coord_file, inputdir ! Strings for file/path
nz = G%ke

call callTree_enter(trim(mod)//"(), MOM_fixed_initialization.F90")
call callTree_enter(trim(mod)//"(), MOM_coord_initialization.F90")

call get_param(param_file, mod, "T_REF", T_Ref, &
"The default initial temperatures.", units="degC", default=10.0)
Expand Down Expand Up @@ -424,7 +424,7 @@ subroutine set_coord_from_file(Rlay, g_prime, G, GV, param_file)
character(len=200) :: filename,coord_file,inputdir ! Strings for file/path
nz = G%ke

call callTree_enter(trim(mod)//"(), MOM_fixed_initialization.F90")
call callTree_enter(trim(mod)//"(), MOM_coord_initialization.F90")

call get_param(param_file, mod, "GFS", g_fs, &
"The reduced gravity at the free surface.", units="m s-2", &
Expand Down Expand Up @@ -478,7 +478,7 @@ subroutine set_coord_linear(Rlay, g_prime, G, GV, param_file)
integer :: k, nz
nz = G%ke

call callTree_enter(trim(mod)//"(), MOM_fixed_initialization.F90")
call callTree_enter(trim(mod)//"(), MOM_coord_initialization.F90")

call get_param(param_file, mod, "LIGHTEST_DENSITY", Rlay_Ref, &
"The reference potential density used for the surface \n"// &
Expand Down

0 comments on commit d22c2b8

Please sign in to comment.