mom-9 Apply patch from Marshall Ward to fix compile time errors

StephenGriffies · Aug 22, 2012 · ba4f265 · ba4f265
1 parent b9dd85f
commit ba4f265
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/mom5/drivers/mom_oasis3_interface.F90 b/src/mom5/drivers/mom_oasis3_interface.F90
@@ -167,7 +167,7 @@ subroutine mom_prism_init(mom4_local_comm)
 end subroutine mom_prism_init
 
 !-----------------------------------------------------------------------------------
-subroutine coupler_init(Dom, Time, Time_step_coupled, Run_len, dt_cpld)
+subroutine coupler_init(Dom, dt_cpld, Time, Time_step_coupled, Run_len)
 
 ! In this routine we set up all our arrays and determine which fields are to be passed to and fro.
 ! Determine the style of coupling
@@ -176,8 +176,8 @@ subroutine coupler_init(Dom, Time, Time_step_coupled, Run_len, dt_cpld)
 ! use them for initialising.
 
 type(domain2d)  :: Dom  
-type(time_type) :: Time, Time_step_coupled, Run_len
 integer         :: dt_cpld
+type(time_type), optional :: Time, Time_step_coupled, Run_len
 
 integer, dimension(5) :: il_paral
 integer, dimension(2) :: var_num_dims ! see below
@@ -402,13 +402,13 @@ subroutine coupler_init(Dom, Time, Time_step_coupled, Run_len, dt_cpld)
 end subroutine  coupler_init
 
 !=======================================================================
-subroutine into_coupler(step, Ocean_sfc, Time, before_ocean_update)
+subroutine into_coupler(step, Ocean_sfc, before_ocean_update, Time)
 !------------------------------------------!
 
 implicit none
 
 type (ocean_public_type) :: Ocean_sfc
-type (time_type)         :: Time
+type (time_type), optional :: Time
 
 integer, intent(in) :: step
 logical, intent(in) :: before_ocean_update ! Flag to indicate whether
@@ -484,7 +484,7 @@ subroutine from_coupler(step,Ice_ocean_boundary, Time)
 implicit none
 
 type (ice_ocean_boundary_type) :: Ice_ocean_boundary
-type (time_type)         :: Time
+type (time_type), optional :: Time
 
 integer, intent(in) :: step
 

diff --git a/src/mom5/drivers/ocean_solo.F90 b/src/mom5/drivers/ocean_solo.F90
@@ -539,12 +539,12 @@ end subroutine external_coupler_mpi_init
   subroutine external_coupler_sbc_init(Dom, dt_cpld, Run_len)
 ! Call to routine initializing arrays etc for transferring via coupler
 ! Perform sanity checks and make sure all inputs are compatible
-  use mom_oasis_interface_mod, only : coupler_init
+  use mom_oasis3_interface_mod, only : coupler_init
   implicit none
   type(domain2d) :: Dom
   integer :: dt_cpld
   type(time_type) :: Run_len
-  call coupler_init(Dom, dt_cpld, Run_len)
+  call coupler_init(Dom, dt_cpld, Run_len=Run_len)
   end  subroutine external_coupler_sbc_init
 !-----------------------------------------------------------------------------------------