Merge branch 'master' into reconnection
This commit is contained in:
commit
2ec54cb0f1
@ -160,14 +160,14 @@ refinement.o : refinement.F90 blocks.o coordinates.o equations.o \
|
||||
operators.o parameters.o timers.o
|
||||
schemes.o : schemes.F90 algebra.o coordinates.o equations.o \
|
||||
interpolations.o timers.o
|
||||
user_problem.o : user_problem.F90 blocks.o constants.o coordinates.o \
|
||||
equations.o error.o operators.o parameters.o random.o \
|
||||
timers.o
|
||||
shapes.o : shapes.F90 blocks.o constants.o coordinates.o equations.o \
|
||||
parameters.o timers.o user_problem.o
|
||||
sources.o : sources.F90 blocks.o coordinates.o equations.o gravity.o \
|
||||
operators.o parameters.o timers.o user_problem.o
|
||||
timers.o : timers.F90
|
||||
user_problem.o : user_problem.F90 blocks.o constants.o coordinates.o \
|
||||
equations.o error.o operators.o parameters.o random.o \
|
||||
timers.o
|
||||
utils.o : utils.F90 error.o
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
|
@ -118,7 +118,7 @@ module user_problem
|
||||
|
||||
write (*,*)
|
||||
write (*,"(1x,a)") "User problem:"
|
||||
write (*,"(4x,a14, 9x,'=',1x,a)") "problem name ", trim(problem_name)
|
||||
write (*,"(4x,a14, 9x,'=',2x,a)") "problem name ", trim(problem_name)
|
||||
|
||||
end if
|
||||
|
||||
@ -192,15 +192,10 @@ module user_problem
|
||||
! include external procedures and variables
|
||||
!
|
||||
use blocks , only : block_data
|
||||
use constants , only : d2r
|
||||
use coordinates, only : im, jm, km
|
||||
use coordinates, only : ay, ady
|
||||
use equations , only : prim2cons
|
||||
use equations , only : nv
|
||||
use equations , only : idn, ivx, ivy, ivz, ipr, ibx, iby, ibz, ibp
|
||||
use equations , only : csnd2
|
||||
use parameters , only : get_parameter_real
|
||||
use random , only : randomn
|
||||
|
||||
! local variables are not implicit by default
|
||||
!
|
||||
@ -212,8 +207,7 @@ module user_problem
|
||||
|
||||
! local variables
|
||||
!
|
||||
integer :: i, j, k
|
||||
real(kind=8) :: sn, cs
|
||||
integer :: i, j, k
|
||||
|
||||
! local arrays
|
||||
!
|
||||
|
Loading…
x
Reference in New Issue
Block a user