From b80fe06cb06a9bee098c31d3d4653967350f8220 Mon Sep 17 00:00:00 2001 From: Philippe Blain Date: Thu, 29 Aug 2019 09:39:38 -0400 Subject: [PATCH 1/4] Refactor boxslotcyl initialization to use icepack parameters --- cicecore/cicedynB/general/ice_init.F90 | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/cicecore/cicedynB/general/ice_init.F90 b/cicecore/cicedynB/general/ice_init.F90 index 9b48fed51..bb992a6b4 100644 --- a/cicecore/cicedynB/general/ice_init.F90 +++ b/cicecore/cicedynB/general/ice_init.F90 @@ -1927,9 +1927,10 @@ subroutine boxslotcyl_data_vel(i, j, & iglob, jglob, & uvel, vvel) - use ice_constants, only: c1, c4, c2, c12, p5, cm_to_m + use ice_constants, only: c2, c12, p5, cm_to_m use ice_domain_size, only: nx_global, ny_global use ice_grid, only: dxrect + use icepack_parameters, only: secday => days_to_s, pi integer (kind=int_kind), intent(in) :: & i, j, & ! local indices @@ -1946,10 +1947,6 @@ subroutine boxslotcyl_data_vel(i, j, & max_vel , & ! max velocity domain_length , & ! physical domain length period ! rotational period - - real (kind=dbl_kind), parameter :: & - pi = c4*atan(c1), & ! pi - days_to_s = 86400._dbl_kind character(len=*), parameter :: subname = '(boxslotcyl_data_vel)' From 330b328c8a67360126d4ac6c46c5cc86a82dbd6f Mon Sep 17 00:00:00 2001 From: Philippe Blain Date: Thu, 29 Aug 2019 10:03:36 -0400 Subject: [PATCH 2/4] Fix documentation typo --- doc/source/user_guide/ug_testing.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/user_guide/ug_testing.rst b/doc/source/user_guide/ug_testing.rst index c5f5a4e29..24c5b729a 100644 --- a/doc/source/user_guide/ug_testing.rst +++ b/doc/source/user_guide/ug_testing.rst @@ -895,7 +895,7 @@ Below is an example of a step-by-step procedure for testing a code change that m # Create a baseline dataset (only necessary if no baseline exists on the system) # git clone the baseline code - ./cice.setup -m onyx -e intel --suite base_suite --testid base0 -bgen cice.my.baseline + ./cice.setup -m onyx -e intel --suite base_suite --testid base0 --bgen cice.my.baseline # Run the test suite with the new code # git clone the new code From b67990e379a493c3bf4d1c65e2082db67480aded Mon Sep 17 00:00:00 2001 From: Philippe Blain Date: Thu, 29 Aug 2019 16:57:47 -0400 Subject: [PATCH 3/4] Correct use statement rename syntax --- cicecore/cicedynB/general/ice_init.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cicecore/cicedynB/general/ice_init.F90 b/cicecore/cicedynB/general/ice_init.F90 index bb992a6b4..b43b41b03 100644 --- a/cicecore/cicedynB/general/ice_init.F90 +++ b/cicecore/cicedynB/general/ice_init.F90 @@ -1930,7 +1930,7 @@ subroutine boxslotcyl_data_vel(i, j, & use ice_constants, only: c2, c12, p5, cm_to_m use ice_domain_size, only: nx_global, ny_global use ice_grid, only: dxrect - use icepack_parameters, only: secday => days_to_s, pi + use icepack_parameters, only: days_to_s => secday, pi integer (kind=int_kind), intent(in) :: & i, j, & ! local indices From 227cae55a4de2c6cc5768469b251067de95422ff Mon Sep 17 00:00:00 2001 From: Philippe Blain Date: Fri, 30 Aug 2019 12:30:06 -0400 Subject: [PATCH 4/4] Change days_to_s to secday --- cicecore/cicedynB/general/ice_init.F90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cicecore/cicedynB/general/ice_init.F90 b/cicecore/cicedynB/general/ice_init.F90 index b43b41b03..bce9d7352 100644 --- a/cicecore/cicedynB/general/ice_init.F90 +++ b/cicecore/cicedynB/general/ice_init.F90 @@ -1930,7 +1930,7 @@ subroutine boxslotcyl_data_vel(i, j, & use ice_constants, only: c2, c12, p5, cm_to_m use ice_domain_size, only: nx_global, ny_global use ice_grid, only: dxrect - use icepack_parameters, only: days_to_s => secday, pi + use icepack_parameters, only: secday, pi integer (kind=int_kind), intent(in) :: & i, j, & ! local indices @@ -1951,7 +1951,7 @@ subroutine boxslotcyl_data_vel(i, j, & character(len=*), parameter :: subname = '(boxslotcyl_data_vel)' domain_length = dxrect*cm_to_m*nx_global - period = c12*days_to_s ! 12 days rotational period + period = c12*secday ! 12 days rotational period max_vel = pi*domain_length/period uvel(i,j) = c2*max_vel*(real(jglob(j), kind=dbl_kind) - p5) &