some clean after erratic modifications
This commit is contained in:
tTh
parent
a1f5030300
commit
6d935e5fd0
|
|
@ -1,7 +1,7 @@
|
|||
|
||||
all: voxelize evolvopick pickover julia lorentz essai
|
||||
|
||||
GFOPT = -Wall -Wextra -time -g -O -Imods/ -I../Modules
|
||||
GFOPT = -Wall -Wextra -time -g -Imods/ -I../Modules
|
||||
|
||||
# ---------------------------------------------
|
||||
# the module 'spitpgm' is now in $PROJECT/Modules
|
||||
|
|
@ -16,29 +16,30 @@ mods/xperiment.o: mods/xperiment.f90 Makefile
|
|||
fraktals.o: fraktals.f90 Makefile
|
||||
gfortran $(GFOPT) -c $<
|
||||
|
||||
OBJS = mods/points3d.o mods/xperiment.o fraktals.o
|
||||
OBJDEP = mods/points3d.o mods/xperiment.o fraktals.o
|
||||
OBJS = $(OBJDEP) ../Modules/spitpgm.o
|
||||
|
||||
# ---------------------------------------------
|
||||
|
||||
essai: essai.f90 Makefile $(OBJS)
|
||||
essai: essai.f90 Makefile $(OBJDEP)
|
||||
gfortran $(GFOPT) $< $(OBJS) -o $@
|
||||
|
||||
henon: henon.f90 Makefile $(OBJS)
|
||||
henon: henon.f90 Makefile $(OBJDEP)
|
||||
gfortran $(GFOPT) $< $(OBJS) -o $@
|
||||
|
||||
julia: julia.f90 Makefile $(OBJS)
|
||||
julia: julia.f90 Makefile $(OBJDEP)
|
||||
gfortran $(GFOPT) $< $(OBJS) -o $@
|
||||
|
||||
pickover: pickover.f90 Makefile $(OBJS)
|
||||
pickover: pickover.f90 Makefile $(OBJDEP)
|
||||
gfortran $(GFOPT) $< $(OBJS) -o $@
|
||||
|
||||
evolvopick: evolvopick.f90 Makefile $(OBJS)
|
||||
evolvopick: evolvopick.f90 Makefile $(OBJDEP)
|
||||
gfortran $(GFOPT) $< $(OBJS) $(DOT_O) -o $@
|
||||
|
||||
voxelize: voxelize.f90 Makefile $(OBJS)
|
||||
voxelize: voxelize.f90 Makefile $(OBJDEP)
|
||||
gfortran $(GFOPT) $< $(OBJS) -o $@
|
||||
|
||||
lorentz: lorentz.f90 Makefile $(OBJS)
|
||||
lorentz: lorentz.f90 Makefile $(OBJDEP)
|
||||
gfortran $(GFOPT) $< $(OBJS) -o $@
|
||||
|
||||
# ---------------------------------------------
|
||||
|
|
|
|||
|
|
@ -9,7 +9,8 @@ qui montre ma première expérience dans ce domaine.
|
|||
## La technique
|
||||
|
||||
Le gros des calculs de fractales est fait dans `mods/fraktals.f90`,
|
||||
et la gestion des pixels 'physiques' est fait dans `mods/spitpgm`.
|
||||
et la gestion des pixels 'physiques' est faite par le
|
||||
module externe `spitpgm`.
|
||||
|
||||
Les fonctions d'usage général sont dans
|
||||
[mods/](répertoire mods/) ave trop peu
|
||||
|
|
@ -19,6 +20,8 @@ Des scripts _shell_ sont utilisés pour construire les vidéos.
|
|||
|
||||
## File Formats
|
||||
|
||||
Certains programmes enregistrent des tables de points 3d dans
|
||||
des fichiers.
|
||||
|
||||
```
|
||||
type t_point3d
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ program essai
|
|||
allocate(picz(W,H), stat=errcode)
|
||||
|
||||
do foo=1, 360
|
||||
write (filename, "(a, i5.5, a)") "frames/popcorn/", foo, ".pnm"
|
||||
write (filename, "(a, i5.5, a)") "frames/popcorn/", foo-1, ".pnm"
|
||||
write(0, *) "-------->", trim(filename), "<"
|
||||
kx = 50.0 * sin(real(foo)*25.133)
|
||||
ky = 50.0 * cos(real(foo)*25.133)
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ subroutine parasites_0(pic, cx, cy, maxiter)
|
|||
! write(0, *) "constantes", cx, cy
|
||||
|
||||
width = ubound(pic, 1) ; height = ubound(pic, 2)
|
||||
coef = float(maxiter)
|
||||
coef = float(maxiter) / 12.3456789
|
||||
|
||||
do ix = 1, width
|
||||
fx = cx + (float(ix) / (float(width)/4.0) - 2.0)
|
||||
|
|
@ -35,9 +35,9 @@ subroutine parasites_0(pic, cx, cy, maxiter)
|
|||
fy = cy + (float(iy) / (float(height)/4.0) - 2.0)
|
||||
|
||||
if (burps) then
|
||||
pic(ix, iy) = int(fx * fy * coef * 1.005)
|
||||
pic(ix, iy) = mod(int(fx * fy * coef * 1.005), 250)
|
||||
else
|
||||
pic(ix, iy) = int(fx * fy * coef)
|
||||
pic(ix, iy) = mod(int(fx * fy * coef), 250)
|
||||
endif
|
||||
|
||||
enddo
|
||||
|
|
@ -45,7 +45,6 @@ subroutine parasites_0(pic, cx, cy, maxiter)
|
|||
|
||||
end subroutine parasites_0
|
||||
|
||||
|
||||
!===============================================================
|
||||
|
||||
subroutine simple_julia(pic, cx, cy, maxiter)
|
||||
|
|
|
|||
|
|
@ -4,6 +4,10 @@
|
|||
|
||||
GFOPT = -Wall -Wextra -time -g
|
||||
|
||||
all: xperiment.o points3d.o
|
||||
|
||||
points3d.o: points3d.f90 Makefile
|
||||
gfortran $(GFOPT) -c $<
|
||||
|
||||
xperiment.o: xperiment.f90 Makefile
|
||||
gfortran $(GFOPT) -c $<
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ module xperiment
|
|||
!===============================================================
|
||||
! nouveau 24 mai 2022
|
||||
|
||||
subroutine parasites_0(pic, cx, cy, maxiter)
|
||||
subroutine parasites_1(pic, cx, cy, maxiter)
|
||||
implicit none
|
||||
|
||||
! here is the wtf
|
||||
|
|
@ -39,13 +39,13 @@ subroutine parasites_0(pic, cx, cy, maxiter)
|
|||
enddo
|
||||
enddo
|
||||
|
||||
end subroutine parasites_0
|
||||
end subroutine parasites_1
|
||||
|
||||
!---------------------------------------------------------------
|
||||
!
|
||||
! aucune idee de l'utilisation de ce truc !
|
||||
!
|
||||
subroutine loop_of_parasites_0(nbre, mode)
|
||||
subroutine loop_of_parasites_1(nbre, mode)
|
||||
implicit none
|
||||
integer, intent(in) :: nbre, mode
|
||||
|
||||
|
|
@ -59,7 +59,7 @@ subroutine loop_of_parasites_0(nbre, mode)
|
|||
|
||||
enddo
|
||||
|
||||
end subroutine loop_of_parasites_0
|
||||
end subroutine loop_of_parasites_1
|
||||
|
||||
!===============================================================
|
||||
end module xperiment
|
||||
|
|
|
|||
Loading…
Reference in New Issue