Merge branch 'master' into reconnection

This commit is contained in:
Grzegorz Kowal 2014-08-08 08:31:27 -03:00
commit 4fa2de498d
2 changed files with 1109 additions and 466 deletions

File diff suppressed because it is too large Load Diff

View File

@ -140,8 +140,8 @@ evolution.o : evolution.F90 blocks.o boundaries.o coordinates.o \
domains.o : domains.F90 blocks.o boundaries.o coordinates.o parameters.o domains.o : domains.F90 blocks.o boundaries.o coordinates.o parameters.o
integrals.o : integrals.F90 blocks.o coordinates.o equations.o error.o \ integrals.o : integrals.F90 blocks.o coordinates.o equations.o error.o \
evolution.o mpitools.o parameters.o timers.o evolution.o mpitools.o parameters.o timers.o
interpolations.o : interpolations.F90 blocks.o coordinates.o parameters.o \ interpolations.o : interpolations.F90 blocks.o coordinates.o error.o \
timers.o parameters.o timers.o
io.o : io.F90 blocks.o coordinates.o equations.o error.o \ io.o : io.F90 blocks.o coordinates.o equations.o error.o \
evolution.o mesh.o mpitools.o random.o refinement.o timers.o evolution.o mesh.o mpitools.o random.o refinement.o timers.o
mesh.o : mesh.F90 blocks.o coordinates.o domains.o equations.o \ mesh.o : mesh.F90 blocks.o coordinates.o domains.o equations.o \