Skip to content

Commit

Permalink
Revert temporary changes in ocean_model_MOM.F90
Browse files Browse the repository at this point in the history
The option argument input_restart_file was a temporary change to allow
restart file specification via mct_driver. Since the latter no longer
depends on ocean_model_MOM.F90, this change can be reverted.

PS: MOM-examples fails if input_restart_file is kept as an argument in
ocean_model_init.
  • Loading branch information
gustavo-marques committed Sep 11, 2017
1 parent a748f96 commit eda526e
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions config_src/coupled_driver/ocean_model_MOM.F90
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ module ocean_model_mod

!> ocean_model_init initializes the ocean model, including registering fields
!! for restarts and reading restart files if appropriate.
subroutine ocean_model_init(Ocean_sfc, OS, Time_init, Time_in, gas_fields_ocn, input_restart_file)
subroutine ocean_model_init(Ocean_sfc, OS, Time_init, Time_in, gas_fields_ocn)
type(ocean_public_type), target, &
intent(inout) :: Ocean_sfc !< A structure containing various
!! publicly visible ocean surface properties after initialization,
Expand All @@ -204,7 +204,6 @@ subroutine ocean_model_init(Ocean_sfc, OS, Time_init, Time_in, gas_fields_ocn, i
!! in the calculation of additional gas or other
!! tracer fluxes, and can be used to spawn related
!! internal variables in the ice model.
character(len=*), optional, intent(in) :: input_restart_file !< If present, name of restart file to read

! This subroutine initializes both the ocean state and the ocean surface type.
! Because of the way that indicies and domains are handled, Ocean_sfc must have
Expand Down Expand Up @@ -241,7 +240,7 @@ subroutine ocean_model_init(Ocean_sfc, OS, Time_init, Time_in, gas_fields_ocn, i

OS%Time = Time_in
call initialize_MOM(OS%Time, param_file, OS%dirs, OS%MOM_CSp, Time_in, &
offline_tracer_mode=offline_tracer_mode, input_restart_file=input_restart_file)
offline_tracer_mode=offline_tracer_mode)
OS%grid => OS%MOM_CSp%G ; OS%GV => OS%MOM_CSp%GV
OS%C_p = OS%MOM_CSp%tv%C_p
OS%fluxes%C_p = OS%MOM_CSp%tv%C_p
Expand Down

0 comments on commit eda526e

Please sign in to comment.