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

Average cleanup #179

Merged
merged 4 commits into from
Jan 18, 2025
Merged

Average cleanup #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1ee25e1
cleanup ExtractSlice and ComputeVerticalAverage routines
ajnonaka Jan 13, 2025
a9bb05a
fix index bug for case where ComputeVerticalAverage is called with in…
ajnonaka Jan 13, 2025
7b72f52
gpu friendly ComputeVerticalAverage
ajnonaka Jan 14, 2025
8fb83a6
updated gpu-safe computeverticalaverage that works for multi-componen…
ajnonaka Jan 14, 2025
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
4 changes: 2 additions & 2 deletions exec/compressible_mui/sav_src/2020/m00.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ void main_driver(const char* argv)

if(project_dir >= 0){
prim.setVal(0.0);
ComputeVerticalAverage(prim, primVertAvg, geom, project_dir, 0, structVarsPrim);
ComputeVerticalAverage(prim, primVertAvg, project_dir, 0, structVarsPrim);
BoxArray ba_flat = primVertAvg.boxArray();
const DistributionMapping& dmap_flat = primVertAvg.DistributionMap();
{
Expand Down Expand Up @@ -675,7 +675,7 @@ void main_driver(const char* argv)
structFactPrim.FortStructure(structFactPrimMF);
structFactCons.FortStructure(structFactConsMF);
if(project_dir >= 0) {
ComputeVerticalAverage(prim, primVertAvg, geom, project_dir, 0, structVarsPrim);
ComputeVerticalAverage(prim, primVertAvg, project_dir, 0, structVarsPrim);
structFactPrimVerticalAverage.FortStructure(primVertAvg);
}
}
Expand Down
4 changes: 2 additions & 2 deletions exec/compressible_mui/sav_src/2020/m01-cutemp_jsq.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ void main_driver(const char* argv)

if(project_dir >= 0){
prim.setVal(0.0);
ComputeVerticalAverage(prim, primVertAvg, geom, project_dir, 0, structVarsPrim);
ComputeVerticalAverage(prim, primVertAvg, project_dir, 0, structVarsPrim);
BoxArray ba_flat = primVertAvg.boxArray();
const DistributionMapping& dmap_flat = primVertAvg.DistributionMap();
{
Expand Down Expand Up @@ -687,7 +687,7 @@ void main_driver(const char* argv)
structFactPrim.FortStructure(structFactPrimMF);
structFactCons.FortStructure(structFactConsMF);
if(project_dir >= 0) {
ComputeVerticalAverage(prim, primVertAvg, geom, project_dir, 0, structVarsPrim);
ComputeVerticalAverage(prim, primVertAvg, project_dir, 0, structVarsPrim);
structFactPrimVerticalAverage.FortStructure(primVertAvg);
}
}
Expand Down
4 changes: 2 additions & 2 deletions exec/compressible_mui/sav_src/2020/m01.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ void main_driver(const char* argv)

if(project_dir >= 0){
prim.setVal(0.0);
ComputeVerticalAverage(prim, primVertAvg, geom, project_dir, 0, structVarsPrim);
ComputeVerticalAverage(prim, primVertAvg, project_dir, 0, structVarsPrim);
BoxArray ba_flat = primVertAvg.boxArray();
const DistributionMapping& dmap_flat = primVertAvg.DistributionMap();
{
Expand Down Expand Up @@ -675,7 +675,7 @@ void main_driver(const char* argv)
structFactPrim.FortStructure(structFactPrimMF);
structFactCons.FortStructure(structFactConsMF);
if(project_dir >= 0) {
ComputeVerticalAverage(prim, primVertAvg, geom, project_dir, 0, structVarsPrim);
ComputeVerticalAverage(prim, primVertAvg, project_dir, 0, structVarsPrim);
structFactPrimVerticalAverage.FortStructure(primVertAvg);
}
}
Expand Down
4 changes: 2 additions & 2 deletions exec/compressible_mui/sav_src/2020/m02.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ void main_driver(const char* argv)

if(project_dir >= 0){
prim.setVal(0.0);
ComputeVerticalAverage(prim, primVertAvg, geom, project_dir, 0, structVarsPrim);
ComputeVerticalAverage(prim, primVertAvg, project_dir, 0, structVarsPrim);
BoxArray ba_flat = primVertAvg.boxArray();
const DistributionMapping& dmap_flat = primVertAvg.DistributionMap();
{
Expand Down Expand Up @@ -728,7 +728,7 @@ void main_driver(const char* argv)
structFactPrim.FortStructure(structFactPrimMF);
structFactCons.FortStructure(structFactConsMF);
if(project_dir >= 0) {
ComputeVerticalAverage(prim, primVertAvg, geom, project_dir, 0, structVarsPrim);
ComputeVerticalAverage(prim, primVertAvg, project_dir, 0, structVarsPrim);
structFactPrimVerticalAverage.FortStructure(primVertAvg);
}
}
Expand Down
4 changes: 2 additions & 2 deletions exec/compressible_mui/sav_src/2020/m10.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@ void main_driver(const char* argv)

if(project_dir >= 0){
prim.setVal(0.0);
ComputeVerticalAverage(prim, primVertAvg, geom, project_dir, 0, structVarsPrim);
ComputeVerticalAverage(prim, primVertAvg, project_dir, 0, structVarsPrim);
BoxArray ba_flat = primVertAvg.boxArray();
const DistributionMapping& dmap_flat = primVertAvg.DistributionMap();
{
Expand Down Expand Up @@ -684,7 +684,7 @@ void main_driver(const char* argv)
structFactPrim.FortStructure(structFactPrimMF);
structFactCons.FortStructure(structFactConsMF);
if(project_dir >= 0) {
ComputeVerticalAverage(prim, primVertAvg, geom, project_dir, 0, structVarsPrim);
ComputeVerticalAverage(prim, primVertAvg, project_dir, 0, structVarsPrim);
structFactPrimVerticalAverage.FortStructure(primVertAvg);
}
}
Expand Down
4 changes: 2 additions & 2 deletions exec/compressible_mui/sav_src/2020/m11.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ void main_driver(const char* argv)

if(project_dir >= 0){
prim.setVal(0.0);
ComputeVerticalAverage(prim, primVertAvg, geom, project_dir, 0, structVarsPrim);
ComputeVerticalAverage(prim, primVertAvg, project_dir, 0, structVarsPrim);
BoxArray ba_flat = primVertAvg.boxArray();
const DistributionMapping& dmap_flat = primVertAvg.DistributionMap();
{
Expand Down Expand Up @@ -688,7 +688,7 @@ void main_driver(const char* argv)
structFactPrim.FortStructure(structFactPrimMF);
structFactCons.FortStructure(structFactConsMF);
if(project_dir >= 0) {
ComputeVerticalAverage(prim, primVertAvg, geom, project_dir, 0, structVarsPrim);
ComputeVerticalAverage(prim, primVertAvg, project_dir, 0, structVarsPrim);
structFactPrimVerticalAverage.FortStructure(primVertAvg);
}
}
Expand Down
4 changes: 2 additions & 2 deletions exec/compressible_mui/sav_src/2020/m12.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ void main_driver(const char* argv)

if(project_dir >= 0){
prim.setVal(0.0);
ComputeVerticalAverage(prim, primVertAvg, geom, project_dir, 0, structVarsPrim);
ComputeVerticalAverage(prim, primVertAvg, project_dir, 0, structVarsPrim);
BoxArray ba_flat = primVertAvg.boxArray();
const DistributionMapping& dmap_flat = primVertAvg.DistributionMap();
{
Expand Down Expand Up @@ -690,7 +690,7 @@ void main_driver(const char* argv)
structFactPrim.FortStructure(structFactPrimMF);
structFactCons.FortStructure(structFactConsMF);
if(project_dir >= 0) {
ComputeVerticalAverage(prim, primVertAvg, geom, project_dir, 0, structVarsPrim);
ComputeVerticalAverage(prim, primVertAvg, project_dir, 0, structVarsPrim);
structFactPrimVerticalAverage.FortStructure(primVertAvg);
}
}
Expand Down
4 changes: 2 additions & 2 deletions exec/compressible_mui/sav_src/202101_before_mui_span/main_driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ void main_driver(const char* argv)

if(project_dir >= 0){
prim.setVal(0.0);
ComputeVerticalAverage(prim, primVertAvg, geom, project_dir, 0, structVarsPrim);
ComputeVerticalAverage(prim, primVertAvg, project_dir, 0, structVarsPrim);
BoxArray ba_flat = primVertAvg.boxArray();
const DistributionMapping& dmap_flat = primVertAvg.DistributionMap();
{
Expand Down Expand Up @@ -703,7 +703,7 @@ void main_driver(const char* argv)
structFactPrim.FortStructure(structFactPrimMF);
structFactCons.FortStructure(structFactConsMF);
if(project_dir >= 0) {
ComputeVerticalAverage(prim, primVertAvg, geom, project_dir, 0, structVarsPrim);
ComputeVerticalAverage(prim, primVertAvg, project_dir, 0, structVarsPrim);
structFactPrimVerticalAverage.FortStructure(primVertAvg);
}
}
Expand Down
4 changes: 2 additions & 2 deletions exec/compressible_mui/sav_src/202101_before_mui_span/main_driver.cpp_0126_bc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ void main_driver(const char* argv)

if(project_dir >= 0){
prim.setVal(0.0);
ComputeVerticalAverage(prim, primVertAvg, geom, project_dir, 0, structVarsPrim);
ComputeVerticalAverage(prim, primVertAvg, project_dir, 0, structVarsPrim);
BoxArray ba_flat = primVertAvg.boxArray();
const DistributionMapping& dmap_flat = primVertAvg.DistributionMap();
{
Expand Down Expand Up @@ -716,7 +716,7 @@ void main_driver(const char* argv)
structFactPrim.FortStructure(structFactPrimMF);
structFactCons.FortStructure(structFactConsMF);
if(project_dir >= 0) {
ComputeVerticalAverage(prim, primVertAvg, geom, project_dir, 0, structVarsPrim);
ComputeVerticalAverage(prim, primVertAvg, project_dir, 0, structVarsPrim);
structFactPrimVerticalAverage.FortStructure(primVertAvg);
}
}
Expand Down
8 changes: 4 additions & 4 deletions exec/compressible_mui/sav_src/202106_before_summer/main_driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,9 +514,9 @@ void main_driver(const char* argv)
// a built version of primFlattened so can obtain what we need to build the
// structure factor and geometry objects for flattened data
if (slicepoint < 0) {
ComputeVerticalAverage(prim, primFlattened, geom, project_dir, 0, structVarsPrim);
ComputeVerticalAverage(prim, primFlattened, project_dir, 0, structVarsPrim);
} else {
ExtractSlice(prim, primFlattened, geom, project_dir, slicepoint, 0, structVarsPrim);
ExtractSlice(prim, primFlattened, project_dir, slicepoint, 0, structVarsPrim);
}
// we rotate this flattened MultiFab to have normal in the z-direction since
// SWFFT only presently supports flattened MultiFabs with z-normal.
Expand Down Expand Up @@ -857,9 +857,9 @@ void main_driver(const char* argv)
if(project_dir >= 0) {
MultiFab primFlattened; // flattened multifab defined below
if (slicepoint < 0) {
ComputeVerticalAverage(prim, primFlattened, geom, project_dir, 0, structVarsPrim);
ComputeVerticalAverage(prim, primFlattened, project_dir, 0, structVarsPrim);
} else {
ExtractSlice(prim, primFlattened, geom, project_dir, slicepoint, 0, structVarsPrim);
ExtractSlice(prim, primFlattened, project_dir, slicepoint, 0, structVarsPrim);
}
// we rotate this flattened MultiFab to have normal in the z-direction since
// SWFFT only presently supports flattened MultiFabs with z-normal.
Expand Down
12 changes: 6 additions & 6 deletions exec/hydro/main_driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,9 +360,9 @@ void main_driver(const char* argv)
// a built version of Flattened so can obtain what we need to build the
// structure factor and geometry objects for flattened data
if (slicepoint < 0) {
ComputeVerticalAverage(structFactMF, Flattened, geom, project_dir, 0, 1);
ComputeVerticalAverage(structFactMF, Flattened, project_dir, 0, 1);
} else {
ExtractSlice(structFactMF, Flattened, geom, project_dir, slicepoint, 0, 1);
ExtractSlice(structFactMF, Flattened, project_dir, slicepoint, 0, 1);
}
BoxArray ba_flat = Flattened.boxArray();
const DistributionMapping& dmap_flat = Flattened.DistributionMap();
Expand Down Expand Up @@ -432,9 +432,9 @@ void main_driver(const char* argv)
if(project_dir >= 0) {
MultiFab Flattened; // flattened multifab defined below
if (slicepoint < 0) {
ComputeVerticalAverage(structFactMF, Flattened, geom, project_dir, 0, structVars);
ComputeVerticalAverage(structFactMF, Flattened, project_dir, 0, structVars);
} else {
ExtractSlice(structFactMF, Flattened, geom, project_dir, slicepoint, 0, structVars);
ExtractSlice(structFactMF, Flattened, project_dir, slicepoint, 0, structVars);
}
structFactFlattened.FortStructure(Flattened);
}
Expand Down Expand Up @@ -526,9 +526,9 @@ void main_driver(const char* argv)
if(project_dir >= 0) {
MultiFab Flattened; // flattened multifab defined below
if (slicepoint < 0) {
ComputeVerticalAverage(structFactMF, Flattened, geom, project_dir, 0, structVars);
ComputeVerticalAverage(structFactMF, Flattened, project_dir, 0, structVars);
} else {
ExtractSlice(structFactMF, Flattened, geom, project_dir, slicepoint, 0, structVars);
ExtractSlice(structFactMF, Flattened, project_dir, slicepoint, 0, structVars);
}
structFactFlattened.FortStructure(Flattened);
}
Expand Down
Loading