From d77936e2b528a705bb1c522c2b737e5b5aed2058 Mon Sep 17 00:00:00 2001 From: Gustavo Marques Date: Wed, 26 Jul 2017 11:05:35 -0600 Subject: [PATCH 1/2] Fix intent(inout) in ice_ocean_boundary --- config_src/mct_driver/coupler_indices.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config_src/mct_driver/coupler_indices.F90 b/config_src/mct_driver/coupler_indices.F90 index 0d3cbb4f93..cd7d61bb33 100644 --- a/config_src/mct_driver/coupler_indices.F90 +++ b/config_src/mct_driver/coupler_indices.F90 @@ -289,7 +289,7 @@ end subroutine ocn_export subroutine fill_ice_ocean_bnd(ice_ocean_boundary, grid, x2o_o, ind) - type(ice_ocean_boundary_type), intent(in) :: ice_ocean_boundary !< A type for the ice ocean boundary + type(ice_ocean_boundary_type), intent(inout) :: ice_ocean_boundary !< A type for the ice ocean boundary type(ocean_grid_type), intent(in) :: grid !type(mct_aVect), intent(in) :: x2o_o real(kind=8), intent(in) :: x2o_o(:,:) From 31787c2b4fc2a80c5ad8e1960103e2b906018804 Mon Sep 17 00:00:00 2001 From: Gustavo Marques Date: Wed, 26 Jul 2017 11:11:59 -0600 Subject: [PATCH 2/2] Adds reference to set_time that was lost during a conflict handling --- config_src/mct_driver/ocn_comp_mct.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config_src/mct_driver/ocn_comp_mct.F90 b/config_src/mct_driver/ocn_comp_mct.F90 index 1e1132bc8c..0dce8f407e 100644 --- a/config_src/mct_driver/ocn_comp_mct.F90 +++ b/config_src/mct_driver/ocn_comp_mct.F90 @@ -32,7 +32,7 @@ module ocn_comp_mct use MOM_grid, only: ocean_grid_type, get_global_grid_size use MOM_variables, only: surface use MOM_error_handler, only: MOM_error, FATAL, is_root_pe -use MOM_time_manager, only: time_type, set_date, set_calendar_type, NOLEAP +use MOM_time_manager, only: time_type, set_date, set_time, set_calendar_type, NOLEAP use coupler_indices, only: coupler_indices_init, cpl_indices use coupler_indices, only: ocn_export, fill_ice_ocean_bnd