cwpearson/astaroth
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in synch_collapse_2020_11 (pull request #15)

Browse Source 
Synch collapse 2020 11
This commit is contained in:
Miikka Väisälä
2020-11-19 07:19:01 +00:00
parent f61223c02b 204f075343
commit dd9dd5e8ce
2 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
acc/mhd_solver/stencil_kernel.ac
View File

@@ -39,6 +39,7 @@ uniform Scalar AC_zorig;
uniform Scalar AC_unit_density; uniform Scalar AC_unit_density;
uniform Scalar AC_unit_velocity; uniform Scalar AC_unit_velocity;
uniform Scalar AC_unit_length; uniform Scalar AC_unit_length;
uniform Scalar AC_unit_magnetic;
// properties of gravitating star // properties of gravitating star
uniform Scalar AC_star_pos_x; uniform Scalar AC_star_pos_x;
uniform Scalar AC_star_pos_y; uniform Scalar AC_star_pos_y;

33
samples/standalone/simulation.cc
View File

@@ -43,7 +43,13 @@
// NEED TO BE DEFINED HERE. IS NOT NOTICED BY compile_acc call. // NEED TO BE DEFINED HERE. IS NOT NOTICED BY compile_acc call.
#define LFORCING (0) #define LFORCING (0)
#ifdef VTXBUF_ACCRETION
#define LSINK (1)
#else
#define LSINK (0) #define LSINK (0)
#endif
#ifdef BFIELDX #ifdef BFIELDX
#define LBFIELD (1) #define LBFIELD (1)
#else #else
@@ -322,6 +328,7 @@ run_simulation(const char* config_path)
// acmesh_init_to(INIT_TYPE_SIMPLE_CORE, mesh); //Initial condition for a collapse test // acmesh_init_to(INIT_TYPE_SIMPLE_CORE, mesh); //Initial condition for a collapse test
#if LSINK #if LSINK
printf("WARNING! Sink particle is under development. USE AT YOUR OWN RISK!")
vertex_buffer_set(VTXBUF_ACCRETION, 0.0, mesh); vertex_buffer_set(VTXBUF_ACCRETION, 0.0, mesh);
#endif #endif
@@ -387,18 +394,10 @@ run_simulation(const char* config_path)
/* Step the simulation */ /* Step the simulation */
AcReal accreted_mass = 0.0; AcReal accreted_mass = 0.0;
AcReal sink_mass = 0.0; AcReal sink_mass = 0.0;
AcReal uu_freefall = 0.0;
AcReal dt_typical = 0.0; AcReal dt_typical = 0.0;
int dtcounter = 0; int dtcounter = 0;
for (int i = start_step + 1; i < max_steps; ++i) { for (int i = start_step + 1; i < max_steps; ++i) {
const AcReal umax = acReduceVec(RTYPE_MAX, VTXBUF_UUX, VTXBUF_UUY, VTXBUF_UUZ);
#if LBFIELD
const AcReal vAmax = acReduceVecScal(RTYPE_ALFVEN_MAX, BFIELDX, BFIELDY, BFIELDZ, VTXBUF_LNRHO);
const AcReal uref = max(umax, vAmax);
const AcReal dt = host_timestep(uref, vAmax, mesh_info);
#else
const AcReal dt = host_timestep(umax, 0.0l, mesh_info);
#endif
#if LSINK #if LSINK
const AcReal sum_mass = acReduceScal(RTYPE_SUM, VTXBUF_ACCRETION); const AcReal sum_mass = acReduceScal(RTYPE_SUM, VTXBUF_ACCRETION);
@@ -406,7 +405,7 @@ run_simulation(const char* config_path)
sink_mass = 0.0; sink_mass = 0.0;
sink_mass = mesh_info.real_params[AC_M_sink_init] + accreted_mass; sink_mass = mesh_info.real_params[AC_M_sink_init] + accreted_mass;
acLoadDeviceConstant(AC_M_sink, sink_mass); acLoadDeviceConstant(AC_M_sink, sink_mass);
vertex_buffer_set(VTXBUF_ACCRETION, 0.0, mesh); vertex_buffer_set(VTXBUF_ACCRETION, 0.0, mesh); //TODO THIS IS A BUG! WILL ONLY SET HOST BUFFER 0!
int on_off_switch; int on_off_switch;
if (i < 1) { if (i < 1) {
@@ -416,11 +415,25 @@ run_simulation(const char* config_path)
on_off_switch = 1; on_off_switch = 1;
} }
acLoadDeviceConstant(AC_switch_accretion, on_off_switch); acLoadDeviceConstant(AC_switch_accretion, on_off_switch);
//Adjust courant condition for free fall velocity
const AcReal RR = mesh_info.real_params[AC_soft]*mesh_info.real_params[AC_soft];
const AcReal SQ2GM = sqrt(AcReal(2.0)*mesh_info.real_params[AC_G_const]*sink_mass);
uu_freefall = fabs(SQ2GM / sqrt(RR));
#else #else
accreted_mass = -1.0; accreted_mass = -1.0;
sink_mass = -1.0; sink_mass = -1.0;
#endif #endif
const AcReal umax = acReduceVec(RTYPE_MAX, VTXBUF_UUX, VTXBUF_UUY, VTXBUF_UUZ);
#if LBFIELD
const AcReal vAmax = acReduceVecScal(RTYPE_ALFVEN_MAX, BFIELDX, BFIELDY, BFIELDZ, VTXBUF_LNRHO);
const AcReal uref = max(max(umax,uu_freefall), vAmax);
const AcReal dt = host_timestep(uref, vAmax, mesh_info);
#else
const AcReal dt = host_timestep(umax, 0.0l, mesh_info);
#endif
#if LFORCING #if LFORCING
const ForcingParams forcing_params = generateForcingParams(mesh_info); const ForcingParams forcing_params = generateForcingParams(mesh_info);
loadForcingParamsToDevice(forcing_params); loadForcingParamsToDevice(forcing_params);