Skip to content

Commit

Permalink
Remove trailing whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
gustavo-marques committed Jul 25, 2017
1 parent 7ce40e5 commit 6b6289a
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
16 changes: 8 additions & 8 deletions config_src/mct_driver/coupler_indices.F90
Original file line number Diff line number Diff line change
Expand Up @@ -300,14 +300,14 @@ subroutine fill_ice_ocean_bnd(ice_ocean_boundary, grid, x2o_o, ind)

! variable that are not in ice_ocean_boundary:
! latent (x2o_Foxx_lat)
! surface Stokes drift, x-comp. (x2o_Sw_ustokes)
! surface Stokes drift, y-comp. (x2o_Sw_vstokes)
! surface Stokes drift, x-comp. (x2o_Sw_ustokes)
! surface Stokes drift, y-comp. (x2o_Sw_vstokes)
! wave model langmuir multiplier (x2o_Sw_lamult)

! biogeochemistry
! Black Carbon hydrophobic release from sea ice component (x2o_Fioi_bcpho)
! Black Carbon hydrophilic release from sea ice component (x2o_Fioi_bcphi)
! dust release from sea ice component (x2o_Fioi_flxdst)
! dust release from sea ice component (x2o_Fioi_flxdst)
! Black Carbon hydrophilic dry deposition (x2o_Faxa_bcphidry)
! Black Carbon hydrophobic dry deposition (x2o_Faxa_bcphodry)
! Black Carbon hydrophobic wet deposition (x2o_Faxa_bcphiwet)
Expand All @@ -316,12 +316,12 @@ subroutine fill_ice_ocean_bnd(ice_ocean_boundary, grid, x2o_o, ind)
! Organic Carbon hydrophilic dry deposition (x2o_Faxa_ocphiwet)
! Sizes 1 to 4 dust - wet deposition (x2o_Faxa_dstwet?)
! Sizes 1 to 4 dust - dry deposition (x2o_Faxa_dstdry?)


! need wind_stress_multiplier?

! Copy from x2o to ice_ocean_boundary. ice_ocean_boundary uses global indexing with no halos.
write(*,*) 'max. k is:', (grid%jec-grid%jsc+1) * (grid%iec-grid%isc+1)
write(*,*) 'max. k is:', (grid%jec-grid%jsc+1) * (grid%iec-grid%isc+1)
! zonal wind stress (taux)
write(*,*) 'taux', SIZE(x2o_o(ind%x2o_Foxx_taux,:))
write(*,*) 'ice_ocean_boundary%u_flux', SIZE(ice_ocean_boundary%u_flux(:,:))
Expand All @@ -336,13 +336,13 @@ subroutine fill_ice_ocean_bnd(ice_ocean_boundary, grid, x2o_o, ind)
! meridional wind stress (tauy)
ice_ocean_boundary%v_flux(i,j) = x2o_o(ind%x2o_Foxx_tauy,k)
! sensible heat flux
ice_ocean_boundary%t_flux(i,j) = x2o_o(ind%x2o_Foxx_sen,k)
ice_ocean_boundary%t_flux(i,j) = x2o_o(ind%x2o_Foxx_sen,k)
! salt flux
ice_ocean_boundary%salt_flux(i,j) = x2o_o(ind%x2o_Fioi_salt,k)
! heat flux from snow & ice melt
ice_ocean_boundary%calving_hflx(i,j) = x2o_o(ind%x2o_Fioi_melth,k)
! snow melt flux
ice_ocean_boundary%fprec(i,j) = x2o_o(ind%x2o_Fioi_meltw,k)
ice_ocean_boundary%fprec(i,j) = x2o_o(ind%x2o_Fioi_meltw,k)
! river runoff flux
ice_ocean_boundary%runoff(i,j) = x2o_o(ind%x2o_Foxx_rofl,k)
! ice runoff flux
Expand All @@ -358,7 +358,7 @@ subroutine fill_ice_ocean_bnd(ice_ocean_boundary, grid, x2o_o, ind)
ice_ocean_boundary%lw_flux(i,j) = x2o_o(k,ind%x2o_Faxa_lwdn)
!!!!!!! SHORTWAVE NEEDS TO BE COMBINED !!!!!!!
! net short-wave heat flux
ice_ocean_boundary%u_flux(i,j) = x2o_o(k,ind%x2o_Foxx_swnet)
ice_ocean_boundary%u_flux(i,j) = x2o_o(k,ind%x2o_Foxx_swnet)
enddo
enddo

Expand Down
8 changes: 4 additions & 4 deletions config_src/mct_driver/ocn_comp_mct.F90
Original file line number Diff line number Diff line change
Expand Up @@ -314,8 +314,8 @@ subroutine ocn_init_mct( EClock, cdata_o, x2o_o, o2x_o, NLFilename )
call get_global_grid_size(glb%grid, ni, nj)

! allocate ice_ocean_boundary
isc = glb%grid%isc; iec = glb%grid%iec;
jsc = glb%grid%jsc; jec = glb%grid%jec;
isc = glb%grid%isc; iec = glb%grid%iec;
jsc = glb%grid%jsc; jec = glb%grid%jec;
allocate(glb%ice_ocean_boundary%u_flux(isc:iec,jsc:jec)); glb%ice_ocean_boundary%u_flux(:,:) = 0.0
allocate(glb%ice_ocean_boundary%v_flux(isc:iec,jsc:jec)); glb%ice_ocean_boundary%v_flux(:,:) = 0.0
allocate(glb%ice_ocean_boundary%t_flux(isc:iec,jsc:jec)); glb%ice_ocean_boundary%t_flux(:,:) = 0.0
Expand All @@ -334,8 +334,8 @@ subroutine ocn_init_mct( EClock, cdata_o, x2o_o, o2x_o, NLFilename )
allocate(glb%ice_ocean_boundary%calving_hflx(isc:iec,jsc:jec)); glb%ice_ocean_boundary%calving_hflx(:,:) = 0.0
allocate(glb%ice_ocean_boundary%p(isc:iec,jsc:jec)); glb%ice_ocean_boundary%p(:,:) = 0.0
allocate(glb%ice_ocean_boundary%mi(isc:iec,jsc:jec)); glb%ice_ocean_boundary%mi(:,:) = 0.0


if (debug .and. root_pe().eq.pe_here()) print *, "calling seq_infodata_putdata"

call seq_infodata_PutData( glb%infodata, &
Expand Down

0 comments on commit 6b6289a

Please sign in to comment.