Skip to content

Regression test for MLEBABecLap when dx =/= dy #5346

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

Draft
eebasso wants to merge 8 commits into
base: development
Choose a base branch
from
Draft

Regression test for MLEBABecLap when dx =/= dy #5346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4a73b76
Add new input files for aniso tests in 2D and 3D
eebasso Apr 15, 2026
aa67d69
Add to MyTest class and parse in readParameters
eebasso Apr 15, 2026
bf1571b
Modify domain and norm1
eebasso Apr 15, 2026
b344530
Add regtest files to .gitignore
eebasso Apr 16, 2026
e46b0cb
Add aniso tests to AMReX-tests.ini
eebasso Apr 18, 2026
a28f212
Fix to 3D Aniso test in .ini file
eebasso Apr 18, 2026
a8436d5
Add aniso tests to other .ini files
eebasso Apr 18, 2026
f88f7cc
Merge branch 'development' of https://github.com/AMReX-Codes/amrex in…
eebasso Apr 18, 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
8 changes: 8 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,11 @@ BLProfParser.lex.yy.cpp
BLProfParser.tab.H
BLProfParser.tab.cpp
BLProfParserNC.y

# Regtests
ChangeLog.AMReX
git.AMReX.HEAD
git.AMReX.out
fboxinfo.make.out
fcompare.make.out
fsnapshot.make.out
3 changes: 3 additions & 0 deletions Tests/LinearSolvers/CellEB2/MyTest.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ private:
int max_level = 0;
int ref_ratio = 2;
int n_cell = 128;
int n_cell_x = 128;
int n_cell_y = 128;
int n_cell_z = 128;
int max_grid_size = 64;

int prob_type = 2;
Expand Down
13 changes: 11 additions & 2 deletions Tests/LinearSolvers/CellEB2/MyTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ MyTest::solve ()
MultiFab::Multiply(mf, vfrc, 0, 0, 1, 0);

Real norminf = mf.norm0();
Real norm1 = mf.norm1()*AMREX_D_TERM((1.0/n_cell), *(1.0/n_cell), *(1.0/n_cell));
Real norm1 = mf.norm1()*AMREX_D_TERM((1.0/n_cell_x), *(1.0/n_cell_y), *(1.0/n_cell_z));
amrex::Print() << "Level " << ilev << ": weighted max and 1 norms " << norminf << ", " << norm1 << '\n';
}
}
Expand Down Expand Up @@ -231,6 +231,15 @@ MyTest::readParameters ()
ParmParse pp;
pp.query("max_level", max_level);
pp.query("n_cell", n_cell);
if (!pp.query("n_cell_x", n_cell_x)) {
n_cell_x = n_cell;
}
if (!pp.query("n_cell_y", n_cell_y)) {
n_cell_y = n_cell;
}
if (!pp.query("n_cell_z", n_cell_z)) {
n_cell_z = n_cell;
}
pp.query("max_grid_size", max_grid_size);
pp.query("prob_type", prob_type);

Expand Down Expand Up @@ -276,7 +285,7 @@ MyTest::initGrids ()
RealBox rb({AMREX_D_DECL(0.,0.,0.)}, {AMREX_D_DECL(1.,1.,1.)});
std::array<int,AMREX_SPACEDIM> isperiodic{AMREX_D_DECL(0,0,0)};
Geometry::Setup(&rb, 0, isperiodic.data());
Box domain0(IntVect{AMREX_D_DECL(0,0,0)}, IntVect{AMREX_D_DECL(n_cell-1,n_cell-1,n_cell-1)});
Box domain0(IntVect{AMREX_D_DECL(0,0,0)}, IntVect{AMREX_D_DECL(n_cell_x-1,n_cell_y-1,n_cell_z-1)});
Box domain = domain0;
for (int ilev = 0; ilev < nlevels; ++ilev)
{
Expand Down
34 changes: 34 additions & 0 deletions Tests/LinearSolvers/CellEB2/inputs.rt.2d.aniso
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
amrex.fpe_trap_invalid = 1

composite_solve = 0

#max_coarsening_level = 0
reltol = 1.e-12

prob_type = 1

max_level = 1

n_cell_x = 96
n_cell_y = 176

max_grid_size = 64
eb2.max_grid_size = 32
eb2.num_coarsen_opt = 3

eb2.geom_type = sphere
eb2.sphere_center = 0.5 0.5 0.5
eb2.sphere_radius = 0.4
eb2.sphere_has_fluid_inside = 1

eb2.geom_type = box
eb2.box_lo = 0.2 0.2 0.2
eb2.box_hi = 0.8 0.8 0.8
eb2.box_has_fluid_inside = 1

eb2.geom_type = flower

eb2.geom_type = rotated_box

# choose geom_type
eb2.geom_type = flower
35 changes: 35 additions & 0 deletions Tests/LinearSolvers/CellEB2/inputs.rt.3d.aniso
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
amrex.fpe_trap_invalid = 1

composite_solve = 1

#max_coarsening_level = 0
reltol = 1.e-12

prob_type = 2

max_level = 1

n_cell_x = 96
n_cell_y = 176
n_cell_z = 128

max_grid_size = 64
eb2.max_grid_size = 32
eb2.num_coarsen_opt = 3

eb2.geom_type = sphere
eb2.sphere_center = 0.5 0.5 0.5
eb2.sphere_radius = 0.4
eb2.sphere_has_fluid_inside = 1

eb2.geom_type = box
eb2.box_lo = 0.2 0.2 0.2
eb2.box_hi = 0.8 0.8 0.8
eb2.box_has_fluid_inside = 1

eb2.geom_type = flower

eb2.geom_type = rotated_box

# choose geom_type
eb2.geom_type = flower
34 changes: 34 additions & 0 deletions Tools/RegressionTesting/AMReX-cuda-tests.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,23 @@ doVis = 0
outputFile = plot
testSrcTree = C_Src

[EB_Cell_Dir_2D_Aniso]
addToCompileString = USE_CUDA=TRUE
tolerance = 6.e-11
runtime_params = gpu_regtest=1
buildDir = Tests/LinearSolvers/CellEB2
inputFile = inputs.rt.2d.aniso
dim = 2
restartTest = 0
useMPI = 1
numprocs = 2
useOMP = 0
numthreads = 2
compileTest = 0
doVis = 0
outputFile = plot
testSrcTree = C_Src

[EB_Cell_Dir_3D]
addToCompileString = USE_CUDA=TRUE
tolerance = 1.e-13
Expand All @@ -160,6 +177,23 @@ doVis = 0
outputFile = plot
testSrcTree = C_Src

[EB_Cell_Dir_3D_Aniso]
addToCompileString = USE_CUDA=TRUE
tolerance = 1.e-13
runtime_params = eb2.geom_type=rotated_box gpu_regtest=1
buildDir = Tests/LinearSolvers/CellEB2
inputFile = inputs.rt.3d.aniso
dim = 3
restartTest = 0
useMPI = 1
numprocs = 4
useOMP = 0
numthreads = 2
compileTest = 0
doVis = 0
outputFile = plot
testSrcTree = C_Src

[EB_Cell_Neu_2D]
addToCompileString = USE_CUDA=TRUE
tolerance = 1.e-12
Expand Down
34 changes: 34 additions & 0 deletions Tools/RegressionTesting/AMReX-hip-tests.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,23 @@ doVis = 0
outputFile = plot
testSrcTree = C_Src

[EB_Cell_Dir_2D_Aniso]
addToCompileString = USE_CUDA=FALSE USE_HIP=TRUE
tolerance = 3.e-8
runtime_params = gpu_regtest=1
buildDir = Tests/LinearSolvers/CellEB2
inputFile = inputs.rt.2d.aniso
dim = 2
restartTest = 0
useMPI = 0
numprocs = 2
useOMP = 0
numthreads = 2
compileTest = 0
doVis = 0
outputFile = plot
testSrcTree = C_Src

[EB_Cell_Dir_3D]
addToCompileString = USE_CUDA=FALSE USE_HIP=TRUE
tolerance = 3.e-13
Expand All @@ -158,6 +175,23 @@ doVis = 0
outputFile = plot
testSrcTree = C_Src

[EB_Cell_Dir_3D_Aniso]
addToCompileString = USE_CUDA=FALSE USE_HIP=TRUE
tolerance = 3.e-13
runtime_params = eb2.geom_type=rotated_box gpu_regtest=1
buildDir = Tests/LinearSolvers/CellEB2
inputFile = inputs.rt.3d.aniso
dim = 3
restartTest = 0
useMPI = 0
numprocs = 4
useOMP = 0
numthreads = 2
compileTest = 0
doVis = 0
outputFile = plot
testSrcTree = C_Src

[EB_Cell_Neu_2D]
addToCompileString = USE_CUDA=FALSE USE_HIP=TRUE
tolerance = 1.e-12
Expand Down
34 changes: 34 additions & 0 deletions Tools/RegressionTesting/AMReX-sycl-tests.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,23 @@ doVis = 0
outputFile = plot
testSrcTree = C_Src

[EB_Cell_Dir_2D_Aniso]
addToCompileString = USE_CUDA=FALSE USE_HIP=FALSE USE_SYCL=TRUE
tolerance = 2.e-12
runtime_params = gpu_regtest=1
buildDir = Tests/LinearSolvers/CellEB2
inputFile = inputs.rt.2d.aniso
dim = 2
restartTest = 0
useMPI = 0
numprocs = 2
useOMP = 0
numthreads = 2
compileTest = 0
doVis = 0
outputFile = plot
testSrcTree = C_Src

[EB_Cell_Dir_3D]
addToCompileString = USE_CUDA=FALSE USE_SYCL=TRUE
tolerance = 2.e-11
Expand All @@ -107,6 +124,23 @@ doVis = 0
outputFile = plot
testSrcTree = C_Src

[EB_Cell_Dir_3D_Aniso]
addToCompileString = USE_CUDA=FALSE USE_SYCL=TRUE
tolerance = 2.e-11
runtime_params = eb2.geom_type=rotated_box gpu_regtest=1
buildDir = Tests/LinearSolvers/CellEB2
inputFile = inputs.rt.3d.aniso
dim = 3
restartTest = 0
useMPI = 0
numprocs = 4
useOMP = 0
numthreads = 2
compileTest = 0
doVis = 0
outputFile = plot
testSrcTree = C_Src

[EB_Cell_Neu_2D]
addToCompileString = USE_CUDA=FALSE USE_SYCL=TRUE
tolerance = 7.e-12
Expand Down
28 changes: 28 additions & 0 deletions Tools/RegressionTesting/AMReX-tests.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,20 @@ doVis = 0
outputFile = plot
testSrcTree = C_Src

[EB_Cell_Dir_2D_Aniso]
buildDir = Tests/LinearSolvers/CellEB2
inputFile = inputs.rt.2d.aniso
dim = 2
restartTest = 0
useMPI = 1
numprocs = 2
useOMP = 0
numthreads = 2
compileTest = 0
doVis = 0
outputFile = plot
testSrcTree = C_Src

[EB_Cell_Dir_3D]
buildDir = Tests/LinearSolvers/CellEB2
inputFile = inputs.rt.3d
Expand All @@ -273,6 +287,20 @@ doVis = 0
outputFile = plot
testSrcTree = C_Src

[EB_Cell_Dir_3D_Aniso]
buildDir = Tests/LinearSolvers/CellEB2
inputFile = inputs.rt.3d.aniso
dim = 3
restartTest = 0
useMPI = 1
numprocs = 2
useOMP = 1
numthreads = 2
compileTest = 0
doVis = 0
outputFile = plot
testSrcTree = C_Src

[EB_Cell_Dir_3D_Hypre]
buildDir = Tests/LinearSolvers/CellEB2
inputFile = inputs.rt.hypre
Expand Down
Loading