Merge branch 'master' into reconnection
This commit is contained in:
commit
f8f80abc98
@ -1068,7 +1068,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 equations , only : cmax, cmax2, cglm
|
||||
use evolution , only : step, time, dt, dth, dte
|
||||
use evolution , only : niterations, nrejections, errs
|
||||
use forcing , only : nmodes, fcoefs, einj
|
||||
@ -1217,6 +1217,8 @@ module io
|
||||
case('cmax')
|
||||
read(svalue, fmt=*) cmax
|
||||
cmax2 = cmax * cmax
|
||||
case('cglm')
|
||||
read(svalue, fmt=*) cglm
|
||||
case('niterations')
|
||||
read(svalue, fmt=*) niterations
|
||||
case('nrejections')
|
||||
@ -1908,7 +1910,7 @@ module io
|
||||
use coordinates , only : zmin, zmax
|
||||
#endif /* NDIMS == 3 */
|
||||
use coordinates , only : bdims => domain_base_dims
|
||||
use equations , only : eqsys, eos, nv, cmax
|
||||
use equations , only : eqsys, eos, nv, cmax, cglm
|
||||
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
|
||||
@ -2045,6 +2047,7 @@ module io
|
||||
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, "cglm" , cglm)
|
||||
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)
|
||||
@ -3496,7 +3499,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 equations , only : cmax, cmax2, cglm
|
||||
use evolution , only : step, time, dt, dth, dte
|
||||
use evolution , only : niterations, nrejections, errs
|
||||
use forcing , only : nmodes, fcoefs
|
||||
@ -3575,6 +3578,8 @@ module io
|
||||
call restore_attribute_h5(grp_id, 'cmax', &
|
||||
H5T_NATIVE_DOUBLE, 1, cmax, status)
|
||||
cmax2 = cmax * cmax
|
||||
call restore_attribute_h5(grp_id, 'cglm', &
|
||||
H5T_NATIVE_DOUBLE, 1, cglm, status)
|
||||
call restore_attribute_h5(grp_id, 'errs', &
|
||||
H5T_NATIVE_DOUBLE, 3, errs, status)
|
||||
|
||||
@ -3699,7 +3704,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, cmax, nv
|
||||
use equations , only : eqsys, eos, adiabatic_index, csnd, cmax, cglm, nv
|
||||
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
|
||||
@ -3831,6 +3836,8 @@ module io
|
||||
H5T_NATIVE_DOUBLE, 1, dte, status)
|
||||
call store_attribute_h5(grp_id, 'cmax', &
|
||||
H5T_NATIVE_DOUBLE, 1, cmax, status)
|
||||
call store_attribute_h5(grp_id, 'cglm', &
|
||||
H5T_NATIVE_DOUBLE, 1, cglm, status)
|
||||
call store_attribute_h5(grp_id, 'absolute_tolerance', &
|
||||
H5T_NATIVE_DOUBLE, 1, atol, status)
|
||||
call store_attribute_h5(grp_id, 'relative_tolerance', &
|
||||
|
Loading…
x
Reference in New Issue
Block a user