Skip to content

Commit

Permalink
Merge branch 'dev/gfdl' of https://github.com/NOAA-GFDL/MOM6 into dev…
Browse files Browse the repository at this point in the history
…/gfdl
  • Loading branch information
CarolineCardinale committed Jun 22, 2017
2 parents 26ed48b + e09f0a9 commit 0d5399f
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/parameterizations/lateral/MOM_tidal_forcing.F90
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,10 @@ module MOM_tidal_forcing
contains

subroutine tidal_forcing_init(Time, G, param_file, CS)
type(time_type), intent(in) :: Time
type(ocean_grid_type), intent(in) :: G !< The ocean's grid structure
type(param_file_type), intent(in) :: param_file !< A structure to parse for run-time parameters
type(tidal_forcing_CS), pointer :: CS
type(time_type), intent(in) :: Time
type(ocean_grid_type), intent(inout) :: G !< The ocean's grid structure
type(param_file_type), intent(in) :: param_file !< A structure to parse for run-time parameters
type(tidal_forcing_CS), pointer :: CS

! This subroutine allocates space for the static variables used
! by this module. The metrics may be effectively 0, 1, or 2-D arrays,
Expand Down

0 comments on commit 0d5399f

Please sign in to comment.