Skip to content

Commit

Permalink
for uncoupled z-plane (do_2D) case, only write out structure factors …
Browse files Browse the repository at this point in the history 
…of the average of each plane, not the vertical average
  • Loading branch information
@ajnonaka
ajnonaka committed Jan 28, 2025
1 parent de2bff2 commit 05e6a23
Showing 1 changed file with 68 additions and 71 deletions.
139 changes: 68 additions & 71 deletions src_compressible_stag/main_driver.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -780,16 +780,14 @@ void main_driver(const char* argv)

if (struct_fact_int > 0) {

structFactConsMF.define(ba,dmap,structVarsCons,0);
structFactPrimMF.define(ba,dmap,structVarsPrim,0);

if ((do_1D==0) and (do_2D==0)) {
structFactPrim.define(ba,dmap,prim_var_names,var_scaling_prim);
structFactCons.define(ba,dmap,cons_var_names,var_scaling_cons);
}

if (do_1D==0) {
structFactConsMF.define(ba,dmap,structVarsCons,0);
structFactPrimMF.define(ba,dmap,structVarsPrim,0);
}

// structure factor class for vertically-averaged dataset
if (project_dir >= 0) {

Expand Down Expand Up @@ -836,17 +834,18 @@ void main_driver(const char* argv)
structFactConsArray[i].define(ba_flat,dmap_flat,cons_var_names,var_scaling_cons);
}

}
} else {

if (do_slab_sf == 0) {
structFactPrimFlattened.define(ba_flat,dmap_flat,prim_var_names,var_scaling_prim);
structFactConsFlattened.define(ba_flat,dmap_flat,cons_var_names,var_scaling_cons);
}
else {
structFactPrimVerticalAverageMembraneLo.define(ba_flat,dmap_flat,prim_var_names,var_scaling_prim);
structFactPrimVerticalAverageMembraneHi.define(ba_flat,dmap_flat,prim_var_names,var_scaling_prim);
structFactConsVerticalAverageMembraneLo.define(ba_flat,dmap_flat,cons_var_names,var_scaling_cons);
structFactConsVerticalAverageMembraneHi.define(ba_flat,dmap_flat,cons_var_names,var_scaling_cons);
if (do_slab_sf == 0) {
structFactPrimFlattened.define(ba_flat,dmap_flat,prim_var_names,var_scaling_prim);
structFactConsFlattened.define(ba_flat,dmap_flat,cons_var_names,var_scaling_cons);
}
else {
structFactPrimVerticalAverageMembraneLo.define(ba_flat,dmap_flat,prim_var_names,var_scaling_prim);
structFactPrimVerticalAverageMembraneHi.define(ba_flat,dmap_flat,prim_var_names,var_scaling_prim);
structFactConsVerticalAverageMembraneLo.define(ba_flat,dmap_flat,cons_var_names,var_scaling_cons);
structFactConsVerticalAverageMembraneHi.define(ba_flat,dmap_flat,cons_var_names,var_scaling_cons);
}
}
}

Expand Down Expand Up @@ -1347,64 +1346,64 @@ void main_driver(const char* argv)
}

}
}
} else {

if (do_slab_sf == 0) {
if (do_slab_sf == 0) {

{
MultiFab Flattened;
{
MultiFab Flattened;

if (slicepoint < 0) {
ComputeVerticalAverage(structFactPrimMF, Flattened, project_dir, 0, structVarsPrim);
} else {
ExtractSlice(structFactPrimMF, Flattened, project_dir, slicepoint, 0, structVarsPrim);
if (slicepoint < 0) {
ComputeVerticalAverage(structFactPrimMF, Flattened, project_dir, 0, structVarsPrim);
} else {
ExtractSlice(structFactPrimMF, Flattened, project_dir, slicepoint, 0, structVarsPrim);
}
structFactPrimFlattened.FortStructure(Flattened);
}
structFactPrimFlattened.FortStructure(Flattened);
}

{
MultiFab Flattened;
{
MultiFab Flattened;

if (slicepoint < 0) {
ComputeVerticalAverage(structFactConsMF, Flattened, project_dir, 0, structVarsCons);
} else {
ExtractSlice(structFactConsMF, Flattened, project_dir, slicepoint, 0, structVarsCons);
if (slicepoint < 0) {
ComputeVerticalAverage(structFactConsMF, Flattened, project_dir, 0, structVarsCons);
} else {
ExtractSlice(structFactConsMF, Flattened, project_dir, slicepoint, 0, structVarsCons);
}
structFactConsFlattened.FortStructure(Flattened);
}
structFactConsFlattened.FortStructure(Flattened);
}

} else {
} else {

{
MultiFab Flattened;
{
MultiFab Flattened;

ComputeVerticalAverage(structFactPrimMF, Flattened, project_dir, 0, structVarsPrim, 0, membrane_cell-1);
structFactPrimVerticalAverageMembraneLo.FortStructure(Flattened);
}
ComputeVerticalAverage(structFactPrimMF, Flattened, project_dir, 0, structVarsPrim, 0, membrane_cell-1);
structFactPrimVerticalAverageMembraneLo.FortStructure(Flattened);
}

{
MultiFab Flattened;
{
MultiFab Flattened;

ComputeVerticalAverage(structFactPrimMF, Flattened, project_dir, 0, structVarsPrim, membrane_cell, n_cells[project_dir]-1);
structFactPrimVerticalAverageMembraneHi.FortStructure(Flattened);
}
ComputeVerticalAverage(structFactPrimMF, Flattened, project_dir, 0, structVarsPrim, membrane_cell, n_cells[project_dir]-1);
structFactPrimVerticalAverageMembraneHi.FortStructure(Flattened);
}

{
MultiFab Flattened;
{
MultiFab Flattened;

ComputeVerticalAverage(structFactConsMF, Flattened, project_dir, 0, structVarsCons, 0, membrane_cell-1);
structFactConsVerticalAverageMembraneLo.FortStructure(Flattened);
}
ComputeVerticalAverage(structFactConsMF, Flattened, project_dir, 0, structVarsCons, 0, membrane_cell-1);
structFactConsVerticalAverageMembraneLo.FortStructure(Flattened);
}

{
MultiFab Flattened;
{
MultiFab Flattened;

ComputeVerticalAverage(structFactConsMF, Flattened, project_dir, 0, structVarsCons, membrane_cell, n_cells[project_dir]-1);
structFactConsVerticalAverageMembraneHi.FortStructure(Flattened);
}
}

}
ComputeVerticalAverage(structFactConsMF, Flattened, project_dir, 0, structVarsCons, membrane_cell, n_cells[project_dir]-1);
structFactConsVerticalAverageMembraneHi.FortStructure(Flattened);
}
} // if (do_slab_sf...
} // if (do_2D...
} // if (project_dir >= 0)

if (n_ads_spec > 0 && (n_cells[(project_dir+1)%3] != 1 || n_cells[(project_dir+2)%3] != 1) ) {
int surfcov_dir = project_dir;
Expand All @@ -1418,25 +1417,23 @@ void main_driver(const char* argv)
}

// write out structure factor
if (step > amrex::Math::abs(n_steps_skip) &&
struct_fact_int > 0 && plot_int > 0 &&
step%plot_int == 0) {
if (step > amrex::Math::abs(n_steps_skip) && struct_fact_int > 0 && plot_int > 0 && step%plot_int == 0) {

if ((do_1D==0) and (do_2D==0)) {
structFactPrim.WritePlotFile(step,time,"plt_SF_prim");
structFactCons.WritePlotFile(step,time,"plt_SF_cons");
}

if (project_dir >= 0) {
if (do_slab_sf == 0) {
structFactPrimFlattened.WritePlotFile(step,time,"plt_SF_prim_Flattened");
structFactConsFlattened.WritePlotFile(step,time,"plt_SF_cons_Flattened");
}
else {
structFactPrimVerticalAverageMembraneLo.WritePlotFile(step,time,"plt_SF_prim_VerticalAverageMembraneLo");
structFactPrimVerticalAverageMembraneHi.WritePlotFile(step,time,"plt_SF_prim_VerticalAverageMembraneHi");
structFactConsVerticalAverageMembraneLo.WritePlotFile(step,time,"plt_SF_cons_VerticalAverageMembraneLo");
structFactConsVerticalAverageMembraneHi.WritePlotFile(step,time,"plt_SF_cons_VerticalAverageMembraneHi");
if (project_dir >= 0) {
if (do_slab_sf == 0) {
structFactPrimFlattened.WritePlotFile(step,time,"plt_SF_prim_Flattened");
structFactConsFlattened.WritePlotFile(step,time,"plt_SF_cons_Flattened");
}
else {
structFactPrimVerticalAverageMembraneLo.WritePlotFile(step,time,"plt_SF_prim_VerticalAverageMembraneLo");
structFactPrimVerticalAverageMembraneHi.WritePlotFile(step,time,"plt_SF_prim_VerticalAverageMembraneHi");
structFactConsVerticalAverageMembraneLo.WritePlotFile(step,time,"plt_SF_cons_VerticalAverageMembraneLo");
structFactConsVerticalAverageMembraneHi.WritePlotFile(step,time,"plt_SF_cons_VerticalAverageMembraneHi");
}
}
}

Expand Down

0 comments on commit 05e6a23

Please sign in to comment.