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

Remove p=2 fem_poisson_perp kernels #163

Merged
merged 3 commits into from
Jul 7, 2023
Merged

Remove p=2 fem_poisson_perp kernels #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b559e0
Remove p=2 fem_poisson_perp kernels since they take too long to build…
manauref Jul 7, 2023
b82f358
Merge branch 'main' into fem_poisson_vareps
manauref Jul 7, 2023
12e7ab7
Fix use of fem_poisson in rt_fem_poisson_tm test. I still get an erro…
manauref Jul 7, 2023
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
420 changes: 0 additions & 420 deletions kernels/fem_poisson_perp/fem_poisson_perp_lhs_stencil_inx_iny_ser.c
View file
Open in desktop

Large diffs are not rendered by default.

1,584 changes: 160 additions & 1,424 deletions kernels/fem_poisson_perp/fem_poisson_perp_lhs_stencil_inx_loy_ser.c
View file
Open in desktop

Large diffs are not rendered by default.

1,584 changes: 160 additions & 1,424 deletions kernels/fem_poisson_perp/fem_poisson_perp_lhs_stencil_inx_upy_ser.c
View file
Open in desktop

Large diffs are not rendered by default.

1,584 changes: 160 additions & 1,424 deletions kernels/fem_poisson_perp/fem_poisson_perp_lhs_stencil_lox_iny_ser.c
View file
Open in desktop

Large diffs are not rendered by default.

4,600 changes: 400 additions & 4,200 deletions kernels/fem_poisson_perp/fem_poisson_perp_lhs_stencil_lox_loy_ser.c
View file
Open in desktop

Large diffs are not rendered by default.

4,600 changes: 400 additions & 4,200 deletions kernels/fem_poisson_perp/fem_poisson_perp_lhs_stencil_lox_upy_ser.c
View file
Open in desktop

Large diffs are not rendered by default.

1,584 changes: 160 additions & 1,424 deletions kernels/fem_poisson_perp/fem_poisson_perp_lhs_stencil_upx_iny_ser.c
View file
Open in desktop

Large diffs are not rendered by default.

4,600 changes: 400 additions & 4,200 deletions kernels/fem_poisson_perp/fem_poisson_perp_lhs_stencil_upx_loy_ser.c
View file
Open in desktop

Large diffs are not rendered by default.

4,600 changes: 400 additions & 4,200 deletions kernels/fem_poisson_perp/fem_poisson_perp_lhs_stencil_upx_upy_ser.c
View file
Open in desktop

Large diffs are not rendered by default.

1,896 changes: 172 additions & 1,724 deletions kernels/fem_poisson_perp/fem_poisson_perp_local_to_global_ser.c
View file
Open in desktop

Large diffs are not rendered by default.

28 changes: 0 additions & 28 deletions kernels/fem_poisson_perp/fem_poisson_perp_num_nodes_ser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,52 +7,24 @@ long fem_poisson_perp_num_nodes_global_3x_ser_p1_periodicx_periodicy(const int *
return 2*(numCells[0]-1)*(numCells[1]-1)+2*(numCells[1]-1)+2*(numCells[0]-1)+2;
}

long fem_poisson_perp_num_nodes_global_3x_ser_p2_periodicx_periodicy(const int *numCells)
{
// numCells: number of cells in each direction.

return 7*(numCells[0]-1)*(numCells[1]-1)+7*(numCells[1]-1)+7*(numCells[0]-1)+7;
}

long fem_poisson_perp_num_nodes_global_3x_ser_p1_periodicx_nonperiodicy(const int *numCells)
{
// numCells: number of cells in each direction.

return 2*(numCells[0]-1)*(numCells[1]-1)+2*(numCells[1]-1)+4*(numCells[0]-1)+4;
}

long fem_poisson_perp_num_nodes_global_3x_ser_p2_periodicx_nonperiodicy(const int *numCells)
{
// numCells: number of cells in each direction.

return 7*(numCells[0]-1)*(numCells[1]-1)+7*(numCells[1]-1)+12*(numCells[0]-1)+12;
}

long fem_poisson_perp_num_nodes_global_3x_ser_p1_nonperiodicx_periodicy(const int *numCells)
{
// numCells: number of cells in each direction.

return 2*(numCells[0]-1)*(numCells[1]-1)+4*(numCells[1]-1)+2*(numCells[0]-1)+4;
}

long fem_poisson_perp_num_nodes_global_3x_ser_p2_nonperiodicx_periodicy(const int *numCells)
{
// numCells: number of cells in each direction.

return 7*(numCells[0]-1)*(numCells[1]-1)+12*(numCells[1]-1)+7*(numCells[0]-1)+12;
}

long fem_poisson_perp_num_nodes_global_3x_ser_p1_nonperiodicx_nonperiodicy(const int *numCells)
{
// numCells: number of cells in each direction.

return 2*(numCells[0]-1)*(numCells[1]-1)+4*(numCells[1]-1)+4*(numCells[0]-1)+8;
}

long fem_poisson_perp_num_nodes_global_3x_ser_p2_nonperiodicx_nonperiodicy(const int *numCells)
{
// numCells: number of cells in each direction.

return 7*(numCells[0]-1)*(numCells[1]-1)+12*(numCells[1]-1)+12*(numCells[0]-1)+20;
}

29 changes: 0 additions & 29 deletions kernels/fem_poisson_perp/fem_poisson_perp_sol_stencil_ser.c
View file
Open in desktop

Large diffs are not rendered by default.

112 changes: 0 additions & 112 deletions kernels/fem_poisson_perp/fem_poisson_perp_src_stencil_inx_iny_ser.c
View file
Open in desktop

Large diffs are not rendered by default.

340 changes: 0 additions & 340 deletions kernels/fem_poisson_perp/fem_poisson_perp_src_stencil_inx_loy_ser.c
View file
Open in desktop

Large diffs are not rendered by default.

340 changes: 0 additions & 340 deletions kernels/fem_poisson_perp/fem_poisson_perp_src_stencil_inx_upy_ser.c
View file
Open in desktop

Large diffs are not rendered by default.

340 changes: 0 additions & 340 deletions kernels/fem_poisson_perp/fem_poisson_perp_src_stencil_lox_iny_ser.c
View file
Open in desktop

Large diffs are not rendered by default.

1,294 changes: 133 additions & 1,161 deletions kernels/fem_poisson_perp/fem_poisson_perp_src_stencil_lox_loy_ser.c
View file
Open in desktop

Large diffs are not rendered by default.

1,294 changes: 133 additions & 1,161 deletions kernels/fem_poisson_perp/fem_poisson_perp_src_stencil_lox_upy_ser.c
View file
Open in desktop

Large diffs are not rendered by default.

340 changes: 0 additions & 340 deletions kernels/fem_poisson_perp/fem_poisson_perp_src_stencil_upx_iny_ser.c
View file
Open in desktop

Large diffs are not rendered by default.

1,294 changes: 133 additions & 1,161 deletions kernels/fem_poisson_perp/fem_poisson_perp_src_stencil_upx_loy_ser.c
View file
Open in desktop

Large diffs are not rendered by default.

1,294 changes: 133 additions & 1,161 deletions kernels/fem_poisson_perp/fem_poisson_perp_src_stencil_upx_upy_ser.c
View file
Open in desktop

Large diffs are not rendered by default.

124 changes: 0 additions & 124 deletions kernels/fem_poisson_perp/gkyl_fem_poisson_perp_kernels.h
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion regression/broken_rt_fem_poisson_tm.c → regression/rt_fem_poisson_tm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ main(int argc, char **argv)
bc_tv.up_type[1] = GKYL_POISSON_DIRICHLET;

// FEM poisson solver.
gkyl_fem_poisson *poisson = gkyl_fem_poisson_new(&grid, basis, &bc_tv, 1.0, NULL, use_gpu);
gkyl_fem_poisson *poisson = gkyl_fem_poisson_new(&grid, basis, &bc_tv, 1.0, NULL, NULL, use_gpu);

int nrep = inp.nloop;

Expand Down
36 changes: 18 additions & 18 deletions unit/ctest_fem_poisson_perp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3140,15 +3140,15 @@ TEST_LIST = {
{ "test_p1_neumannx_dirichletx_dirichlety", test_p1_neumannx_dirichletx_dirichlety_consteps },
{ "test_p1_dirichletx_neumannx_dirichlety", test_p1_dirichletx_neumannx_dirichlety_consteps },
{ "test_p1_neumannx_dirichletx_periodicy", test_p1_neumannx_dirichletx_periodicy_consteps },
{ "test_p2_periodicx_periodicy", test_p2_periodicx_periodicy_consteps },
{ "test_p2_dirichletx_dirichlety", test_p2_dirichletx_dirichlety_consteps },
{ "test_p2_dirichletx_periodicy", test_p2_dirichletx_periodicy_consteps },
{ "test_p2_periodicx_dirichlety", test_p2_periodicx_dirichlety_consteps },
{ "test_p2_dirichletx_neumanny_dirichlety", test_p2_dirichletx_neumanny_dirichlety_consteps },
{ "test_p2_dirichletx_dirichlety_neumanny", test_p2_dirichletx_dirichlety_neumanny_consteps },
{ "test_p2_neumannx_dirichletx_dirichlety", test_p2_neumannx_dirichletx_dirichlety_consteps },
{ "test_p2_dirichletx_neumannx_dirichlety", test_p2_dirichletx_neumannx_dirichlety_consteps },
{ "test_p2_neumannx_dirichletx_periodicy", test_p2_neumannx_dirichletx_periodicy_consteps },
// { "test_p2_periodicx_periodicy", test_p2_periodicx_periodicy_consteps },
// { "test_p2_dirichletx_dirichlety", test_p2_dirichletx_dirichlety_consteps },
// { "test_p2_dirichletx_periodicy", test_p2_dirichletx_periodicy_consteps },
// { "test_p2_periodicx_dirichlety", test_p2_periodicx_dirichlety_consteps },
// { "test_p2_dirichletx_neumanny_dirichlety", test_p2_dirichletx_neumanny_dirichlety_consteps },
// { "test_p2_dirichletx_dirichlety_neumanny", test_p2_dirichletx_dirichlety_neumanny_consteps },
// { "test_p2_neumannx_dirichletx_dirichlety", test_p2_neumannx_dirichletx_dirichlety_consteps },
// { "test_p2_dirichletx_neumannx_dirichlety", test_p2_dirichletx_neumannx_dirichlety_consteps },
// { "test_p2_neumannx_dirichletx_periodicy", test_p2_neumannx_dirichletx_periodicy_consteps },
#ifdef GKYL_HAVE_CUDA
{ "gpu_test_p1_periodicx_periodicy", gpu_test_p1_periodicx_periodicy_consteps },
{ "gpu_test_p1_dirichletx_dirichlety", gpu_test_p1_dirichletx_dirichlety_consteps },
Expand All @@ -3160,15 +3160,15 @@ TEST_LIST = {
{ "gpu_test_p1_neumannx_dirichletx_dirichlety", gpu_test_p1_neumannx_dirichletx_dirichlety_consteps },
{ "gpu_test_p1_dirichletx_neumannx_dirichlety", gpu_test_p1_dirichletx_neumannx_dirichlety_consteps },
{ "gpu_test_p1_neumannx_dirichletx_periodicy", gpu_test_p1_neumannx_dirichletx_periodicy_consteps },
{ "gpu_test_p2_periodicx_periodicy", gpu_test_p2_periodicx_periodicy_consteps },
{ "gpu_test_p2_dirichletx_dirichlety", gpu_test_p2_dirichletx_dirichlety_consteps },
{ "gpu_test_p2_dirichletx_periodicy", gpu_test_p2_dirichletx_periodicy_consteps },
{ "gpu_test_p2_periodicx_dirichlety", gpu_test_p2_periodicx_dirichlety_consteps },
{ "gpu_test_p2_dirichletx_neumanny_dirichlety", gpu_test_p2_dirichletx_neumanny_dirichlety_consteps },
{ "gpu_test_p2_dirichletx_dirichlety_neumanny", gpu_test_p2_dirichletx_dirichlety_neumanny_consteps },
{ "gpu_test_p2_neumannx_dirichletx_dirichlety", gpu_test_p2_neumannx_dirichletx_dirichlety_consteps },
{ "gpu_test_p2_dirichletx_neumannx_dirichlety", gpu_test_p2_dirichletx_neumannx_dirichlety_consteps },
{ "gpu_test_p2_neumannx_dirichletx_periodicy", gpu_test_p2_neumannx_dirichletx_periodicy_consteps },
// { "gpu_test_p2_periodicx_periodicy", gpu_test_p2_periodicx_periodicy_consteps },
// { "gpu_test_p2_dirichletx_dirichlety", gpu_test_p2_dirichletx_dirichlety_consteps },
// { "gpu_test_p2_dirichletx_periodicy", gpu_test_p2_dirichletx_periodicy_consteps },
// { "gpu_test_p2_periodicx_dirichlety", gpu_test_p2_periodicx_dirichlety_consteps },
// { "gpu_test_p2_dirichletx_neumanny_dirichlety", gpu_test_p2_dirichletx_neumanny_dirichlety_consteps },
// { "gpu_test_p2_dirichletx_dirichlety_neumanny", gpu_test_p2_dirichletx_dirichlety_neumanny_consteps },
// { "gpu_test_p2_neumannx_dirichletx_dirichlety", gpu_test_p2_neumannx_dirichletx_dirichlety_consteps },
// { "gpu_test_p2_dirichletx_neumannx_dirichlety", gpu_test_p2_dirichletx_neumannx_dirichlety_consteps },
// { "gpu_test_p2_neumannx_dirichletx_periodicy", gpu_test_p2_neumannx_dirichletx_periodicy_consteps },
#endif
{ NULL, NULL },
};
Expand Down
Loading