Merge branch 'master' into reconnection
This commit is contained in:
commit
47b2b2bcdb
@ -1261,6 +1261,7 @@ module io
|
||||
use blocks , only : change_blocks_process
|
||||
use coordinates , only : nn => bcells, ncells, nghosts
|
||||
use coordinates , only : xmin, xmax, ymin, ymax, zmin, zmax
|
||||
use equations , only : cmax, cmax2
|
||||
use evolution , only : step, time, dt, dth, dte
|
||||
use evolution , only : niterations, nrejections, errs
|
||||
use forcing , only : nmodes, fcoefs, einj
|
||||
@ -1420,6 +1421,9 @@ module io
|
||||
read(svalue, fmt = *) dth
|
||||
case('dte')
|
||||
read(svalue, fmt = *) dte
|
||||
case('cmax')
|
||||
read(svalue, fmt = *) cmax
|
||||
cmax2 = cmax * cmax
|
||||
case('niterations')
|
||||
read(svalue, fmt = *) niterations
|
||||
case('nrejections')
|
||||
@ -2248,7 +2252,7 @@ module io
|
||||
use coordinates , only : zmin, zmax
|
||||
#endif /* NDIMS == 3 */
|
||||
use coordinates , only : bdims => domain_base_dims
|
||||
use equations , only : eqsys, eos, nv
|
||||
use equations , only : eqsys, eos, nv, cmax
|
||||
use evolution , only : step, time, dt, dth, dte, cfl, glm_alpha, errs
|
||||
use evolution , only : atol, rtol, mrej, niterations, nrejections
|
||||
use forcing , only : nmodes, fcoefs, einj
|
||||
@ -2400,6 +2404,7 @@ module io
|
||||
call write_attribute_xml(lun, "dth" , dth)
|
||||
call write_attribute_xml(lun, "dte" , dte)
|
||||
call write_attribute_xml(lun, "cfl" , cfl)
|
||||
call write_attribute_xml(lun, "cmax" , cmax)
|
||||
call write_attribute_xml(lun, "glm_alpha", glm_alpha)
|
||||
call write_attribute_xml(lun, "absolute_tolerance", atol)
|
||||
call write_attribute_xml(lun, "relative_tolerance", rtol)
|
||||
@ -4184,7 +4189,7 @@ module io
|
||||
use coordinates , only : bdims => domain_base_dims
|
||||
use coordinates , only : xmin, xmax, ymin, ymax, zmin, zmax
|
||||
use coordinates , only : periodic
|
||||
use equations , only : eqsys, eos, adiabatic_index, csnd
|
||||
use equations , only : eqsys, eos, adiabatic_index, csnd, cmax
|
||||
use evolution , only : step, time, dt, dth, dte, cfl, glm_alpha, errs
|
||||
use evolution , only : atol, rtol, mrej, niterations, nrejections
|
||||
use forcing , only : nmodes, einj, fcoefs
|
||||
@ -4291,6 +4296,7 @@ module io
|
||||
call write_attribute(gid, 'dth' , dth )
|
||||
call write_attribute(gid, 'dte' , dte )
|
||||
call write_attribute(gid, 'cfl' , cfl )
|
||||
call write_attribute(gid, 'cmax', cmax)
|
||||
call write_attribute(gid, 'glm_alpha', glm_alpha)
|
||||
if (eos == 'adi') then
|
||||
call write_attribute(gid, 'adiabatic_index', adiabatic_index)
|
||||
@ -4386,6 +4392,7 @@ module io
|
||||
use blocks , only : get_mblocks, get_dblocks, get_nleafs
|
||||
use coordinates , only : ncells
|
||||
use coordinates , only : xmin, xmax, ymin, ymax, zmin, zmax
|
||||
use equations , only : cmax, cmax2
|
||||
use evolution , only : step, time, dt, dth, dte
|
||||
use evolution , only : niterations, nrejections, errs
|
||||
use forcing , only : nmodes, fcoefs
|
||||
@ -4463,6 +4470,8 @@ module io
|
||||
call read_attribute(gid, 'dt' , dt )
|
||||
call read_attribute(gid, 'dth' , dth )
|
||||
call read_attribute(gid, 'dte' , dte )
|
||||
call read_attribute(gid, 'cmax', cmax)
|
||||
cmax2 = cmax * cmax
|
||||
call read_attribute(gid, 'errs(1)', errs(1))
|
||||
call read_attribute(gid, 'errs(2)', errs(2))
|
||||
call read_attribute(gid, 'errs(3)', errs(3))
|
||||
|
Loading…
x
Reference in New Issue
Block a user