gkowal/amun-code
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EQUATIONS: Replace explicit calls to get_parameter_*() with unified one.

Browse Source 
Signed-off-by: Grzegorz Kowal <grzegorz@amuncode.org>
This commit is contained in:
Grzegorz Kowal 2019-01-28 21:23:55 -02:00
parent 419cf04363
commit 927642bf3e
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
sources/equations.F90
View File

@ -258,8 +258,7 @@ module equations
! include external procedures and variables
!
use parameters, only : get_parameter_string, get_parameter_real &
, get_parameter_integer
use parameters, only : get_parameter
! local variables are not implicit by default
!
@ -307,16 +306,16 @@ module equations
! get the primitive variable solver
!
call get_parameter_string("primitive_solver" , c2p )
call get_parameter("primitive_solver", c2p )
! get the tolerance
!
call get_parameter_real ("tolerance" , tol )
call get_parameter("tolerance" , tol )
! get the maximum number of Newton-Raphson method iterations
!
call get_parameter_integer("nr_maxit" , nrmax)
call get_parameter_integer("nr_extra" , nrext)
call get_parameter("nr_maxit" , nrmax)
call get_parameter("nr_extra" , nrext)
! depending on the system of equations initialize the module variables
!
@ -835,7 +834,7 @@ module equations
! obtain the adiabatic specific heat ratio
!
call get_parameter_real("gamma" , gamma )
call get_parameter("gamma", gamma)
! calculate additional parameters
!
@ -845,7 +844,7 @@ module equations
! obtain the isothermal sound speed
!
call get_parameter_real("csnd" , csnd )
call get_parameter("csnd" , csnd )
! calculate additional parameters
!
@ -869,12 +868,12 @@ module equations
! read the boundary values from the parameter file
!
call get_parameter_real(pvars(p) // "_bnd_xl", qpbnd(p,1,1))
call get_parameter_real(pvars(p) // "_bnd_xr", qpbnd(p,1,2))
call get_parameter_real(pvars(p) // "_bnd_yl", qpbnd(p,2,1))
call get_parameter_real(pvars(p) // "_bnd_yr", qpbnd(p,2,2))
call get_parameter_real(pvars(p) // "_bnd_zl", qpbnd(p,3,1))
call get_parameter_real(pvars(p) // "_bnd_zr", qpbnd(p,3,2))
call get_parameter(pvars(p) // "_bnd_xl", qpbnd(p,1,1))
call get_parameter(pvars(p) // "_bnd_xr", qpbnd(p,1,2))
call get_parameter(pvars(p) // "_bnd_yl", qpbnd(p,2,1))
call get_parameter(pvars(p) // "_bnd_yr", qpbnd(p,2,2))
call get_parameter(pvars(p) // "_bnd_zl", qpbnd(p,3,1))
call get_parameter(pvars(p) // "_bnd_zr", qpbnd(p,3,2))
end do ! over all variables
@ -885,9 +884,9 @@ module equations
! get the minimum allowed density and pressure in the system, and the maximum
! Lorentz factor for special relativity
!
call get_parameter_real("dmin" , dmin )
call get_parameter_real("pmin" , pmin )
call get_parameter_real("lmax" , lmax )
call get_parameter("dmin", dmin)
call get_parameter("pmin", pmin)
call get_parameter("lmax", lmax)
! calculate the maximum speed corresponding to the maximum Lorentz factor
!
@ -895,7 +894,7 @@ module equations
! get the upper bound for the sonic Mach number
!
call get_parameter_real("msmax" , msmax )
call get_parameter("msmax", msmax)
! calculate the sonic Mach number factor
!
@ -903,7 +902,7 @@ module equations
! get the state correction flags
!
call get_parameter_string("fix_unphysical_cells", unphysical_fix )
call get_parameter("fix_unphysical_cells", unphysical_fix)
! check if the correction of unphysical cells is on
!
@ -916,8 +915,8 @@ module equations
! get parameters for unphysical cells correction
!
call get_parameter_integer("ngavg", ngavg)
call get_parameter_integer("npavg", npavg)
call get_parameter("ngavg", ngavg)
call get_parameter("npavg", npavg)
! correct the above parameters to reasonable values
!