Skip to content

Commit

Permalink
removed trailing whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
mvertens committed Jul 12, 2018
1 parent f49c205 commit 7fb01ff
Show file tree
Hide file tree
Showing 7 changed files with 141 additions and 141 deletions.
18 changes: 9 additions & 9 deletions config_src/mct_driver/MOM_ocean_model.F90
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ module MOM_ocean_model
use MOM_marine_ice, only : iceberg_forces, iceberg_fluxes, marine_ice_init, marine_ice_CS
use MOM_restart, only : MOM_restart_CS, save_restart
use MOM_string_functions, only : uppercase
use MOM_surface_forcing, only : surface_forcing_init
use MOM_surface_forcing, only : surface_forcing_init
use MOM_surface_forcing, only : convert_IOB_to_fluxes
use MOM_surface_forcing, only : convert_IOB_to_forces, ice_ocn_bnd_type_chksum
use MOM_surface_forcing, only : ice_ocean_boundary_type, surface_forcing_CS
Expand Down Expand Up @@ -150,7 +150,7 @@ module MOM_ocean_model
!> Contains information about the ocean state, although it is not necessary that
!! this is implemented with all models. This type is NOT private, and can therefore CANNOT vary
!! between different ocean models.
type, public :: ocean_state_type
type, public :: ocean_state_type
logical :: is_ocean_PE = .false. !< True if this is an ocean PE.
type(time_type) :: Time !< The ocean model's time and master clock.
integer :: Restart_control !< An integer that is bit-tested to determine whether
Expand Down Expand Up @@ -285,15 +285,15 @@ subroutine ocean_model_init(Ocean_sfc, OS, Time_init, Time_in, gas_fields_ocn, i
"staggering of the surface velocity field that is \n"//&
"returned to the coupler. Valid values include \n"//&
"'A', 'B', or 'C'.", default="C")
if (uppercase(stagger(1:1)) == 'A') then
if (uppercase(stagger(1:1)) == 'A') then
Ocean_sfc%stagger = AGRID
elseif (uppercase(stagger(1:1)) == 'B') then
elseif (uppercase(stagger(1:1)) == 'B') then
Ocean_sfc%stagger = BGRID_NE
elseif (uppercase(stagger(1:1)) == 'C') then
elseif (uppercase(stagger(1:1)) == 'C') then
Ocean_sfc%stagger = CGRID_NE
else
else
call MOM_error(FATAL,"ocean_model_init: OCEAN_SURFACE_STAGGER = "// &
trim(stagger)//" is invalid.")
trim(stagger)//" is invalid.")
end if

call get_param(param_file, mdl, "RESTORE_SALINITY",OS%restore_salinity, &
Expand Down Expand Up @@ -662,8 +662,8 @@ subroutine ocean_model_save_restart(OS, Time, directory, filename_suffix)

if (present(directory)) then
restart_dir = directory
else
restart_dir = OS%dirs%restart_output_dir
else
restart_dir = OS%dirs%restart_output_dir
endif

call save_restart(restart_dir, Time, OS%grid, OS%restart_CSp, GV=OS%GV)
Expand Down
4 changes: 2 additions & 2 deletions config_src/mct_driver/MOM_surface_forcing.F90
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ module MOM_surface_forcing

!> Contains pointers to the forcing fields which may be used to drive MOM.
!! All fluxes are positive downward.
type, public :: surface_forcing_CS ;
type, public :: surface_forcing_CS ;
integer :: wind_stagger !< AGRID, BGRID_NE, or CGRID_NE (integer values
!! from MOM_domains) to indicate the staggering of
!! the winds that are being provided in calls to
Expand Down Expand Up @@ -604,7 +604,7 @@ subroutine convert_IOB_to_forces(IOB, forces, index_bounds, Time, G, CS)
endif
end if
end do; end do

! GMM, CIME uses AGRID. All the BGRID_NE code can be cleaned later
wind_stagger = AGRID

Expand Down
14 changes: 7 additions & 7 deletions config_src/nuopc_driver/MOM_ocean_model.F90
Original file line number Diff line number Diff line change
Expand Up @@ -691,7 +691,7 @@ subroutine ocean_model_restart(OS, timestamp, restartname)
!! internal ocean state being saved to a restart file
character(len=*), optional, intent(in) :: timestamp !< An optional timestamp string that should be
!! prepended to the file name. (Currently this is unused.)
character(len=*), optional, intent(in) :: restartname !< Name of restart file to use
character(len=*), optional, intent(in) :: restartname !< Name of restart file to use
!! This option distinguishes the cesm interface from the
!! non-cesm interface

Expand All @@ -715,7 +715,7 @@ subroutine ocean_model_restart(OS, timestamp, restartname)
if (OS%use_ice_shelf) then
call ice_shelf_save_restart(OS%Ice_shelf_CSp, OS%Time, OS%dirs%restart_output_dir)
endif

else

if (BTEST(OS%Restart_control,1)) then
Expand All @@ -733,7 +733,7 @@ subroutine ocean_model_restart(OS, timestamp, restartname)
if (BTEST(OS%Restart_control,0)) then
call save_restart(OS%dirs%restart_output_dir, OS%Time, OS%grid, &
OS%restart_CSp, GV=OS%GV)

call forcing_save_restart(OS%forcing_CSp, OS%grid, OS%Time, &
OS%dirs%restart_output_dir)
if (OS%use_ice_shelf) then
Expand Down Expand Up @@ -768,7 +768,7 @@ subroutine ocean_model_end(Ocean_sfc, Ocean_state, Time, write_restart)
!! the internal ocean state to be deallocated
!! upon termination.
type(time_type), intent(in) :: Time !< The model time, used for writing restarts.
logical, intent(in) :: write_restart !< true => write restart file
logical, intent(in) :: write_restart !< true => write restart file

if (write_restart) then
call ocean_model_save_restart(Ocean_state, Time)
Expand Down Expand Up @@ -811,10 +811,10 @@ subroutine ocean_model_save_restart(OS, Time, directory, filename_suffix)
"was called with unused buoyancy fluxes. For conservation, the ocean "//&
"restart files can only be created after the buoyancy forcing is applied.")

if (present(directory)) then
if (present(directory)) then
restart_dir = directory
else
restart_dir = OS%dirs%restart_output_dir
else
restart_dir = OS%dirs%restart_output_dir
endif

call save_restart(restart_dir, Time, OS%grid, OS%restart_CSp, GV=OS%GV)
Expand Down
2 changes: 1 addition & 1 deletion config_src/nuopc_driver/MOM_surface_forcing.F90
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@ subroutine convert_IOB_to_forces(IOB, forces, index_bounds, Time, G, CS)
rigidity_at_h, & ! Ice rigidity at tracer points (m3 s-1)
taux_at_h, & ! Zonal wind stresses at h points (Pa)
tauy_at_h ! Meridional wind stresses at h points (Pa)

real :: gustiness ! unresolved gustiness that contributes to ustar (Pa)
real :: Irho0 ! inverse of the mean density in (m^3/kg)
real :: taux2, tauy2 ! squared wind stresses (Pa^2)
Expand Down
Loading

0 comments on commit 7fb01ff

Please sign in to comment.