Skip to content

Commit

Permalink
Merge pull request #85 from bast/radovan/rm-trailing-whitespace
Browse files Browse the repository at this point in the history
remove trailing whitespace
  • Loading branch information
heikef authored Dec 1, 2017
2 parents 828b457 + e880f56 commit e14716c
Show file tree
Hide file tree
Showing 47 changed files with 641 additions and 641 deletions.
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
if(DEFINED ENV{TRAVIS_TEST})
include_directories(/home/travis/virtualenv/python2.7.9/lib/python2.7/site-packages/numpy/core/include/)
endif()

include_directories(${CMAKE_BINARY_DIR})
include(ExternalProject)
add_subdirectory(libgimic)
Expand Down
6 changes: 3 additions & 3 deletions src/fgimic/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

add_executable(gimic.bin
add_executable(gimic.bin
gimic.F90
getkw.f90
integral.f90
Expand All @@ -16,7 +16,7 @@ target_link_libraries(gimic.bin gimic2)

configure_file(gimic.py.in gimic.py)

install(FILES __init__.py ${CMAKE_CURRENT_BINARY_DIR}/gimic.py getkw.py
install(FILES __init__.py ${CMAKE_CURRENT_BINARY_DIR}/gimic.py getkw.py
DESTINATION ${PYTHON_SITE_INSTALL_DIR}/fgimic
)

Expand All @@ -28,7 +28,7 @@ if (ENABLE_CFOUR)
find_package(CFour)
if (CFOUR_FOUND)
link_directories(${CFOUR_LIBRARY_DIR})
add_executable(xcpdens
add_executable(xcpdens
xcpdens.F90
)
target_link_libraries(xcpdens libr)
Expand Down
2 changes: 1 addition & 1 deletion src/fgimic/cubeplot.f90
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ subroutine write_cubeplot(fname, grid, pdata, skip)
call getfd(fd)
open(fd,file=trim(fname),form='formatted',status='unknown')
write(fd,*) 'Gaussian cube data, generated by genpot'
write(fd,*)
write(fd,*)

call get_grid_size(grid, npts(1), npts(2), npts(3))

Expand Down
16 changes: 8 additions & 8 deletions src/fgimic/divj_field.f90
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ module divj_field_class
end type

public divj_field, divj_direct_plt, new_divj_field, del_divj_field
public divj_plot, divj_field_t
public divj_plot, divj_field_t
private

real(DP), dimension(5), parameter :: wgt=(/2.d0,-16.d0,0.d0,16.d0,-2.d0/)
real(DP), parameter :: step=1.d-3
real(DP), parameter :: hx=1.d0/(24.d0*step)
Expand Down Expand Up @@ -56,7 +56,7 @@ subroutine del_divj_field(this)
subroutine divj_plot(this, gopen_file)
type(divj_field_t), intent(inout) :: this
character(*), intent(in) :: gopen_file

integer(I4) :: i,j,p1,p2,p3
real(DP) :: amax
real(DP), dimension(3) :: rr
Expand All @@ -75,7 +75,7 @@ subroutine divj_plot(this, gopen_file)
write(DJPFD, '(4f19.8)') rr, buf(i,j,1)
if (abs(buf(i,j,1)) > amax) amax=abs(buf(i,j,1))
end do
write(DJPFD, *)
write(DJPFD, *)
end do
close(DJPFD)
write(str_g, '(a,e19.12)') 'Max divergence:', amax
Expand All @@ -89,8 +89,8 @@ subroutine divj_direct_plt(this)
!type(jfield_t) :: jf
integer(I4) :: i, j, k, p1, p2, p3
real(DP) :: div, amax
real(DP), dimension(3) :: rr
real(DP), dimension(3) :: rr

if (settings%is_mpirun) then
call msg_error('divj_direct_plt(): does not work in parallel')
stop
Expand All @@ -99,7 +99,7 @@ subroutine divj_direct_plt(this)
!jf%grid=>this%grid
!call jfield_eta(jf, 12.d0)
call get_grid_size(this%grid, p1, p2, p3)

open(DJPFD, file='DIVJPLT')
amax=D0
do k=1,p3
Expand All @@ -110,7 +110,7 @@ subroutine divj_direct_plt(this)
write(DJPFD, '(4f19.8)') rr, div
if (abs(div) > amax) amax=abs(div)
end do
write(DJPFD, *)
write(DJPFD, *)
end do
end do
write(str_g, '(a,e19.12)')'Max divergence:', amax
Expand Down
12 changes: 6 additions & 6 deletions src/fgimic/edens_field.f90
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
!
! Calulate the electronic density on a grid.
! Coded by Jonas Juselius <[email protected]> 2003 & 2011
!
!

module edens_field_class
use globals_module
Expand All @@ -15,10 +15,10 @@ module edens_field_class
use parallel_module
use cubeplot_module
implicit none

public new_edens_field, del_edens_field, edens_field_t
public edens_plot, edens_field

type edens_field_t
type(edens_t) :: edens
type(grid_t), pointer :: grid
Expand Down Expand Up @@ -55,7 +55,7 @@ subroutine del_edens_field(this)
subroutine edens_plot(this, basename)
type(edens_field_t), intent(inout) :: this
character(*), intent(in) :: basename

integer(I4) :: i,j,p1,p2,p3
real(DP) :: amax
real(DP), dimension(3) :: rr
Expand All @@ -75,7 +75,7 @@ subroutine edens_plot(this, basename)
write(EDPFD, '(4f19.8)') rr, buf(i,j,1)
if (abs(buf(i,j,1)) > amax) amax=abs(buf(i,j,1))
end do
write(EDPFD, *)
write(EDPFD, *)
end do
close(EDPFD)
write(str_g, '(a,e19.12)') 'Max electronic density:', amax
Expand All @@ -94,7 +94,7 @@ subroutine edens_field(this)
call get_grid_size(this%grid, p1, p2, p3)

buf=>this%buf

do k=1,p3
do j=1,p2
do i=1,p1
Expand Down
Loading

0 comments on commit e14716c

Please sign in to comment.