Add Gas explicit stepping and output
This commit is contained in:
+3
-1
@@ -400,7 +400,9 @@ contains
|
||||
|
||||
ierr = SPH_SUCCESS
|
||||
if (npart <= 0) return
|
||||
drho_dt = 0.0_rk
|
||||
do i = 1, npart
|
||||
if (sph_gas_is_active_particle(i)) drho_dt(i) = 0.0_rk
|
||||
end do
|
||||
do i = 1, npart
|
||||
if (.not. sph_gas_is_active_particle(i)) cycle
|
||||
do n = 1, neighbor_count(i)
|
||||
|
||||
@@ -5,7 +5,9 @@ module sph_output_csv
|
||||
use sph_database, only: npart, particle_id_ext, particle_phase, particle_status, &
|
||||
material_id, section_id, x, v, rho, pressure, temperature, h, &
|
||||
water_mass, water_momentum, water_max_pressure, water_min_density, &
|
||||
water_max_density, water_dt_cfl, water_dt_accel, water_dt_viscous
|
||||
water_max_density, water_dt_cfl, water_dt_accel, water_dt_viscous, &
|
||||
gas_particle_count, gas_mass, gas_volume, gas_center, gas_mean_pressure, &
|
||||
gas_max_pressure, gas_equivalent_radius, gas_radius_rate, gas_dtcrit
|
||||
implicit none
|
||||
|
||||
integer, parameter :: SPH_OUTPUT_UNIT = 41
|
||||
@@ -108,6 +110,17 @@ contains
|
||||
write(SPH_OUTPUT_UNIT, '(A,",",ES24.16)') 'min_density', water_min_density
|
||||
write(SPH_OUTPUT_UNIT, '(A,",",ES24.16)') 'max_density', water_max_density
|
||||
write(SPH_OUTPUT_UNIT, '(A,",",ES24.16)') 'dtcrit', dtcrit
|
||||
write(SPH_OUTPUT_UNIT, '(A,",",I0)') 'gas_particles', gas_particle_count
|
||||
write(SPH_OUTPUT_UNIT, '(A,",",ES24.16)') 'gas_mass', gas_mass
|
||||
write(SPH_OUTPUT_UNIT, '(A,",",ES24.16)') 'gas_volume', gas_volume
|
||||
write(SPH_OUTPUT_UNIT, '(A,",",ES24.16)') 'gas_center_x', gas_center(1)
|
||||
write(SPH_OUTPUT_UNIT, '(A,",",ES24.16)') 'gas_center_y', gas_center(2)
|
||||
write(SPH_OUTPUT_UNIT, '(A,",",ES24.16)') 'gas_center_z', gas_center(3)
|
||||
write(SPH_OUTPUT_UNIT, '(A,",",ES24.16)') 'gas_mean_pressure', gas_mean_pressure
|
||||
write(SPH_OUTPUT_UNIT, '(A,",",ES24.16)') 'gas_max_pressure', gas_max_pressure
|
||||
write(SPH_OUTPUT_UNIT, '(A,",",ES24.16)') 'gas_equivalent_radius', gas_equivalent_radius
|
||||
write(SPH_OUTPUT_UNIT, '(A,",",ES24.16)') 'gas_radius_rate', gas_radius_rate
|
||||
write(SPH_OUTPUT_UNIT, '(A,",",ES24.16)') 'gas_dtcrit', gas_dtcrit
|
||||
close(unit=SPH_OUTPUT_UNIT)
|
||||
end subroutine sph_output_write_summary
|
||||
|
||||
|
||||
@@ -8,6 +8,9 @@ module sph_solver_explicit
|
||||
use sph_water, only: sph_water_update_pressure, sph_water_compute_density_rate, &
|
||||
sph_water_compute_acceleration, sph_water_update_diagnostics, &
|
||||
sph_water_estimate_dt_limits
|
||||
use sph_gas, only: sph_gas_update_pressure, sph_gas_compute_density_rate, &
|
||||
sph_gas_compute_acceleration, sph_gas_update_diagnostics, &
|
||||
sph_gas_estimate_dt_limits
|
||||
use sph_output_csv, only: sph_output_write_step
|
||||
implicit none
|
||||
|
||||
@@ -20,7 +23,7 @@ contains
|
||||
ierr = SPH_SUCCESS
|
||||
dtcrit = dt_default
|
||||
if (npart > 0) then
|
||||
call sph_solver_water_dt(dtcrit, ierr)
|
||||
call sph_solver_phase_dt(dtcrit, ierr)
|
||||
if (ierr /= SPH_SUCCESS) return
|
||||
if (dtcrit <= 0.0_rk .or. dtcrit > dt_default) dtcrit = dt_default
|
||||
end if
|
||||
@@ -43,10 +46,16 @@ contains
|
||||
if (ierr /= SPH_SUCCESS) return
|
||||
call sph_water_update_pressure(ierr)
|
||||
if (ierr /= SPH_SUCCESS) return
|
||||
call sph_gas_update_pressure(ierr)
|
||||
if (ierr /= SPH_SUCCESS) return
|
||||
call sph_water_compute_density_rate(ierr)
|
||||
if (ierr /= SPH_SUCCESS) return
|
||||
call sph_gas_compute_density_rate(ierr)
|
||||
if (ierr /= SPH_SUCCESS) return
|
||||
call sph_water_compute_acceleration(ierr)
|
||||
if (ierr /= SPH_SUCCESS) return
|
||||
call sph_gas_compute_acceleration(ierr)
|
||||
if (ierr /= SPH_SUCCESS) return
|
||||
do i = 1, npart
|
||||
vhalf(:,i) = v(:,i) + 0.5_rk * dt * a(:,i)
|
||||
x(:,i) = x(:,i) + dt * vhalf(:,i)
|
||||
@@ -55,6 +64,8 @@ contains
|
||||
end do
|
||||
call sph_water_update_diagnostics(ierr)
|
||||
if (ierr /= SPH_SUCCESS) return
|
||||
call sph_gas_update_diagnostics(ierr)
|
||||
if (ierr /= SPH_SUCCESS) return
|
||||
end if
|
||||
|
||||
current_time = current_time + dt
|
||||
@@ -85,12 +96,16 @@ contains
|
||||
end do
|
||||
end subroutine sph_solver_run_explicit
|
||||
|
||||
subroutine sph_solver_water_dt(dtcrit, ierr)
|
||||
subroutine sph_solver_phase_dt(dtcrit, ierr)
|
||||
real(rk), intent(out) :: dtcrit
|
||||
integer, intent(out) :: ierr
|
||||
real(rk) :: dt_cfl
|
||||
real(rk) :: dt_accel
|
||||
real(rk) :: dt_viscous
|
||||
real(rk) :: gas_cfl
|
||||
real(rk) :: gas_accel
|
||||
real(rk) :: gas_limit
|
||||
real(rk) :: water_limit
|
||||
|
||||
if (safety_factor <= 0.0_rk) then
|
||||
call sph_error_set(SPH_ERROR_ARGUMENT, 'time step safety factor must be positive')
|
||||
@@ -100,7 +115,15 @@ contains
|
||||
end if
|
||||
call sph_water_estimate_dt_limits(dt_cfl, dt_accel, dt_viscous, ierr)
|
||||
if (ierr /= SPH_SUCCESS) return
|
||||
dtcrit = min(dt_cfl, min(dt_accel, dt_viscous)) * safety_factor
|
||||
end subroutine sph_solver_water_dt
|
||||
water_limit = min(dt_cfl, min(dt_accel, dt_viscous))
|
||||
dtcrit = 0.0_rk
|
||||
if (water_limit > 0.0_rk) dtcrit = water_limit
|
||||
call sph_gas_estimate_dt_limits(gas_cfl, gas_accel, gas_limit, ierr)
|
||||
if (ierr /= SPH_SUCCESS) return
|
||||
if (gas_limit > 0.0_rk) then
|
||||
if (dtcrit <= 0.0_rk .or. gas_limit < dtcrit) dtcrit = gas_limit
|
||||
end if
|
||||
dtcrit = dtcrit * safety_factor
|
||||
end subroutine sph_solver_phase_dt
|
||||
|
||||
end module sph_solver_explicit
|
||||
|
||||
Reference in New Issue
Block a user