Skip to content

Commit a38db33

Browse files
committed
run fprettify and JuliaFormatter
1 parent 294d26a commit a38db33

13 files changed

+695
-727
lines changed

commun.F90

+39-40
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,59 @@
11
module commun
22

3-
type mesh_fields
4-
real(8), dimension(:,:), pointer :: ex, ey
5-
real(8), dimension(:,:), pointer :: bz
6-
end type mesh_fields
3+
type mesh_fields
4+
real(8), dimension(:, :), pointer :: ex, ey
5+
real(8), dimension(:, :), pointer :: bz
6+
end type mesh_fields
77

8-
real(8) :: c, csq
9-
real(8) :: pi
8+
real(8) :: c, csq
9+
real(8) :: pi
1010

11-
integer :: md, nd
12-
integer :: nx, ny
13-
integer :: nstep, nstepmax
14-
integer :: idiag
11+
integer :: md, nd
12+
integer :: nx, ny
13+
integer :: nstep, nstepmax
14+
integer :: idiag
1515

16-
integer, private :: i, j
16+
integer, private :: i, j
1717

18-
real(8) :: dt, dx, dy
19-
real(8) :: dimx, dimy
20-
real(8) :: cfl
21-
real(8) :: tfinal
22-
real(8) :: omega
18+
real(8) :: dt, dx, dy
19+
real(8) :: dimx, dimy
20+
real(8) :: cfl
21+
real(8) :: tfinal
22+
real(8) :: omega
2323

2424
contains
2525

26-
subroutine readin( )
26+
subroutine readin()
2727

28-
implicit none
28+
implicit none
2929

30-
namelist/donnees/ cfl, & !nbre de Courant
31-
tfinal, & !duree maxi
32-
nstepmax, & !nbre d'iterations maxi
33-
idiag, & !frequence des diagnostics
34-
md,nd, & !nombre d'onde de la solution initiale
35-
nx, ny, & !nombre de points dans les deux directions
36-
dimx, dimy !dimensions du domaine
30+
namelist /donnees/ cfl, & !nbre de Courant
31+
tfinal, & !duree maxi
32+
nstepmax, & !nbre d'iterations maxi
33+
idiag, & !frequence des diagnostics
34+
md, nd, & !nombre d'onde de la solution initiale
35+
nx, ny, & !nombre de points dans les deux directions
36+
dimx, dimy !dimensions du domaine
3737

3838
!***Initialisation des valeurs pas default
3939

40-
pi = 4.*atan(1.)
40+
pi = 4.*atan(1.)
4141

42-
c = 1d0 !celerite de la lumiere
43-
csq = c * c
42+
c = 1d0 !celerite de la lumiere
43+
csq = c*c
4444

45-
open(10,file="input_data",status='old')
46-
read(10,donnees)
47-
close(10)
45+
open (10, file="input_data", status='old')
46+
read (10, donnees)
47+
close (10)
4848

49-
write(*,"(a,g12.3)")" largeur dimx = ", dimx
50-
write(*,"(a,g12.3)")" longueur dimy = ", dimy
51-
write(*,"(a,g12.3)")" temps = ", tfinal
52-
write(*,"(a,g12.3)")" nombre nx = ", nx
53-
write(*,"(a,g12.3)")" nombre ny = ", ny
54-
write(*,"(a,g12.3)")" nombre de Courant = ", cfl
55-
write(*,"(a,g12.3)")" frequence des diagnostics = ", idiag
49+
write (*, "(a,g12.3)") " largeur dimx = ", dimx
50+
write (*, "(a,g12.3)") " longueur dimy = ", dimy
51+
write (*, "(a,g12.3)") " temps = ", tfinal
52+
write (*, "(a,g12.3)") " nombre nx = ", nx
53+
write (*, "(a,g12.3)") " nombre ny = ", ny
54+
write (*, "(a,g12.3)") " nombre de Courant = ", cfl
55+
write (*, "(a,g12.3)") " frequence des diagnostics = ", idiag
5656

57-
58-
end subroutine readin
57+
end subroutine readin
5958

6059
end module commun

fdtd.jl

+24-24
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
1-
function faraday!( fields, ix, jx, iy, jy, dt )
1+
function faraday!(fields, ix, jx, iy, jy, dt)
22

33
dx, dy = fields.mesh.dx, fields.mesh.dy
44

5-
for j=iy:jy, i=ix:jx
6-
dex_dy = (fields.ex[i,j+1]-fields.ex[i,j]) / dy
7-
dey_dx = (fields.ey[i+1,j]-fields.ey[i,j]) / dx
8-
fields.bz[i,j] = fields.bz[i,j] + dt * (dex_dy - dey_dx)
5+
for j = iy:jy, i = ix:jx
6+
dex_dy = (fields.ex[i, j+1] - fields.ex[i, j]) / dy
7+
dey_dx = (fields.ey[i+1, j] - fields.ey[i, j]) / dx
8+
fields.bz[i, j] = fields.bz[i, j] + dt * (dex_dy - dey_dx)
99
end
1010

1111
end
1212

13-
function ampere_maxwell!( fields, ix, jx, iy, jy, dt )
13+
function ampere_maxwell!(fields, ix, jx, iy, jy, dt)
1414

1515
dx, dy = fields.mesh.dx, fields.mesh.dy
1616

17-
for j=iy+1:jy, i=ix:jx
18-
dbz_dy = (fields.bz[i,j]-fields.bz[i,j-1]) / dy
19-
fields.ex[i,j] = fields.ex[i,j] + dt*csq*dbz_dy
17+
for j = iy+1:jy, i = ix:jx
18+
dbz_dy = (fields.bz[i, j] - fields.bz[i, j-1]) / dy
19+
fields.ex[i, j] = fields.ex[i, j] + dt * csq * dbz_dy
2020
end
2121

22-
for j=iy:jy, i=ix+1:jx
23-
dbz_dx = (fields.bz[i,j]-fields.bz[i-1,j]) / dx
24-
fields.ey[i,j] = fields.ey[i,j] - dt*csq*dbz_dx
22+
for j = iy:jy, i = ix+1:jx
23+
dbz_dx = (fields.bz[i, j] - fields.bz[i-1, j]) / dx
24+
fields.ey[i, j] = fields.ey[i, j] - dt * csq * dbz_dx
2525
end
2626

27-
end
27+
end
2828

2929
function periodic_bc!(fields, ix, jx, iy, jy, dt)
3030

3131
for i = ix:jx
32-
dbz_dy = (fields.bz[i,iy]-fields.bz[i,jy]) / fields.mesh.dy
33-
fields.ex[i,iy] = fields.ex[i,iy] + dt*csq*dbz_dy
34-
fields.ex[i,jy+1] = fields.ex[i,iy]
35-
end
36-
32+
dbz_dy = (fields.bz[i, iy] - fields.bz[i, jy]) / fields.mesh.dy
33+
fields.ex[i, iy] = fields.ex[i, iy] + dt * csq * dbz_dy
34+
fields.ex[i, jy+1] = fields.ex[i, iy]
35+
end
36+
3737
for j = iy:jy
38-
dbz_dx = (fields.bz[ix,j]-fields.bz[jx,j]) / fields.mesh.dx
39-
fields.ey[ix,j] = fields.ey[ix,j] - dt*csq*dbz_dx
40-
fields.ey[jx+1,j] = fields.ey[ix,j]
38+
dbz_dx = (fields.bz[ix, j] - fields.bz[jx, j]) / fields.mesh.dx
39+
fields.ey[ix, j] = fields.ey[ix, j] - dt * csq * dbz_dx
40+
fields.ey[jx+1, j] = fields.ey[ix, j]
4141
end
4242

43-
fields.bz[:,jy+1] .= fields.bz[:,iy]
44-
fields.bz[jx+1,:] .= fields.bz[ix,:]
45-
43+
fields.bz[:, jy+1] .= fields.bz[:, iy]
44+
fields.bz[jx+1, :] .= fields.bz[ix, :]
45+
4646
end

0 commit comments

Comments
 (0)