Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Invalid memory access when a super-time-stepping method is used #629

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Invalid memory access when a super-time-stepping method is used #629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5d5e3a
Added task funcs for super-time-stepping.
takasao Oct 28, 2024
bc54261
FIxed style of sts_task_list.cpp
takasao Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
296 changes: 281 additions & 15 deletions src/task_list/sts_task_list.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,22 +365,22 @@ void SuperTimeStepTaskList::AddTask(const TaskID& id, const TaskID& dep) {
} else if (id == SEND_HYDFLX) {
task_list_[ntasks].TaskFunc=
static_cast<TaskStatus (TaskList::*)(MeshBlock*,int)>
(&TimeIntegratorTaskList::SendHydroFlux);
(&SuperTimeStepTaskList::SendHydroFlux_STS);
task_list_[ntasks].lb_time = true;
} else if (id == SEND_FLDFLX) {
task_list_[ntasks].TaskFunc=
static_cast<TaskStatus (TaskList::*)(MeshBlock*,int)>
(&TimeIntegratorTaskList::SendEMF);
(&SuperTimeStepTaskList::SendEMF_STS);
task_list_[ntasks].lb_time = true;
} else if (id == RECV_HYDFLX) {
task_list_[ntasks].TaskFunc=
static_cast<TaskStatus (TaskList::*)(MeshBlock*,int)>
(&TimeIntegratorTaskList::ReceiveAndCorrectHydroFlux);
(&SuperTimeStepTaskList::ReceiveAndCorrectHydroFlux_STS);
task_list_[ntasks].lb_time = false;
} else if (id == RECV_FLDFLX) {
task_list_[ntasks].TaskFunc=
static_cast<TaskStatus (TaskList::*)(MeshBlock*,int)>
(&TimeIntegratorTaskList::ReceiveAndCorrectEMF);
(&SuperTimeStepTaskList::ReceiveAndCorrectEMF_STS);
task_list_[ntasks].lb_time = false;
} else if (id == INT_HYD) {
task_list_[ntasks].TaskFunc=
Expand Down Expand Up @@ -425,12 +425,12 @@ void SuperTimeStepTaskList::AddTask(const TaskID& id, const TaskID& dep) {
} else if (id == SEND_HYDFLXSH) {
task_list_[ntasks].TaskFunc=
static_cast<TaskStatus (TaskList::*)(MeshBlock*,int)>
(&TimeIntegratorTaskList::SendHydroFluxShear);
(&SuperTimeStepTaskList::SendHydroFluxShear_STS);
task_list_[ntasks].lb_time = true;
} else if (id == RECV_HYDFLXSH) {
task_list_[ntasks].TaskFunc=
static_cast<TaskStatus (TaskList::*)(MeshBlock*,int)>
(&TimeIntegratorTaskList::ReceiveHydroFluxShear);
(&SuperTimeStepTaskList::ReceiveHydroFluxShear_STS);
task_list_[ntasks].lb_time = false;
} else if (id == SEND_HYDSH) {
task_list_[ntasks].TaskFunc=
Expand All @@ -455,12 +455,12 @@ void SuperTimeStepTaskList::AddTask(const TaskID& id, const TaskID& dep) {
} else if (id == SEND_EMFSH) {
task_list_[ntasks].TaskFunc=
static_cast<TaskStatus (TaskList::*)(MeshBlock*,int)>
(&TimeIntegratorTaskList::SendEMFShear);
(&SuperTimeStepTaskList::SendEMFShear_STS);
task_list_[ntasks].lb_time = true;
} else if (id == RECV_EMFSH) {
task_list_[ntasks].TaskFunc=
static_cast<TaskStatus (TaskList::*)(MeshBlock*,int)>
(&TimeIntegratorTaskList::ReceiveEMFShear);
(&SuperTimeStepTaskList::ReceiveEMFShear_STS);
task_list_[ntasks].lb_time = false;
} else if (id == CALC_SCLRFLX) {
task_list_[ntasks].TaskFunc=
Expand All @@ -470,12 +470,12 @@ void SuperTimeStepTaskList::AddTask(const TaskID& id, const TaskID& dep) {
} else if (id == SEND_SCLRFLX) {
task_list_[ntasks].TaskFunc=
static_cast<TaskStatus (TaskList::*)(MeshBlock*,int)>
(&TimeIntegratorTaskList::SendScalarFlux);
(&SuperTimeStepTaskList::SendScalarFlux_STS);
task_list_[ntasks].lb_time = true;
} else if (id == RECV_SCLRFLX) {
task_list_[ntasks].TaskFunc=
static_cast<TaskStatus (TaskList::*)(MeshBlock*,int)>
(&TimeIntegratorTaskList::ReceiveScalarFlux);
(&SuperTimeStepTaskList::ReceiveScalarFlux_STS);
task_list_[ntasks].lb_time = false;
} else if (id == INT_SCLR) {
task_list_[ntasks].TaskFunc=
Expand Down Expand Up @@ -510,12 +510,12 @@ void SuperTimeStepTaskList::AddTask(const TaskID& id, const TaskID& dep) {
} else if (id == SEND_SCLRFLXSH) {
task_list_[ntasks].TaskFunc=
static_cast<TaskStatus (TaskList::*)(MeshBlock*,int)>
(&TimeIntegratorTaskList::SendScalarsFluxShear);
(&SuperTimeStepTaskList::SendScalarsFluxShear_STS);
task_list_[ntasks].lb_time = true;
} else if (id == RECV_SCLRFLXSH) {
task_list_[ntasks].TaskFunc=
static_cast<TaskStatus (TaskList::*)(MeshBlock*,int)>
(&TimeIntegratorTaskList::ReceiveScalarsFluxShear);
(&SuperTimeStepTaskList::ReceiveScalarsFluxShear_STS);
task_list_[ntasks].lb_time = false;
} else if (id == PROLONG) {
task_list_[ntasks].TaskFunc=
Expand Down Expand Up @@ -550,17 +550,17 @@ void SuperTimeStepTaskList::AddTask(const TaskID& id, const TaskID& dep) {
} else if (id == DIFFUSE_HYD) {
task_list_[ntasks].TaskFunc=
static_cast<TaskStatus (TaskList::*)(MeshBlock*,int)>
(&TimeIntegratorTaskList::DiffuseHydro);
(&SuperTimeStepTaskList::DiffuseHydro_STS);
task_list_[ntasks].lb_time = true;
} else if (id == DIFFUSE_FLD) {
task_list_[ntasks].TaskFunc=
static_cast<TaskStatus (TaskList::*)(MeshBlock*,int)>
(&TimeIntegratorTaskList::DiffuseField);
(&SuperTimeStepTaskList::DiffuseField_STS);
task_list_[ntasks].lb_time = true;
} else if (id == DIFFUSE_SCLR) {
task_list_[ntasks].TaskFunc=
static_cast<TaskStatus (TaskList::*)(MeshBlock*,int)>
(&TimeIntegratorTaskList::DiffuseScalars);
(&SuperTimeStepTaskList::DiffuseScalars_STS);
task_list_[ntasks].lb_time = true;
} else {
std::stringstream msg;
Expand Down Expand Up @@ -997,3 +997,269 @@ TaskStatus SuperTimeStepTaskList::CheckRefinement_STS(MeshBlock *pmb, int stage)
pmb->pmr->CheckRefinementCondition();
return TaskStatus::success;
}

//----------------------------------------------------------------------------------------
// Functions to communicate fluxes between MeshBlocks for flux correction with AMR

TaskStatus SuperTimeStepTaskList::SendHydroFlux_STS(MeshBlock *pmb, int stage) {
if (stage <= nstages) {
if (pmb->pmy_mesh->sts_loc == TaskType::op_split_before ||
pmb->pmy_mesh->sts_loc == TaskType::op_split_after) {
pmb->phydro->hbvar.SendFluxCorrection();
}
return TaskStatus::success;
}
return TaskStatus::fail;
}

//----------------------------------------------------------------------------------------
// Functions to communicate emf between MeshBlocks for flux correction with AMR

TaskStatus SuperTimeStepTaskList::SendEMF_STS(MeshBlock *pmb, int stage) {
if (stage <= nstages) {
if (pmb->pmy_mesh->sts_loc == TaskType::op_split_before ||
pmb->pmy_mesh->sts_loc == TaskType::op_split_after) {
pmb->pfield->fbvar.SendFluxCorrection();
}
return TaskStatus::success;
}
return TaskStatus::fail;
}

//----------------------------------------------------------------------------------------
// Functions to receive fluxes between MeshBlocks

TaskStatus SuperTimeStepTaskList::ReceiveAndCorrectHydroFlux_STS(MeshBlock *pmb,
int stage) {
if (stage <= nstages) {
if (pmb->pmy_mesh->sts_loc == TaskType::op_split_before ||
pmb->pmy_mesh->sts_loc == TaskType::op_split_after) {
if (pmb->phydro->hbvar.ReceiveFluxCorrection()) {
return TaskStatus::next;
} else {
return TaskStatus::fail;
}
} else {
return TaskStatus::next;
}
}
return TaskStatus::fail;
}

//----------------------------------------------------------------------------------------
// Functions to receive emf between MeshBlocks

TaskStatus SuperTimeStepTaskList::ReceiveAndCorrectEMF_STS(MeshBlock *pmb, int stage) {
if (stage <= nstages) {
if (pmb->pmy_mesh->sts_loc == TaskType::op_split_before ||
pmb->pmy_mesh->sts_loc == TaskType::op_split_after) {
if (pmb->pfield->fbvar.ReceiveFluxCorrection()) {
return TaskStatus::next;
} else {
return TaskStatus::fail;
}
} else {
return TaskStatus::next;
}
}
return TaskStatus::fail;
}

//----------------------------------------------------------------------------------------
//! Functions to communicate Field variables between MeshBlocks with shear

TaskStatus SuperTimeStepTaskList::SendHydroFluxShear_STS(MeshBlock *pmb, int stage) {
if (stage <= nstages) {
if (pmb->pmy_mesh->sts_loc == TaskType::op_split_before ||
pmb->pmy_mesh->sts_loc == TaskType::op_split_after) {
pmb->phydro->hbvar.SendFluxShearingBoxBoundaryBuffers();
}
return TaskStatus::success;
}
return TaskStatus::fail;
}


TaskStatus SuperTimeStepTaskList::ReceiveHydroFluxShear_STS(MeshBlock *pmb, int stage) {
if (stage <= nstages) {
if (pmb->pmy_mesh->sts_loc == TaskType::op_split_before ||
pmb->pmy_mesh->sts_loc == TaskType::op_split_after) {
if (pmb->phydro->hbvar.ReceiveFluxShearingBoxBoundaryBuffers()) {
pmb->phydro->hbvar.SetFluxShearingBoxBoundaryBuffers();
return TaskStatus::success;
} else {
return TaskStatus::fail;
}
} else {
return TaskStatus::success;
}
}
return TaskStatus::fail;
}

//----------------------------------------------------------------------------------------
//! Functions to communicate EMFs between MeshBlocks with shear

TaskStatus SuperTimeStepTaskList::SendEMFShear_STS(MeshBlock *pmb, int stage) {
if (stage <= nstages) {
if (pmb->pmy_mesh->sts_loc == TaskType::op_split_before ||
pmb->pmy_mesh->sts_loc == TaskType::op_split_after) {
pmb->pfield->fbvar.SendEMFShearingBoxBoundaryCorrection();
}
return TaskStatus::success;
}
return TaskStatus::fail;
}

//----------------------------------------------------------------------------------------
//! Functions to communicate EMFs between MeshBlocks with shear

TaskStatus SuperTimeStepTaskList::ReceiveEMFShear_STS(MeshBlock *pmb, int stage) {
if (stage <= nstages) {
if (pmb->pmy_mesh->sts_loc == TaskType::op_split_before ||
pmb->pmy_mesh->sts_loc == TaskType::op_split_after) {
if (pmb->pfield->fbvar.ReceiveEMFShearingBoxBoundaryCorrection()) {
pmb->pfield->fbvar.SetEMFShearingBoxBoundaryCorrection();
return TaskStatus::success;
} else {
return TaskStatus::fail;
}
} else {
return TaskStatus::success;
}
}
return TaskStatus::fail;
}

TaskStatus SuperTimeStepTaskList::SendScalarFlux_STS(MeshBlock *pmb, int stage) {
if (stage <= nstages) {
if (pmb->pmy_mesh->sts_loc == TaskType::op_split_before ||
pmb->pmy_mesh->sts_loc == TaskType::op_split_after) {
pmb->pscalars->sbvar.SendFluxCorrection();
}
return TaskStatus::success;
}
return TaskStatus::fail;
}


TaskStatus SuperTimeStepTaskList::ReceiveScalarFlux_STS(MeshBlock *pmb, int stage) {
if (stage <= nstages) {
if (pmb->pmy_mesh->sts_loc == TaskType::op_split_before ||
pmb->pmy_mesh->sts_loc == TaskType::op_split_after) {
if (pmb->pscalars->sbvar.ReceiveFluxCorrection()) {
return TaskStatus::next;
} else {
return TaskStatus::fail;
}
} else {
return TaskStatus::next;
}
}
return TaskStatus::fail;
}

TaskStatus SuperTimeStepTaskList::SendScalarsFluxShear_STS(MeshBlock *pmb, int stage) {
if (stage <= nstages) {
if (pmb->pmy_mesh->sts_loc == TaskType::op_split_before ||
pmb->pmy_mesh->sts_loc == TaskType::op_split_after) {
pmb->pscalars->sbvar.SendFluxShearingBoxBoundaryBuffers();
}
return TaskStatus::success;
}
return TaskStatus::fail;
}


TaskStatus SuperTimeStepTaskList::ReceiveScalarsFluxShear_STS(MeshBlock *pmb, int stage) {
if (stage <= nstages) {
if (pmb->pmy_mesh->sts_loc == TaskType::op_split_before ||
pmb->pmy_mesh->sts_loc == TaskType::op_split_after) {
if (pmb->pscalars->sbvar.ReceiveFluxShearingBoxBoundaryBuffers()) {
pmb->pscalars->sbvar.SetFluxShearingBoxBoundaryBuffers();
return TaskStatus::success;
} else {
return TaskStatus::fail;
}
} else {
return TaskStatus::success;
}
}
return TaskStatus::fail;
}

//----------------------------------------------------------------------------------------
//! Functions to calculate hydro diffusion fluxes (stored in HydroDiffusion::visflx[],
//! cndflx[], added at the end of Hydro::CalculateFluxes()

TaskStatus SuperTimeStepTaskList::DiffuseHydro_STS(MeshBlock *pmb, int stage) {
Hydro *ph = pmb->phydro;
Field *pf = pmb->pfield;

// return if there are no diffusion to be added
if (!(ph->hdif.hydro_diffusion_defined)
|| pmb->pmy_mesh->fluid_setup != FluidFormulation::evolve) return TaskStatus::next;

if (stage <= nstages) {
if (pmb->pmy_mesh->sts_loc == TaskType::op_split_before ||
pmb->pmy_mesh->sts_loc == TaskType::op_split_after) {
// if using orbital advection, put modified conservative into the function
if (pmb->porb->orbital_advection_defined) {
pmb->porb->ConvertOrbitalSystem(ph->w, ph->u, OrbitalTransform::prim);
ph->hdif.CalcDiffusionFlux(ph->w, pmb->porb->w_orb, pf->bcc);
} else {
ph->hdif.CalcDiffusionFlux(ph->w, ph->w, pf->bcc);
}
}
return TaskStatus::next;
}
return TaskStatus::fail;
}

//----------------------------------------------------------------------------------------
//! Functions to calculate diffusion EMF

TaskStatus SuperTimeStepTaskList::DiffuseField_STS(MeshBlock *pmb, int stage) {
Field *pf = pmb->pfield;

// return if there are no diffusion to be added
if (!(pf->fdif.field_diffusion_defined)) return TaskStatus::next;

if (stage <= nstages) {
if (pmb->pmy_mesh->sts_loc == TaskType::op_split_before ||
pmb->pmy_mesh->sts_loc == TaskType::op_split_after) {
// TODO(pdmullen): DiffuseField is also called in SuperTimeStepTaskLsit.
// It must skip Hall effect (once implemented) diffusion process in STS
// and always calculate those terms in the main integrator.
pf->fdif.CalcDiffusionEMF(pf->b, pf->bcc, pf->e);
}
return TaskStatus::next;
}
return TaskStatus::fail;
}

TaskStatus SuperTimeStepTaskList::DiffuseScalars_STS(MeshBlock *pmb, int stage) {
if (pmb->pmy_mesh->fluid_setup == FluidFormulation::fixed) return TaskStatus::next;

PassiveScalars *ps = pmb->pscalars;
Hydro *ph = pmb->phydro;
// return if there are no diffusion to be added
if (!(ps->scalar_diffusion_defined))
return TaskStatus::next;

if (stage <= nstages) {
if (pmb->pmy_mesh->sts_loc == TaskType::op_split_before ||
pmb->pmy_mesh->sts_loc == TaskType::op_split_after) {
// TODO(felker): adapted directly from HydroDiffusion::ClearFlux. Deduplicate
ps->diffusion_flx[X1DIR].ZeroClear();
ps->diffusion_flx[X2DIR].ZeroClear();
ps->diffusion_flx[X3DIR].ZeroClear();

// unlike HydroDiffusion, only 1x passive scalar diffusive process is allowed, so
// there is no need for counterpart to wrapper fn HydroDiffusion::CalcDiffusionFlux
ps->DiffusiveFluxIso(ps->r, ph->w, ps->diffusion_flx);
}
return TaskStatus::next;
}
return TaskStatus::fail;
}
15 changes: 15 additions & 0 deletions src/task_list/task_list.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,21 @@ class SuperTimeStepTaskList : public TaskList {
TaskStatus NewBlockTimeStep_STS(MeshBlock *pmb, int stage);
TaskStatus CheckRefinement_STS(MeshBlock *pmb, int stage);

TaskStatus SendHydroFlux_STS(MeshBlock *pmb, int stage);
TaskStatus SendEMF_STS(MeshBlock *pmb, int stage);
TaskStatus ReceiveAndCorrectHydroFlux_STS(MeshBlock *pmb, int stage);
TaskStatus ReceiveAndCorrectEMF_STS(MeshBlock *pmb, int stage);
TaskStatus SendHydroFluxShear_STS(MeshBlock *pmb, int stage);
TaskStatus ReceiveHydroFluxShear_STS(MeshBlock *pmb, int stage);
TaskStatus SendEMFShear_STS(MeshBlock *pmb, int stage);
TaskStatus ReceiveEMFShear_STS(MeshBlock *pmb, int stage);
TaskStatus SendScalarFlux_STS(MeshBlock *pmb, int stage);
TaskStatus ReceiveScalarFlux_STS(MeshBlock *pmb, int stage);
TaskStatus SendScalarsFluxShear_STS(MeshBlock *pmb, int stage);
TaskStatus ReceiveScalarsFluxShear_STS(MeshBlock *pmb, int stage);
TaskStatus DiffuseHydro_STS(MeshBlock *pmb, int stage);
TaskStatus DiffuseField_STS(MeshBlock *pmb, int stage);
TaskStatus DiffuseScalars_STS(MeshBlock *pmb, int stage);

private:
bool SHEAR_PERIODIC; // flag for shear periodic boundary (true w/ , false w/o)
Expand Down