Skip to content

psc_shock: Add marder_interval param #394

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

Merged
JamesMcClung merged 4 commits into from
Mar 26, 2026
Merged

psc_shock: Add marder_interval param #394

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
02af8e3
psc_shock: inject turb in ghosts too
JamesMcClung Feb 4, 2026
c6d2e41
psc_shock: don't init turb when no turb
JamesMcClung Mar 18, 2026
bca237c
psc_shock: only log k stats on rank 0
JamesMcClung Mar 25, 2026
89075a8
psc_shock: +marder_interval
JamesMcClung Feb 24, 2026
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
28 changes: 18 additions & 10 deletions src/psc_shock.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ double turb_db2;
double turb_correlation_length;

int out_interval;
int marder_interval;

bool mirror_domain;
std::string turb_method;
Expand Down Expand Up @@ -136,6 +137,7 @@ void setupParameters(int argc, char** argv)

int n_writes = inputParams.getOrDefault<int>("n_writes", 100);
out_interval = psc_params.nmax / n_writes;
marder_interval = inputParams.getOrDefault<int>("marder_interval", -1);

mirror_domain = inputParams.getOrDefault<bool>("mirror_domain", false);
turb_method =
Expand Down Expand Up @@ -335,7 +337,7 @@ void inject_b_from_potential(MfieldsState& mflds,
auto field_patch = make_Fields3d<dim_xyz>(mflds[p]);
auto vector_potential_patch = make_Fields3d<dim_xyz>(vector_potential[p]);

grid.Foreach_3d(0, 1, [&](int jx, int jy, int jz) {
grid.Foreach_3d(2, 1, [&](int jx, int jy, int jz) {
field_patch(HX, jx, jy, jz) = vector_potential_patch(AZ, jx, jy + 1, jz) -
vector_potential_patch(AZ, jx, jy, jz) -
vector_potential_patch(AY, jx, jy, jz + 1) +
Expand Down Expand Up @@ -566,7 +568,11 @@ void inject_turbulence_dense(MfieldsState& mflds)
double kmax = ((Double3)Int3::max(-i3_min, i3_max) * dk_vec).mag();
int nk = kmax / dk + 1;

LOG_INFO("nk = %d, kmax = %f\n", nk, kmax);
int rank;
MPI_Comm_rank(mflds.grid().comm(), &rank);
if (rank == 0) {
LOG_INFO("nk = %d, kmax = %f\n", nk, kmax);
}

auto k_mins = std::vector<double>(nk);
for (int i = 0; i < nk; i++) {
Expand Down Expand Up @@ -638,13 +644,15 @@ void inject_turbulence_dense(MfieldsState& mflds)

void initializeFields(MfieldsState& mflds)
{
if (turb_method == "alfven_dense") {
inject_turbulence_dense(mflds);
} else if (turb_method == "noise_gabor") {
GaborKernel kernel;
inject_turbulence_noise(mflds, kernel);
} else {
LOG_ERROR("Unrecognized turbulence method: %s\n", turb_method.c_str());
if (turb_db2 > 0.0) {
if (turb_method == "alfven_dense") {
inject_turbulence_dense(mflds);
} else if (turb_method == "noise_gabor") {
GaborKernel kernel;
inject_turbulence_noise(mflds, kernel);
} else {
LOG_ERROR("Unrecognized turbulence method: %s\n", turb_method.c_str());
}
}

add_background_fields(mflds);
Expand Down Expand Up @@ -697,7 +705,7 @@ static void run(int argc, char** argv)
double marder_diffusion = 0.9;
int marder_loop = 3;
bool marder_dump = false;
psc_params.marder_interval = -1;
psc_params.marder_interval = marder_interval;
Marder marder(grid, marder_diffusion, marder_loop, marder_dump);

// ----------------------------------------------------------------------
Expand Down
Loading